Merge branch 'fix-19074' of github.com:atcastle/next.js into fix-19074

vercel · Jul 7, 2021 · eb681c5 · eb681c5
2 parents 065446d + 92dc966
commit eb681c5
Show file tree

Hide file tree

Showing 30 changed files with 6,131 additions and 4,637 deletions.
diff --git a/examples/with-patternfly/package.json b/examples/with-patternfly/package.json
@@ -11,7 +11,7 @@
     "@patternfly/react-core": "^4.121.1",
     "@patternfly/react-icons": "^4.10.7",
     "next": "latest",
-    "next-transpile-modules": "^7.3.0",
+    "next-transpile-modules": "^8.0.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "11.0.2-canary.5"
+  "version": "11.0.2-canary.7"
 }
diff --git a/packages/create-next-app/create-app.ts b/packages/create-next-app/create-app.ts
@@ -89,7 +89,11 @@ export async function createApp({
         console.error(
           `Could not locate an example named ${chalk.red(
             `"${example}"`
-          )}. Please check your spelling and try again.`
+          )}. It could be due to the following:\n`,
+          `1. Your spelling of example ${chalk.red(
+            `"${example}"`
+          )} might be incorrect.\n`,
+          `2. You might not be connected to the internet.`
         )
         process.exit(1)
       }

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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+    "@next/eslint-plugin-next": "11.0.2-canary.7",
     "@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/package.json b/packages/eslint-plugin-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "11.0.2-canary.5",
+  "version": "11.0.2-canary.7",
   "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.0.2-canary.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "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.5",
+  "version": "11.0.2-canary.7",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts b/packages/next/build/webpack/loaders/next-serverless-loader/utils.ts
@@ -249,14 +249,17 @@ export function getUtils({
         let paramValue: string
 
         if (Array.isArray(params[param])) {
-          paramValue = (params[param] as string[]).join('/')
+          paramValue = (params[param] as string[])
+            .map((v) => v && encodeURIComponent(v))
+            .join('/')
         } else {
-          paramValue = params[param] as string
+          paramValue =
+            params[param] && encodeURIComponent(params[param] as string)
         }
 
         pathname =
           pathname.substr(0, paramIdx) +
-          encodeURI(paramValue || '') +
+          (paramValue || '') +
           pathname.substr(paramIdx + builtParam.length)
       }
     }

diff --git a/packages/next/bundles/package.json b/packages/next/bundles/package.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "schema-utils3": "npm:schema-utils@3.0.0",
     "webpack-sources2": "npm:webpack-sources@2.3.0",
-    "webpack5": "npm:webpack@5.39.0"
+    "webpack5": "npm:webpack@5.43.0"
   },
   "resolutions": {
     "browserslist": "4.16.6",