Merge branch 'canary' into perf/shared-static-worker-pool

kodiakhq[bot] · web-flow · commit decb63c12778 · 2021-08-11T13:23:38.000Z
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.0.2-canary.28"
+  "version": "11.0.2-canary.29"
 }
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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+    "@next/eslint-plugin-next": "11.0.2-canary.29",
     "@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/README.md b/packages/eslint-plugin-next/README.md
@@ -0,0 +1,4 @@
+# `@next/eslint-plugin-next`
+
+Documentation for `@next/eslint-plugin-next` can be found at:
+https://nextjs.org/docs/basic-features/eslint#eslint-plugin
diff --git a/packages/eslint-plugin-next/jsconfig.json b/packages/eslint-plugin-next/jsconfig.json
@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es2019"
+  },
+  "exclude": ["node_modules"]
+}
diff --git a/packages/eslint-plugin-next/lib/rules/google-font-display.js b/packages/eslint-plugin-next/lib/rules/google-font-display.js
@@ -1,4 +1,4 @@
-const NodeAttributes = require('../utils/nodeAttributes.js')
+const NodeAttributes = require('../utils/node-attributes.js')
 
 module.exports = {
   meta: {
diff --git a/packages/eslint-plugin-next/lib/rules/google-font-preconnect.js b/packages/eslint-plugin-next/lib/rules/google-font-preconnect.js
@@ -1,4 +1,4 @@
-const NodeAttributes = require('../utils/nodeAttributes.js')
+const NodeAttributes = require('../utils/node-attributes.js')
 
 module.exports = {
   meta: {
diff --git a/packages/eslint-plugin-next/lib/rules/link-passhref.js b/packages/eslint-plugin-next/lib/rules/link-passhref.js
@@ -1,4 +1,4 @@
-const NodeAttributes = require('../utils/nodeAttributes.js')
+const NodeAttributes = require('../utils/node-attributes.js')
 
 module.exports = {
   meta: {
diff --git a/packages/eslint-plugin-next/lib/rules/no-html-link-for-pages.js b/packages/eslint-plugin-next/lib/rules/no-html-link-for-pages.js
@@ -1,5 +1,7 @@
+// @ts-check
 const path = require('path')
 const fs = require('fs')
+const getRootDir = require('../utils/get-root-dirs')
 const {
   getUrlFromPagesDirectories,
   normalizeURL,
@@ -20,7 +22,7 @@ const fsExistsSyncCache = {}
 module.exports = {
   meta: {
     docs: {
-      description: 'Prohibit full page refresh for nextjs pages',
+      description: 'Prohibit full page refresh for Next.js pages',
       category: 'HTML',
       recommended: true,
     },
@@ -43,14 +45,27 @@ module.exports = {
     ],
   },
 
+  /**
+   * Creates an ESLint rule listener.
+   *
+   * @param {import('eslint').Rule.RuleContext} context - ESLint rule context
+   * @returns {import('eslint').Rule.RuleListener} An ESLint rule listener
+   */
   create: function (context) {
-    const [customPagesDirectory] = context.options
-    const pagesDirs = customPagesDirectory
-      ? [customPagesDirectory].flat()
-      : [
-          path.join(context.getCwd(), 'pages'),
-          path.join(context.getCwd(), 'src', 'pages'),
-        ]
+    /** @type {(string|string[])[]} */
+    const ruleOptions = context.options
+    const [customPagesDirectory] = ruleOptions
+
+    const rootDirs = getRootDir(context)
+
+    const pagesDirs = (customPagesDirectory
+      ? [customPagesDirectory]
+      : rootDirs.map((dir) => [
+          path.join(dir, 'pages'),
+          path.join(dir, 'src', 'pages'),
+        ])
+    ).flat()
+
     const foundPagesDirs = pagesDirs.filter((dir) => {
       if (fsExistsSyncCache[dir] === undefined) {
         fsExistsSyncCache[dir] = fs.existsSync(dir)
diff --git a/packages/eslint-plugin-next/lib/rules/no-page-custom-font.js b/packages/eslint-plugin-next/lib/rules/no-page-custom-font.js
@@ -1,4 +1,4 @@
-const NodeAttributes = require('../utils/nodeAttributes.js')
+const NodeAttributes = require('../utils/node-attributes.js')
 
 module.exports = {
   meta: {
diff --git a/packages/eslint-plugin-next/lib/utils/get-root-dirs.js b/packages/eslint-plugin-next/lib/utils/get-root-dirs.js
@@ -0,0 +1,40 @@
+// @ts-check
+const glob = require('glob')
+
+/**
+ * Process a Next.js root directory glob.
+ *
+ * @param {string} rootDir - A Next.js root directory glob.
+ * @returns {string[]} - An array of Root directories.
+ */
+const processRootDir = (rootDir) => {
+  // Ensures we only match folders.
+  if (!rootDir.endsWith('/')) rootDir += '/'
+  return glob.sync(rootDir)
+}
+
+/**
+ * Gets one or more Root
+ *
+ * @param {import('eslint').Rule.RuleContext} context - ESLint rule context
+ * @returns An array of root directories.
+ */
+const getRootDirs = (context) => {
+  let rootDirs = [context.getCwd()]
+
+  /** @type {{rootDir?:string|string[]}|undefined} */
+  const nextSettings = context.settings.next || {}
+  let rootDir = nextSettings.rootDir
+
+  if (typeof rootDir === 'string') {
+    rootDirs = processRootDir(rootDir)
+  } else if (Array.isArray(rootDir)) {
+    rootDirs = rootDir
+      .map((dir) => (typeof dir === 'string' ? processRootDir(dir) : []))
+      .flat()
+  }
+
+  return rootDirs
+}
+
+module.exports = getRootDirs
diff --git a/packages/eslint-plugin-next/lib/utils/node-attributes.js b/packages/eslint-plugin-next/lib/utils/node-attributes.js
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
@@ -1,11 +1,20 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "11.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/eslint-plugin-next"
+  },
+  "files": [
+    "lib"
+  ],
+  "dependencies": {
+    "glob": "7.1.7"
+  },
+  "devDependencies": {
+    "@types/eslint": "7.28.0"
   }
 }
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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -65,10 +65,10 @@
   "dependencies": {
     "@babel/runtime": "7.12.5",
     "@hapi/accept": "5.0.2",
-    "@next/env": "11.0.2-canary.28",
-    "@next/polyfill-module": "11.0.2-canary.28",
-    "@next/react-dev-overlay": "11.0.2-canary.28",
-    "@next/react-refresh-utils": "11.0.2-canary.28",
+    "@next/env": "11.0.2-canary.29",
+    "@next/polyfill-module": "11.0.2-canary.29",
+    "@next/react-dev-overlay": "11.0.2-canary.29",
+    "@next/react-refresh-utils": "11.0.2-canary.29",
     "@node-rs/helper": "1.2.1",
     "assert": "2.0.0",
     "ast-types": "0.13.2",
@@ -153,7 +153,7 @@
     "@babel/traverse": "^7.12.10",
     "@babel/types": "7.12.12",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "11.0.2-canary.28",
+    "@next/polyfill-nomodule": "11.0.2-canary.29",
     "@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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "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.0.2-canary.28",
+  "version": "11.0.2-canary.29",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/yarn.lock b/yarn.lock
@@ -4142,10 +4142,10 @@
     "@types/eslint" "*"
     "@types/estree" "*"
 
-"@types/eslint@*":
-  version "7.2.8"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.8.tgz#45cd802380fcc352e5680e1781d43c50916f12ee"
-  integrity sha512-RTKvBsfz0T8CKOGZMfuluDNyMFHnu5lvNr4hWEsQeHXH6FcmIDIozOyWMh36nLGMwVd5UFNXC2xztA8lln22MQ==
+"@types/eslint@*", "@types/eslint@7.28.0":
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
+  integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
@@ -6325,7 +6325,7 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228:
+caniuse-lite@1.0.30001228, caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228:
   version "1.0.30001228"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001228.tgz#bfdc5942cd3326fa51ee0b42fbef4da9d492a7fa"
   integrity sha512-QQmLOGJ3DEgokHbMSA8cj2a+geXqmnpyOFT0lhQV6P3/YOJvGDEwoedcwxEQ30gJIwIIunHIicunJ2rzK5gB2A==
@@ -9826,6 +9826,18 @@ glob@7.1.6, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-dirs@^2.0.1:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-2.1.0.tgz#e9046a49c806ff04d6c1825e196c8f0091e8df4d"

Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,5 @@`
`17`	`17`	`"registry": "https://registry.npmjs.org/"`
`18`	`18`	`}`
`19`	`19`	`},`
`20`		`- "version": "11.0.2-canary.28"`
	`20`	`+ "version": "11.0.2-canary.29"`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "11.0.2-canary.28",`
	`3`	`+ "version": "11.0.2-canary.29",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-const NodeAttributes = require('../utils/nodeAttributes.js')`
	`1`	`+const NodeAttributes = require('../utils/node-attributes.js')`
`2`	`2`
`3`	`3`	`module.exports = {`
`4`	`4`	`meta: {`