Merge branch 'canary' into shu/7fvu

vercel · Apr 25, 2023 · dbd9850 · dbd9850
2 parents 5c6bc94 + f08cab3
commit dbd9850
Show file tree

Hide file tree

Showing 49 changed files with 197 additions and 92 deletions.
diff --git a/errors/version-staleness.md b/errors/version-staleness.md
@@ -48,5 +48,5 @@ If you want to report a bug on GitHub, you should upgrade to the newest canary r
 - [Video: How to Contribute to Open Source (Next.js)](https://www.youtube.com/watch?v=cuoNzXFLitc)
 - [Contributing to Next.js](https://github.com/vercel/next.js/blob/canary/contributing.md)
 - [Triaging issues](https://github.com/vercel/next.js/blob/canary/contributing/repository/triaging.md)
-- [Verifiying canary](https://github.com/vercel/next.js/blob/canary/.github/actions/issue-validator/canary.md)
+- [Verifying canary](https://github.com/vercel/next.js/blob/canary/.github/actions/issue-validator/canary.md)
 - [Adding a reproduction](https://github.com/vercel/next.js/blob/canary/.github/actions/issue-validator/repro.md)
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.3.2-canary.3"
+  "version": "13.3.2-canary.6"
 }
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "@svgr/webpack": "5.5.0",
     "@swc/cli": "0.1.55",
     "@swc/core": "1.3.51",
-    "@swc/helpers": "0.5.0",
+    "@swc/helpers": "0.5.1",
     "@testing-library/react": "13.0.0",
     "@types/cheerio": "0.22.16",
     "@types/fs-extra": "8.1.0",

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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+    "@next/eslint-plugin-next": "13.3.2-canary.6",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.42.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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "description": "ESLint plugin for NextJS.",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "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": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "description": "A polyfill for non-dead, nomodule browsers.",
   "main": "dist/polyfill-nomodule.js",
   "license": "MIT",

diff --git a/packages/next-swc/crates/napi/npm/darwin-arm64/package.json b/packages/next-swc/crates/napi/npm/darwin-arm64/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-darwin-arm64",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/darwin-arm64"
+  },
   "os": [
     "darwin"
   ],

diff --git a/packages/next-swc/crates/napi/npm/darwin-x64/package.json b/packages/next-swc/crates/napi/npm/darwin-x64/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-darwin-x64",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/darwin-x64"
+  },
   "os": [
     "darwin"
   ],

diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-gnu/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-linux-arm64-gnu",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/linux-arm64-gnu"
+  },
   "os": [
     "linux"
   ],

diff --git a/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-arm64-musl/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-linux-arm64-musl",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/linux-arm64-musl"
+  },
   "os": [
     "linux"
   ],

diff --git a/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json b/packages/next-swc/crates/napi/npm/linux-x64-gnu/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-linux-x64-gnu",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/linux-x64-gnu"
+  },
   "os": [
     "linux"
   ],

diff --git a/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json b/packages/next-swc/crates/napi/npm/linux-x64-musl/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-linux-x64-musl",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/linux-x64-musl"
+  },
   "os": [
     "linux"
   ],

diff --git a/packages/next-swc/crates/napi/npm/win32-arm64-msvc/package.json b/packages/next-swc/crates/napi/npm/win32-arm64-msvc/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-win32-arm64-msvc",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/win32-arm64-msvc"
+  },
   "os": [
     "win32"
   ],

diff --git a/packages/next-swc/crates/napi/npm/win32-ia32-msvc/package.json b/packages/next-swc/crates/napi/npm/win32-ia32-msvc/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-win32-ia32-msvc",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/win32-ia32-msvc"
+  },
   "os": [
     "win32"
   ],

diff --git a/packages/next-swc/crates/napi/npm/win32-x64-msvc/package.json b/packages/next-swc/crates/napi/npm/win32-x64-msvc/package.json
@@ -1,6 +1,11 @@
 {
   "name": "@next/swc-win32-x64-msvc",
   "version": "0.0.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/vercel/next.js",
+    "directory": "packages/next-swc/crates/napi/npm/win32-x64-msvc"
+  },
   "os": [
     "win32"
   ],

