Merge branch 'canary' into fix/500_response_status

Author: dpnolte

Cargo.lock

@@ -114,7 +114,7 @@ This script will load and execute when _any_ route in your application is access
 
 ### Strategy
 
-Although the default behavior of `next/script` allows you load third-party scripts in any page or layout, you can fine-tune its loading behavior by using the `strategy` property:
+Although the default behavior of `next/script` allows you to load third-party scripts in any page or layout, you can fine-tune its loading behavior by using the `strategy` property:
 
 - `beforeInteractive`: Load the script before any Next.js code and before any page hydration occurs.
 - `afterInteractive`: (**default**) Load the script early but after some hydration on the page occurs.

docs/02-app/01-building-your-application/06-optimizing/03-scripts.mdx

@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.5.5-canary.16"
+  "version": "13.5.5-canary.17"
 }

lerna.json

@@ -66,7 +66,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.14.7",
     "@babel/preset-flow": "7.14.5",
     "@babel/preset-react": "7.14.5",
-    "@edge-runtime/jest-environment": "2.3.0",
+    "@edge-runtime/jest-environment": "2.3.4",
     "@emotion/cache": "11.11.0",
     "@emotion/react": "11.11.1",
     "@fullhuman/postcss-purgecss": "1.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "keywords": [
     "react",
     "next",

packages/create-next-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "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.16",
+    "@next/eslint-plugin-next": "13.5.5-canary.17",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0",
     "eslint-import-resolver-node": "^0.3.6",

packages/eslint-config-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/eslint-plugin-next",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "description": "ESLint plugin for Next.js.",
   "main": "dist/index.js",
   "license": "MIT",

packages/eslint-plugin-next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/font",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/font"

packages/font/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",

packages/next-bundle-analyzer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "license": "MIT",
   "repository": {
     "type": "git",

packages/next-codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "keywords": [
     "react",
     "next",

packages/next-env/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "main": "index.js",
   "license": "MIT",
   "repository": {

packages/next-mdx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "repository": {
     "url": "vercel/next.js",
     "directory": "packages/next-plugin-storybook"

packages/next-plugin-storybook/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "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",

packages/next-polyfill-module/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "13.5.5-canary.16",
+  "version": "13.5.5-canary.17",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

packages/next-polyfill-nomodule/package.json

@@ -15,7 +15,6 @@ either = "1"
 fxhash = "0.2.1"
 hex = "0.4.3"
 once_cell = { workspace = true }
-next-transform-font = {workspace = true}
 pathdiff = "0.2.0"
 regex = "1.5"
 rustc-hash = "1"
@@ -24,6 +23,9 @@ serde_json = "1"
 sha1 = "0.10.1"
 tracing = { version = "0.1.37" }
 
+next-transform-dynamic = { workspace = true }
+next-transform-font = { workspace = true }
+
 turbopack-binding = { workspace = true, features = [
   "__swc_core",
   "__swc_core_next_core",

packages/next-swc/crates/core/Cargo.toml

@@ -37,6 +37,7 @@ use std::{cell::RefCell, path::PathBuf, rc::Rc, sync::Arc};
 use auto_cjs::contains_cjs;
 use either::Either;
 use fxhash::FxHashSet;
+use next_transform_dynamic::{next_dynamic, NextDynamicMode};
 use next_transform_font::next_font_loaders;
 use serde::Deserialize;
 use turbopack_binding::swc::{
@@ -58,7 +59,6 @@ mod auto_cjs;
 pub mod cjs_optimizer;
 pub mod disallow_re_export_all_in_page;
 pub mod named_import_transform;
-pub mod next_dynamic;
 pub mod next_ssg;
 pub mod optimize_barrel;
 pub mod optimize_server_react;
@@ -226,7 +226,7 @@ where
             !opts.disable_next_ssg
         ),
         amp_attributes::amp_attributes(),
-        next_dynamic::next_dynamic(
+        next_dynamic(
             opts.is_development,
             opts.is_server,
             match &opts.server_components {
@@ -238,6 +238,7 @@ where
                 },
                 _ => false,
             },
+            NextDynamicMode::Webpack,
             file.name.clone(),
             opts.pages_dir.clone()
         ),