Merge branch 'canary' into experimental-node-streams-support

vercel · Apr 24, 2024 · 1d78635 · 1d78635
2 parents ab7a8aa + e078fd1
commit 1d78635
Show file tree

Hide file tree

Showing 43 changed files with 445 additions and 146 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -32,6 +32,9 @@ packages/next-env/**/*.d.ts
 test/**/out/**
 test/development/basic/hmr/components/parse-error.js
 
+# TODO: upgrade prettier to 3.1.1 to support import attributes
+test/integration/import-attributes/**/*
+
 bench/nested-deps/pages/**/*
 bench/nested-deps/components/**/*
 

diff --git a/.../02-app/02-api-reference/05-next-config-js/serverComponentsExternalPackages.mdx b/.../02-app/02-api-reference/05-next-config-js/serverComponentsExternalPackages.mdx
@@ -44,6 +44,7 @@ Next.js includes a [short list of popular packages](https://github.com/vercel/ne
 - `eslint`
 - `express`
 - `firebase-admin`
+- `isolated-vm`
 - `jest`
 - `jsdom`
 - `libsql`

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.3.0-canary.19"
+  "version": "14.3.0-canary.21"
 }
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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+    "@next/eslint-plugin-next": "14.3.0-canary.21",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "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": "14.3.0-canary.19",
+  "version": "14.3.0-canary.21",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -93,7 +93,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "14.3.0-canary.19",
+    "@next/env": "14.3.0-canary.21",
     "@swc/helpers": "0.5.10",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001579",
@@ -131,7 +131,7 @@
     "@babel/plugin-proposal-object-rest-spread": "7.20.7",
     "@babel/plugin-syntax-bigint": "7.8.3",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-syntax-import-assertions": "7.22.5",
+    "@babel/plugin-syntax-import-attributes": "7.22.5",
     "@babel/plugin-syntax-jsx": "7.22.5",
     "@babel/plugin-transform-modules-commonjs": "7.22.5",
     "@babel/plugin-transform-runtime": "7.22.5",
@@ -150,10 +150,10 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/polyfill-module": "14.3.0-canary.19",
-    "@next/polyfill-nomodule": "14.3.0-canary.19",
-    "@next/react-refresh-utils": "14.3.0-canary.19",
-    "@next/swc": "14.3.0-canary.19",
+    "@next/polyfill-module": "14.3.0-canary.21",
+    "@next/polyfill-nomodule": "14.3.0-canary.21",
+    "@next/react-refresh-utils": "14.3.0-canary.21",
+    "@next/swc": "14.3.0-canary.21",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/build/babel/preset.ts b/packages/next/src/build/babel/preset.ts
@@ -154,7 +154,12 @@ export default (
         },
       ],
       require('next/dist/compiled/babel/plugin-syntax-dynamic-import'),
-      require('next/dist/compiled/babel/plugin-syntax-import-assertions'),
+      [
+        require('next/dist/compiled/babel/plugin-syntax-import-attributes'),
+        {
+          deprecatedAssertSyntax: true,
+        },
+      ],
       require('./plugins/react-loadable-plugin'),
       [
         require('next/dist/compiled/babel/plugin-proposal-class-properties'),

diff --git a/packages/next/src/bundles/babel/bundle.js b/packages/next/src/bundles/babel/bundle.js
@@ -72,8 +72,8 @@ function pluginSyntaxDynamicImport() {
   return require('next/dist/compiled/babel-packages').pluginSyntaxDynamicImport()
 }
 
-function pluginSyntaxImportAssertions() {
-  return require('next/dist/compiled/babel-packages').pluginSyntaxImportAssertions()
+function pluginSyntaxImportAttributes() {
+  return require('next/dist/compiled/babel-packages').pluginSyntaxImportAttributes()
 }
 
 function pluginSyntaxJsx() {
@@ -127,7 +127,7 @@ module.exports = {
   pluginProposalObjectRestSpread,
   pluginSyntaxBigint,
   pluginSyntaxDynamicImport,
-  pluginSyntaxImportAssertions,
+  pluginSyntaxImportAttributes,
   pluginSyntaxJsx,
   pluginTransformDefine,
   pluginTransformModulesCommonjs,

diff --git a/packages/next/src/bundles/babel/packages-bundle.js b/packages/next/src/bundles/babel/packages-bundle.js
@@ -28,8 +28,8 @@ function pluginSyntaxDynamicImport() {
   return require('@babel/plugin-syntax-dynamic-import')
 }
 
-function pluginSyntaxImportAssertions() {
-  return require('@babel/plugin-syntax-import-assertions')
+function pluginSyntaxImportAttributes() {
+  return require('@babel/plugin-syntax-import-attributes')
 }
 
 function pluginSyntaxJsx() {
@@ -72,7 +72,7 @@ module.exports = {
   pluginProposalObjectRestSpread,
   pluginSyntaxBigint,
   pluginSyntaxDynamicImport,
-  pluginSyntaxImportAssertions,
+  pluginSyntaxImportAttributes,
   pluginSyntaxJsx,
   pluginTransformDefine,
   pluginTransformModulesCommonjs,

diff --git a/packages/next/src/bundles/babel/packages/plugin-syntax-import-assertions.js b/packages/next/src/bundles/babel/packages/plugin-syntax-import-assertions.js
diff --git a/packages/next/src/bundles/babel/packages/plugin-syntax-import-attributes.js b/packages/next/src/bundles/babel/packages/plugin-syntax-import-attributes.js
@@ -0,0 +1 @@
+module.exports = require('./bundle').pluginSyntaxImportAttributes()
diff --git a/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts b/packages/next/src/client/components/router-reducer/prefetch-cache-utils.ts
@@ -110,12 +110,7 @@ export function getOrCreatePrefetchCacheEntry({
     buildId,
     nextUrl,
     prefetchCache,
-    kind:
-      kind ||
-      // in dev, there's never gonna be a prefetch entry so we want to prefetch here
-      (process.env.NODE_ENV === 'development'
-        ? PrefetchKind.AUTO
-        : PrefetchKind.TEMPORARY),
+    kind: kind || PrefetchKind.TEMPORARY,
   })
 }