Merge branch 'canary' into shu/6lrx

feedthejim · web-flow · commit b005975219b6 · 2023-09-19T12:22:57.000+02:00
diff --git a/docs/02-app/02-api-reference/04-functions/revalidateTag.mdx b/docs/02-app/02-api-reference/04-functions/revalidateTag.mdx
@@ -30,7 +30,7 @@ fetch(url, { next: { tags: [...] } });
 
 ## Examples
 
-## Server Action
+### Server Action
 
 ```ts filename="app/actions.ts" switcher
 'use server'
diff --git a/examples/with-playwright/playwright.config.ts b/examples/with-playwright/playwright.config.ts
@@ -32,7 +32,7 @@ export default defineConfig({
     // More information: https://playwright.dev/docs/api/class-testoptions#test-options-base-url
     baseURL,
 
-    // Retry a test if its failing with enabled tracing. This allows you to analyse the DOM, console logs, network traffic etc.
+    // Retry a test if its failing with enabled tracing. This allows you to analyze the DOM, console logs, network traffic etc.
     // More information: https://playwright.dev/docs/trace-viewer
     trace: 'retry-with-trace',
 
diff --git a/lerna.json b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "13.4.20-canary.39"
+  "version": "13.4.20-canary.40"
 }
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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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": "13.4.20-canary.39",
+    "@next/eslint-plugin-next": "13.4.20-canary.40",
     "@rushstack/eslint-patch": "^1.3.3",
     "@typescript-eslint/parser": "^5.4.2 || ^6.0.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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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": "13.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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": "13.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -90,7 +90,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "13.4.20-canary.39",
+    "@next/env": "13.4.20-canary.40",
     "@swc/helpers": "0.5.2",
     "busboy": "1.6.0",
     "caniuse-lite": "^1.0.30001406",
@@ -145,11 +145,11 @@
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/cli": "2.16.2",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "13.4.20-canary.39",
-    "@next/polyfill-nomodule": "13.4.20-canary.39",
-    "@next/react-dev-overlay": "13.4.20-canary.39",
-    "@next/react-refresh-utils": "13.4.20-canary.39",
-    "@next/swc": "13.4.20-canary.39",
+    "@next/polyfill-module": "13.4.20-canary.40",
+    "@next/polyfill-nomodule": "13.4.20-canary.40",
+    "@next/react-dev-overlay": "13.4.20-canary.40",
+    "@next/react-refresh-utils": "13.4.20-canary.40",
+    "@next/swc": "13.4.20-canary.40",
     "@opentelemetry/api": "1.4.1",
     "@playwright/test": "^1.35.1",
     "@segment/ajv-human-errors": "2.1.2",
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -2269,12 +2269,13 @@ export default async function build(
             const moduleTypes = ['app-page', 'pages']
 
             for (const type of moduleTypes) {
+              const modulePath = require.resolve(
+                `next/dist/server/future/route-modules/${type}/module.compiled`
+              )
+              const relativeModulePath = path.relative(root, modulePath)
+
               const contextDir = path.join(
-                path.dirname(
-                  require.resolve(
-                    `next/dist/server/future/route-modules/${type}/module`
-                  )
-                ),
+                path.dirname(modulePath),
                 'vendored',
                 'contexts'
               )
@@ -2287,6 +2288,8 @@ export default async function build(
                 addToTracedFiles(root, itemPath, tracedFiles)
                 addToTracedFiles(root, itemPath, minimalTracedFiles)
               }
+              addToTracedFiles(root, relativeModulePath, tracedFiles)
+              addToTracedFiles(root, relativeModulePath, minimalTracedFiles)
             }
 
             await Promise.all([
diff --git a/packages/next/src/server/dev/hot-reloader-webpack.ts b/packages/next/src/server/dev/hot-reloader-webpack.ts
@@ -1487,12 +1487,16 @@ export default class HotReloader implements NextJsHotReloaderInterface {
     if (error) {
       return Promise.reject(error)
     }
-    return this.onDemandEntries?.ensurePage({
+    const res = (await this.onDemandEntries?.ensurePage({
       page,
       clientOnly,
       appPaths,
       match,
       isApp,
-    }) as any
+    })) as any
+
+    if (res && res.err) {
+      throw res.err
+    }
   }
 }
diff --git a/packages/next/src/server/dev/on-demand-entry-handler.ts b/packages/next/src/server/dev/on-demand-entry-handler.ts
@@ -726,9 +726,12 @@ export function onDemandEntryHandler({
       const isInsideAppDir =
         !!appDir && pagePathData.absolutePagePath.startsWith(appDir)
 
-      if (typeof isApp === 'boolean' && !(isApp === isInsideAppDir)) {
+      if (typeof isApp === 'boolean' && isApp !== isInsideAppDir) {
+        Error.stackTraceLimit = 15
         throw new Error(
-          'Ensure bailed, found path does not match ensure type (pages/app)'
+          `Ensure bailed, found path "${
+            pagePathData.page
+          }" does not match ensure type (${isApp ? 'app' : 'pages'})`
         )
       }
 
