Merge branch 'canary' into huozhi/remove-rsc-client-ref-exports

vercel · May 9, 2024 · 95d2973 · 95d2973
2 parents 4af3983 + 1277ff4
commit 95d2973
Show file tree

Hide file tree

Showing 32 changed files with 188 additions and 66 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -3,4 +3,7 @@
 # https://docs.github.com/en/repositories/working-with-files/using-files/viewing-a-file#ignore-commits-in-the-blame-view
 
 # chore(examples): use default prettier for examples/templates (#60530)
-4466ba436b996263307171d344cca199e8087744
+4466ba436b996263307171d344cca199e8087744
+
+# chore: update prettier to 3.2.5 (#65092)
+64b718c6618b6c419872abbf22163ae543ac259e
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "14.3.0-canary.50"
+  "version": "14.3.0-canary.51"
 }
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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+    "@next/eslint-plugin-next": "14.3.0-canary.51",
     "@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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "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.50",
+  "version": "14.3.0-canary.51",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -93,7 +93,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "14.3.0-canary.50",
+    "@next/env": "14.3.0-canary.51",
     "@swc/helpers": "0.5.11",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001579",
@@ -153,10 +153,10 @@
     "@jest/types": "29.5.0",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/polyfill-module": "14.3.0-canary.50",