diff --git a/packages/next-swc/package.json b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "private": true,
   "scripts": {
     "clean": "rm -rf ./native/*",

diff --git a/packages/next/package.json b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "13.3.2-canary.3",
+  "version": "13.3.2-canary.6",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -81,8 +81,8 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.3.2-canary.3",
-    "@swc/helpers": "0.5.0",
+    "@next/env": "13.3.2-canary.6",
+    "@swc/helpers": "0.5.1",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
     "postcss": "8.4.14",
@@ -140,11 +140,11 @@
     "@jest/types": "29.5.0",
     "@napi-rs/cli": "2.14.7",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.3.2-canary.3",
-    "@next/polyfill-nomodule": "13.3.2-canary.3",
-    "@next/react-dev-overlay": "13.3.2-canary.3",
-    "@next/react-refresh-utils": "13.3.2-canary.3",
-    "@next/swc": "13.3.2-canary.3",
+    "@next/polyfill-module": "13.3.2-canary.6",
+    "@next/polyfill-nomodule": "13.3.2-canary.6",
+    "@next/react-dev-overlay": "13.3.2-canary.6",
+    "@next/react-refresh-utils": "13.3.2-canary.6",
+    "@next/swc": "13.3.2-canary.6",
     "@opentelemetry/api": "1.4.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",

diff --git a/packages/next/src/build/analysis/get-page-static-info.ts b/packages/next/src/build/analysis/get-page-static-info.ts
@@ -342,9 +342,12 @@ export async function getPageStaticInfo(params: {
     }
     if (pageType === 'app') {
       if (config) {
-        Log.warnOnce(
-          `\`export const config\` in ${pageFilePath} is deprecated. Please change it to segment export config. See https://beta.nextjs.org/docs/api-reference/segment-config`
-        )
+        const message = `\`export const config\` in ${pageFilePath} is deprecated. Please change \`runtime\` property to segment export config. See https://beta.nextjs.org/docs/api-reference/segment-config`
+        if (isDev) {
+          Log.warnOnce(message)
+        } else {
+          throw new Error(message)
+        }
         config = {}
       }
     }

diff --git a/packages/next/src/build/webpack/loaders/utils.ts b/packages/next/src/build/webpack/loaders/utils.ts
@@ -1,16 +1,20 @@
 import { createHash } from 'crypto'
-
 import { RSC_MODULE_TYPES } from '../../../shared/lib/constants'
 
 const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'avif', 'ico', 'svg']
 const imageRegex = new RegExp(`\\.(${imageExtensions.join('|')})$`)
 
-export function isClientComponentModule(mod: {
+export function isClientComponentEntryModule(mod: {
   resource: string
   buildInfo: any
 }) {
-  const hasClientDirective = mod.buildInfo.rsc?.type === RSC_MODULE_TYPES.client
-  return hasClientDirective || imageRegex.test(mod.resource)
+  const rscInfo = mod.buildInfo.rsc
+  const hasClientDirective = rscInfo?.isClientRef
+  const isActionLayerEntry =
+    rscInfo?.actions && rscInfo?.type === RSC_MODULE_TYPES.client
+  return (
+    hasClientDirective || isActionLayerEntry || imageRegex.test(mod.resource)
+  )
 }
 
 export const regexCSS = /\.(css|scss|sass)(\?.*)?$/

diff --git a/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts b/packages/next/src/build/webpack/plugins/flight-client-entry-plugin.ts
@@ -26,7 +26,7 @@ import {
 import {
   generateActionId,
   getActions,
-  isClientComponentModule,
+  isClientComponentEntryModule,
   isCSSMod,
 } from '../loaders/utils'
 import { traverseModules, forEachEntryModule } from '../utils'
@@ -521,7 +521,7 @@ export class ClientReferenceEntryPlugin {
       }
       visitedBySegment[entryRequest].add(storeKey)
 
-      const isClientComponent = isClientComponentModule(mod)
+      const isClientComponent = isClientComponentEntryModule(mod)
 
       const actions = getActions(mod)
       if (actions) {

diff --git a/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/src/build/webpack/plugins/flight-manifest-plugin.ts
@@ -12,7 +12,7 @@ import {
   SYSTEM_ENTRYPOINTS,
 } from '../../../shared/lib/constants'
 import { relative, sep } from 'path'
-import { isClientComponentModule, isCSSMod } from '../loaders/utils'
+import { isClientComponentEntryModule, isCSSMod } from '../loaders/utils'
 import { getProxiedPluginState } from '../../build-context'
 
 import { traverseModules } from '../utils'
@@ -212,7 +212,10 @@ export class ClientReferenceManifestPlugin {
 
         // Only apply following logic to client module requests from client entry,
         // or if the module is marked as client module.
-        if (!clientRequestsSet.has(resource) && !isClientComponentModule(mod)) {
+        if (
+          !clientRequestsSet.has(resource) &&
+          !isClientComponentEntryModule(mod)
+        ) {
           return
         }
 

diff --git a/packages/next/src/client/components/router-reducer/handle-mutable.ts b/packages/next/src/client/components/router-reducer/handle-mutable.ts
@@ -39,7 +39,7 @@ export function handleMutable(
         mutable.hashFragment && mutable.hashFragment !== ''
           ? // Remove leading # and decode hash to make non-latin hashes work.
             decodeURIComponent(mutable.hashFragment.slice(1))
-          : null,
+          : state.focusAndScrollRef.hashFragment,
       segmentPaths:
         mutable?.scrollableSegments ?? state.focusAndScrollRef.segmentPaths,
     },

diff --git a/packages/next/src/lib/metadata/generate/utils.ts b/packages/next/src/lib/metadata/generate/utils.ts
@@ -1,20 +1,17 @@
-function resolveArray<T>(value: T): T[] {
+function resolveArray<T>(value: T | T[]): T[] {
   if (Array.isArray(value)) {
-    return value
+    return value as any
   }
-  return [value]
+  return [value] as any
 }
 
-function resolveAsArrayOrUndefined<T extends unknown | readonly unknown[]>(
+function resolveAsArrayOrUndefined<T>(
   value: T | T[] | undefined | null
-): undefined | T[] {
+): T extends undefined | null ? undefined : T[] {
   if (typeof value === 'undefined' || value === null) {
-    return undefined
+    return undefined as any
   }
-  if (Array.isArray(value)) {
-    return value
-  }
-  return [value]
+  return resolveArray(value) as any
 }
 
 export { resolveAsArrayOrUndefined, resolveArray }
diff --git a/packages/next/src/lib/metadata/get-metadata-route.ts b/packages/next/src/lib/metadata/get-metadata-route.ts
@@ -56,7 +56,7 @@ export function normalizeMetadataRoute(page: string) {
         page.startsWith('/manifest') ||
         isStaticMetadataFile
 
-      route = path.join(
+      route = path.posix.join(
         dir,
         `${baseName}${suffix ? `-${suffix}` : ''}${ext}`,
         isSingleRoute ? '' : '[[...__metadata_id__]]',