Merge branch 'canary' into fix-symlinks-with-standalone

vercel · Apr 14, 2022 · b85c223 · b85c223
2 parents c474595 + 6907519
commit b85c223
Show file tree

Hide file tree

Showing 33 changed files with 123 additions and 90 deletions.
diff --git a/examples/with-electron-typescript/package.json b/examples/with-electron-typescript/package.json
@@ -10,7 +10,7 @@
     "build": "npm run build-renderer && npm run build-electron",
     "pack-app": "npm run build && electron-builder --dir",
     "dist": "npm run build && electron-builder",
-    "type-check": "tsc"
+    "type-check": "tsc -p ./renderer/tsconfig.json && tsc -p ./electron-src/tsconfig.json"
   },
   "dependencies": {
     "electron-is-dev": "^1.1.0",
@@ -23,7 +23,7 @@
     "@types/react": "^16.9.9",
     "@types/react-dom": "^16.9.9",
     "electron": "^13",
-    "electron-builder": "^22.9.1",
+    "electron-builder": "^23.0.3",
     "next": "latest",
     "rimraf": "^3.0.0",
     "typescript": "^4.0.5"

diff --git a/examples/with-electron/package.json b/examples/with-electron/package.json
@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "electron": "^12.0.2",
-    "electron-builder": "^22.10.5",
+    "electron-builder": "^23.0.3",
     "next": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"

diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.1.6-canary.0"
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+    "@next/eslint-plugin-next": "12.1.6-canary.1",
     "@rushstack/eslint-patch": "1.0.8",
     "@typescript-eslint/parser": "5.10.1",
     "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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-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.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform --cargo-name next_swc_napi native",

diff --git a/packages/next/build/webpack/loaders/next-flight-client-loader.ts b/packages/next/build/webpack/loaders/next-flight-client-loader.ts
@@ -8,9 +8,7 @@
 import { promisify } from 'util'
 
 import { parse } from '../../swc'
-import { buildExports } from './utils'
-
-const IS_NEXT_CLIENT_BUILT_IN = /[\\/]next[\\/](link|image)\.js$/
+import { buildExports, isNextBuiltinClientComponent } from './utils'
 
 function addExportNames(names: string[], node: any) {
   if (!node) return
@@ -59,7 +57,7 @@ async function collectExports(
   const names: string[] = []
 
   // Next.js built-in client components
-  if (IS_NEXT_CLIENT_BUILT_IN.test(resourcePath)) {
+  if (isNextBuiltinClientComponent(resourcePath)) {
     names.push('default')
   }
 
@@ -160,7 +158,7 @@ export default async function transformSource(
   const moduleRefDef =
     "const MODULE_REFERENCE = Symbol.for('react.module.reference');\n"
 
-  const isNextClientBuiltIn = IS_NEXT_CLIENT_BUILT_IN.test(resourcePath)
+  const isNextClientBuiltIn = isNextBuiltinClientComponent(resourcePath)
 
   const clientRefsExports = names.reduce((res: any, name) => {
     const moduleRef =

diff --git a/packages/next/build/webpack/loaders/next-flight-server-loader.ts b/packages/next/build/webpack/loaders/next-flight-server-loader.ts
@@ -1,30 +1,11 @@
 import { builtinModules } from 'module'
 
 import { parse } from '../../swc'
-import { buildExports } from './utils'
-
-const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'avif']
-
-export const createClientComponentFilter = (extensions: string[]) => {
-  // Special cases for Next.js APIs that are considered as client components:
-  // - .client.[ext]
-  // - next built-in client components
-  // - .[imageExt]
-  const regex = new RegExp(
-    '(' +
-      `\\.client(\\.(${extensions.join('|')}))?|` +
-      `next/(link|image)(\\.js)?|` +
-      `\\.(${imageExtensions.join('|')})` +
-      ')$'
-  )
-
-  return (importSource: string) => regex.test(importSource)
-}
-
-export const createServerComponentFilter = (extensions: string[]) => {
-  const regex = new RegExp(`\\.server(\\.(${extensions.join('|')}))?$`)
-  return (importSource: string) => regex.test(importSource)
-}
+import {
+  buildExports,
+  createClientComponentFilter,
+  createServerComponentFilter,
+} from './utils'
 
 function createFlightServerRequest(request: string, options: object) {
   return `next-flight-server-loader?${JSON.stringify(options)}!${request}`

diff --git a/packages/next/build/webpack/loaders/utils.ts b/packages/next/build/webpack/loaders/utils.ts
@@ -1,3 +1,15 @@
+const defaultJsFileExtensions = ['js', 'mjs', 'jsx', 'ts', 'tsx', 'json']
+const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'avif']
+const nextClientComponents = ['link', 'image', 'head', 'script']
+
+const NEXT_BUILT_IN_CLIENT_RSC_REGEX = new RegExp(
+  `[\\\\/]next[\\\\/](${nextClientComponents.join('|')})\\.js$`
+)
+
+export function isNextBuiltinClientComponent(resourcePath: string) {
+  return NEXT_BUILT_IN_CLIENT_RSC_REGEX.test(resourcePath)
+}
+
 export function buildExports(moduleExports: any, isESM: boolean) {
   let ret = ''
   Object.keys(moduleExports).forEach((key) => {
@@ -11,3 +23,26 @@ export function buildExports(moduleExports: any, isESM: boolean) {
   })
   return ret
 }
+
+export const createClientComponentFilter = (
+  extensions: string[] = defaultJsFileExtensions
+) => {
+  // Special cases for Next.js APIs that are considered as client components:
+  // - .client.[ext]
+  // - next built-in client components
+  // - .[imageExt]
+  const regex = new RegExp(
+    '(' +
+      `\\.client(\\.(${extensions.join('|')}))?|` +
+      `next/(${nextClientComponents.join('|')})(\\.js)?|` +
+      `\\.(${imageExtensions.join('|')})` +
+      ')$'
+  )
+
+  return (importSource: string) => regex.test(importSource)
+}
+
+export const createServerComponentFilter = (extensions: string[]) => {
+  const regex = new RegExp(`\\.server(\\.(${extensions.join('|')}))?$`)
+  return (importSource: string) => regex.test(importSource)
+}
diff --git a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
@@ -7,7 +7,7 @@
 
 import { webpack, sources } from 'next/dist/compiled/webpack/webpack'
 import { MIDDLEWARE_FLIGHT_MANIFEST } from '../../../shared/lib/constants'
-import { createClientComponentFilter } from '../loaders/next-flight-server-loader'
+import { createClientComponentFilter } from '../loaders/utils'
 
 // This is the module that will be used to anchor all client references to.
 // I.e. it will have all the client files as async deps from this point on.

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

diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
@@ -431,14 +431,7 @@ function createServerComponentRenderer(
     return root
   }
 
-  // Although it's not allowed to attach some static methods to Component,
-  // we still re-assign all the component APIs to keep the behavior unchanged.
-  for (const methodName of [
-    'getInitialProps',
-    'getStaticProps',
-    'getServerSideProps',
-    'getStaticPaths',
-  ]) {
+  for (const methodName of Object.keys(Component)) {
     const method = (Component as any)[methodName]
     if (method) {
       ;(ServerComponentWrapper as any)[methodName] = method
@@ -1375,7 +1368,7 @@ export async function renderToHTML(
           <AppContainerWithIsomorphicFiberStructure>
             {isServerComponent && !!AppMod.__next_rsc__ ? (
               // _app.server.js is used.
-              <Component {...props.pageProps} router={router} />
+              <Component {...props.pageProps} />
             ) : (
               <App {...props} Component={Component} router={router} />
             )}

diff --git a/packages/next/server/web-server.ts b/packages/next/server/web-server.ts
@@ -125,7 +125,7 @@ export default class NextWebServer extends BaseServer {
   ): Promise<RenderResult | null> {
     return renderToHTML(
       {
-        url: pathname,
+        url: req.url,
         cookies: req.cookies,
         headers: req.headers,
       } as any,

diff --git a/packages/next/server/web/spec-extension/request.ts b/packages/next/server/web/spec-extension/request.ts
@@ -13,7 +13,7 @@ export class NextRequest extends Request {
     cookieParser(): { [key: string]: string }
     geo: RequestData['geo']
     ip?: string
-    page?: { name?: string; params?: { [key: string]: string } }
+    page?: { name?: string; params?: { [key: string]: string | string[] } }
     ua?: UserAgent | null
     url: NextURL
   }
@@ -105,7 +105,7 @@ export interface RequestInit extends globalThis.RequestInit {
   }
   page?: {
     name?: string
-    params?: { [key: string]: string }
+    params?: { [key: string]: string | string[] }
   }
 }
 

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -313,6 +313,7 @@ export async function ncc_use_subscription(task, opts) {
         react: 'react',
         'react-dom': 'react-dom',
       },
+      target: 'es5',
     })
     .target('compiled/use-subscription')
 }

diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-dev-overlay",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "A development-only overlay for developing React applications.",
   "repository": {
     "url": "vercel/next.js",

diff --git a/packages/react-refresh-utils/package.json b/packages/react-refresh-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/react-refresh-utils",
-  "version": "12.1.6-canary.0",
+  "version": "12.1.6-canary.1",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",