-    "@next/polyfill-nomodule": "14.3.0-canary.50",
-    "@next/react-refresh-utils": "14.3.0-canary.50",
-    "@next/swc": "14.3.0-canary.50",
+    "@next/polyfill-module": "14.3.0-canary.51",
+    "@next/polyfill-nomodule": "14.3.0-canary.51",
+    "@next/react-refresh-utils": "14.3.0-canary.51",
+    "@next/swc": "14.3.0-canary.51",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.41.2",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/build/webpack-config.ts b/packages/next/src/build/webpack-config.ts
@@ -1275,6 +1275,14 @@ export default async function getBaseWebpackConfig(
         },
         ...(hasAppDir
           ? [
+              {
+                layer: WEBPACK_LAYERS.appRouteHandler,
+                test: new RegExp(
+                  `private-next-app-dir\\/.*\\/route\\.(${pageExtensions.join(
+                    '|'
+                  )})$`
+                ),
+              },
               {
                 // Make sure that AsyncLocalStorage module instance is shared between server and client
                 // layers.
@@ -1700,17 +1708,23 @@ export default async function getBaseWebpackConfig(
               '.shared-runtime'
             )
             const layer = resource.contextInfo.issuerLayer
+
             let runtime
 
-            if (layer === WEBPACK_LAYERS.serverSideRendering) {
-              runtime = 'app-page'
-            } else if (!layer) {
-              runtime = 'pages'
-            } else {
-              throw new Error(
-                `shared-runtime module ${moduleName} cannot be used in ${layer} layer`
-              )
+            switch (layer) {
+              case WEBPACK_LAYERS.appRouteHandler:
+                runtime = 'app-route'
+                break
+              case WEBPACK_LAYERS.serverSideRendering:
+              case WEBPACK_LAYERS.reactServerComponents:
+              case WEBPACK_LAYERS.appPagesBrowser:
+              case WEBPACK_LAYERS.actionBrowser:
+                runtime = 'app-page'
+                break
+              default:
+                runtime = 'pages'
             }
+
             resource.request = `next/dist/server/future/route-modules/${runtime}/vendored/contexts/${moduleName}`
           }
         ),

diff --git a/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts b/packages/next/src/build/webpack/plugins/next-types-plugin/index.ts
@@ -613,7 +613,11 @@ export class NextTypesPlugin {
         }
         return
       }
-      if (mod.layer !== WEBPACK_LAYERS.reactServerComponents) return
+      if (
+        mod.layer !== WEBPACK_LAYERS.reactServerComponents &&
+        mod.layer !== WEBPACK_LAYERS.appRouteHandler
+      )
+        return
 
       const IS_LAYOUT = /[/\\]layout\.[^./\\]+$/.test(mod.resource)
       const IS_PAGE = !IS_LAYOUT && /[/\\]page\.[^.]+$/.test(mod.resource)

diff --git a/packages/next/src/lib/constants.ts b/packages/next/src/lib/constants.ts
@@ -115,8 +115,7 @@ const WEBPACK_LAYERS_NAMES = {
    */
   shared: 'shared',
   /**
-   * The layer for server-only runtime and picking up `react-server` export conditions.
-   * Including app router RSC pages and app router custom routes.
+   * React Server Components layer (rsc).
    */
   reactServerComponents: 'rsc',
   /**
@@ -151,6 +150,10 @@ const WEBPACK_LAYERS_NAMES = {
    * The server bundle layer for metadata routes.
    */
   appMetadataRoute: 'app-metadata-route',
+  /**
+   * The layer for the server bundle for App Route handlers.
+   */
+  appRouteHandler: 'app-route-handler',
 } as const
 
 export type WebpackLayerName =
@@ -163,6 +166,7 @@ const WEBPACK_LAYERS = {
       WEBPACK_LAYERS_NAMES.reactServerComponents,
       WEBPACK_LAYERS_NAMES.actionBrowser,
       WEBPACK_LAYERS_NAMES.appMetadataRoute,
+      WEBPACK_LAYERS_NAMES.appRouteHandler,
       WEBPACK_LAYERS_NAMES.instrument,
     ],
     clientOnly: [
@@ -178,6 +182,7 @@ const WEBPACK_LAYERS = {
       WEBPACK_LAYERS_NAMES.reactServerComponents,
       WEBPACK_LAYERS_NAMES.actionBrowser,
       WEBPACK_LAYERS_NAMES.appMetadataRoute,
+      WEBPACK_LAYERS_NAMES.appRouteHandler,
       WEBPACK_LAYERS_NAMES.serverSideRendering,
       WEBPACK_LAYERS_NAMES.appPagesBrowser,
       WEBPACK_LAYERS_NAMES.shared,

diff --git a/packages/next/src/server/future/route-modules/app-page/vendored/contexts/entrypoints.ts b/packages/next/src/server/future/route-modules/app-page/vendored/contexts/entrypoints.ts
@@ -3,5 +3,8 @@ export * as ServerInsertedHtml from '../../../../../../shared/lib/server-inserte
 export * as AppRouterContext from '../../../../../../shared/lib/app-router-context.shared-runtime'
 export * as HooksClientContext from '../../../../../../shared/lib/hooks-client-context.shared-runtime'
 export * as RouterContext from '../../../../../../shared/lib/router-context.shared-runtime'
+export * as HtmlContext from '../../../../../../shared/lib/html-context.shared-runtime'
 export * as AmpContext from '../../../../../../shared/lib/amp-context.shared-runtime'
+export * as LoadableContext from '../../../../../../shared/lib/loadable-context.shared-runtime'
 export * as ImageConfigContext from '../../../../../../shared/lib/image-config-context.shared-runtime'
+export * as Loadable from '../../../../../../shared/lib/loadable.shared-runtime'
diff --git a/packages/next/src/server/future/route-modules/app-page/vendored/contexts/html-context.ts b/packages/next/src/server/future/route-modules/app-page/vendored/contexts/html-context.ts
@@ -0,0 +1,3 @@
+module.exports = require('../../module.compiled').vendored[
+  'contexts'
+].HtmlContext
diff --git a/packages/next/src/server/future/route-modules/app-page/vendored/contexts/loadable-context.ts b/packages/next/src/server/future/route-modules/app-page/vendored/contexts/loadable-context.ts
@@ -0,0 +1,3 @@
+module.exports = require('../../module.compiled').vendored[
+  'contexts'
+].LoadableContext
diff --git a/packages/next/src/server/future/route-modules/app-page/vendored/contexts/loadable.ts b/packages/next/src/server/future/route-modules/app-page/vendored/contexts/loadable.ts
@@ -0,0 +1 @@
+module.exports = require('../../module.compiled').vendored['contexts'].Loadable
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('../../module.compiled').vendored['contexts'].Loadable