Merge branch 'canary' into lint-fix

vercel · Sep 1, 2021 · 09b3f7b · 09b3f7b
2 parents 78e095e + c1dbc12
commit 09b3f7b
Show file tree

Hide file tree

Showing 19 changed files with 55 additions and 24 deletions.
diff --git a/docs/basic-features/environment-variables.md b/docs/basic-features/environment-variables.md
@@ -78,7 +78,7 @@ export async function getStaticProps() {
 
 ## Exposing Environment Variables to the Browser
 
-By default all environment variables loaded through `.env.local` are only available in the Node.js environment, meaning they won't be exposed to the browser.
+By default environment variables are only available in the Node.js environment, meaning they won't be exposed to the browser.
 
 In order to expose a variable to the browser you have to prefix the variable with `NEXT_PUBLIC_`. For example:
 

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.1.2"
+  "version": "11.1.3-canary.0"
 }
diff --git a/packages/create-next-app/create-app.ts b/packages/create-next-app/create-app.ts
@@ -226,7 +226,7 @@ export async function createApp({
      * TypeScript projects will have type definitions and other devDependencies.
      */
     if (typescript) {
-      devDependencies.push('typescript', '@types/react')
+      devDependencies.push('typescript', '@types/react', '@types/node')
     }
     /**
      * Install package.json dependencies if they exist.

diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "keywords": [
     "react",
     "next",

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "11.1.2",
+    "@next/eslint-plugin-next": "11.1.3-canary.0",
     "@rushstack/eslint-patch": "^1.0.6",
     "@typescript-eslint/parser": "^4.20.0",
     "eslint-import-resolver-node": "^0.3.4",

diff --git a/packages/eslint-plugin-next/lib/rules/next-script-for-ga.js b/packages/eslint-plugin-next/lib/rules/next-script-for-ga.js
@@ -52,8 +52,8 @@ module.exports = {
         // https://developers.google.com/analytics/devguides/collection/analyticsjs#the_google_analytics_tag
         // https://developers.google.com/tag-manager/quickstart
         if (
-          attributes.has('dangerouslySetInnerHTML') &&
-          attributes.value('dangerouslySetInnerHTML')[0]
+          attributes.value('dangerouslySetInnerHTML') &&
+          attributes.value('dangerouslySetInnerHTML').length > 0
         ) {
           const htmlContent =
             attributes.value('dangerouslySetInnerHTML')[0].value.quasis &&

diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

diff --git a/packages/next-bundle-analyzer/package.json b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "keywords": [
     "react",
     "next",

diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

diff --git a/packages/next-polyfill-module/package.json b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "A standard library polyfill for ES Modules supporting browsers (Edge 16+, Firefox 60+, Chrome 61+, Safari 10.1+)",
   "main": "dist/polyfill-module.js",
   "license": "MIT",

diff --git a/packages/next-polyfill-nomodule/package.json b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -66,10 +66,10 @@
   "dependencies": {
     "@babel/runtime": "7.15.3",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.1.2",
-    "@next/polyfill-module": "11.1.2",
-    "@next/react-dev-overlay": "11.1.2",
-    "@next/react-refresh-utils": "11.1.2",
+    "@next/env": "11.1.3-canary.0",
+    "@next/polyfill-module": "11.1.3-canary.0",
+    "@next/react-dev-overlay": "11.1.3-canary.0",
+    "@next/react-refresh-utils": "11.1.3-canary.0",
     "@node-rs/helper": "1.2.1",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -154,7 +154,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "11.1.2",
+    "@next/polyfill-nomodule": "11.1.3-canary.0",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
     "@taskr/watch": "1.1.0",

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "11.1.2",
+  "version": "11.1.3-canary.0",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/test/integration/create-next-app/index.test.js b/test/integration/create-next-app/index.test.js
@@ -143,6 +143,7 @@ describe('create next app', () => {
         'react-dom',
       ])
       expect(Object.keys(pkgJSON.devDependencies)).toEqual([
+        '@types/node',
         '@types/react',
         'eslint',
         'eslint-config-next',

diff --git a/test/unit/eslint-plugin-next/next-script-for-ga.test.ts b/test/unit/eslint-plugin-next/next-script-for-ga.test.ts
@@ -207,5 +207,35 @@ ruleTester.run('sync-scripts', rule, {
         },
       ],
     },
+    {
+      code: `
+        export class Blah extends Head {
+          createGoogleAnalyticsMarkup() {
+            return {
+              __html: \`
+                window.dataLayer = window.dataLayer || [];
+                function gtag(){dataLayer.push(arguments);}
+                gtag('js', new Date());
+                gtag('config', 'UA-148481588-2');\`,
+            };
+          }
+
+          render() {
+            return (
+              <div>
+                <h1>Hello title</h1>
+                <script dangerouslySetInnerHTML={this.createGoogleAnalyticsMarkup()} />
+                <script async src='https://www.google-analytics.com/analytics.js'></script>
+              </div>
+            );
+          }
+      }`,
+      errors: [
+        {
+          message: ERROR_MSG,
+          type: 'JSXOpeningElement',
+        },
+      ],
+    },
   ],
 })