Merge branch 'canary' into fix/log-nextjs-color

vercel · Oct 4, 2023 · aacac01 · aacac01
2 parents 1dd221d + ae1b899
commit aacac01
Show file tree

Hide file tree

Showing 76 changed files with 568 additions and 389 deletions.
diff --git a/examples/api-routes-apollo-server/package.json b/examples/api-routes-apollo-server/package.json
@@ -9,7 +9,7 @@
     "@apollo/server": "^4.1.1",
     "@as-integrations/next": "^1.1.0",
     "@graphql-tools/schema": "^9.0.9",
-    "graphql": "16.6.0",
+    "graphql": "16.8.1",
     "graphql-tag": "^2.12.6",
     "next": "latest",
     "react": "^18.2.0",

diff --git a/examples/cms-contentful/package.json b/examples/cms-contentful/package.json
@@ -17,7 +17,7 @@
     "contentful-import": "^9.0.4",
     "date-fns": "2.30.0",
     "next": "latest",
-    "postcss": "8.4.28",
+    "postcss": "8.4.31",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tailwindcss": "^3.3.3",

diff --git a/examples/cms-cosmic/package.json b/examples/cms-cosmic/package.json
@@ -21,7 +21,7 @@
     "@types/node": "^18.0.0",
     "@types/react": "^18.0.14",
     "autoprefixer": "10.4.7",
-    "postcss": "8.4.14",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.1.4",
     "typescript": "^4.7.4"
   }

diff --git a/examples/cms-datocms/package.json b/examples/cms-datocms/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-drupal/package.json b/examples/cms-drupal/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-enterspeed/package.json b/examples/cms-enterspeed/package.json
@@ -16,7 +16,7 @@
     "@types/node": "18.0.0",
     "@types/react": "18.0.14",
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15",
     "typescript": "4.7.4"
   }

diff --git a/examples/cms-ghost/package.json b/examples/cms-ghost/package.json
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-graphcms/package.json b/examples/cms-graphcms/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-kontent-ai/package.json b/examples/cms-kontent-ai/package.json
@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.7",
-    "postcss": "8.4.14",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15",
     "tslib": "2.4.0"
   }

diff --git a/examples/cms-prepr/package.json b/examples/cms-prepr/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-prismic/package.json b/examples/cms-prismic/package.json
@@ -21,7 +21,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.10",
-    "postcss": "8.4.16",
+    "postcss": "8.4.31",
     "slice-machine-ui": "^0.4.2",
     "tailwindcss": "^3.1.8",
     "typescript": "^4.8.3"

diff --git a/examples/cms-storyblok/package.json b/examples/cms-storyblok/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-takeshape/package.json b/examples/cms-takeshape/package.json
@@ -17,7 +17,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-umbraco-heartcore/package.json b/examples/cms-umbraco-heartcore/package.json
@@ -14,7 +14,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.2",
-    "postcss": "8.4.5",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.15"
   }
 }
diff --git a/examples/cms-wordpress/package.json b/examples/cms-wordpress/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "autoprefixer": "10.4.7",
-    "postcss": "8.4.14",
+    "postcss": "8.4.31",
     "tailwindcss": "^3.0.24"
   }
 }
diff --git a/examples/radix-ui/package.json b/examples/radix-ui/package.json
@@ -16,7 +16,7 @@
     "@types/node": "18.8.0",
     "@types/react": "18.0.21",
     "autoprefixer": "10.4.12",
-    "postcss": "8.4.17",
+    "postcss": "8.4.31",
     "tailwindcss": "3.1.8",
     "typescript": "4.8.4"
   }

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.5.5-canary.1"
+  "version": "13.5.5-canary.2"
 }
diff --git a/lint-staged.config.js b/lint-staged.config.js
@@ -27,6 +27,12 @@ module.exports = {
       `git add ${escapedFileNames}`,
     ]
   },