@@ -896,7 +899,7 @@ export function onDemandEntryHandler({
   }
 
   // Make sure that we won't have multiple invalidations ongoing concurrently.
-  const curEnsurePage = new Map<string, Promise<void>>()
+  const curEnsurePage = new Map<string, Promise<void | { err: Error }>>()
 
   return {
     async ensurePage({
@@ -912,21 +915,35 @@ export function onDemandEntryHandler({
       match?: RouteMatch
       isApp?: boolean
     }) {
-      if (curEnsurePage.has(page)) {
-        return curEnsurePage.get(page)
+      const ensureKey = JSON.stringify({ page, clientOnly, match, appPaths })
+      const pendingEnsure = curEnsurePage.get(ensureKey)
+
+      if (pendingEnsure) {
+        const res = await pendingEnsure
+
+        if (res && res.err) {
+          throw res.err
+        }
       }
+
       const promise = ensurePageImpl({
         page,
         clientOnly,
         appPaths,
         match,
         isApp,
-      }).finally(() => {
-        curEnsurePage.delete(page)
+        // we have to catch the error since we are memoizing
+        // otherwise we can hit random unhandledRejections
       })
-      curEnsurePage.set(page, promise)
+        .catch((err) => {
+          return { err }
+        })
+        .finally(() => {
+          curEnsurePage.delete(ensureKey)
+        })
 
-      await promise
+      curEnsurePage.set(ensureKey, promise)
+      return promise
     },
     onHMR(client: ws, getHmrServerError: () => Error | null) {
       let bufferedHmrServerError: Error | null = null
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": "13.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "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": "13.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/packages/third-parties/package.json b/packages/third-parties/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/third-parties",
-  "version": "13.4.20-canary.39",
+  "version": "13.4.20-canary.40",
   "private": true,
   "repository": {
     "url": "vercel/next.js",
@@ -23,7 +23,7 @@
     "third-party-capital": "1.0.20"
   },
   "devDependencies": {
-    "next": "13.4.20-canary.39",
+    "next": "13.4.20-canary.40",
     "outdent": "0.8.0",
     "prettier": "2.5.1"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`"registry": "https://registry.npmjs.org/"`
`17`	`17`	`}`
`18`	`18`	`},`
`19`		`- "version": "13.4.20-canary.39"`
	`19`	`+ "version": "13.4.20-canary.40"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "create-next-app",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/eslint-plugin-next",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"description": "ESLint plugin for NextJS.",`
`5`	`5`	`"main": "dist/index.js",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/font",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"repository": {`
`5`	`5`	`"url": "vercel/next.js",`
`6`	`6`	`"directory": "packages/font"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/bundle-analyzer",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"types": "index.d.ts",`
`6`	`6`	`"license": "MIT",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/codemod",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"license": "MIT",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@next/env",`
`3`		`- "version": "13.4.20-canary.39",`
	`3`	`+ "version": "13.4.20-canary.40",`
`4`	`4`	`"keywords": [`
`5`	`5`	`"react",`
`6`	`6`	`"next",`