Merge branch 'canary' into 07-12-render_source

packages/next-swc/crates/next-api/src/project.rs

@@ -568,8 +568,8 @@ impl Project {
                 self.project_path(),
                 node_root,
                 node_root,
-                node_root.join("chunks".into()),
-                node_root.join("assets".into()),
+                node_root.join("build/chunks".into()),
+                node_root.join("build/assets".into()),
                 node_build_environment(),
                 next_mode.runtime_type(),
             )

packages/next/src/client/components/is-next-router-error.ts

@@ -1,8 +1,11 @@
 import { isNotFoundError } from './not-found'
 import { isRedirectError } from './redirect'
 
+/**
+ * Returns true if the error is a navigation signal error. These errors are
+ * thrown by user code to perform navigation operations and interrupt the React
+ * render.
+ */
 export function isNextRouterError(error: any): boolean {
-  return (
-    error && error.digest && (isRedirectError(error) || isNotFoundError(error))
-  )
+  return isRedirectError(error) || isNotFoundError(error)
 }

packages/next/src/client/components/react-dev-overlay/app/hot-reloader-client.tsx

@@ -430,6 +430,7 @@ function processMessage(
         router.fastRefresh()
         dispatcher.onRefresh()
       })
+      reportHmrLatency(sendMessage, [])
 
       if (process.env.__NEXT_TEST_MODE) {
         if (self.__NEXT_HMR_CB) {

packages/next/src/export/helpers/is-dynamic-usage-error.ts

@@ -1,8 +1,8 @@
 import { isDynamicServerError } from '../../client/components/hooks-server-context'
 import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
-import { isNavigationSignalError } from './is-navigation-signal-error'
+import { isNextRouterError } from '../../client/components/is-next-router-error'
 
 export const isDynamicUsageError = (err: unknown) =>
   isDynamicServerError(err) ||
   isBailoutToCSRError(err) ||
-  isNavigationSignalError(err)
+  isNextRouterError(err)

packages/next/src/server/app-render/create-error-handler.tsx

@@ -3,8 +3,8 @@ import { formatServerError } from '../../lib/format-server-error'
 import { SpanStatusCode, getTracer } from '../lib/trace/tracer'
 import { isAbortError } from '../pipe-readable'
 import { isBailoutToCSRError } from '../../shared/lib/lazy-dynamic/bailout-to-csr'
-import { isNavigationSignalError } from '../../export/helpers/is-navigation-signal-error'
 import { isDynamicServerError } from '../../client/components/hooks-server-context'
+import { isNextRouterError } from '../../client/components/is-next-router-error'
 
 declare global {
   var __next_log_error__: undefined | ((err: unknown) => void)
@@ -56,7 +56,7 @@ export function createErrorHandler({
     if (isBailoutToCSRError(err)) return err.digest
 
     // If this is a navigation error, we don't need to log the error.
-    if (isNavigationSignalError(err)) return err.digest
+    if (isNextRouterError(err)) return err.digest
 
     err = getErrorByRenderSource(err)
 

packages/next/src/server/lib/experimental/create-env-definitions.test.ts

@@ -17,10 +17,10 @@ describe('create-env-definitions', () => {
       declare global {
         namespace NodeJS {
           interface ProcessEnv {
-            FROM_DEV_ENV_LOCAL: readonly string
-            FROM_ENV_LOCAL: readonly string
-            FROM_ENV: readonly string
-            FROM_NEXT_CONFIG: readonly string
+            FROM_DEV_ENV_LOCAL: string
+            FROM_ENV_LOCAL: string
+            FROM_ENV: string
+            FROM_NEXT_CONFIG: string
           }
         }
       }

packages/next/src/server/lib/experimental/create-env-definitions.ts

@@ -10,7 +10,7 @@ export async function createEnvDefinitions({
   env: Env
 }) {
   const envKeysStr = Object.keys(env)
-    .map((key) => `      ${key}: readonly string`)
+    .map((key) => `      ${key}: string`)
     .join('\n')
 
   const definitionStr = `// Type definitions for Next.js environment variables

test/development/app-dir/typed-env/typed-env.test.ts

@@ -13,15 +13,15 @@ describe('typed-env', () => {
       },
 
       // should not include from production-specific env
-      // e.g. FROM_PROD_ENV_LOCAL: readonly string
+      // e.g. FROM_PROD_ENV_LOCAL: string
       `// Type definitions for Next.js environment variables
 declare global {
   namespace NodeJS {
     interface ProcessEnv {
-      FROM_DEV_ENV_LOCAL: readonly string
-      FROM_ENV_LOCAL: readonly string
-      FROM_ENV: readonly string
-      FROM_NEXT_CONFIG: readonly string
+      FROM_DEV_ENV_LOCAL: string
+      FROM_ENV_LOCAL: string
+      FROM_ENV: string
+      FROM_NEXT_CONFIG: string
     }
   }
 }
@@ -35,15 +35,15 @@ export {}`
         return await next.readFile('.next/types/env.d.ts')
       },
       // env.d.ts is written from original .env
-      /FROM_ENV: readonly string/
+      /FROM_ENV: string/
     )
 
     // modify .env
     await next.patchFile('.env', 'MODIFIED_ENV="MODIFIED_ENV"')
 
     // should not include from original .env
-    // e.g. FROM_ENV: readonly string
-    // but have MODIFIED_ENV: readonly string
+    // e.g. FROM_ENV: string
+    // but have MODIFIED_ENV: string
     await check(
       async () => {
         return await next.readFile('.next/types/env.d.ts')
@@ -52,10 +52,10 @@ export {}`
 declare global {
   namespace NodeJS {
     interface ProcessEnv {
-      FROM_DEV_ENV_LOCAL: readonly string
-      FROM_ENV_LOCAL: readonly string
-      MODIFIED_ENV: readonly string
-      FROM_NEXT_CONFIG: readonly string
+      FROM_DEV_ENV_LOCAL: string
+      FROM_ENV_LOCAL: string
+      MODIFIED_ENV: string
+      FROM_NEXT_CONFIG: string
     }
   }
 }

test/development/app-hmr/hmr.test.ts

@@ -1,5 +1,5 @@
 import { nextTestSetup } from 'e2e-utils'
-import { check, waitFor } from 'next-test-utils'
+import { retry, waitFor } from 'next-test-utils'
 
 const envFile = '.env.development.local'
 
@@ -40,11 +40,10 @@ describe(`app-dir-hmr`, () => {
 
       try {
         // Should be 404 in a few seconds
-        await check(async () => {
+        await retry(async () => {
           const body = await browser.elementByCss('body').text()
           expect(body).toContain('404')
-          return 'success'
-        }, 'success')
+        })
 
         // The new page should be rendered
         const newHTML = await next.render('/folder-renamed')
@@ -61,11 +60,31 @@ describe(`app-dir-hmr`, () => {
       expect(await browser.elementByCss('p').text()).toBe('mac')
       await next.patchFile(envFile, 'MY_DEVICE="ipad"')
 
+      const logs = await browser.log()
+      await retry(async () => {
+        expect(logs).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              message: '[Fast Refresh] rebuilding',
+              source: 'log',
+            }),
+          ])
+        )
+      })
+
       try {
-        await check(async () => {
+        await retry(async () => {
           expect(await browser.elementByCss('p').text()).toBe('ipad')
-          return 'success'
-        }, /success/)
+        })
+
+        expect(logs).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              message: expect.stringContaining('[Fast Refresh] done in'),
+              source: 'log',
+            }),
+          ])
+        )
       } finally {
         await next.patchFile(envFile, envContent)
       }
@@ -77,11 +96,31 @@ describe(`app-dir-hmr`, () => {
       expect(await browser.elementByCss('p').text()).toBe('mac')
       await next.patchFile(envFile, 'MY_DEVICE="ipad"')
 
+      const logs = await browser.log()
+      await retry(async () => {
+        expect(logs).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              message: '[Fast Refresh] rebuilding',
+              source: 'log',
+            }),
+          ])
+        )
+      })
+
       try {
-        await check(async () => {
+        await retry(async () => {
           expect(await browser.elementByCss('p').text()).toBe('ipad')
-          return 'success'
-        }, /success/)
+        })
+
+        expect(logs).toEqual(
+          expect.arrayContaining([
+            expect.objectContaining({
+              message: expect.stringContaining('[Fast Refresh] done in'),
+              source: 'log',
+            }),
+          ])
+        )
       } finally {
         await next.patchFile(envFile, envContent)
       }