+  '**/*.rs': (filenames) => {
+    const escapedFileNames = filenames
+      .map((filename) => (isWin ? filename : escape([filename])))
+      .join(' ')
+    return [`cargo fmt -- ${escapedFileNames}`, `git add ${escapedFileNames}`]
+  },
 }
 
 function escape(str) {

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": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "keywords": [
     "react",
     "next",

diff --git a/packages/create-next-app/templates/app-tw/js/app/layout.js b/packages/create-next-app/templates/app-tw/js/app/layout.js
@@ -1,5 +1,5 @@
-import './globals.css'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

diff --git a/packages/create-next-app/templates/app-tw/ts/app/layout.tsx b/packages/create-next-app/templates/app-tw/ts/app/layout.tsx
@@ -1,6 +1,6 @@
-import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

diff --git a/packages/create-next-app/templates/app/js/app/layout.js b/packages/create-next-app/templates/app/js/app/layout.js
@@ -1,5 +1,5 @@
-import './globals.css'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

diff --git a/packages/create-next-app/templates/app/ts/app/layout.tsx b/packages/create-next-app/templates/app/ts/app/layout.tsx
@@ -1,6 +1,6 @@
-import './globals.css'
 import type { Metadata } from 'next'
 import { Inter } from 'next/font/google'
+import './globals.css'
 
 const inter = Inter({ subsets: ['latin'] })
 

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": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "description": "ESLint configuration used by Next.js.",
   "main": "index.js",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "homepage": "https://nextjs.org/docs/app/building-your-application/configuring/eslint#eslint-config",
   "dependencies": {
-    "@next/eslint-plugin-next": "13.5.5-canary.1",
+    "@next/eslint-plugin-next": "13.5.5-canary.2",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

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": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

diff --git a/packages/font/package.json b/packages/font/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

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": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.5.5-canary.1",
+  "version": "13.5.5-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": "13.5.5-canary.1",
+  "version": "13.5.5-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": "13.5.5-canary.1",
+  "version": "13.5.5-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": "13.5.5-canary.1",
+  "version": "13.5.5-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": "13.5.5-canary.1",
+  "version": "13.5.5-canary.2",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/crates/next-core/src/next_import_map.rs b/packages/next-swc/crates/next-core/src/next_import_map.rs
@@ -452,7 +452,7 @@ async fn insert_next_server_special_aliases(
                     match runtime {
                         NextRuntime::Edge => "next/dist/compiled/react/jsx-runtime",
                         NextRuntime::NodeJs => {
-                            "next/dist/server/future/route-modules/app-page/vendored/shared/\
+                            "next/dist/server/future/route-modules/app-page/vendored/ssr/\
                              react-jsx-runtime"
                         }
                     },
@@ -465,7 +465,7 @@ async fn insert_next_server_special_aliases(
                     match runtime {
                         NextRuntime::Edge => "next/dist/compiled/react/jsx-dev-runtime",
                         NextRuntime::NodeJs => {
-                            "next/dist/server/future/route-modules/app-page/vendored/shared/\
+                            "next/dist/server/future/route-modules/app-page/vendored/ssr/\
                              react-jsx-dev-runtime"
                         }
                     },
@@ -579,7 +579,7 @@ async fn insert_next_server_special_aliases(
                     match runtime {
                         NextRuntime::Edge => "next/dist/compiled/react/jsx-runtime",
                         NextRuntime::NodeJs => {
-                            "next/dist/server/future/route-modules/app-page/vendored/shared/\
+                            "next/dist/server/future/route-modules/app-page/vendored/rsc/\
                              react-jsx-runtime"
                         }
                     },
@@ -592,7 +592,7 @@ async fn insert_next_server_special_aliases(
                     match runtime {
                         NextRuntime::Edge => "next/dist/compiled/react/jsx-dev-runtime",
                         NextRuntime::NodeJs => {
-                            "next/dist/server/future/route-modules/app-page/vendored/shared/\
+                            "next/dist/server/future/route-modules/app-page/vendored/rsc/\
                              react-jsx-dev-runtime"
                         }
                     },

diff --git a/packages/next-swc/crates/next-core/src/next_server/context.rs b/packages/next-swc/crates/next-core/src/next_server/context.rs
@@ -109,6 +109,7 @@ pub async fn get_server_resolve_options_context(
     let unsupported_modules_resolve_plugin = UnsupportedModulesResolvePlugin::new(project_path);
     let server_component_externals_plugin = ExternalCjsModulesResolvePlugin::new(
         project_path,
+        project_path.root(),
         ExternalPredicate::Only(next_config.server_component_externals()).cell(),
     );
     let ty = ty.into_value();
@@ -125,6 +126,7 @@ pub async fn get_server_resolve_options_context(
     };
     let external_cjs_modules_plugin = ExternalCjsModulesResolvePlugin::new(
         project_path,
+        project_path.root(),
         ExternalPredicate::AllExcept(next_config.transpile_packages()).cell(),
     );