Merge branch 'canary' into group-streaming-api

vercel · Feb 2, 2022 · 18c3ea0 · 18c3ea0
2 parents 690ed06 + 965d26e
commit 18c3ea0
Show file tree

Hide file tree

Showing 30 changed files with 240 additions and 124 deletions.
diff --git a/docs/advanced-features/compiler.md b/docs/advanced-features/compiler.md
@@ -112,7 +112,7 @@ module.exports = {
 }
 ```
 
-NOTE: In Next.js all JavaScripts files in `pages` directory are considered routes. So, for `relay-compiler` you'll need to specify `artifactDirectory` configuration settings outside of the `pages`, otherwise `relay-compiler` will generate files next to the source file in the `__generated__` directory, and this file will be considered a route, which will break production build.
+NOTE: In Next.js all JavaScript files in `pages` directory are considered routes. So, for `relay-compiler` you'll need to specify `artifactDirectory` configuration settings outside of the `pages`, otherwise `relay-compiler` will generate files next to the source file in the `__generated__` directory, and this file will be considered a route, which will break production builds.
 
 ### Remove React Properties
 

diff --git a/examples/with-docker/Dockerfile b/examples/with-docker/Dockerfile
@@ -7,8 +7,8 @@ COPY package.json yarn.lock ./
 RUN yarn install --frozen-lockfile
 
 # If using npm with a `package-lock.json` comment out above and use below instead
-# COPY package.json package-lock.json / 
-# RUN npm install
+# COPY package.json package-lock.json ./ 
+# RUN npm ci
 
 # Rebuild the source code only when needed
 FROM node:16-alpine AS builder

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.0.11-canary.0"
+  "version": "12.0.11-canary.1"
 }
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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "description": "ESLint configuration used by NextJS.",
   "main": "index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "directory": "packages/eslint-config-next"
   },
   "dependencies": {
-    "@next/eslint-plugin-next": "12.0.11-canary.0",
+    "@next/eslint-plugin-next": "12.0.11-canary.1",
     "@rushstack/eslint-patch": "^1.0.8",
     "@typescript-eslint/parser": "^5.0.0",
     "eslint-import-resolver-node": "^0.3.4",

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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "description": "ESLint plugin for NextJS.",
   "main": "lib/index.js",
   "license": "MIT",

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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {

diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",

diff --git a/packages/next-env/package.json b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "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": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native",

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -959,11 +959,6 @@ export default async function getBaseWebpackConfig(
     },
   }
 
-  const nonUserCondition = {
-    include: /node_modules/,
-    exclude: babelIncludeRegexes,
-  }
-
   let webpackConfig: webpack.Configuration = {
     parallelism: Number(process.env.NEXT_WEBPACK_PARALLELISM) || undefined,
     externals: targetWeb
@@ -1256,13 +1251,6 @@ export default async function getBaseWebpackConfig(
             },
           ],
         },
-        {
-          ...nonUserCondition,
-          // Make all non-user modules to be compiled in a single layer
-          // This avoids compiling them mutliple times and avoids module id changes
-          issuerLayer: 'middleware',
-          layer: '',
-        },
         ...(!config.images.disableStaticImages
           ? [
               {

diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts
@@ -44,37 +44,25 @@ export default async function middlewareSSRLoader(this: any) {
     }
 
     // Set server context
-    self.__current_route = ${JSON.stringify(page)}
     self.__server_context = {
-      Component: pageMod.default,
-      pageConfig: pageMod.config || {},
-      buildManifest,
-      reactLoadableManifest,
-      Document,
-      App,
-      getStaticProps: pageMod.getStaticProps,
-      getServerSideProps: pageMod.getServerSideProps,
-      getStaticPaths: pageMod.getStaticPaths,
-      ComponentMod: undefined,
-      serverComponentManifest: ${isServerComponent} ? rscManifest : null,
-
-      // components
-      errorMod,
-      error500Mod,
-
-      // renderOpts
+      page: ${JSON.stringify(page)},
       buildId: ${JSON.stringify(buildId)},
-      dev: ${dev},
-      env: process.env,
-      supportsDynamicHTML: true,
-      concurrentFeatures: true,
-      disableOptimizedLoading: true,
     }
   
     const render = getRender({
+      dev: ${dev},
+      page: ${JSON.stringify(page)},
+      pageMod,
+      errorMod,
+      error500Mod,
+      App,
       Document,
+      buildManifest,
+      reactLoadableManifest,
+      serverComponentManifest: ${isServerComponent} ? rscManifest : null,
       isServerComponent: ${isServerComponent},
       config: ${stringifiedConfig},
+      buildId: ${JSON.stringify(buildId)},
     })
 
     export default function rscMiddleware(opts) {

diff --git a/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts b/packages/next/build/webpack/loaders/next-middleware-ssr-loader/render.ts
@@ -1,4 +1,7 @@
 import type { NextConfig } from '../../../../server/config-shared'
+import type { DocumentType, AppType } from '../../../../shared/lib/utils'
+import type { BuildManifest } from '../../../../server/get-page-files'
+import type { ReactLoadableManifest } from '../../../../server/load-components'
 
 import { NextRequest } from '../../../../server/web/spec-extension/request'
 import { toNodeHeaders } from '../../../../server/web/utils'
@@ -20,20 +23,98 @@ function sendError(req: any, error: Error) {
   })
 }
 
+// Polyfilled for `path-browserify` inside the Web Server.
+process.cwd = () => ''
+
 export function getRender({
+  dev,
+  page,
+  pageMod,
+  errorMod,
+  error500Mod,
   Document,
+  App,
+  buildManifest,
+  reactLoadableManifest,
+  serverComponentManifest,
   isServerComponent,
   config,
+  buildId,
 }: {
-  Document: any
+  dev: boolean
+  page: string
+  pageMod: any
+  errorMod: any
+  error500Mod: any
+  Document: DocumentType
+  App: AppType
+  buildManifest: BuildManifest
+  reactLoadableManifest: ReactLoadableManifest
+  serverComponentManifest: any | null
   isServerComponent: boolean
   config: NextConfig
+  buildId: string
 }) {
-  // Polyfilled for `path-browserify`.
-  process.cwd = () => ''
+  const baseLoadComponentResult = {
+    dev,
+    buildManifest,
+    reactLoadableManifest,
+    Document,
+    App,
+  }
+
   const server = new WebServer({
     conf: config,
     minimalMode: true,
+    webServerConfig: {
+      extendRenderOpts: {
+        buildId,
+        supportsDynamicHTML: true,
+        concurrentFeatures: true,
+        disableOptimizedLoading: true,
+        serverComponentManifest,
+      },
+      loadComponent: async (pathname) => {
+        if (pathname === page) {
+          return {
+            ...baseLoadComponentResult,
+            Component: pageMod.default,
+            pageConfig: pageMod.config || {},
+            getStaticProps: pageMod.getStaticProps,
+            getServerSideProps: pageMod.getServerSideProps,
+            getStaticPaths: pageMod.getStaticPaths,
+            ComponentMod: pageMod,
+          }
+        }
+
+        // If there is a custom 500 page, we need to handle it separately.
+        if (pathname === '/500' && error500Mod) {
+          return {
+            ...baseLoadComponentResult,
+            Component: error500Mod.default,
+            pageConfig: error500Mod.config || {},
+            getStaticProps: error500Mod.getStaticProps,
+            getServerSideProps: error500Mod.getServerSideProps,
+            getStaticPaths: error500Mod.getStaticPaths,
+            ComponentMod: error500Mod,
+          }
+        }
+
+        if (pathname === '/_error') {
+          return {
+            ...baseLoadComponentResult,
+            Component: errorMod.default,
+            pageConfig: errorMod.config || {},
+            getStaticProps: errorMod.getStaticProps,
+            getServerSideProps: errorMod.getServerSideProps,
+            getStaticPaths: errorMod.getStaticPaths,
+            ComponentMod: errorMod,
+          }
+        }
+
+        return null
+      },
+    },
   })
   const requestHandler = server.getRequestHandler()
 
@@ -72,8 +153,8 @@ export function getRender({
         ? JSON.parse(query.__props__)
         : undefined
 
-    // Extend the context.
-    Object.assign((self as any).__server_context, {
+    // Extend the render options.
+    server.updateRenderOpts({
       renderServerComponentData,
       serverComponentProps,
     })

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.0.11-canary.0",
+  "version": "12.0.11-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -69,7 +69,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.0.11-canary.0",
+    "@next/env": "12.0.11-canary.1",
     "caniuse-lite": "^1.0.30001283",
     "postcss": "8.4.5",
     "styled-jsx": "5.0.0",
@@ -117,11 +117,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "1.2.1",
     "@napi-rs/triples": "1.0.3",
-    "@next/polyfill-module": "12.0.11-canary.0",
-    "@next/polyfill-nomodule": "12.0.11-canary.0",
-    "@next/react-dev-overlay": "12.0.11-canary.0",
-    "@next/react-refresh-utils": "12.0.11-canary.0",
-    "@next/swc": "12.0.11-canary.0",
+    "@next/polyfill-module": "12.0.11-canary.1",
+    "@next/polyfill-nomodule": "12.0.11-canary.1",
+    "@next/react-dev-overlay": "12.0.11-canary.1",
+    "@next/react-refresh-utils": "12.0.11-canary.1",
+    "@next/swc": "12.0.11-canary.1",
     "@peculiar/webcrypto": "1.1.7",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",