test/e2e/on-request-error/basic/basic.test.ts

@@ -2,13 +2,18 @@ import { nextTestSetup } from 'e2e-utils'
 import { retry } from 'next-test-utils'
 
 describe('on-request-error - basic', () => {
-  const { next } = nextTestSetup({
+  const { next, skipped } = nextTestSetup({
     files: __dirname,
+    skipDeployment: true,
     env: {
       __NEXT_EXPERIMENTAL_INSTRUMENTATION: '1',
     },
   })
 
+  if (skipped) {
+    return
+  }
+
   const outputLogPath = 'output-log.json'
 
   async function getOutputLogJson() {

test/e2e/on-request-error/skip-next-internal-error/app/another/page.js

@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>another</p>
+}

test/e2e/on-request-error/skip-next-internal-error/app/app-route/not-found/route.js

@@ -0,0 +1,7 @@
+import { notFound } from 'next/navigation'
+
+export function GET() {
+  notFound()
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/app-route/redirect/route.js

@@ -0,0 +1,7 @@
+import { redirect } from 'next/navigation'
+
+export function GET() {
+  redirect('/another')
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/client/dynamic-fetch/page.js

@@ -0,0 +1,4 @@
+export default async function Page() {
+  await fetch('https://example.vercel.sh')
+  return <p>dynamic page</p>
+}

test/e2e/on-request-error/skip-next-internal-error/app/client/no-ssr/component.js

@@ -0,0 +1,3 @@
+export default function Component() {
+  return <p>Component</p>
+}

test/e2e/on-request-error/skip-next-internal-error/app/client/no-ssr/page.js

@@ -0,0 +1,11 @@
+'use client'
+
+import nextDynamic from 'next/dynamic'
+
+const Component = nextDynamic(() => import('./component'))
+
+export default function Page() {
+  return <Component />
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/client/not-found/page.js

@@ -0,0 +1,9 @@
+'use client'
+
+import { notFound } from 'next/navigation'
+
+export default function Page() {
+  notFound()
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/client/redirect/page.js

@@ -0,0 +1,9 @@
+'use client'
+
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  redirect('/another')
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/layout.js

@@ -0,0 +1,9 @@
+export default function Layout({ children }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/server/dynamic-fetch/page.js

@@ -0,0 +1,4 @@
+export default async function Page() {
+  await fetch('https://example.vercel.sh')
+  return <p>dynamic page</p>
+}

test/e2e/on-request-error/skip-next-internal-error/app/server/not-found/page.js

@@ -0,0 +1,7 @@
+import { notFound } from 'next/navigation'
+
+export default function Page() {
+  notFound()
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/app/server/redirect/page.js

@@ -0,0 +1,7 @@
+import { redirect } from 'next/navigation'
+
+export default function Page() {
+  redirect('/another')
+}
+
+export const dynamic = 'force-dynamic'

test/e2e/on-request-error/skip-next-internal-error/instrumentation.js

@@ -0,0 +1,3 @@
+export function onRequestError(err, request, context) {
+  console.log('[instrumentation]:error', err.message)
+}

test/e2e/on-request-error/skip-next-internal-error/next.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+  experimental: {
+    instrumentationHook: true,
+  },
+}