Merge branch 'canary' into update/test-trace

vercel · Oct 27, 2021 · fda4d61 · fda4d61
2 parents 77e33d5 + 00c53d6
commit fda4d61
Show file tree

Hide file tree

Showing 16 changed files with 23 additions and 33 deletions.
diff --git a/errors/failed-loading-swc.md b/errors/failed-loading-swc.md
@@ -16,16 +16,9 @@ If SWC continues to fail to load you can opt-out by disabling `swcMinify` in you
 }
 ```
 
-Be sure to report the issue on [the feedback thread](https://github.com/vercel/next.js/discussions/30174) sharing the below information so we can get it fixed:
-
-- your node architecture and platform `node -e 'console.log(process.arch, process.platform)'`
-- your operating system version and CPU
-- your Next.js version `yarn next --version`
-- your package manager (`yarn` or `npm`) and version
-- your node.js version `node -v`
-- whether `@next/swc-<your-system-version>` was downloaded in `node_modules` correctly
+Be sure to report the issue on [the feedback thread](https://github.com/vercel/next.js/discussions/30468) so that we can investigate it further.
 
 ### Useful Links
 
-- [SWC Feedback Thread](https://github.com/vercel/next.js/discussions/30174)
+- [SWC Feedback Thread](https://github.com/vercel/next.js/discussions/30468)
 - [SWC Disabled Document](https://nextjs.org/docs/messages/swc-disabled)
diff --git a/lerna.json b/lerna.json
@@ -17,5 +17,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.2-canary.1"
+  "version": "12.0.2-canary.2"
 }
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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+    "@next/eslint-plugin-next": "12.0.2-canary.2",
     "@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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -901,10 +901,7 @@ export default async function getBaseWebpackConfig(
       ? // make sure importing "next" is handled gracefully for client
         // bundles in case a user imported types and it wasn't removed
         // TODO: should we warn/error for this instead?
-        {
-          next: 'next',
-          ...(webServerRuntime ? { etag: '{}', chalk: '{}' } : {}),
-        }
+        ['next', ...(webServerRuntime ? [{ etag: '{}', chalk: '{}' }] : [])]
       : !isServerless
       ? [
           ({

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -67,10 +67,10 @@
   "dependencies": {
     "@babel/runtime": "7.15.4",
     "@hapi/accept": "5.0.2",
-    "@next/env": "12.0.2-canary.1",
-    "@next/polyfill-module": "12.0.2-canary.1",
-    "@next/react-dev-overlay": "12.0.2-canary.1",
-    "@next/react-refresh-utils": "12.0.2-canary.1",
+    "@next/env": "12.0.2-canary.2",
+    "@next/polyfill-module": "12.0.2-canary.2",
+    "@next/react-dev-overlay": "12.0.2-canary.2",
+    "@next/react-refresh-utils": "12.0.2-canary.2",
     "@node-rs/helper": "1.2.1",
     "acorn": "8.5.0",
     "assert": "2.0.0",
@@ -156,7 +156,7 @@
     "@babel/traverse": "7.15.0",
     "@babel/types": "7.15.0",
     "@napi-rs/cli": "1.1.0",
-    "@next/polyfill-nomodule": "12.0.2-canary.1",
+    "@next/polyfill-nomodule": "12.0.2-canary.2",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "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": "12.0.2-canary.1",
+  "version": "12.0.2-canary.2",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",