Merge branch 'canary' into fix/use-server-test

vercel · Sep 28, 2023 · 3efa207 · 3efa207
2 parents ddb903e + 49f646d
commit 3efa207
Show file tree

Hide file tree

Showing 37 changed files with 2,416 additions and 2,198 deletions.
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.5.4-canary.4"
+  "version": "13.5.4-canary.5"
 }
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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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": "13.5.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+    "@next/eslint-plugin-next": "13.5.4-canary.5",
     "@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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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.4-canary.4",
+  "version": "13.5.4-canary.5",
   "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/env.rs b/packages/next-swc/crates/next-core/src/env.rs
@@ -99,6 +99,46 @@ pub async fn env_for_js(
         },
     );
 
+    map.insert(
+        "__NEXT_MANUAL_TRAILING_SLASH".to_string(),
+        if next_config.skip_trailing_slash_redirect.unwrap_or(false) {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        },
+    );
+
+    map.insert(
+        "__NEXT_NO_MIDDLEWARE_URL_NORMALIZE".to_string(),
+        if next_config.skip_middleware_url_normalize.unwrap_or(false) {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        },
+    );
+
+    map.insert(
+        "__NEXT_EXTERNAL_MIDDLEWARE_REWRITE_RESOLVE".to_string(),
+        if next_config
+            .experimental
+            .external_middleware_rewrites_resolve
+            .unwrap_or(false)
+        {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        },
+    );
+
+    map.insert(
+        "__NEXT_SCROLL_RESTORATION".to_string(),
+        if next_config.experimental.scroll_restoration.unwrap_or(false) {
+            "true".to_string()
+        } else {
+            "false".to_string()
+        },
+    );
+
     if !test_mode.is_empty() {
         map.insert("__NEXT_TEST_MODE".to_string(), "true".to_string());
     }

diff --git a/packages/next-swc/crates/next-core/src/next_config.rs b/packages/next-swc/crates/next-core/src/next_config.rs
@@ -88,6 +88,8 @@ pub struct NextConfig {
     pub trailing_slash: Option<bool>,
     pub asset_prefix: Option<String>,
     pub base_path: Option<String>,
+    pub skip_middleware_url_normalize: Option<bool>,
+    pub skip_trailing_slash_redirect: Option<bool>,
 
     ///
     #[serde(rename = "_originalRedirects")]
@@ -127,8 +129,6 @@ pub struct NextConfig {
     typescript: TypeScriptConfig,
     use_file_system_public_routes: bool,
     webpack: Option<serde_json::Value>,
-    skip_middleware_url_normalize: Option<bool>,
-    skip_trailing_slash_redirect: Option<bool>,
 }
 
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize, TraceRawVcs)]
@@ -429,6 +429,8 @@ pub struct ExperimentalConfig {
     pub swc_plugins: Option<Vec<(String, serde_json::Value)>>,
     pub turbo: Option<ExperimentalTurboConfig>,
     pub turbotrace: Option<serde_json::Value>,
+    pub external_middleware_rewrites_resolve: Option<bool>,
+    pub scroll_restoration: Option<bool>,
 
     // ---
     // UNSUPPORTED
@@ -446,7 +448,6 @@ pub struct ExperimentalConfig {
     esm_externals: Option<serde_json::Value>,
     extension_alias: Option<serde_json::Value>,
     external_dir: Option<bool>,
-    external_middleware_rewrites_resolve: Option<bool>,
     /// If set to `false`, webpack won't fall back to polyfill Node.js modules
     /// in the browser Full list of old polyfills is accessible here:
     /// [webpack/webpack#Module_notound_error.js#L13-L42](https://github.com/webpack/webpack/blob/2a0536cf510768111a3a6dceeb14cb79b9f59273/lib/Module_not_found_error.js#L13-L42)
@@ -480,7 +481,6 @@ pub struct ExperimentalConfig {
     /// directory.
     ppr: Option<bool>,
     proxy_timeout: Option<f64>,
-    scroll_restoration: Option<bool>,
     /// Enables server actions. Using this feature will enable the
     /// `react@experimental` for the `app` directory. @see https://nextjs.org/docs/app/api-reference/functions/server-actions
     server_actions: Option<bool>,

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.5.4-canary.4",
+  "version": "13.5.4-canary.5",
   "private": true,
   "scripts": {
     "clean": "node ../../scripts/rm.mjs native",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.5.4-canary.4",
+  "version": "13.5.4-canary.5",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -90,7 +90,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.5.4-canary.4",
+    "@next/env": "13.5.4-canary.5",
     "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -144,11 +144,11 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.5.4-canary.4",
-    "@next/polyfill-nomodule": "13.5.4-canary.4",
-    "@next/react-dev-overlay": "13.5.4-canary.4",
-    "@next/react-refresh-utils": "13.5.4-canary.4",
-    "@next/swc": "13.5.4-canary.4",
+    "@next/polyfill-module": "13.5.4-canary.5",
+    "@next/polyfill-nomodule": "13.5.4-canary.5",
+    "@next/react-dev-overlay": "13.5.4-canary.5",
+    "@next/react-refresh-utils": "13.5.4-canary.5",
+    "@next/swc": "13.5.4-canary.5",
     "@opentelemetry/api": "1.4.1",
     "@playwright/test": "^1.35.1",
     "@segment/ajv-human-errors": "2.1.2",