From e16c74bcaa43618ff596e2e1e33ce8ea1d6b0892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Wed, 7 Sep 2022 15:19:54 +0200
Subject: [PATCH 01/69] chore: turn off debug mode on issue validator (#40301)

The issue validator GitHub action has been running in the background for a while, and the output looks good: https://github.com/vercel/next.js/actions/workflows/validate_issue.yml

This PR switches off debug mode and will start commenting on improper bug reports to make triaging more effective.
---
 .github/workflows/validate_issue.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/validate_issue.yml b/.github/workflows/validate_issue.yml
index 3c6e3a4a2e43..abd6c0784d5f 100644
--- a/.github/workflows/validate_issue.yml
+++ b/.github/workflows/validate_issue.yml
@@ -15,4 +15,3 @@ jobs:
         run: node ./.github/actions/issue-validator/index.mjs
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DEBUG: 1

From 084ad964a0ed9af5c7594f40b73ca77ed1b460be Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Wed, 7 Sep 2022 18:28:15 +0200
Subject: [PATCH 02/69] Fix static info parsing when export data fetching
 method as variable (#40317)

Fix the ssr/ssg detection when you export a nextjs data fetching method
as a variable instead of an async function.

- [x] Add case support in `checkExports`
- [x] Add unit tests for `getPageStaticInfo`
---
 .../build/analysis/get-page-static-info.ts    | 13 +++++++++
 .../page-runtime/ssr-variable-gssp.js         | 12 +++++++++
 ...test.ts => parse-page-static-info.test.ts} | 27 +++++++++++++++----
 3 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 test/unit/fixtures/page-runtime/ssr-variable-gssp.js
 rename test/unit/{parse-page-runtime.test.ts => parse-page-static-info.test.ts} (69%)

diff --git a/packages/next/build/analysis/get-page-static-info.ts b/packages/next/build/analysis/get-page-static-info.ts
index cc18cc8d743a..bcaaac6bd2cc 100644
--- a/packages/next/build/analysis/get-page-static-info.ts
+++ b/packages/next/build/analysis/get-page-static-info.ts
@@ -53,6 +53,19 @@ export function checkExports(swcAST: any): { ssr: boolean; ssg: boolean } {
           }
         }
 
+        if (
+          node.type === 'ExportDeclaration' &&
+          node.declaration?.type === 'VariableDeclaration'
+        ) {
+          const id = node.declaration?.declarations[0]?.id.value
+          if (['getStaticProps', 'getServerSideProps'].includes(id)) {
+            return {
+              ssg: id === 'getStaticProps',
+              ssr: id === 'getServerSideProps',
+            }
+          }
+        }
+
         if (node.type === 'ExportNamedDeclaration') {
           const values = node.specifiers.map(
             (specifier: any) =>
diff --git a/test/unit/fixtures/page-runtime/ssr-variable-gssp.js b/test/unit/fixtures/page-runtime/ssr-variable-gssp.js
new file mode 100644
index 000000000000..e09007babef5
--- /dev/null
+++ b/test/unit/fixtures/page-runtime/ssr-variable-gssp.js
@@ -0,0 +1,12 @@
+export default function Nodejs() {
+  return 'nodejs'
+}
+
+// export an identifier instead of function
+export const getServerSideProps = async () => {
+  return { props: {} }
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+}
diff --git a/test/unit/parse-page-runtime.test.ts b/test/unit/parse-page-static-info.test.ts
similarity index 69%
rename from test/unit/parse-page-runtime.test.ts
rename to test/unit/parse-page-static-info.test.ts
index a9c4a358faaf..772081e53fb0 100644
--- a/test/unit/parse-page-runtime.test.ts
+++ b/test/unit/parse-page-static-info.test.ts
@@ -9,21 +9,25 @@ function createNextConfig(runtime?: 'experimental-edge' | 'nodejs') {
   }
 }
 
-describe('parse page runtime config', () => {
+describe('parse page static info', () => {
   it('should parse nodejs runtime correctly', async () => {
-    const { runtime } = await getPageStaticInfo({
+    const { runtime, ssr, ssg } = await getPageStaticInfo({
       pageFilePath: join(fixtureDir, 'page-runtime/nodejs-ssr.js'),
       nextConfig: createNextConfig(),
     })
     expect(runtime).toBe('nodejs')
+    expect(ssr).toBe(true)
+    expect(ssg).toBe(false)
   })
 
   it('should parse static runtime correctly', async () => {
-    const { runtime } = await getPageStaticInfo({
+    const { runtime, ssr, ssg } = await getPageStaticInfo({
       pageFilePath: join(fixtureDir, 'page-runtime/nodejs.js'),
       nextConfig: createNextConfig(),
     })
     expect(runtime).toBe(undefined)
+    expect(ssr).toBe(false)
+    expect(ssg).toBe(false)
   })
 
   it('should parse edge runtime correctly', async () => {
@@ -41,22 +45,35 @@ describe('parse page runtime config', () => {
     })
     expect(runtime).toBe(undefined)
   })
+
+  it('should parse ssr info with variable exported gSSP correctly', async () => {
+    const { ssr, ssg } = await getPageStaticInfo({
+      pageFilePath: join(fixtureDir, 'page-runtime/ssr-variable-gssp.js'),
+      nextConfig: createNextConfig(),
+    })
+    expect(ssr).toBe(true)
+    expect(ssg).toBe(false)
+  })
 })
 
 describe('fallback to the global runtime configuration', () => {
   it('should fallback when gSP is defined and exported', async () => {
-    const { runtime } = await getPageStaticInfo({
+    const { runtime, ssr, ssg } = await getPageStaticInfo({
       pageFilePath: join(fixtureDir, 'page-runtime/fallback-with-gsp.js'),
       nextConfig: createNextConfig('experimental-edge'),
     })
     expect(runtime).toBe('experimental-edge')
+    expect(ssr).toBe(false)
+    expect(ssg).toBe(true)
   })
 
   it('should fallback when gSP is re-exported from other module', async () => {
-    const { runtime } = await getPageStaticInfo({
+    const { runtime, ssr, ssg } = await getPageStaticInfo({
       pageFilePath: join(fixtureDir, 'page-runtime/fallback-re-export-gsp.js'),
       nextConfig: createNextConfig('experimental-edge'),
     })
     expect(runtime).toBe('experimental-edge')
+    expect(ssr).toBe(false)
+    expect(ssg).toBe(true)
   })
 })

From 35253e1a938eb773310a7a28d8ab3f3be8462b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Born=C3=B6?= <hannes.borno@vercel.com>
Date: Wed, 7 Sep 2022 22:12:13 +0200
Subject: [PATCH 03/69] fix(switchable-runtime): make dev server not break when
 wrong runtime config is exported (#40312)

Currently the DEV server can't recover if you export an invalid runtime
config. It ends up in a state where it stops to work but nothing is
printed to the terminal.

It now prints an error but keeps working. When building it should crash,
there's an existing test for that
https://github.com/vercel/next.js/blob/canary/test/production/exported-runtimes-value-validation/index.test.ts#L5-L17

#### Reproduce
```tsx
export default function Page() {
  return <p>hello world</p>
}

export const config = {
  runtime: 'something-odd',
}

```
---
 .../build/analysis/get-page-static-info.ts    | 13 ++--
 packages/next/server/dev/hot-reloader.ts      |  1 +
 packages/next/server/dev/next-dev-server.ts   |  1 +
 .../server/dev/on-demand-entry-handler.ts     |  1 +
 test/e2e/switchable-runtime/index.test.ts     | 68 +++++++++++++++++++
 .../pages/invalid-runtime.js                  |  3 +
 6 files changed, 81 insertions(+), 6 deletions(-)
 create mode 100644 test/e2e/switchable-runtime/pages/invalid-runtime.js

diff --git a/packages/next/build/analysis/get-page-static-info.ts b/packages/next/build/analysis/get-page-static-info.ts
index bcaaac6bd2cc..37d95e9bdcdd 100644
--- a/packages/next/build/analysis/get-page-static-info.ts
+++ b/packages/next/build/analysis/get-page-static-info.ts
@@ -239,21 +239,22 @@ export async function getPageStaticInfo(params: {
     }
 
     if (
-      typeof config.runtime !== 'string' &&
-      typeof config.runtime !== 'undefined'
+      typeof config.runtime !== 'undefined' &&
+      !isServerRuntime(config.runtime)
     ) {
-      throw new Error(`Provided runtime `)
-    } else if (!isServerRuntime(config.runtime)) {
       const options = Object.values(SERVER_RUNTIME).join(', ')
       if (typeof config.runtime !== 'string') {
-        throw new Error(
+        Log.error(
           `The \`runtime\` config must be a string. Please leave it empty or choose one of: ${options}`
         )
       } else {
-        throw new Error(
+        Log.error(
           `Provided runtime "${config.runtime}" is not supported. Please leave it empty or choose one of: ${options}`
         )
       }
+      if (!isDev) {
+        process.exit(1)
+      }
     }
 
     let runtime =
diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
index 8e1d195b7c7b..7a7584b43bdc 100644
--- a/packages/next/server/dev/hot-reloader.ts
+++ b/packages/next/server/dev/hot-reloader.ts
@@ -602,6 +602,7 @@ export default class HotReloader {
               ? await getPageStaticInfo({
                   pageFilePath: entryData.absolutePagePath,
                   nextConfig: this.config,
+                  isDev: true,
                 })
               : {}
 
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index 920a6264845d..d360778905f4 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -369,6 +369,7 @@ export default class DevServer extends Server {
             pageFilePath: fileName,
             nextConfig: this.nextConfig,
             page: rootFile,
+            isDev: true,
           })
 
           if (isMiddlewareFile(rootFile)) {
diff --git a/packages/next/server/dev/on-demand-entry-handler.ts b/packages/next/server/dev/on-demand-entry-handler.ts
index a0a2fe8bf171..1c752b7b296d 100644
--- a/packages/next/server/dev/on-demand-entry-handler.ts
+++ b/packages/next/server/dev/on-demand-entry-handler.ts
@@ -632,6 +632,7 @@ export function onDemandEntryHandler({
         const staticInfo = await getPageStaticInfo({
           pageFilePath: pagePathData.absolutePagePath,
           nextConfig,
+          isDev: true,
         })
 
         const added = new Map<CompilerNameValues, ReturnType<typeof addEntry>>()
diff --git a/test/e2e/switchable-runtime/index.test.ts b/test/e2e/switchable-runtime/index.test.ts
index f21f94dba24b..b9cef7819887 100644
--- a/test/e2e/switchable-runtime/index.test.ts
+++ b/test/e2e/switchable-runtime/index.test.ts
@@ -202,6 +202,74 @@ describe('Switchable runtime', () => {
           })
         }
       })
+
+      it('should not crash the dev server when invalid runtime is configured', async () => {
+        await check(
+          () => renderViaHTTP(next.url, '/invalid-runtime'),
+          /Hello from page without errors/
+        )
+
+        // Invalid runtime type
+        await next.patchFile(
+          'pages/invalid-runtime.js',
+          `
+          export default function Page() {
+            return <p>Hello from page with invalid type</p>
+          }
+          
+          export const config = {
+            runtime: 10,
+          }
+            `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/invalid-runtime'),
+          /Hello from page with invalid type/
+        )
+        expect(next.cliOutput).toInclude(
+          'error - The `runtime` config must be a string. Please leave it empty or choose one of:'
+        )
+
+        // Invalid runtime
+        await next.patchFile(
+          'pages/invalid-runtime.js',
+          `
+            export default function Page() {
+              return <p>Hello from page with invalid runtime</p>
+            }
+            
+            export const config = {
+              runtime: "asd"
+            }
+              `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/invalid-runtime'),
+          /Hello from page with invalid runtime/
+        )
+        expect(next.cliOutput).toInclude(
+          'error - Provided runtime "asd" is not supported. Please leave it empty or choose one of:'
+        )
+
+        // Fix the runtime
+        await next.patchFile(
+          'pages/invalid-runtime.js',
+          `
+        export default function Page() {
+          return <p>Hello from page without errors</p>
+        }
+        
+        export const config = {
+          runtime: 'experimental-edge',
+        }
+  
+        `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/invalid-runtime'),
+          /Hello from page without errors/
+        )
+      })
     })
   } else {
     describe('Switchable runtime (prod)', () => {
diff --git a/test/e2e/switchable-runtime/pages/invalid-runtime.js b/test/e2e/switchable-runtime/pages/invalid-runtime.js
new file mode 100644
index 000000000000..17235157127b
--- /dev/null
+++ b/test/e2e/switchable-runtime/pages/invalid-runtime.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>Hello from page without errors</p>
+}

From d5e6eb1ef221ddc8d27de11792595c452c4303c2 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 7 Sep 2022 13:24:29 -0700
Subject: [PATCH 04/69] Revert "Refactor Server Router" (#40328)

This temporarily reverts the refactor while we investigate
https://github.com/vercel/next.js/issues/40241 further.

Reverts vercel/next.js#39902
---
 packages/next/server/dev/next-dev-server.ts |   1 +
 packages/next/server/router.ts              | 478 +++++++++-----------
 2 files changed, 214 insertions(+), 265 deletions(-)

diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index d360778905f4..a67bfb58bcbb 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -221,6 +221,7 @@ export default class DevServer extends Server {
       for (const path in exportPathMap) {
         const { page, query = {} } = exportPathMap[path]
 
+        // We use unshift so that we're sure the routes is defined before Next's default routes
         this.router.addFsRoute({
           match: getPathMatch(path),
           type: 'route',
diff --git a/packages/next/server/router.ts b/packages/next/server/router.ts
index ca2ce97b1a7d..0cb309f823af 100644
--- a/packages/next/server/router.ts
+++ b/packages/next/server/router.ts
@@ -40,7 +40,7 @@ export type Route = {
     res: BaseNextResponse,
     params: Params,
     parsedUrl: NextUrlWithParsedQuery,
-    upgradeHead?: Buffer
+    upgradeHead?: any
   ) => Promise<RouteResult> | RouteResult
 }
 
@@ -49,37 +49,21 @@ export type DynamicRoutes = Array<{ page: string; match: RouteMatch }>
 export type PageChecker = (pathname: string) => Promise<boolean>
 
 export default class Router {
-  public catchAllMiddleware: ReadonlyArray<Route>
-
-  private readonly headers: ReadonlyArray<Route>
-  private readonly fsRoutes: Route[]
-  private readonly redirects: ReadonlyArray<Route>
-  private readonly rewrites: {
-    beforeFiles: ReadonlyArray<Route>
-    afterFiles: ReadonlyArray<Route>
-    fallback: ReadonlyArray<Route>
+  headers: Route[]
+  fsRoutes: Route[]
+  redirects: Route[]
+  rewrites: {
+    beforeFiles: Route[]
+    afterFiles: Route[]
+    fallback: Route[]
   }
-  private readonly catchAllRoute: Route
-  private readonly pageChecker: PageChecker
-  private dynamicRoutes: DynamicRoutes
-  private readonly useFileSystemPublicRoutes: boolean
-  private readonly nextConfig: NextConfig
-  private compiledRoutes: ReadonlyArray<Route>
-  private needsRecompilation: boolean
-
-  /**
-   * context stores information used by the router.
-   */
-  private readonly context = new WeakMap<
-    BaseNextRequest,
-    {
-      /**
-       * pageChecks is the memoized record of all checks made against pages to
-       * help de-duplicate work.
-       */
-      pageChecks: Record<string, boolean>
-    }
-  >()
+  catchAllRoute: Route
+  catchAllMiddleware: Route[]
+  pageChecker: PageChecker
+  dynamicRoutes: DynamicRoutes
+  useFileSystemPublicRoutes: boolean
+  seenRequests: Set<any>
+  nextConfig: NextConfig
 
   constructor({
     headers = [],
@@ -97,16 +81,16 @@ export default class Router {
     useFileSystemPublicRoutes,
     nextConfig,
   }: {
-    headers: ReadonlyArray<Route>
-    fsRoutes: ReadonlyArray<Route>
+    headers: Route[]
+    fsRoutes: Route[]
     rewrites: {
-      beforeFiles: ReadonlyArray<Route>
-      afterFiles: ReadonlyArray<Route>
-      fallback: ReadonlyArray<Route>
+      beforeFiles: Route[]
+      afterFiles: Route[]
+      fallback: Route[]
     }
-    redirects: ReadonlyArray<Route>
+    redirects: Route[]
     catchAllRoute: Route
-    catchAllMiddleware: ReadonlyArray<Route>
+    catchAllMiddleware: Route[]
     dynamicRoutes: DynamicRoutes | undefined
     pageChecker: PageChecker
     useFileSystemPublicRoutes: boolean
@@ -114,7 +98,7 @@ export default class Router {
   }) {
     this.nextConfig = nextConfig
     this.headers = headers
-    this.fsRoutes = [...fsRoutes]
+    this.fsRoutes = fsRoutes
     this.rewrites = rewrites
     this.redirects = redirects
     this.pageChecker = pageChecker
@@ -122,32 +106,7 @@ export default class Router {
     this.catchAllMiddleware = catchAllMiddleware
     this.dynamicRoutes = dynamicRoutes
     this.useFileSystemPublicRoutes = useFileSystemPublicRoutes
-
-    // Perform the initial route compilation.
-    this.compiledRoutes = this.compileRoutes()
-    this.needsRecompilation = false
-  }
-
-  private async checkPage(
-    req: BaseNextRequest,
-    pathname: string
-  ): Promise<boolean> {
-    pathname = normalizeLocalePath(pathname, this.locales).pathname
-
-    const context = this.context.get(req)
-    if (!context) {
-      throw new Error(
-        'Invariant: request is not available inside the context, this is an internal error please open an issue.'
-      )
-    }
-
-    if (context.pageChecks[pathname] !== undefined) {
-      return context.pageChecks[pathname]
-    }
-
-    const result = await this.pageChecker(pathname)
-    context.pageChecks[pathname] = result
-    return result
+    this.seenRequests = new Set()
   }
 
   get locales() {
@@ -158,201 +117,192 @@ export default class Router {
     return this.nextConfig.basePath || ''
   }
 
-  public setDynamicRoutes(dynamicRoutes: DynamicRoutes) {
-    this.dynamicRoutes = dynamicRoutes
-    this.needsRecompilation = true
+  setDynamicRoutes(routes: DynamicRoutes = []) {
+    this.dynamicRoutes = routes
   }
-  public setCatchallMiddleware(catchAllMiddleware: ReadonlyArray<Route>) {
-    this.catchAllMiddleware = catchAllMiddleware
-    this.needsRecompilation = true
+  setCatchallMiddleware(route?: Route[]) {
+    this.catchAllMiddleware = route || []
   }
 
-  public addFsRoute(fsRoute: Route) {
-    // We use unshift so that we're sure the routes is defined before Next's
-    // default routes.
+  addFsRoute(fsRoute: Route) {
     this.fsRoutes.unshift(fsRoute)
-    this.needsRecompilation = true
-  }
-
-  private compileRoutes(): ReadonlyArray<Route> {
-    /*
-        Desired routes order
-        - headers
-        - redirects
-        - Check filesystem (including pages), if nothing found continue
-        - User rewrites (checking filesystem and pages each match)
-      */
-
-    const [middlewareCatchAllRoute] = this.catchAllMiddleware
-
-    return [
-      ...(middlewareCatchAllRoute
-        ? this.fsRoutes
-            .filter((route) => route.name === '_next/data catchall')
-            .map((route) => ({ ...route, check: false }))
-        : []),
-      ...this.headers,
-      ...this.redirects,
-      ...(this.useFileSystemPublicRoutes && middlewareCatchAllRoute
-        ? [middlewareCatchAllRoute]
-        : []),
-      ...this.rewrites.beforeFiles,
-      ...this.fsRoutes,
-      // We only check the catch-all route if public page routes hasn't been
-      // disabled
-      ...(this.useFileSystemPublicRoutes
-        ? [
-            {
-              type: 'route',
-              name: 'page checker',
-              match: getPathMatch('/:path*'),
-              fn: async (req, res, params, parsedUrl, upgradeHead) => {
-                const pathname = removeTrailingSlash(parsedUrl.pathname || '/')
-                if (!pathname) {
-                  return { finished: false }
-                }
-
-                if (await this.checkPage(req, pathname)) {
-                  return this.catchAllRoute.fn(
-                    req,
-                    res,
-                    params,
-                    parsedUrl,
-                    upgradeHead
-                  )
-                }
-
-                return { finished: false }
-              },
-            } as Route,
-          ]
-        : []),
-      ...this.rewrites.afterFiles,
-      ...(this.rewrites.fallback.length
-        ? [
-            {
-              type: 'route',
-              name: 'dynamic route/page check',
-              match: getPathMatch('/:path*'),
-              fn: async (req, res, _params, parsedCheckerUrl, upgradeHead) => {
-                return {
-                  finished: await this.checkFsRoutes(
-                    req,
-                    res,
-                    parsedCheckerUrl,
-                    upgradeHead
-                  ),
-                }
-              },
-            } as Route,
-            ...this.rewrites.fallback,
-          ]
-        : []),
-
-      // We only check the catch-all route if public page routes hasn't been
-      // disabled
-      ...(this.useFileSystemPublicRoutes ? [this.catchAllRoute] : []),
-    ]
   }
 
-  private async checkFsRoutes(
+  async execute(
     req: BaseNextRequest,
     res: BaseNextResponse,
     parsedUrl: NextUrlWithParsedQuery,
-    upgradeHead?: Buffer
-  ) {
-    const originalFsPathname = parsedUrl.pathname
-    const fsPathname = removePathPrefix(originalFsPathname!, this.basePath)
-
-    for (const route of this.fsRoutes) {
-      const params = route.match(fsPathname)
-
-      if (params) {
-        parsedUrl.pathname = fsPathname
-
-        const { finished } = await route.fn(req, res, params, parsedUrl)
-        if (finished) {
-          return true
-        }
-
-        parsedUrl.pathname = originalFsPathname
-      }
+    upgradeHead?: any
+  ): Promise<boolean> {
+    if (this.seenRequests.has(req)) {
+      throw new Error(
+        `Invariant: request has already been processed: ${req.url}, this is an internal error please open an issue.`
+      )
     }
+    this.seenRequests.add(req)
+    try {
+      // memoize page check calls so we don't duplicate checks for pages
+      const pageChecks: { [name: string]: Promise<boolean> } = {}
+      const memoizedPageChecker = async (p: string): Promise<boolean> => {
+        p = normalizeLocalePath(p, this.locales).pathname
 
-    let matchedPage = await this.checkPage(req, fsPathname)
-
-    // If we didn't match a page check dynamic routes
-    if (!matchedPage) {
-      const normalizedFsPathname = normalizeLocalePath(
-        fsPathname,
-        this.locales
-      ).pathname
-
-      for (const dynamicRoute of this.dynamicRoutes) {
-        if (dynamicRoute.match(normalizedFsPathname)) {
-          matchedPage = true
+        if (pageChecks[p] !== undefined) {
+          return pageChecks[p]
         }
+        const result = this.pageChecker(p)
+        pageChecks[p] = result
+        return result
       }
-    }
 
-    // Matched a page or dynamic route so render it using catchAllRoute
-    if (matchedPage) {
-      const params = this.catchAllRoute.match(parsedUrl.pathname)
-      if (!params) {
-        throw new Error(
-          `Invariant: could not match params, this is an internal error please open an issue.`
-        )
-      }
+      let parsedUrlUpdated = parsedUrl
 
-      parsedUrl.pathname = fsPathname
-      parsedUrl.query._nextBubbleNoFallback = '1'
+      const applyCheckTrue = async (checkParsedUrl: NextUrlWithParsedQuery) => {
+        const originalFsPathname = checkParsedUrl.pathname
+        const fsPathname = removePathPrefix(originalFsPathname!, this.basePath)
 
-      const { finished } = await this.catchAllRoute.fn(
-        req,
-        res,
-        params,
-        parsedUrl,
-        upgradeHead
-      )
+        for (const fsRoute of this.fsRoutes) {
+          const fsParams = fsRoute.match(fsPathname)
 
-      return finished
-    }
+          if (fsParams) {
+            checkParsedUrl.pathname = fsPathname
 
-    return false
-  }
+            const fsResult = await fsRoute.fn(
+              req,
+              res,
+              fsParams,
+              checkParsedUrl
+            )
 
-  async execute(
-    req: BaseNextRequest,
-    res: BaseNextResponse,
-    parsedUrl: NextUrlWithParsedQuery,
-    upgradeHead?: Buffer
-  ): Promise<boolean> {
-    // Only recompile if the routes need to be recompiled, this should only
-    // happen in development.
-    if (this.needsRecompilation) {
-      this.compiledRoutes = this.compileRoutes()
-      this.needsRecompilation = false
-    }
+            if (fsResult.finished) {
+              return true
+            }
 
-    if (this.context.has(req)) {
-      throw new Error(
-        `Invariant: request has already been processed: ${req.url}, this is an internal error please open an issue.`
-      )
-    }
-    this.context.set(req, { pageChecks: {} })
+            checkParsedUrl.pathname = originalFsPathname
+          }
+        }
+        let matchedPage = await memoizedPageChecker(fsPathname)
+
+        // If we didn't match a page check dynamic routes
+        if (!matchedPage) {
+          const normalizedFsPathname = normalizeLocalePath(
+            fsPathname,
+            this.locales
+          ).pathname
+
+          for (const dynamicRoute of this.dynamicRoutes) {
+            if (dynamicRoute.match(normalizedFsPathname)) {
+              matchedPage = true
+            }
+          }
+        }
 
-    try {
-      // Create a deep copy of the parsed URL.
-      const parsedUrlUpdated = {
-        ...parsedUrl,
-        query: {
-          ...parsedUrl.query,
-        },
+        // Matched a page or dynamic route so render it using catchAllRoute
+        if (matchedPage) {
+          const pageParams = this.catchAllRoute.match(checkParsedUrl.pathname)
+          checkParsedUrl.pathname = fsPathname
+          checkParsedUrl.query._nextBubbleNoFallback = '1'
+
+          const result = await this.catchAllRoute.fn(
+            req,
+            res,
+            pageParams as Params,
+            checkParsedUrl
+          )
+          return result.finished
+        }
       }
 
-      for (const route of this.compiledRoutes) {
+      /*
+        Desired routes order
+        - headers
+        - redirects
+        - Check filesystem (including pages), if nothing found continue
+        - User rewrites (checking filesystem and pages each match)
+      */
+
+      const [middlewareCatchAllRoute] = this.catchAllMiddleware
+      const allRoutes = [
+        ...(middlewareCatchAllRoute
+          ? this.fsRoutes
+              .filter((r) => r.name === '_next/data catchall')
+              .map((r) => {
+                return {
+                  ...r,
+                  check: false,
+                }
+              })
+          : []),
+        ...this.headers,
+        ...this.redirects,
+        ...(this.useFileSystemPublicRoutes && middlewareCatchAllRoute
+          ? [middlewareCatchAllRoute]
+          : []),
+        ...this.rewrites.beforeFiles,
+        ...this.fsRoutes,
+        // We only check the catch-all route if public page routes hasn't been
+        // disabled
+        ...(this.useFileSystemPublicRoutes
+          ? [
+              {
+                type: 'route',
+                name: 'page checker',
+                match: getPathMatch('/:path*'),
+                fn: async (
+                  checkerReq,
+                  checkerRes,
+                  params,
+                  parsedCheckerUrl
+                ) => {
+                  let { pathname } = parsedCheckerUrl
+                  pathname = removeTrailingSlash(pathname || '/')
+
+                  if (!pathname) {
+                    return { finished: false }
+                  }
+
+                  if (await memoizedPageChecker(pathname)) {
+                    return this.catchAllRoute.fn(
+                      checkerReq,
+                      checkerRes,
+                      params,
+                      parsedCheckerUrl
+                    )
+                  }
+                  return { finished: false }
+                },
+              } as Route,
+            ]
+          : []),
+        ...this.rewrites.afterFiles,
+        ...(this.rewrites.fallback.length
+          ? [
+              {
+                type: 'route',
+                name: 'dynamic route/page check',
+                match: getPathMatch('/:path*'),
+                fn: async (
+                  _checkerReq,
+                  _checkerRes,
+                  _params,
+                  parsedCheckerUrl
+                ) => {
+                  return {
+                    finished: await applyCheckTrue(parsedCheckerUrl),
+                  }
+                },
+              } as Route,
+              ...this.rewrites.fallback,
+            ]
+          : []),
+
+        // We only check the catch-all route if public page routes hasn't been
+        // disabled
+        ...(this.useFileSystemPublicRoutes ? [this.catchAllRoute] : []),
+      ]
+
+      for (const testRoute of allRoutes) {
         // only process rewrites for upgrade request
-        if (upgradeHead && route.type !== 'rewrite') {
+        if (upgradeHead && testRoute.type !== 'rewrite') {
           continue
         }
 
@@ -364,7 +314,7 @@ export default class Router {
 
         if (
           pathnameInfo.locale &&
-          !route.matchesLocaleAPIRoutes &&
+          !testRoute.matchesLocaleAPIRoutes &&
           pathnameInfo.pathname.match(/^\/api(?:\/|$)/)
         ) {
           continue
@@ -375,20 +325,20 @@ export default class Router {
         }
 
         const basePath = pathnameInfo.basePath
-        if (!route.matchesBasePath) {
+        if (!testRoute.matchesBasePath) {
           pathnameInfo.basePath = ''
         }
 
         if (
-          route.matchesLocale &&
-          parsedUrlUpdated.query.__nextLocale &&
+          testRoute.matchesLocale &&
+          parsedUrl.query.__nextLocale &&
           !pathnameInfo.locale
         ) {
-          pathnameInfo.locale = parsedUrlUpdated.query.__nextLocale
+          pathnameInfo.locale = parsedUrl.query.__nextLocale
         }
 
         if (
-          !route.matchesLocale &&
+          !testRoute.matchesLocale &&
           pathnameInfo.locale === this.nextConfig.i18n?.defaultLocale &&
           pathnameInfo.locale
         ) {
@@ -396,7 +346,7 @@ export default class Router {
         }
 
         if (
-          route.matchesTrailingSlash &&
+          testRoute.matchesTrailingSlash &&
           getRequestMeta(req, '__nextHadTrailingSlash')
         ) {
           pathnameInfo.trailingSlash = true
@@ -407,13 +357,13 @@ export default class Router {
           ...pathnameInfo,
         })
 
-        let params = route.match(matchPathname)
-        if (route.has && params) {
-          const hasParams = matchHas(req, route.has, parsedUrlUpdated.query)
+        let newParams = testRoute.match(matchPathname)
+        if (testRoute.has && newParams) {
+          const hasParams = matchHas(req, testRoute.has, parsedUrlUpdated.query)
           if (hasParams) {
-            Object.assign(params, hasParams)
+            Object.assign(newParams, hasParams)
           } else {
-            params = false
+            newParams = false
           }
         }
 
@@ -423,34 +373,35 @@ export default class Router {
          * never there, we consider this an invalid match and keep routing.
          */
         if (
-          params &&
+          newParams &&
           this.basePath &&
-          !route.matchesBasePath &&
+          !testRoute.matchesBasePath &&
           !getRequestMeta(req, '_nextDidRewrite') &&
           !basePath
         ) {
           continue
         }
 
-        if (params) {
+        if (newParams) {
           parsedUrlUpdated.pathname = matchPathname
-          const result = await route.fn(
+          const result = await testRoute.fn(
             req,
             res,
-            params,
+            newParams,
             parsedUrlUpdated,
             upgradeHead
           )
+
           if (result.finished) {
             return true
           }
 
+          // since the fs route didn't finish routing we need to re-add the
+          // basePath to continue checking with the basePath present
+          parsedUrlUpdated.pathname = originalPathname
+
           if (result.pathname) {
             parsedUrlUpdated.pathname = result.pathname
-          } else {
-            // since the fs route didn't finish routing we need to re-add the
-            // basePath to continue checking with the basePath present
-            parsedUrlUpdated.pathname = originalPathname
           }
 
           if (result.query) {
@@ -461,19 +412,16 @@ export default class Router {
           }
 
           // check filesystem
-          if (
-            route.check &&
-            (await this.checkFsRoutes(req, res, parsedUrlUpdated))
-          ) {
-            return true
+          if (testRoute.check === true) {
+            if (await applyCheckTrue(parsedUrlUpdated)) {
+              return true
+            }
           }
         }
       }
-
-      // All routes were tested, none were found.
       return false
     } finally {
-      this.context.delete(req)
+      this.seenRequests.delete(req)
     }
   }
 }

From a9b9e007033a3e2618352d3e0516d9870a70069b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Born=C3=B6?= <hannes.borno@vercel.com>
Date: Wed, 7 Sep 2022 22:42:32 +0200
Subject: [PATCH 05/69] fix(switchable-runtime): Make it possible to switch
 between edge and server runtime in dev (#39327)

Makes it possible to switch between edge/server runtime in dev without
breaking the server.

Fixes slack:
[1](https://vercel.slack.com/archives/CGU8HUTUH/p1659082535540549)
[2](https://vercel.slack.com/archives/C02CDC2ALJH/p1658978287244359)
[3](https://vercel.slack.com/archives/C03KAR5DCKC/p1656869427468779)

#### middleware-plugin.ts
`middlewareManifest` moved from module scope to local scope. Stale state
from earlier builds ended up in `middleware-manifest.json`. Functions
that changed from edge to server runtime stayed in the manifest as edge
functions.

#### on-demand-entry-handler.ts
When a server or edge entry is added we check if it has switched
runtime. If that's the case the old entry is removed.

#### Reproduce
Create edge API route and visit `/api/hello`
```js
// pages/api/hello.js
export const config = {
  runtime: 'experimental-edge',
}

export default () => new Response('Hello')
```

Change it to a server api route and visit `/api/hello`, it will explode.
```js
// pages/api/hello.js
export default function (req, res) {
  res.send('Hello')
}
```

#### Bug not fixed
One EDGE case is not fixed. It occurs if you switch between edge and
server runtime several times without changing the content of the file:

Edge runtime
```js
export const config = {
  runtime: 'experimental-edge',
}

export default () => new Response('Hello')
```

Change it to a server runtime
```js
export default function (req, res) {
  res.send('Hello')
}
```

Change back to edge runtime, the content of the file is the same as the
first time we compiled the edge runtime version.
```js
export const config = {
  runtime: 'experimental-edge',
}

export default () => new Response('Hello')
```

The reason is that both the edge and server compiler emits to the same
file (/.next/server/pages/api/hello.js) which makes this check fail in
webpack:
https://github.com/webpack/webpack/blob/main/lib/Compiler.js#L849-L861
Possible solution is to use different output folders for edge and server
https://vercel.slack.com/archives/CGU8HUTUH/p1661163106667559

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 .../webpack/plugins/middleware-plugin.ts      |  12 +-
 .../server/dev/on-demand-entry-handler.ts     |  10 +
 test/e2e/switchable-runtime/index.test.ts     | 184 ++++++++++++++++++
 .../pages/api/switch-in-dev-same-content.js   |   3 +
 .../pages/api/switch-in-dev.js                |   3 +
 .../pages/api/syntax-error-in-dev.js          |   5 +
 .../switchable-runtime/pages/switch-in-dev.js |   7 +
 7 files changed, 218 insertions(+), 6 deletions(-)
 create mode 100644 test/e2e/switchable-runtime/pages/api/switch-in-dev-same-content.js
 create mode 100644 test/e2e/switchable-runtime/pages/api/switch-in-dev.js
 create mode 100644 test/e2e/switchable-runtime/pages/api/syntax-error-in-dev.js
 create mode 100644 test/e2e/switchable-runtime/pages/switch-in-dev.js

diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index 82b94f8b4101..6711ade2f916 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -46,12 +46,6 @@ interface EntryMetadata {
 }
 
 const NAME = 'MiddlewarePlugin'
-const middlewareManifest: MiddlewareManifest = {
-  sortedMiddleware: [],
-  middleware: {},
-  functions: {},
-  version: 2,
-}
 
 /**
  * Checks the value of usingIndirectEval and when it is a set of modules it
@@ -121,6 +115,12 @@ function getCreateAssets(params: {
 }) {
   const { compilation, metadataByEntry } = params
   return (assets: any) => {
+    const middlewareManifest: MiddlewareManifest = {
+      sortedMiddleware: [],
+      middleware: {},
+      functions: {},
+      version: 2,
+    }
     for (const entrypoint of compilation.entrypoints.values()) {
       if (!entrypoint.name) {
         continue
diff --git a/packages/next/server/dev/on-demand-entry-handler.ts b/packages/next/server/dev/on-demand-entry-handler.ts
index 1c752b7b296d..4784fcf4489f 100644
--- a/packages/next/server/dev/on-demand-entry-handler.ts
+++ b/packages/next/server/dev/on-demand-entry-handler.ts
@@ -649,12 +649,22 @@ export function onDemandEntryHandler({
           },
           onServer: () => {
             added.set(COMPILER_NAMES.server, addEntry(COMPILER_NAMES.server))
+            const edgeServerEntry = `${COMPILER_NAMES.edgeServer}${pagePathData.page}`
+            if (entries[edgeServerEntry]) {
+              // Runtime switched from edge to server
+              delete entries[edgeServerEntry]
+            }
           },
           onEdgeServer: () => {
             added.set(
               COMPILER_NAMES.edgeServer,
               addEntry(COMPILER_NAMES.edgeServer)
             )
+            const serverEntry = `${COMPILER_NAMES.server}${pagePathData.page}`
+            if (entries[serverEntry]) {
+              // Runtime switched from server to edge
+              delete entries[serverEntry]
+            }
           },
         })
 
diff --git a/test/e2e/switchable-runtime/index.test.ts b/test/e2e/switchable-runtime/index.test.ts
index b9cef7819887..5485116ebc5c 100644
--- a/test/e2e/switchable-runtime/index.test.ts
+++ b/test/e2e/switchable-runtime/index.test.ts
@@ -203,6 +203,190 @@ describe('Switchable runtime', () => {
         }
       })
 
+      it('should be possible to switch between runtimes in API routes', async () => {
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev'),
+          'server response'
+        )
+
+        // Edge
+        await next.patchFile(
+          'pages/api/switch-in-dev.js',
+          `
+          export const config = {
+            runtime: 'experimental-edge',
+          }
+  
+          export default () => new Response('edge response')
+          `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev'),
+          'edge response'
+        )
+
+        // Server
+        await next.patchFile(
+          'pages/api/switch-in-dev.js',
+          `
+          export default function (req, res) {
+            res.send('server response again')
+          }
+          `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev'),
+          'server response again'
+        )
+
+        // Edge
+        await next.patchFile(
+          'pages/api/switch-in-dev.js',
+          `
+          export const config = {
+            runtime: 'experimental-edge',
+          }
+  
+          export default () => new Response('edge response again')
+          `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev'),
+          'edge response again'
+        )
+      })
+
+      it('should be possible to switch between runtimes in pages', async () => {
+        await check(
+          () => renderViaHTTP(next.url, '/switch-in-dev'),
+          /Hello from edge page/
+        )
+
+        // Server
+        await next.patchFile(
+          'pages/switch-in-dev.js',
+          `
+          export default function Page() {
+            return <p>Hello from server page</p>
+          }
+          `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/switch-in-dev'),
+          /Hello from server page/
+        )
+
+        // Edge
+        await next.patchFile(
+          'pages/switch-in-dev.js',
+          `
+      export default function Page() {
+        return <p>Hello from edge page again</p>
+      }
+
+      export const config = {
+        runtime: 'experimental-edge',
+      }
+      `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/switch-in-dev'),
+          /Hello from edge page again/
+        )
+
+        // Server
+        await next.patchFile(
+          'pages/switch-in-dev.js',
+          `
+            export default function Page() {
+              return <p>Hello from server page again</p>
+            }
+            `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/switch-in-dev'),
+          /Hello from server page again/
+        )
+      })
+
+      // Doesn't work, see https://github.com/vercel/next.js/pull/39327
+      it.skip('should be possible to switch between runtimes with same content', async () => {
+        const fileContent = await next.readFile(
+          'pages/api/switch-in-dev-same-content.js'
+        )
+        console.log({ fileContent })
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev-same-content'),
+          'server response'
+        )
+
+        // Edge
+        await next.patchFile(
+          'pages/api/switch-in-dev-same-content.js',
+          `
+          export const config = {
+            runtime: 'experimental-edge',
+          }
+  
+          export default () => new Response('edge response')
+          `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev-same-content'),
+          'edge response'
+        )
+
+        // Server - same content as first compilation of the server runtime version
+        await next.patchFile(
+          'pages/api/switch-in-dev-same-content.js',
+          fileContent
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/switch-in-dev-same-content'),
+          'server response'
+        )
+      })
+
+      it('should recover from syntax error when using edge runtime', async () => {
+        await check(
+          () => renderViaHTTP(next.url, '/api/syntax-error-in-dev'),
+          'edge response'
+        )
+
+        // Syntax error
+        await next.patchFile(
+          'pages/api/syntax-error-in-dev.js',
+          `
+        export const config = {
+          runtime: 'experimental-edge',
+        }
+    
+        export default  => new Response('edge response')
+        `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/syntax-error-in-dev'),
+          /Unexpected token/
+        )
+
+        // Fix syntax error
+        await next.patchFile(
+          'pages/api/syntax-error-in-dev.js',
+          `
+          export default () => new Response('edge response again')
+
+          export const config = {
+            runtime: 'experimental-edge',
+          }
+          
+        `
+        )
+        await check(
+          () => renderViaHTTP(next.url, '/api/syntax-error-in-dev'),
+          'edge response again'
+        )
+      })
+
       it('should not crash the dev server when invalid runtime is configured', async () => {
         await check(
           () => renderViaHTTP(next.url, '/invalid-runtime'),
diff --git a/test/e2e/switchable-runtime/pages/api/switch-in-dev-same-content.js b/test/e2e/switchable-runtime/pages/api/switch-in-dev-same-content.js
new file mode 100644
index 000000000000..a587c8cb1a71
--- /dev/null
+++ b/test/e2e/switchable-runtime/pages/api/switch-in-dev-same-content.js
@@ -0,0 +1,3 @@
+export default (req, res) => {
+  res.send('server response')
+}
diff --git a/test/e2e/switchable-runtime/pages/api/switch-in-dev.js b/test/e2e/switchable-runtime/pages/api/switch-in-dev.js
new file mode 100644
index 000000000000..a587c8cb1a71
--- /dev/null
+++ b/test/e2e/switchable-runtime/pages/api/switch-in-dev.js
@@ -0,0 +1,3 @@
+export default (req, res) => {
+  res.send('server response')
+}
diff --git a/test/e2e/switchable-runtime/pages/api/syntax-error-in-dev.js b/test/e2e/switchable-runtime/pages/api/syntax-error-in-dev.js
new file mode 100644
index 000000000000..3b7243a1205e
--- /dev/null
+++ b/test/e2e/switchable-runtime/pages/api/syntax-error-in-dev.js
@@ -0,0 +1,5 @@
+export default () => new Response('edge response')
+
+export const config = {
+  runtime: `experimental-edge`,
+}
diff --git a/test/e2e/switchable-runtime/pages/switch-in-dev.js b/test/e2e/switchable-runtime/pages/switch-in-dev.js
new file mode 100644
index 000000000000..b67d4cabd53c
--- /dev/null
+++ b/test/e2e/switchable-runtime/pages/switch-in-dev.js
@@ -0,0 +1,7 @@
+export default function Page() {
+  return <p>Hello from edge page</p>
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+}

From b86bf075639c0a899087831e731046e22af823b5 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 7 Sep 2022 13:44:58 -0700
Subject: [PATCH 06/69] v12.2.6-canary.11

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 ++--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 +++++++-------
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 29350f4a08fa..65ad1559e7ba 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.2.6-canary.10"
+  "version": "12.2.6-canary.11"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 721fd07b6fed..7768ac4351e9 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 5ea10aa13205..2d05f1dd73b5 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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.2.6-canary.10",
+    "@next/eslint-plugin-next": "12.2.6-canary.11",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 35c47b9c1c3a..c962b79d34cd 100644
--- 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.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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
index 8118628540f6..96e40b6f4ed7 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 947d444897b8..9dd1e3367111 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 70c1be3643b4..e2a73c53f4f5 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index 5154b092531f..f4a25c98ffc8 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 43d3c0859537..7facfee704ff 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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
index 6f96414c44fe..412946be8dab 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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
index 25c6807234f4..d4ae98531996 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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
index 05c0aa843831..99b6702820ff 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index 5c6ab9517a11..faa1fc761280 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.2.6-canary.10",
+    "@next/env": "12.2.6-canary.11",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.2.6-canary.10",
-    "@next/polyfill-nomodule": "12.2.6-canary.10",
-    "@next/react-dev-overlay": "12.2.6-canary.10",
-    "@next/react-refresh-utils": "12.2.6-canary.10",
-    "@next/swc": "12.2.6-canary.10",
+    "@next/polyfill-module": "12.2.6-canary.11",
+    "@next/polyfill-nomodule": "12.2.6-canary.11",
+    "@next/react-dev-overlay": "12.2.6-canary.11",
+    "@next/react-refresh-utils": "12.2.6-canary.11",
+    "@next/swc": "12.2.6-canary.11",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index 9008d34e3e7b..f7b9a6e6714a 100644
--- 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.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "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
index 13f37d3be78c..40c1d1442215 100644
--- 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.2.6-canary.10",
+  "version": "12.2.6-canary.11",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5c2a8952141b..a57007b5348c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -363,7 +363,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.2.6-canary.10
+      '@next/eslint-plugin-next': 12.2.6-canary.11
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -419,12 +419,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.2.6-canary.10
-      '@next/polyfill-module': 12.2.6-canary.10
-      '@next/polyfill-nomodule': 12.2.6-canary.10
-      '@next/react-dev-overlay': 12.2.6-canary.10
-      '@next/react-refresh-utils': 12.2.6-canary.10
-      '@next/swc': 12.2.6-canary.10
+      '@next/env': 12.2.6-canary.11
+      '@next/polyfill-module': 12.2.6-canary.11
+      '@next/polyfill-nomodule': 12.2.6-canary.11
+      '@next/react-dev-overlay': 12.2.6-canary.11
+      '@next/react-refresh-utils': 12.2.6-canary.11
+      '@next/swc': 12.2.6-canary.11
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0

From 62c7eff35435f346f56f9f107bead86a51c60bae Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 7 Sep 2022 16:38:10 -0700
Subject: [PATCH 07/69] Revert "Revert "Refactor Server Router" (#40328)" 
 (#40333)

This unreverts https://github.com/vercel/next.js/pull/40328 as it wasn't
the cause for https://github.com/vercel/next.js/issues/40241 like
initially suspected and the actual fix has been included here as well
with regression test.

Fixes: https://github.com/vercel/next.js/issues/40241

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`
---
 packages/next/server/base-server.ts           |   6 +-
 packages/next/server/dev/next-dev-server.ts   |   1 -
 packages/next/server/router.ts                | 478 ++++++++++--------
 test/production/required-server-files.test.ts |   6 +
 4 files changed, 276 insertions(+), 215 deletions(-)

diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
index d2e5db5bf051..a518b36cfcfb 100644
--- a/packages/next/server/base-server.ts
+++ b/packages/next/server/base-server.ts
@@ -959,7 +959,11 @@ export default abstract class Server<ServerOptions extends Options = Options> {
 
     // Toggle whether or not this is a Data request
     const isDataReq =
-      !!(query.__nextDataReq || req.headers['x-nextjs-data']) &&
+      !!(
+        query.__nextDataReq ||
+        (req.headers['x-nextjs-data'] &&
+          (this.serverOptions as any).webServerConfig)
+      ) &&
       (isSSG || hasServerProps || isServerComponent)
 
     delete query.__nextDataReq
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index a67bfb58bcbb..d360778905f4 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -221,7 +221,6 @@ export default class DevServer extends Server {
       for (const path in exportPathMap) {
         const { page, query = {} } = exportPathMap[path]
 
-        // We use unshift so that we're sure the routes is defined before Next's default routes
         this.router.addFsRoute({
           match: getPathMatch(path),
           type: 'route',
diff --git a/packages/next/server/router.ts b/packages/next/server/router.ts
index 0cb309f823af..ca2ce97b1a7d 100644
--- a/packages/next/server/router.ts
+++ b/packages/next/server/router.ts
@@ -40,7 +40,7 @@ export type Route = {
     res: BaseNextResponse,
     params: Params,
     parsedUrl: NextUrlWithParsedQuery,
-    upgradeHead?: any
+    upgradeHead?: Buffer
   ) => Promise<RouteResult> | RouteResult
 }
 
@@ -49,21 +49,37 @@ export type DynamicRoutes = Array<{ page: string; match: RouteMatch }>
 export type PageChecker = (pathname: string) => Promise<boolean>
 
 export default class Router {
-  headers: Route[]
-  fsRoutes: Route[]
-  redirects: Route[]
-  rewrites: {
-    beforeFiles: Route[]
-    afterFiles: Route[]
-    fallback: Route[]
+  public catchAllMiddleware: ReadonlyArray<Route>
+
+  private readonly headers: ReadonlyArray<Route>
+  private readonly fsRoutes: Route[]
+  private readonly redirects: ReadonlyArray<Route>
+  private readonly rewrites: {
+    beforeFiles: ReadonlyArray<Route>
+    afterFiles: ReadonlyArray<Route>
+    fallback: ReadonlyArray<Route>
   }
-  catchAllRoute: Route
-  catchAllMiddleware: Route[]
-  pageChecker: PageChecker
-  dynamicRoutes: DynamicRoutes
-  useFileSystemPublicRoutes: boolean
-  seenRequests: Set<any>
-  nextConfig: NextConfig
+  private readonly catchAllRoute: Route
+  private readonly pageChecker: PageChecker
+  private dynamicRoutes: DynamicRoutes
+  private readonly useFileSystemPublicRoutes: boolean
+  private readonly nextConfig: NextConfig
+  private compiledRoutes: ReadonlyArray<Route>
+  private needsRecompilation: boolean
+
+  /**
+   * context stores information used by the router.
+   */
+  private readonly context = new WeakMap<
+    BaseNextRequest,
+    {
+      /**
+       * pageChecks is the memoized record of all checks made against pages to
+       * help de-duplicate work.
+       */
+      pageChecks: Record<string, boolean>
+    }
+  >()
 
   constructor({
     headers = [],
@@ -81,16 +97,16 @@ export default class Router {
     useFileSystemPublicRoutes,
     nextConfig,
   }: {
-    headers: Route[]
-    fsRoutes: Route[]
+    headers: ReadonlyArray<Route>
+    fsRoutes: ReadonlyArray<Route>
     rewrites: {
-      beforeFiles: Route[]
-      afterFiles: Route[]
-      fallback: Route[]
+      beforeFiles: ReadonlyArray<Route>
+      afterFiles: ReadonlyArray<Route>
+      fallback: ReadonlyArray<Route>
     }
-    redirects: Route[]
+    redirects: ReadonlyArray<Route>
     catchAllRoute: Route
-    catchAllMiddleware: Route[]
+    catchAllMiddleware: ReadonlyArray<Route>
     dynamicRoutes: DynamicRoutes | undefined
     pageChecker: PageChecker
     useFileSystemPublicRoutes: boolean
@@ -98,7 +114,7 @@ export default class Router {
   }) {
     this.nextConfig = nextConfig
     this.headers = headers
-    this.fsRoutes = fsRoutes
+    this.fsRoutes = [...fsRoutes]
     this.rewrites = rewrites
     this.redirects = redirects
     this.pageChecker = pageChecker
@@ -106,7 +122,32 @@ export default class Router {
     this.catchAllMiddleware = catchAllMiddleware
     this.dynamicRoutes = dynamicRoutes
     this.useFileSystemPublicRoutes = useFileSystemPublicRoutes
-    this.seenRequests = new Set()
+
+    // Perform the initial route compilation.
+    this.compiledRoutes = this.compileRoutes()
+    this.needsRecompilation = false
+  }
+
+  private async checkPage(
+    req: BaseNextRequest,
+    pathname: string
+  ): Promise<boolean> {
+    pathname = normalizeLocalePath(pathname, this.locales).pathname
+
+    const context = this.context.get(req)
+    if (!context) {
+      throw new Error(
+        'Invariant: request is not available inside the context, this is an internal error please open an issue.'
+      )
+    }
+
+    if (context.pageChecks[pathname] !== undefined) {
+      return context.pageChecks[pathname]
+    }
+
+    const result = await this.pageChecker(pathname)
+    context.pageChecks[pathname] = result
+    return result
   }
 
   get locales() {
@@ -117,192 +158,201 @@ export default class Router {
     return this.nextConfig.basePath || ''
   }
 
-  setDynamicRoutes(routes: DynamicRoutes = []) {
-    this.dynamicRoutes = routes
+  public setDynamicRoutes(dynamicRoutes: DynamicRoutes) {
+    this.dynamicRoutes = dynamicRoutes
+    this.needsRecompilation = true
   }
-  setCatchallMiddleware(route?: Route[]) {
-    this.catchAllMiddleware = route || []
+  public setCatchallMiddleware(catchAllMiddleware: ReadonlyArray<Route>) {
+    this.catchAllMiddleware = catchAllMiddleware
+    this.needsRecompilation = true
   }
 
-  addFsRoute(fsRoute: Route) {
+  public addFsRoute(fsRoute: Route) {
+    // We use unshift so that we're sure the routes is defined before Next's
+    // default routes.
     this.fsRoutes.unshift(fsRoute)
+    this.needsRecompilation = true
   }
 
-  async execute(
+  private compileRoutes(): ReadonlyArray<Route> {
+    /*
+        Desired routes order
+        - headers
+        - redirects
+        - Check filesystem (including pages), if nothing found continue
+        - User rewrites (checking filesystem and pages each match)
+      */
+
+    const [middlewareCatchAllRoute] = this.catchAllMiddleware
+
+    return [
+      ...(middlewareCatchAllRoute
+        ? this.fsRoutes
+            .filter((route) => route.name === '_next/data catchall')
+            .map((route) => ({ ...route, check: false }))
+        : []),
+      ...this.headers,
+      ...this.redirects,
+      ...(this.useFileSystemPublicRoutes && middlewareCatchAllRoute
+        ? [middlewareCatchAllRoute]
+        : []),
+      ...this.rewrites.beforeFiles,
+      ...this.fsRoutes,
+      // We only check the catch-all route if public page routes hasn't been
+      // disabled
+      ...(this.useFileSystemPublicRoutes
+        ? [
+            {
+              type: 'route',
+              name: 'page checker',
+              match: getPathMatch('/:path*'),
+              fn: async (req, res, params, parsedUrl, upgradeHead) => {
+                const pathname = removeTrailingSlash(parsedUrl.pathname || '/')
+                if (!pathname) {
+                  return { finished: false }
+                }
+
+                if (await this.checkPage(req, pathname)) {
+                  return this.catchAllRoute.fn(
+                    req,
+                    res,
+                    params,
+                    parsedUrl,
+                    upgradeHead
+                  )
+                }
+
+                return { finished: false }
+              },
+            } as Route,
+          ]
+        : []),
+      ...this.rewrites.afterFiles,
+      ...(this.rewrites.fallback.length
+        ? [
+            {
+              type: 'route',
+              name: 'dynamic route/page check',
+              match: getPathMatch('/:path*'),
+              fn: async (req, res, _params, parsedCheckerUrl, upgradeHead) => {
+                return {
+                  finished: await this.checkFsRoutes(
+                    req,
+                    res,
+                    parsedCheckerUrl,
+                    upgradeHead
+                  ),
+                }
+              },
+            } as Route,
+            ...this.rewrites.fallback,
+          ]
+        : []),
+
+      // We only check the catch-all route if public page routes hasn't been
+      // disabled
+      ...(this.useFileSystemPublicRoutes ? [this.catchAllRoute] : []),
+    ]
+  }
+
+  private async checkFsRoutes(
     req: BaseNextRequest,
     res: BaseNextResponse,
     parsedUrl: NextUrlWithParsedQuery,
-    upgradeHead?: any
-  ): Promise<boolean> {
-    if (this.seenRequests.has(req)) {
-      throw new Error(
-        `Invariant: request has already been processed: ${req.url}, this is an internal error please open an issue.`
-      )
-    }
-    this.seenRequests.add(req)
-    try {
-      // memoize page check calls so we don't duplicate checks for pages
-      const pageChecks: { [name: string]: Promise<boolean> } = {}
-      const memoizedPageChecker = async (p: string): Promise<boolean> => {
-        p = normalizeLocalePath(p, this.locales).pathname
+    upgradeHead?: Buffer
+  ) {
+    const originalFsPathname = parsedUrl.pathname
+    const fsPathname = removePathPrefix(originalFsPathname!, this.basePath)
+
+    for (const route of this.fsRoutes) {
+      const params = route.match(fsPathname)
 
-        if (pageChecks[p] !== undefined) {
-          return pageChecks[p]
+      if (params) {
+        parsedUrl.pathname = fsPathname
+
+        const { finished } = await route.fn(req, res, params, parsedUrl)
+        if (finished) {
+          return true
         }
-        const result = this.pageChecker(p)
-        pageChecks[p] = result
-        return result
+
+        parsedUrl.pathname = originalFsPathname
       }
+    }
+
+    let matchedPage = await this.checkPage(req, fsPathname)
+
+    // If we didn't match a page check dynamic routes
+    if (!matchedPage) {
+      const normalizedFsPathname = normalizeLocalePath(
+        fsPathname,
+        this.locales
+      ).pathname
 
-      let parsedUrlUpdated = parsedUrl
+      for (const dynamicRoute of this.dynamicRoutes) {
+        if (dynamicRoute.match(normalizedFsPathname)) {
+          matchedPage = true
+        }
+      }
+    }
 
-      const applyCheckTrue = async (checkParsedUrl: NextUrlWithParsedQuery) => {
-        const originalFsPathname = checkParsedUrl.pathname
-        const fsPathname = removePathPrefix(originalFsPathname!, this.basePath)
+    // Matched a page or dynamic route so render it using catchAllRoute
+    if (matchedPage) {
+      const params = this.catchAllRoute.match(parsedUrl.pathname)
+      if (!params) {
+        throw new Error(
+          `Invariant: could not match params, this is an internal error please open an issue.`
+        )
+      }
 
-        for (const fsRoute of this.fsRoutes) {
-          const fsParams = fsRoute.match(fsPathname)
+      parsedUrl.pathname = fsPathname
+      parsedUrl.query._nextBubbleNoFallback = '1'
 
-          if (fsParams) {
-            checkParsedUrl.pathname = fsPathname
+      const { finished } = await this.catchAllRoute.fn(
+        req,
+        res,
+        params,
+        parsedUrl,
+        upgradeHead
+      )
 
-            const fsResult = await fsRoute.fn(
-              req,
-              res,
-              fsParams,
-              checkParsedUrl
-            )
+      return finished
+    }
 
-            if (fsResult.finished) {
-              return true
-            }
+    return false
+  }
 
-            checkParsedUrl.pathname = originalFsPathname
-          }
-        }
-        let matchedPage = await memoizedPageChecker(fsPathname)
-
-        // If we didn't match a page check dynamic routes
-        if (!matchedPage) {
-          const normalizedFsPathname = normalizeLocalePath(
-            fsPathname,
-            this.locales
-          ).pathname
-
-          for (const dynamicRoute of this.dynamicRoutes) {
-            if (dynamicRoute.match(normalizedFsPathname)) {
-              matchedPage = true
-            }
-          }
-        }
+  async execute(
+    req: BaseNextRequest,
+    res: BaseNextResponse,
+    parsedUrl: NextUrlWithParsedQuery,
+    upgradeHead?: Buffer
+  ): Promise<boolean> {
+    // Only recompile if the routes need to be recompiled, this should only
+    // happen in development.
+    if (this.needsRecompilation) {
+      this.compiledRoutes = this.compileRoutes()
+      this.needsRecompilation = false
+    }
 
-        // Matched a page or dynamic route so render it using catchAllRoute
-        if (matchedPage) {
-          const pageParams = this.catchAllRoute.match(checkParsedUrl.pathname)
-          checkParsedUrl.pathname = fsPathname
-          checkParsedUrl.query._nextBubbleNoFallback = '1'
+    if (this.context.has(req)) {
+      throw new Error(
+        `Invariant: request has already been processed: ${req.url}, this is an internal error please open an issue.`
+      )
+    }
+    this.context.set(req, { pageChecks: {} })
 
-          const result = await this.catchAllRoute.fn(
-            req,
-            res,
-            pageParams as Params,
-            checkParsedUrl
-          )
-          return result.finished
-        }
+    try {
+      // Create a deep copy of the parsed URL.
+      const parsedUrlUpdated = {
+        ...parsedUrl,
+        query: {
+          ...parsedUrl.query,
+        },
       }
 
-      /*
-        Desired routes order
-        - headers
-        - redirects
-        - Check filesystem (including pages), if nothing found continue
-        - User rewrites (checking filesystem and pages each match)
-      */
-
-      const [middlewareCatchAllRoute] = this.catchAllMiddleware
-      const allRoutes = [
-        ...(middlewareCatchAllRoute
-          ? this.fsRoutes
-              .filter((r) => r.name === '_next/data catchall')
-              .map((r) => {
-                return {
-                  ...r,
-                  check: false,
-                }
-              })
-          : []),
-        ...this.headers,
-        ...this.redirects,
-        ...(this.useFileSystemPublicRoutes && middlewareCatchAllRoute
-          ? [middlewareCatchAllRoute]
-          : []),
-        ...this.rewrites.beforeFiles,
-        ...this.fsRoutes,
-        // We only check the catch-all route if public page routes hasn't been
-        // disabled
-        ...(this.useFileSystemPublicRoutes
-          ? [
-              {
-                type: 'route',
-                name: 'page checker',
-                match: getPathMatch('/:path*'),
-                fn: async (
-                  checkerReq,
-                  checkerRes,
-                  params,
-                  parsedCheckerUrl
-                ) => {
-                  let { pathname } = parsedCheckerUrl
-                  pathname = removeTrailingSlash(pathname || '/')
-
-                  if (!pathname) {
-                    return { finished: false }
-                  }
-
-                  if (await memoizedPageChecker(pathname)) {
-                    return this.catchAllRoute.fn(
-                      checkerReq,
-                      checkerRes,
-                      params,
-                      parsedCheckerUrl
-                    )
-                  }
-                  return { finished: false }
-                },
-              } as Route,
-            ]
-          : []),
-        ...this.rewrites.afterFiles,
-        ...(this.rewrites.fallback.length
-          ? [
-              {
-                type: 'route',
-                name: 'dynamic route/page check',
-                match: getPathMatch('/:path*'),
-                fn: async (
-                  _checkerReq,
-                  _checkerRes,
-                  _params,
-                  parsedCheckerUrl
-                ) => {
-                  return {
-                    finished: await applyCheckTrue(parsedCheckerUrl),
-                  }
-                },
-              } as Route,
-              ...this.rewrites.fallback,
-            ]
-          : []),
-
-        // We only check the catch-all route if public page routes hasn't been
-        // disabled
-        ...(this.useFileSystemPublicRoutes ? [this.catchAllRoute] : []),
-      ]
-
-      for (const testRoute of allRoutes) {
+      for (const route of this.compiledRoutes) {
         // only process rewrites for upgrade request
-        if (upgradeHead && testRoute.type !== 'rewrite') {
+        if (upgradeHead && route.type !== 'rewrite') {
           continue
         }
 
@@ -314,7 +364,7 @@ export default class Router {
 
         if (
           pathnameInfo.locale &&
-          !testRoute.matchesLocaleAPIRoutes &&
+          !route.matchesLocaleAPIRoutes &&
           pathnameInfo.pathname.match(/^\/api(?:\/|$)/)
         ) {
           continue
@@ -325,20 +375,20 @@ export default class Router {
         }
 
         const basePath = pathnameInfo.basePath
-        if (!testRoute.matchesBasePath) {
+        if (!route.matchesBasePath) {
           pathnameInfo.basePath = ''
         }
 
         if (
-          testRoute.matchesLocale &&
-          parsedUrl.query.__nextLocale &&
+          route.matchesLocale &&
+          parsedUrlUpdated.query.__nextLocale &&
           !pathnameInfo.locale
         ) {
-          pathnameInfo.locale = parsedUrl.query.__nextLocale
+          pathnameInfo.locale = parsedUrlUpdated.query.__nextLocale
         }
 
         if (
-          !testRoute.matchesLocale &&
+          !route.matchesLocale &&
           pathnameInfo.locale === this.nextConfig.i18n?.defaultLocale &&
           pathnameInfo.locale
         ) {
@@ -346,7 +396,7 @@ export default class Router {
         }
 
         if (
-          testRoute.matchesTrailingSlash &&
+          route.matchesTrailingSlash &&
           getRequestMeta(req, '__nextHadTrailingSlash')
         ) {
           pathnameInfo.trailingSlash = true
@@ -357,13 +407,13 @@ export default class Router {
           ...pathnameInfo,
         })
 
-        let newParams = testRoute.match(matchPathname)
-        if (testRoute.has && newParams) {
-          const hasParams = matchHas(req, testRoute.has, parsedUrlUpdated.query)
+        let params = route.match(matchPathname)
+        if (route.has && params) {
+          const hasParams = matchHas(req, route.has, parsedUrlUpdated.query)
           if (hasParams) {
-            Object.assign(newParams, hasParams)
+            Object.assign(params, hasParams)
           } else {
-            newParams = false
+            params = false
           }
         }
 
@@ -373,35 +423,34 @@ export default class Router {
          * never there, we consider this an invalid match and keep routing.
          */
         if (
-          newParams &&
+          params &&
           this.basePath &&
-          !testRoute.matchesBasePath &&
+          !route.matchesBasePath &&
           !getRequestMeta(req, '_nextDidRewrite') &&
           !basePath
         ) {
           continue
         }
 
-        if (newParams) {
+        if (params) {
           parsedUrlUpdated.pathname = matchPathname
-          const result = await testRoute.fn(
+          const result = await route.fn(
             req,
             res,
-            newParams,
+            params,
             parsedUrlUpdated,
             upgradeHead
           )
-
           if (result.finished) {
             return true
           }
 
-          // since the fs route didn't finish routing we need to re-add the
-          // basePath to continue checking with the basePath present
-          parsedUrlUpdated.pathname = originalPathname
-
           if (result.pathname) {
             parsedUrlUpdated.pathname = result.pathname
+          } else {
+            // since the fs route didn't finish routing we need to re-add the
+            // basePath to continue checking with the basePath present
+            parsedUrlUpdated.pathname = originalPathname
           }
 
           if (result.query) {
@@ -412,16 +461,19 @@ export default class Router {
           }
 
           // check filesystem
-          if (testRoute.check === true) {
-            if (await applyCheckTrue(parsedUrlUpdated)) {
-              return true
-            }
+          if (
+            route.check &&
+            (await this.checkFsRoutes(req, res, parsedUrlUpdated))
+          ) {
+            return true
           }
         }
       }
+
+      // All routes were tested, none were found.
       return false
     } finally {
-      this.seenRequests.delete(req)
+      this.context.delete(req)
     }
   }
 }
diff --git a/test/production/required-server-files.test.ts b/test/production/required-server-files.test.ts
index 9f2446f93c99..1d97b5bc5be3 100644
--- a/test/production/required-server-files.test.ts
+++ b/test/production/required-server-files.test.ts
@@ -324,6 +324,12 @@ describe('should set-up next', () => {
   it('should de-dupe HTML/data requests', async () => {
     const res = await fetchViaHTTP(appPort, '/gsp', undefined, {
       redirect: 'manual',
+      headers: {
+        // ensure the nextjs-data header being present
+        // doesn't incorrectly return JSON for HTML path
+        // during prerendering
+        'x-nextjs-data': '1',
+      },
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('x-nextjs-cache')).toBeFalsy()

From aa5be3ff64f84b0cf93ed175d29ca6078e9f7517 Mon Sep 17 00:00:00 2001
From: Henrik Wenz <HaNdTriX@users.noreply.github.com>
Date: Thu, 8 Sep 2022 01:39:35 +0200
Subject: [PATCH 08/69] [Docs] Migrate with-react-jss to typescript (#40308)

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/with-react-jss/.babelrc              |  3 ---
 examples/with-react-jss/package.json          | 11 +++++++---
 .../pages/{_app.js => _app.tsx}               |  5 +++--
 .../pages/{_document.js => _document.tsx}     |  4 ++--
 .../pages/{index.js => index.tsx}             |  4 +---
 examples/with-react-jss/tsconfig.json         | 20 +++++++++++++++++++
 6 files changed, 34 insertions(+), 13 deletions(-)
 delete mode 100644 examples/with-react-jss/.babelrc
 rename examples/with-react-jss/pages/{_app.js => _app.tsx} (60%)
 rename examples/with-react-jss/pages/{_document.js => _document.tsx} (87%)
 rename examples/with-react-jss/pages/{index.js => index.tsx} (90%)
 create mode 100644 examples/with-react-jss/tsconfig.json

diff --git a/examples/with-react-jss/.babelrc b/examples/with-react-jss/.babelrc
deleted file mode 100644
index 1ff94f7ed28e..000000000000
--- a/examples/with-react-jss/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["next/babel"]
-}
diff --git a/examples/with-react-jss/package.json b/examples/with-react-jss/package.json
index 17ac6c57e840..2ee0fa080925 100644
--- a/examples/with-react-jss/package.json
+++ b/examples/with-react-jss/package.json
@@ -7,8 +7,13 @@
   },
   "dependencies": {
     "next": "latest",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-jss": "^10.3.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "react-jss": "^10.9.2"
+  },
+  "devDependencies": {
+    "@types/node": "18.7.15",
+    "@types/react": "18.0.18",
+    "typescript": "4.8.2"
   }
 }
diff --git a/examples/with-react-jss/pages/_app.js b/examples/with-react-jss/pages/_app.tsx
similarity index 60%
rename from examples/with-react-jss/pages/_app.js
rename to examples/with-react-jss/pages/_app.tsx
index ad98bbd6bf42..74b569b67fac 100644
--- a/examples/with-react-jss/pages/_app.js
+++ b/examples/with-react-jss/pages/_app.tsx
@@ -1,9 +1,10 @@
+import type { AppProps } from 'next/app'
 import { useEffect } from 'react'
 
-export default function App({ Component, pageProps }) {
+export default function App({ Component, pageProps }: AppProps) {
   useEffect(() => {
     const style = document.getElementById('server-side-styles')
-    if (style) {
+    if (style && style.parentNode) {
       style.parentNode.removeChild(style)
     }
   }, [])
diff --git a/examples/with-react-jss/pages/_document.js b/examples/with-react-jss/pages/_document.tsx
similarity index 87%
rename from examples/with-react-jss/pages/_document.js
rename to examples/with-react-jss/pages/_document.tsx
index 53ad6b117efe..a20015c58ad7 100644
--- a/examples/with-react-jss/pages/_document.js
+++ b/examples/with-react-jss/pages/_document.tsx
@@ -1,8 +1,8 @@
-import Document from 'next/document'
+import Document, { DocumentContext } from 'next/document'
 import { SheetsRegistry, JssProvider, createGenerateId } from 'react-jss'
 
 export default class JssDocument extends Document {
-  static async getInitialProps(ctx) {
+  static async getInitialProps(ctx: DocumentContext) {
     const registry = new SheetsRegistry()
     const generateId = createGenerateId()
     const originalRenderPage = ctx.renderPage
diff --git a/examples/with-react-jss/pages/index.js b/examples/with-react-jss/pages/index.tsx
similarity index 90%
rename from examples/with-react-jss/pages/index.js
rename to examples/with-react-jss/pages/index.tsx
index f8bafce6daad..1726845c1f76 100644
--- a/examples/with-react-jss/pages/index.js
+++ b/examples/with-react-jss/pages/index.tsx
@@ -12,7 +12,7 @@ const useStyles = createUseStyles({
   },
 })
 
-function Index() {
+export default function IndexPage() {
   const classes = useStyles()
 
   return (
@@ -23,5 +23,3 @@ function Index() {
     </div>
   )
 }
-
-export default Index
diff --git a/examples/with-react-jss/tsconfig.json b/examples/with-react-jss/tsconfig.json
new file mode 100644
index 000000000000..ccaea0672d6e
--- /dev/null
+++ b/examples/with-react-jss/tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "incremental": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "module": "esnext",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve"
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"]
+}

From 34fa5f8535c5e7d663c8bec829b681497c1801c3 Mon Sep 17 00:00:00 2001
From: William Duplenne <will.dupl95@gmail.com>
Date: Thu, 8 Sep 2022 01:53:42 +0200
Subject: [PATCH 09/69] [Docs] Update react-remove-properties example (#40307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hi 👋

Based on https://nextjs.org/docs/advanced-features/compiler#remove-react-properties, this is not experimental but lives under `compiler` now.

## Documentation / Examples
- [x] Make sure the linting passes by running pnpm lint
- [x] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/react-remove-properties/next.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/react-remove-properties/next.config.js b/examples/react-remove-properties/next.config.js
index 7d3aca8225d8..37db77a9c2a5 100644
--- a/examples/react-remove-properties/next.config.js
+++ b/examples/react-remove-properties/next.config.js
@@ -1,6 +1,6 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
-  experimental: {
+  compiler: {
     reactRemoveProperties: true,
     // Or, specify a custom list of regular expressions to match properties to remove.
     // The regexes defined here are processed in Rust so the syntax is different from

From 588a61b432b0d2350f96cfac47d7d4dfad773183 Mon Sep 17 00:00:00 2001
From: Henrik Wenz <HaNdTriX@users.noreply.github.com>
Date: Thu, 8 Sep 2022 01:59:49 +0200
Subject: [PATCH 10/69] [Docs] Migrate using-preact example to typescript
 (#40295)

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/using-preact/next.config.js          |  7 ++++--
 examples/using-preact/package.json            | 20 ++++++++++-------
 examples/using-preact/pages/about.js          |  3 ---
 examples/using-preact/pages/about.tsx         |  3 +++
 .../pages/{index.js => index.tsx}             |  2 +-
 examples/using-preact/pages/ssg.js            |  9 --------
 examples/using-preact/pages/ssg.tsx           | 13 +++++++++++
 examples/using-preact/pages/ssr.js            |  9 --------
 examples/using-preact/pages/ssr.tsx           | 13 +++++++++++
 examples/using-preact/tsconfig.json           | 22 +++++++++++++++++++
 10 files changed, 69 insertions(+), 32 deletions(-)
 delete mode 100644 examples/using-preact/pages/about.js
 create mode 100644 examples/using-preact/pages/about.tsx
 rename examples/using-preact/pages/{index.js => index.tsx} (91%)
 delete mode 100644 examples/using-preact/pages/ssg.js
 create mode 100644 examples/using-preact/pages/ssg.tsx
 delete mode 100644 examples/using-preact/pages/ssr.js
 create mode 100644 examples/using-preact/pages/ssr.tsx
 create mode 100644 examples/using-preact/tsconfig.json

diff --git a/examples/using-preact/next.config.js b/examples/using-preact/next.config.js
index cffe26659035..f0e665c2218a 100644
--- a/examples/using-preact/next.config.js
+++ b/examples/using-preact/next.config.js
@@ -1,5 +1,8 @@
 const withPreact = require('next-plugin-preact')
 
-module.exports = withPreact({
+/** @type {import('next').NextConfig} */
+const nextConfig = {
   /* regular next.js config options here */
-})
+}
+
+module.exports = withPreact(nextConfig)
diff --git a/examples/using-preact/package.json b/examples/using-preact/package.json
index 0f8d828fc183..dc2b8b3f46da 100644
--- a/examples/using-preact/package.json
+++ b/examples/using-preact/package.json
@@ -5,14 +5,18 @@
     "build": "next build",
     "start": "next start"
   },
-  "devDependencies": {},
   "dependencies": {
-    "next": "^12.0.0",
-    "next-plugin-preact": "^3.0.6",
-    "preact": "^10.5.15",
-    "preact-render-to-string": "^5.1.19",
-    "react": "npm:@preact/compat@^17.0.2",
-    "react-dom": "npm:@preact/compat@^17.0.2",
-    "react-ssr-prepass": "npm:preact-ssr-prepass@^1.2.0"
+    "next": "latest",
+    "next-plugin-preact": "latest",
+    "preact": "^10.10.6",
+    "preact-render-to-string": "^5.2.3",
+    "react": "npm:@preact/compat@^17.1.1",
+    "react-dom": "npm:@preact/compat@^17.1.1",
+    "react-ssr-prepass": "npm:preact-ssr-prepass@1.2.0"
+  },
+  "devDependencies": {
+    "@types/node": "18.7.15",
+    "@types/react": "16.9.17",
+    "typescript": "4.8.2"
   }
 }
diff --git a/examples/using-preact/pages/about.js b/examples/using-preact/pages/about.js
deleted file mode 100644
index 46817af02a5c..000000000000
--- a/examples/using-preact/pages/about.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function About() {
-  return <div>About us</div>
-}
diff --git a/examples/using-preact/pages/about.tsx b/examples/using-preact/pages/about.tsx
new file mode 100644
index 000000000000..71c7703a7bd2
--- /dev/null
+++ b/examples/using-preact/pages/about.tsx
@@ -0,0 +1,3 @@
+export default function AboutPage() {
+  return <div>About us</div>
+}
diff --git a/examples/using-preact/pages/index.js b/examples/using-preact/pages/index.tsx
similarity index 91%
rename from examples/using-preact/pages/index.js
rename to examples/using-preact/pages/index.tsx
index 62301b996922..a0051fe32b9f 100644
--- a/examples/using-preact/pages/index.js
+++ b/examples/using-preact/pages/index.tsx
@@ -1,6 +1,6 @@
 import Link from 'next/link'
 
-export default function Home() {
+export default function IndexPage() {
   return (
     <div>
       Hello World.{' '}
diff --git a/examples/using-preact/pages/ssg.js b/examples/using-preact/pages/ssg.js
deleted file mode 100644
index 58adabc4b5b7..000000000000
--- a/examples/using-preact/pages/ssg.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function SSG({ framework }) {
-  return <div>{framework} ssg example</div>
-}
-
-export function getStaticProps() {
-  return {
-    props: { framework: 'preact' },
-  }
-}
diff --git a/examples/using-preact/pages/ssg.tsx b/examples/using-preact/pages/ssg.tsx
new file mode 100644
index 000000000000..ef13cface3bb
--- /dev/null
+++ b/examples/using-preact/pages/ssg.tsx
@@ -0,0 +1,13 @@
+import { InferGetStaticPropsType } from 'next'
+
+export function getStaticProps() {
+  return {
+    props: { framework: 'preact' },
+  }
+}
+
+export default function SSGPage({
+  framework,
+}: InferGetStaticPropsType<typeof getStaticProps>) {
+  return <div>{framework} ssg example</div>
+}
diff --git a/examples/using-preact/pages/ssr.js b/examples/using-preact/pages/ssr.js
deleted file mode 100644
index 695e329a8591..000000000000
--- a/examples/using-preact/pages/ssr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export default function SSR({ framework }) {
-  return <div>{framework} ssr example</div>
-}
-
-export function getServerSideProps() {
-  return {
-    props: { framework: 'preact' },
-  }
-}
diff --git a/examples/using-preact/pages/ssr.tsx b/examples/using-preact/pages/ssr.tsx
new file mode 100644
index 000000000000..24c86325aa72
--- /dev/null
+++ b/examples/using-preact/pages/ssr.tsx
@@ -0,0 +1,13 @@
+import { InferGetServerSidePropsType } from 'next'
+
+export function getServerSideProps() {
+  return {
+    props: { framework: 'preact' },
+  }
+}
+
+export default function SSRPage({
+  framework,
+}: InferGetServerSidePropsType<typeof getServerSideProps>) {
+  return <div>{framework} ssr example</div>
+}
diff --git a/examples/using-preact/tsconfig.json b/examples/using-preact/tsconfig.json
new file mode 100644
index 000000000000..f83cb8071c2e
--- /dev/null
+++ b/examples/using-preact/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "incremental": true,
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "module": "esnext",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "jsxFactory": "h",
+    "jsxFragmentFactory": "Fragment"
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"]
+}

From 0c58621796a94810671dad393e67c78a9b9f5af1 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Wed, 7 Sep 2022 17:02:46 -0700
Subject: [PATCH 11/69] v12.2.6-canary.12

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 ++--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 +++++++-------
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 65ad1559e7ba..dc5ab3db5feb 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.2.6-canary.11"
+  "version": "12.2.6-canary.12"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 7768ac4351e9..45f18996dabe 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 2d05f1dd73b5..4617fbec97a4 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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.2.6-canary.11",
+    "@next/eslint-plugin-next": "12.2.6-canary.12",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index c962b79d34cd..80240a527714 100644
--- 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.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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
index 96e40b6f4ed7..18adefc11bdb 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 9dd1e3367111..ae97f89ed5c3 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index e2a73c53f4f5..73473cc501c5 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index f4a25c98ffc8..ec912d883e69 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 7facfee704ff..945a51992ee1 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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
index 412946be8dab..198897f4bf50 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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
index d4ae98531996..6b227552f52f 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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
index 99b6702820ff..4b5172b8236d 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index faa1fc761280..aa572d7b39f5 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.2.6-canary.11",
+    "@next/env": "12.2.6-canary.12",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.2.6-canary.11",
-    "@next/polyfill-nomodule": "12.2.6-canary.11",
-    "@next/react-dev-overlay": "12.2.6-canary.11",
-    "@next/react-refresh-utils": "12.2.6-canary.11",
-    "@next/swc": "12.2.6-canary.11",
+    "@next/polyfill-module": "12.2.6-canary.12",
+    "@next/polyfill-nomodule": "12.2.6-canary.12",
+    "@next/react-dev-overlay": "12.2.6-canary.12",
+    "@next/react-refresh-utils": "12.2.6-canary.12",
+    "@next/swc": "12.2.6-canary.12",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index f7b9a6e6714a..11602ec757a0 100644
--- 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.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "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
index 40c1d1442215..eb8a3c1762fe 100644
--- 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.2.6-canary.11",
+  "version": "12.2.6-canary.12",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a57007b5348c..d204490f545a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -363,7 +363,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.2.6-canary.11
+      '@next/eslint-plugin-next': 12.2.6-canary.12
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -419,12 +419,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.2.6-canary.11
-      '@next/polyfill-module': 12.2.6-canary.11
-      '@next/polyfill-nomodule': 12.2.6-canary.11
-      '@next/react-dev-overlay': 12.2.6-canary.11
-      '@next/react-refresh-utils': 12.2.6-canary.11
-      '@next/swc': 12.2.6-canary.11
+      '@next/env': 12.2.6-canary.12
+      '@next/polyfill-module': 12.2.6-canary.12
+      '@next/polyfill-nomodule': 12.2.6-canary.12
+      '@next/react-dev-overlay': 12.2.6-canary.12
+      '@next/react-refresh-utils': 12.2.6-canary.12
+      '@next/swc': 12.2.6-canary.12
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0

From a4d907a564e0f73adcaeaa684a00a3faefc5a678 Mon Sep 17 00:00:00 2001
From: "JH.Lee" <contact@jins.dev>
Date: Thu, 8 Sep 2022 09:42:19 +0900
Subject: [PATCH 12/69] refactor(next/swc): remove unnecessary field in
 `RemoveConsole` (#40296)

This PR removes `in_function_params` field in `RemoveConsole` module.

It's an unnecessary field that does not affect the module.
---
 packages/next-swc/crates/core/src/remove_console.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/next-swc/crates/core/src/remove_console.rs b/packages/next-swc/crates/core/src/remove_console.rs
index 0068cbe16034..035b7dba776c 100644
--- a/packages/next-swc/crates/core/src/remove_console.rs
+++ b/packages/next-swc/crates/core/src/remove_console.rs
@@ -34,7 +34,6 @@ pub struct Options {
 struct RemoveConsole {
     exclude: Vec<JsWord>,
     bindings: Vec<AHashSet<Id>>,
-    in_function_params: bool,
 }
 
 impl RemoveConsole {
@@ -91,12 +90,10 @@ impl Fold for RemoveConsole {
     }
 
     fn fold_function(&mut self, mut func: Function) -> Function {
-        self.in_function_params = true;
         let mut new_params: AHashSet<Id> = AHashSet::default();
         for param in &func.params {
             new_params.extend(collect_top_level_decls(param));
         }
-        self.in_function_params = false;
 
         self.bindings.push(new_params);
         self.bindings.push(collect_top_level_decls(&func));
@@ -129,6 +126,5 @@ pub fn remove_console(config: Config) -> impl Fold {
     RemoveConsole {
         exclude,
         bindings: Default::default(),
-        in_function_params: false,
     }
 }

From 220e144a6a9b164cba7162c2941363c620460953 Mon Sep 17 00:00:00 2001
From: Gal Schlezinger <gal@spitfire.co.il>
Date: Thu, 8 Sep 2022 14:19:18 +0300
Subject: [PATCH 13/69] [edge] fix URLSearchParams lacking data from rewrite
 (#40260)

Given the change in #40076, when a middleware rewrites into an Edge
API route and changes the querystring, the changed querystring does
not appear in the incoming NextRequest object in the Edge API route

```ts
// middleware.ts
export function middleware(req: NextRequest) {
  const url = req.nextUrl;
  url.pathname = "/api/hello";
  url.searchParams.set("foo", "bar");
  return NextResponse.rewrite(url);
}

// pages/api/hello.ts
import { NextRequest } from "next/server";

export default function handler(req: NextRequest) {
  return NextResponse.json(req.nextUrl.searchParams.get("foo"));
}

export const config = { runtime: "experimental-edge" };
```

Our expectation when requesting `/api/hello` is to see `"bar"`,
but instead we are getting `null` back.

This commit fixes this issue by reading the given `query` instead of using
the initial querystring provided with the user request (prior to rewriting)

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`
---
 packages/next/server/next-server.ts              |  4 +---
 test/e2e/middleware-general/app/middleware.js    |  6 ++++++
 .../app/pages/api/edge-search-params.js          | 10 ++++++++++
 test/e2e/middleware-general/test/index.test.ts   | 16 +++++++++++++++-
 4 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 test/e2e/middleware-general/app/pages/api/edge-search-params.js

diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index 7084d982f18a..27316dd1fd3e 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -2049,9 +2049,7 @@ export default class NextNodeServer extends BaseServer {
 
     // For middleware to "fetch" we must always provide an absolute URL
     const isDataReq = !!params.query.__nextDataReq
-    const query = urlQueryToSearchParams(
-      Object.assign({}, getRequestMeta(params.req, '__NEXT_INIT_QUERY') || {})
-    ).toString()
+    const query = urlQueryToSearchParams(params.query).toString()
     const locale = params.query.__nextLocale
     // Use original pathname (without `/page`) instead of appPath for url
     let normalizedPathname = params.page
diff --git a/test/e2e/middleware-general/app/middleware.js b/test/e2e/middleware-general/app/middleware.js
index 83ba6722ff61..5a5f2f903d01 100644
--- a/test/e2e/middleware-general/app/middleware.js
+++ b/test/e2e/middleware-general/app/middleware.js
@@ -47,6 +47,12 @@ export async function middleware(request) {
     return NextResponse.next()
   }
 
+  if (url.pathname === '/api/edge-search-params') {
+    const newUrl = url.clone()
+    newUrl.searchParams.set('foo', 'bar')
+    return NextResponse.rewrite(newUrl)
+  }
+
   if (url.pathname === '/') {
     url.pathname = '/ssg/first'
     return NextResponse.rewrite(url)
diff --git a/test/e2e/middleware-general/app/pages/api/edge-search-params.js b/test/e2e/middleware-general/app/pages/api/edge-search-params.js
new file mode 100644
index 000000000000..a67cecdf18ec
--- /dev/null
+++ b/test/e2e/middleware-general/app/pages/api/edge-search-params.js
@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+export const config = { runtime: 'experimental-edge' }
+
+/**
+ * @param {import('next/server').NextRequest}
+ */
+export default (req) => {
+  return NextResponse.json(Object.fromEntries(req.nextUrl.searchParams))
+}
diff --git a/test/e2e/middleware-general/test/index.test.ts b/test/e2e/middleware-general/test/index.test.ts
index a99d002b1201..e5e19c6bc1e9 100644
--- a/test/e2e/middleware-general/test/index.test.ts
+++ b/test/e2e/middleware-general/test/index.test.ts
@@ -116,7 +116,10 @@ describe('Middleware Runtime', () => {
               'ANOTHER_MIDDLEWARE_TEST',
               'STRING_ENV_VAR',
             ],
-            files: ['server/edge-runtime-webpack.js', 'server/middleware.js'],
+            files: expect.arrayContaining([
+              'server/edge-runtime-webpack.js',
+              'server/middleware.js',
+            ]),
             name: 'middleware',
             page: '/',
             matchers: [{ regexp: '^/.*$' }],
@@ -157,6 +160,17 @@ describe('Middleware Runtime', () => {
       })
     }
 
+    it('passes search params with rewrites', async () => {
+      const response = await fetchViaHTTP(next.url, `/api/edge-search-params`, {
+        a: 'b',
+      })
+      await expect(response.json()).resolves.toMatchObject({
+        a: 'b',
+        // included from middleware
+        foo: 'bar',
+      })
+    })
+
     it('should have init header for NextResponse.redirect', async () => {
       const res = await fetchViaHTTP(
         next.url,

From 45d68ae5096929a810b02463f21c8103e83eb75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Thu, 8 Sep 2022 13:43:12 +0200
Subject: [PATCH 14/69] Update README.md

Closes #40336
---
 packages/next/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/next/README.md b/packages/next/README.md
index a85ea7acb225..824aab204216 100644
--- a/packages/next/README.md
+++ b/packages/next/README.md
@@ -46,7 +46,7 @@ Please see our [contributing.md](/contributing.md).
 
 ### Good First Issues
 
-We have a list of [good first issues](https://github.com/vercel/next.js/labels/good%20first%20issue) that contain bugs which have a relatively limited scope. This is a great place to get started, gain experience, and get familiar with our contribution process.
+We have a list of [good first issues](https://github.com/vercel/next.js/labels/good%20first%20issue) that contain bugs that have a relatively limited scope. This is a great place to get started, gain experience, and get familiar with our contribution process.
 
 ## Authors
 

From 1aa341f635e0e47e31fd94c3d4504bbb51725c9d Mon Sep 17 00:00:00 2001
From: S0UPernova <79978982+S0UPernova@users.noreply.github.com>
Date: Thu, 8 Sep 2022 05:44:38 -0700
Subject: [PATCH 15/69] added type to clientPromise in with-mongodb/lib
 (#40339)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/with-mongodb/lib/mongodb.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-mongodb/lib/mongodb.ts b/examples/with-mongodb/lib/mongodb.ts
index 7aaf63e04cec..9397929118bb 100644
--- a/examples/with-mongodb/lib/mongodb.ts
+++ b/examples/with-mongodb/lib/mongodb.ts
@@ -8,7 +8,7 @@ const uri = process.env.MONGODB_URI
 const options = {}
 
 let client
-let clientPromise
+let clientPromise: Promise<MongoClient>
 
 if (!process.env.MONGODB_URI) {
   throw new Error('Please add your Mongo URI to .env.local')

From b85fceac635314066b178fa7c7e35edd0da690d9 Mon Sep 17 00:00:00 2001
From: Henrik Wenz <HaNdTriX@users.noreply.github.com>
Date: Thu, 8 Sep 2022 14:50:53 +0200
Subject: [PATCH 16/69] [Docs] Remove babel from custom-server-typescript
 example (#40309)

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/custom-server-typescript/.babelrc     |  3 ---
 examples/custom-server-typescript/package.json | 18 +++++++++---------
 .../custom-server-typescript/tsconfig.json     |  3 ++-
 3 files changed, 11 insertions(+), 13 deletions(-)
 delete mode 100644 examples/custom-server-typescript/.babelrc

diff --git a/examples/custom-server-typescript/.babelrc b/examples/custom-server-typescript/.babelrc
deleted file mode 100644
index 1ff94f7ed28e..000000000000
--- a/examples/custom-server-typescript/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["next/babel"]
-}
diff --git a/examples/custom-server-typescript/package.json b/examples/custom-server-typescript/package.json
index dd8cf92cc482..9e79d47ca0a3 100644
--- a/examples/custom-server-typescript/package.json
+++ b/examples/custom-server-typescript/package.json
@@ -6,17 +6,17 @@
     "start": "cross-env NODE_ENV=production node dist/index.js"
   },
   "dependencies": {
-    "cross-env": "^7.0.2",
+    "cross-env": "^7.0.3",
     "next": "latest",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@types/node": "^12.0.12",
-    "@types/react": "^16.9.44",
-    "@types/react-dom": "^16.9.8",
-    "nodemon": "^2.0.4",
-    "ts-node": "^8.10.2",
-    "typescript": "4.0"
+    "@types/node": "^18.7.15",
+    "@types/react": "^18.0.18",
+    "@types/react-dom": "^18.0.6",
+    "nodemon": "^2.0.19",
+    "ts-node": "^10.9.1",
+    "typescript": "~4.8.2"
   }
 }
diff --git a/examples/custom-server-typescript/tsconfig.json b/examples/custom-server-typescript/tsconfig.json
index 919ea44a15e9..4097ef5f16ea 100644
--- a/examples/custom-server-typescript/tsconfig.json
+++ b/examples/custom-server-typescript/tsconfig.json
@@ -19,7 +19,8 @@
     "preserveConstEnums": true,
     "sourceMap": true,
     "forceConsistentCasingInFileNames": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "incremental": true
   },
   "exclude": ["dist", ".next", "out", "next.config.js"],
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

From 2b9268a91171f76fb83b45b155b9f9bda3b348c4 Mon Sep 17 00:00:00 2001
From: Henrik Wenz <HaNdTriX@users.noreply.github.com>
Date: Thu, 8 Sep 2022 14:56:12 +0200
Subject: [PATCH 17/69] [Docs] Merge with-mobx-state-tree with
 with-mobx-state-tree-typescript example (#40306)

## Changes

see commits

## Context

As discussed in https://github.com/vercel/next.js/pull/40302#issuecomment-1239238966 we are going to merge the mobx examples.

#40302

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 .../with-mobx-state-tree-typescript/.babelrc  |  4 --
 .../.gitignore                                | 36 -------------
 .../with-mobx-state-tree-typescript/README.md | 34 +-----------
 .../next-env.d.ts                             |  5 --
 .../package.json                              | 24 ---------
 examples/with-mobx-state-tree/.babelrc        |  4 --
 examples/with-mobx-state-tree/README.md       | 12 ++---
 .../with-mobx-state-tree/components/Clock.js  | 25 ---------
 .../components/Clock.tsx                      |  0
 .../components/SampleComponent.js             | 35 -------------
 .../components/SampleComponent.tsx            |  0
 examples/with-mobx-state-tree/package.json    | 16 +++---
 examples/with-mobx-state-tree/pages/_app.js   | 12 -----
 .../pages/_app.tsx                            |  0
 examples/with-mobx-state-tree/pages/index.js  |  5 --
 .../pages/index.tsx                           |  0
 examples/with-mobx-state-tree/pages/other.js  |  5 --
 .../pages/other.tsx                           |  0
 examples/with-mobx-state-tree/pages/ssg.js    | 17 ------
 .../pages/ssg.tsx                             |  0
 examples/with-mobx-state-tree/pages/ssr.js    | 18 -------
 .../pages/ssr.tsx                             |  0
 examples/with-mobx-state-tree/store.js        | 52 -------------------
 .../store.ts                                  |  0
 .../tsconfig.json                             |  2 +-
 25 files changed, 17 insertions(+), 289 deletions(-)
 delete mode 100644 examples/with-mobx-state-tree-typescript/.babelrc
 delete mode 100644 examples/with-mobx-state-tree-typescript/.gitignore
 delete mode 100644 examples/with-mobx-state-tree-typescript/next-env.d.ts
 delete mode 100644 examples/with-mobx-state-tree-typescript/package.json
 delete mode 100644 examples/with-mobx-state-tree/.babelrc
 delete mode 100644 examples/with-mobx-state-tree/components/Clock.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/components/Clock.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/components/SampleComponent.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/components/SampleComponent.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/pages/_app.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/pages/_app.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/pages/index.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/pages/index.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/pages/other.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/pages/other.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/pages/ssg.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/pages/ssg.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/pages/ssr.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/pages/ssr.tsx (100%)
 delete mode 100644 examples/with-mobx-state-tree/store.js
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/store.ts (100%)
 rename examples/{with-mobx-state-tree-typescript => with-mobx-state-tree}/tsconfig.json (93%)

diff --git a/examples/with-mobx-state-tree-typescript/.babelrc b/examples/with-mobx-state-tree-typescript/.babelrc
deleted file mode 100644
index 1bbd4ca8f2cd..000000000000
--- a/examples/with-mobx-state-tree-typescript/.babelrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "presets": ["next/babel"],
-  "plugins": [["@babel/plugin-proposal-decorators", { "legacy": true }]]
-}
diff --git a/examples/with-mobx-state-tree-typescript/.gitignore b/examples/with-mobx-state-tree-typescript/.gitignore
deleted file mode 100644
index c87c9b392c02..000000000000
--- a/examples/with-mobx-state-tree-typescript/.gitignore
+++ /dev/null
@@ -1,36 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# local env files
-.env*.local
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
diff --git a/examples/with-mobx-state-tree-typescript/README.md b/examples/with-mobx-state-tree-typescript/README.md
index 5c169956f27c..ee22d0490016 100644
--- a/examples/with-mobx-state-tree-typescript/README.md
+++ b/examples/with-mobx-state-tree-typescript/README.md
@@ -1,35 +1,3 @@
 # MobX State Tree with TypeScript example
 
-Usually splitting your app state into `pages` feels natural but sometimes you'll want to have global state for your app. This is an example on how you can use mobx that also works with our universal rendering approach.
-
-In this example we are going to display a digital clock that updates every second. The first render is happening in the server and the date will be `00:00:00`, then the browser will take over and it will start updating the date.
-
-To illustrate SSG and SSR, go to `/ssg` and `/ssr`, those pages are using Next.js data fetching methods to get the date in the server and return it as props to the page, and then the browser will hydrate the store and continue updating the date.
-
-The trick here for supporting universal mobx is to separate the cases for the client and the server. When we are on the server we want to create a new store every time, otherwise different users data will be mixed up. If we are in the client we want to use always the same store. That's what we accomplish on `store.js`
-
-The clock, under `components/Clock.js`, has access to the state using the `inject` and `observer` functions from `mobx-react`. In this case Clock is a direct child from the page but it could be deep down the render tree.
-
-## Deploy your own
-
-Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example) or preview live with [StackBlitz](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/with-mobx-state-tree-typescript)
-
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-mobx-state-tree-typescript&project-name=with-mobx-state-tree-typescript&repository-name=with-mobx-state-tree-typescript)
-
-## How to use
-
-Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), or [pnpm](https://pnpm.io) to bootstrap the example:
-
-```bash
-npx create-next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
-```
-
-```bash
-yarn create next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
-```
-
-```bash
-pnpm create next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
-```
-
-Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
+**Note:** This example has been moved to [examples/with-mobx-state-tree](../with-mobx-state-tree/)
diff --git a/examples/with-mobx-state-tree-typescript/next-env.d.ts b/examples/with-mobx-state-tree-typescript/next-env.d.ts
deleted file mode 100644
index 4f11a03dc6cc..000000000000
--- a/examples/with-mobx-state-tree-typescript/next-env.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/examples/with-mobx-state-tree-typescript/package.json b/examples/with-mobx-state-tree-typescript/package.json
deleted file mode 100644
index 7e05b342b506..000000000000
--- a/examples/with-mobx-state-tree-typescript/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "private": true,
-  "scripts": {
-    "dev": "next",
-    "build": "next build",
-    "start": "next start"
-  },
-  "dependencies": {
-    "mobx": "^5.9.0",
-    "mobx-react": "^5.4.3",
-    "mobx-react-lite": "^2.0.7",
-    "mobx-state-tree": "^3.11.0",
-    "next": "latest",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "typescript": "^3.0.1"
-  },
-  "devDependencies": {
-    "@babel/core": "7.14.3",
-    "@babel/plugin-proposal-decorators": "^7.3.0",
-    "@types/node": "^14.0.23",
-    "@types/react": "^16.4.12"
-  }
-}
diff --git a/examples/with-mobx-state-tree/.babelrc b/examples/with-mobx-state-tree/.babelrc
deleted file mode 100644
index 1bbd4ca8f2cd..000000000000
--- a/examples/with-mobx-state-tree/.babelrc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "presets": ["next/babel"],
-  "plugins": [["@babel/plugin-proposal-decorators", { "legacy": true }]]
-}
diff --git a/examples/with-mobx-state-tree/README.md b/examples/with-mobx-state-tree/README.md
index af8e00e1306e..5c169956f27c 100644
--- a/examples/with-mobx-state-tree/README.md
+++ b/examples/with-mobx-state-tree/README.md
@@ -1,4 +1,4 @@
-# MobX State Tree example
+# MobX State Tree with TypeScript example
 
 Usually splitting your app state into `pages` feels natural but sometimes you'll want to have global state for your app. This is an example on how you can use mobx that also works with our universal rendering approach.
 
@@ -12,24 +12,24 @@ The clock, under `components/Clock.js`, has access to the state using the `injec
 
 ## Deploy your own
 
-Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example) or preview live with [StackBlitz](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/with-mobx-state-tree)
+Deploy the example using [Vercel](https://vercel.com?utm_source=github&utm_medium=readme&utm_campaign=next-example) or preview live with [StackBlitz](https://stackblitz.com/github/vercel/next.js/tree/canary/examples/with-mobx-state-tree-typescript)
 
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-mobx-state-tree&project-name=with-mobx-state-tree&repository-name=with-mobx-state-tree)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/git/external?repository-url=https://github.com/vercel/next.js/tree/canary/examples/with-mobx-state-tree-typescript&project-name=with-mobx-state-tree-typescript&repository-name=with-mobx-state-tree-typescript)
 
 ## How to use
 
 Execute [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app) with [npm](https://docs.npmjs.com/cli/init), [Yarn](https://yarnpkg.com/lang/en/docs/cli/create/), or [pnpm](https://pnpm.io) to bootstrap the example:
 
 ```bash
-npx create-next-app --example with-mobx-state-tree with-mobx-state-tree-app
+npx create-next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
 ```
 
 ```bash
-yarn create next-app --example with-mobx-state-tree with-mobx-state-tree-app
+yarn create next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
 ```
 
 ```bash
-pnpm create next-app --example with-mobx-state-tree with-mobx-state-tree-app
+pnpm create next-app --example with-mobx-state-tree-typescript with-mobx-state-tree-typescript-app
 ```
 
 Deploy it to the cloud with [Vercel](https://vercel.com/new?utm_source=github&utm_medium=readme&utm_campaign=next-example) ([Documentation](https://nextjs.org/docs/deployment)).
diff --git a/examples/with-mobx-state-tree/components/Clock.js b/examples/with-mobx-state-tree/components/Clock.js
deleted file mode 100644
index cfbddeae67ab..000000000000
--- a/examples/with-mobx-state-tree/components/Clock.js
+++ /dev/null
@@ -1,25 +0,0 @@
-export default function Clock(props) {
-  return (
-    <div className={props.light ? 'light' : ''}>
-      {format(new Date(props.lastUpdate))}
-      <style jsx>{`
-        div {
-          padding: 15px;
-          color: #82fa58;
-          display: inline-block;
-          font: 50px menlo, monaco, monospace;
-          background-color: #000;
-        }
-
-        .light {
-          background-color: #999;
-        }
-      `}</style>
-    </div>
-  )
-}
-
-const format = (t) =>
-  `${pad(t.getUTCHours())}:${pad(t.getUTCMinutes())}:${pad(t.getUTCSeconds())}`
-
-const pad = (n) => (n < 10 ? `0${n}` : n)
diff --git a/examples/with-mobx-state-tree-typescript/components/Clock.tsx b/examples/with-mobx-state-tree/components/Clock.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/components/Clock.tsx
rename to examples/with-mobx-state-tree/components/Clock.tsx
diff --git a/examples/with-mobx-state-tree/components/SampleComponent.js b/examples/with-mobx-state-tree/components/SampleComponent.js
deleted file mode 100644
index 6478d9319aba..000000000000
--- a/examples/with-mobx-state-tree/components/SampleComponent.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react'
-import Link from 'next/link'
-import { inject, observer } from 'mobx-react'
-import Clock from './Clock'
-
-@inject('store')
-@observer
-class SampleComponent extends React.Component {
-  componentDidMount() {
-    this.props.store.start()
-  }
-
-  componentWillUnmount() {
-    this.props.store.stop()
-  }
-
-  render() {
-    return (
-      <div>
-        <h1>{this.props.title}</h1>
-        <Clock
-          lastUpdate={this.props.store.lastUpdate}
-          light={this.props.store.light}
-        />
-        <nav>
-          <Link href={this.props.linkTo}>
-            <a>Navigate</a>
-          </Link>
-        </nav>
-      </div>
-    )
-  }
-}
-
-export default SampleComponent
diff --git a/examples/with-mobx-state-tree-typescript/components/SampleComponent.tsx b/examples/with-mobx-state-tree/components/SampleComponent.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/components/SampleComponent.tsx
rename to examples/with-mobx-state-tree/components/SampleComponent.tsx
diff --git a/examples/with-mobx-state-tree/package.json b/examples/with-mobx-state-tree/package.json
index 819eed5e194c..0a2de828056c 100644
--- a/examples/with-mobx-state-tree/package.json
+++ b/examples/with-mobx-state-tree/package.json
@@ -6,15 +6,17 @@
     "start": "next start"
   },
   "dependencies": {
-    "mobx": "3.3.1",
-    "mobx-react": "^4.0.4",
-    "mobx-state-tree": "1.0.1",
+    "mobx": "^6.6.1",
+    "mobx-react": "^7.5.2",
+    "mobx-react-lite": "^3.4.0",
+    "mobx-state-tree": "^5.1.6",
     "next": "latest",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@babel/core": "7.14.5",
-    "@babel/plugin-proposal-decorators": "^7.1.2"
+    "@types/node": "^18.7.15",
+    "@types/react": "^18.0.18",
+    "typescript": "^4.8.2"
   }
 }
diff --git a/examples/with-mobx-state-tree/pages/_app.js b/examples/with-mobx-state-tree/pages/_app.js
deleted file mode 100644
index e75b81d85556..000000000000
--- a/examples/with-mobx-state-tree/pages/_app.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Provider } from 'mobx-react'
-import { useStore } from '../store'
-
-export default function App({ Component, pageProps }) {
-  const store = useStore(pageProps.initialState)
-
-  return (
-    <Provider store={store}>
-      <Component {...pageProps} />
-    </Provider>
-  )
-}
diff --git a/examples/with-mobx-state-tree-typescript/pages/_app.tsx b/examples/with-mobx-state-tree/pages/_app.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/pages/_app.tsx
rename to examples/with-mobx-state-tree/pages/_app.tsx
diff --git a/examples/with-mobx-state-tree/pages/index.js b/examples/with-mobx-state-tree/pages/index.js
deleted file mode 100644
index 00b3a426d77d..000000000000
--- a/examples/with-mobx-state-tree/pages/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import SampleComponent from '../components/SampleComponent'
-
-export default function Home() {
-  return <SampleComponent title="Index Page" linkTo="/other" />
-}
diff --git a/examples/with-mobx-state-tree-typescript/pages/index.tsx b/examples/with-mobx-state-tree/pages/index.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/pages/index.tsx
rename to examples/with-mobx-state-tree/pages/index.tsx
diff --git a/examples/with-mobx-state-tree/pages/other.js b/examples/with-mobx-state-tree/pages/other.js
deleted file mode 100644
index 64baaaeeddfb..000000000000
--- a/examples/with-mobx-state-tree/pages/other.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import SampleComponent from '../components/SampleComponent'
-
-export default function Other() {
-  return <SampleComponent title={'Other Page'} linkTo="/" />
-}
diff --git a/examples/with-mobx-state-tree-typescript/pages/other.tsx b/examples/with-mobx-state-tree/pages/other.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/pages/other.tsx
rename to examples/with-mobx-state-tree/pages/other.tsx
diff --git a/examples/with-mobx-state-tree/pages/ssg.js b/examples/with-mobx-state-tree/pages/ssg.js
deleted file mode 100644
index 4191006042e6..000000000000
--- a/examples/with-mobx-state-tree/pages/ssg.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { getSnapshot } from 'mobx-state-tree'
-import SampleComponent from '../components/SampleComponent'
-import { initializeStore } from '../store'
-
-export default function Ssg() {
-  return <SampleComponent title={'SSG Page'} linkTo="/" />
-}
-
-// If you build and start the app, the date returned here will have the same
-// value for all requests, as this method gets executed at build time.
-export function getStaticProps() {
-  const store = initializeStore()
-
-  store.update()
-
-  return { props: { initialState: getSnapshot(store) } }
-}
diff --git a/examples/with-mobx-state-tree-typescript/pages/ssg.tsx b/examples/with-mobx-state-tree/pages/ssg.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/pages/ssg.tsx
rename to examples/with-mobx-state-tree/pages/ssg.tsx
diff --git a/examples/with-mobx-state-tree/pages/ssr.js b/examples/with-mobx-state-tree/pages/ssr.js
deleted file mode 100644
index 8bdb3f3e50ad..000000000000
--- a/examples/with-mobx-state-tree/pages/ssr.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getSnapshot } from 'mobx-state-tree'
-import SampleComponent from '../components/SampleComponent'
-import { initializeStore } from '../store'
-
-export default function Ssr() {
-  return <SampleComponent title={'SSR Page'} linkTo="/" />
-}
-
-// The date returned here will be different for every request that hits the page,
-// that is because the page becomes a serverless function instead of being statically
-// exported when you use `getServerSideProps` or `getInitialProps`
-export function getServerSideProps() {
-  const store = initializeStore()
-
-  store.update()
-
-  return { props: { initialState: getSnapshot(store) } }
-}
diff --git a/examples/with-mobx-state-tree-typescript/pages/ssr.tsx b/examples/with-mobx-state-tree/pages/ssr.tsx
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/pages/ssr.tsx
rename to examples/with-mobx-state-tree/pages/ssr.tsx
diff --git a/examples/with-mobx-state-tree/store.js b/examples/with-mobx-state-tree/store.js
deleted file mode 100644
index 879feca16f04..000000000000
--- a/examples/with-mobx-state-tree/store.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { useMemo } from 'react'
-import { types, applySnapshot } from 'mobx-state-tree'
-
-let store
-
-const Store = types
-  .model({
-    lastUpdate: types.Date,
-    light: false,
-  })
-  .actions((self) => {
-    let timer
-    function start() {
-      timer = setInterval(() => {
-        // mobx-state-tree doesn't allow anonymous callbacks changing data
-        // pass off to another action instead
-        self.update()
-      }, 1000)
-    }
-
-    function update() {
-      self.lastUpdate = Date.now()
-      self.light = true
-    }
-
-    function stop() {
-      clearInterval(timer)
-    }
-
-    return { start, stop, update }
-  })
-
-export function initializeStore(snapshot = null) {
-  const _store = store ?? Store.create({ lastUpdate: 0 })
-
-  // If your page has Next.js data fetching methods that use a Mobx store, it will
-  // get hydrated here, check `pages/ssg.js` and `pages/ssr.js` for more details
-  if (snapshot) {
-    applySnapshot(_store, snapshot)
-  }
-  // For SSG and SSR always create a new store
-  if (typeof window === 'undefined') return _store
-  // Create the store once in the client
-  if (!store) store = _store
-
-  return store
-}
-
-export function useStore(initialState) {
-  const store = useMemo(() => initializeStore(initialState), [initialState])
-  return store
-}
diff --git a/examples/with-mobx-state-tree-typescript/store.ts b/examples/with-mobx-state-tree/store.ts
similarity index 100%
rename from examples/with-mobx-state-tree-typescript/store.ts
rename to examples/with-mobx-state-tree/store.ts
diff --git a/examples/with-mobx-state-tree-typescript/tsconfig.json b/examples/with-mobx-state-tree/tsconfig.json
similarity index 93%
rename from examples/with-mobx-state-tree-typescript/tsconfig.json
rename to examples/with-mobx-state-tree/tsconfig.json
index b5d1e2f17bbe..e1e1e26feec7 100644
--- a/examples/with-mobx-state-tree-typescript/tsconfig.json
+++ b/examples/with-mobx-state-tree/tsconfig.json
@@ -13,7 +13,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "experimentalDecorators": true
+    "incremental": true
   },
   "exclude": ["node_modules"],
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"]

From 66834d5c153f5473859e5a499f5b0cf13d902a5a Mon Sep 17 00:00:00 2001
From: Steven <steven@ceriously.com>
Date: Thu, 8 Sep 2022 11:09:46 -0400
Subject: [PATCH 18/69] Fix `image-component` example types (#40352)

---
 examples/image-component/pages/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/image-component/pages/index.tsx b/examples/image-component/pages/index.tsx
index 55e23411e7d2..012011cf1ec7 100644
--- a/examples/image-component/pages/index.tsx
+++ b/examples/image-component/pages/index.tsx
@@ -5,7 +5,7 @@ import ViewSource from '../components/view-source'
 import vercel from '../public/vercel.png'
 import type { PropsWithChildren } from 'react'
 
-const Code = (props: PropsWithChildren) => (
+const Code = (props: PropsWithChildren<{}>) => (
   <code className={styles.inlineCode} {...props} />
 )
 

From 712d98d3d7ba3ca9849c964aa611e805291a7f7f Mon Sep 17 00:00:00 2001
From: Steven <steven@ceriously.com>
Date: Thu, 8 Sep 2022 11:19:55 -0400
Subject: [PATCH 19/69] Update docs for `remotePatterns` image config (#40350)

This updates the docs to favor `remotePatterns` image config (instead of `domains`)
---
 docs/api-reference/next/future/image.md   |  4 +++-
 docs/api-reference/next/image.md          |  4 +++-
 docs/basic-features/image-optimization.md | 12 ++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/docs/api-reference/next/future/image.md b/docs/api-reference/next/future/image.md
index b0a8883262c6..2aba62f711ad 100644
--- a/docs/api-reference/next/future/image.md
+++ b/docs/api-reference/next/future/image.md
@@ -151,7 +151,7 @@ Must be one of the following:
 2. A path string. This can be either an absolute external URL,
    or an internal path depending on the [loader](#loader) prop.
 
-When using an external URL, you must add it to [domains](#domains) in `next.config.js`.
+When using an external URL, you must add it to [remotePatterns](#remote-patterns) in `next.config.js`.
 
 ### width
 
@@ -430,6 +430,8 @@ The `**` syntax does not work in the middle of the pattern.
 
 ### Domains
 
+> Note: We recommend using [`remotePatterns`](#remote-patterns) instead so you can restrict protocol and pathname.
+
 Similar to [`remotePatterns`](#remote-patterns), the `domains` configuration can be used to provide a list of allowed hostnames for external images.
 
 However, the `domains` configuration does not support wildcard pattern matching and it cannot restrict protocol, port, or pathname.
diff --git a/docs/api-reference/next/image.md b/docs/api-reference/next/image.md
index 60ffe36f20da..5c0bc210e088 100644
--- a/docs/api-reference/next/image.md
+++ b/docs/api-reference/next/image.md
@@ -45,7 +45,7 @@ Must be one of the following:
    or an internal path depending on the [loader](#loader) prop or [loader configuration](#loader-configuration).
 
 When using an external URL, you must add it to
-[domains](#domains) in
+[remotePatterns](#remote-patterns) in
 `next.config.js`.
 
 ### width
@@ -393,6 +393,8 @@ The `**` syntax does not work in the middle of the pattern.
 
 ### Domains
 
+> Note: We recommend using [`remotePatterns`](#remote-patterns) instead so you can restrict protocol and pathname.
+
 Similar to [`remotePatterns`](#remote-patterns), the `domains` configuration can be used to provide a list of allowed hostnames for external images.
 
 However, the `domains` configuration does not support wildcard pattern matching and it cannot restrict protocol, port, or pathname.
diff --git a/docs/basic-features/image-optimization.md b/docs/basic-features/image-optimization.md
index 1b5ac21aa200..e53e61f8b773 100644
--- a/docs/basic-features/image-optimization.md
+++ b/docs/basic-features/image-optimization.md
@@ -72,7 +72,7 @@ function Home() {
 
 ### Remote Images
 
-To use a remote image, the `src` property should be a URL string, which can be [relative](#loaders) or [absolute](/docs/api-reference/next/image.md#domains). Because Next.js does not have access to remote files during the build process, you'll need to provide the [`width`](/docs/api-reference/next/image.md#width), [`height`](/docs/api-reference/next/image.md#height) and optional [`blurDataURL`](/docs/api-reference/next/image.md#blurdataurl) props manually:
+To use a remote image, the `src` property should be a URL string, which can be [relative](#loaders) or [absolute](/docs/api-reference/next/image.md#remote-patterns). Because Next.js does not have access to remote files during the build process, you'll need to provide the [`width`](/docs/api-reference/next/image.md#width), [`height`](/docs/api-reference/next/image.md#height) and optional [`blurDataURL`](/docs/api-reference/next/image.md#blurdataurl) props manually:
 
 ```jsx
 import Image from 'next/image'
@@ -97,17 +97,17 @@ export default function Home() {
 
 ### Domains
 
-Sometimes you may want to access a remote image, but still use the built-in Next.js Image Optimization API. To do this, leave the `loader` at its default setting and enter an absolute URL for the Image `src`.
+Sometimes you may want to optimize a remote image, but still use the built-in Next.js Image Optimization API. To do this, leave the `loader` at its default setting and enter an absolute URL for the Image `src` prop.
 
-To protect your application from malicious users, you must define a list of remote hostnames you intend to allow remote access.
+To protect your application from malicious users, you must define a list of remote hostnames you intend to use with the `next/image` component.
 
-> Learn more about [`domains`](/docs/api-reference/next/image.md#domains) configuration.
+> Learn more about [`remotePatterns`](/docs/api-reference/next/image.md#remote-patterns) configuration.
 
 ### Loaders
 
 Note that in the [example earlier](#remote-images), a partial URL (`"/me.png"`) is provided for a remote image. This is possible because of the `next/image` [loader](/docs/api-reference/next/image.md#loader) architecture.
 
-A loader is a function that generates the URLs for your image. It appends a root domain to your provided `src`, and generates multiple URLs to request the image at different sizes. These multiple URLs are used in the automatic [srcset](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/srcset) generation, so that visitors to your site will be served an image that is the right size for their viewport.
+A loader is a function that generates the URLs for your image. It modifies the provided `src`, and generates multiple URLs to request the image at different sizes. These multiple URLs are used in the automatic [srcset](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/srcset) generation, so that visitors to your site will be served an image that is the right size for their viewport.
 
 The default loader for Next.js applications uses the built-in Image Optimization API, which optimizes images from anywhere on the web, and then serves them directly from the Next.js web server. If you would like to serve your images directly from a CDN or image server, you can use one of the [built-in loaders](/docs/api-reference/next/image.md#built-in-loaders) or write your own with a few lines of JavaScript.
 
@@ -209,7 +209,7 @@ For examples of the Image component used with the various fill modes, see the [I
 
 ## Configuration
 
-The `next/image` component and Next.js Image Optimization API can be configured in the [`next.config.js` file](/docs/api-reference/next.config.js/introduction.md). These configurations allow you to [enable remote images](/docs/api-reference/next/image.md#domains), [define custom image breakpoints](/docs/api-reference/next/image.md#device-sizes), [change caching behavior](/docs/api-reference/next/image.md#caching-behavior) and more.
+The `next/image` component and Next.js Image Optimization API can be configured in the [`next.config.js` file](/docs/api-reference/next.config.js/introduction.md). These configurations allow you to [enable remote images](/docs/api-reference/next/image.md#remote-patterns), [define custom image breakpoints](/docs/api-reference/next/image.md#device-sizes), [change caching behavior](/docs/api-reference/next/image.md#caching-behavior) and more.
 
 [**Read the full image configuration documentation for more information.**](/docs/api-reference/next/image.md#configuration-options)
 

From 5793301c609036b7845a909e8420e8c0e0778624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Thu, 8 Sep 2022 17:21:36 +0200
Subject: [PATCH 20/69] fix(lint): disable `react/no-unknown-property` (#40331)

~(PR https://github.com/jsx-eslint/eslint-plugin-react/pull/3377)
introduced a change in `eslint-plugin-react@7.31.2` that will now show
an error when unknown properties appear on elements. We can opt out of
this by overriding the default.~

As discussed internally, we are turning `react/no-unknown-property` off,
as it might be confusing even if different props are being used, (eg.:
`css` for `emotion`).

It's easy to fix
https://github.com/jsx-eslint/eslint-plugin-react/blob/master/docs/rules/no-unknown-property.md#rule-options,
but it might not be clear at first glance that Next.js is using
`eslint-plugin-react` internally.

If the user wants to enforce this rule, they can still add it to their
own `rules` config.

Fixes #40321, ref: https://github.com/vercel/next.js/discussions/40269,
https://github.com/vercel/next.js/issues/38333
---
 packages/eslint-config-next/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/eslint-config-next/index.js b/packages/eslint-config-next/index.js
index 5c846dee12af..24a28c0c523b 100644
--- a/packages/eslint-config-next/index.js
+++ b/packages/eslint-config-next/index.js
@@ -60,6 +60,7 @@ module.exports = {
   plugins: ['import', 'react', 'jsx-a11y'],
   rules: {
     'import/no-anonymous-default-export': 'warn',
+    'react/no-unknown-property': 'off',
     'react/react-in-jsx-scope': 'off',
     'react/prop-types': 'off',
     'jsx-a11y/alt-text': [

From 75e5616ce4d20db7f8c58839b806527a03a6d119 Mon Sep 17 00:00:00 2001
From: Carl von Buelow <cvbuelow@physna.com>
Date: Thu, 8 Sep 2022 11:37:41 -0400
Subject: [PATCH 21/69] Update `onLoadingComplete` for `next/future/image` to
 receive reference to `<img>` (#40326)

* fixes #18398
* fixes #38864

Co-authored-by: Steven <steven@ceriously.com>
---
 docs/api-reference/next/future/image.md          | 16 +++++++---------
 packages/next/client/future/image.tsx            | 10 ++--------
 .../default/pages/on-loading-complete.js         |  6 ++++--
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/docs/api-reference/next/future/image.md b/docs/api-reference/next/future/image.md
index 2aba62f711ad..bd97cbeced80 100644
--- a/docs/api-reference/next/future/image.md
+++ b/docs/api-reference/next/future/image.md
@@ -7,11 +7,11 @@ description: Try the latest Image Optimization with the new `next/future/image`
 <details>
   <summary><b>Version History</b></summary>
 
-| Version   | Changes                                                                                                                     |
-| --------- | --------------------------------------------------------------------------------------------------------------------------- |
-| `v12.3.0` | `next/future/image` component stable. `remotePatterns` config stable. `unoptimized` config stable. `alt` property required. |
-| `v12.2.4` | `fill` property added.                                                                                                      |
-| `v12.2.0` | Experimental `next/future/image` component introduced.                                                                      |
+| Version   | Changes                                                                                                                                                          |
+| --------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `v12.3.0` | `next/future/image` component stable. `remotePatterns` config stable. `unoptimized` config stable. `alt` property required. `onLoadingComplete` receives `<img>` |
+| `v12.2.4` | `fill` property added.                                                                                                                                           |
+| `v12.2.0` | Experimental `next/future/image` component introduced.                                                                                                           |
 
 </details>
 
@@ -33,6 +33,7 @@ Compared to `next/image`, the new `next/future/image` component has the followin
   - Removes `lazyRoot` prop since there is no native equivalent
 - Removes `loader` config in favor of [`loader`](#loader) prop
 - Changed `alt` prop from optional to required
+- Changed `onLoadingComplete` callback to receive reference to `<img>` element
 
 ## Known Browser Bugs
 
@@ -306,10 +307,7 @@ Also keep in mind that the required `width` and `height` props can interact with
 
 A callback function that is invoked once the image is completely loaded and the [placeholder](#placeholder) has been removed.
 
-The callback function will be called with one argument, an object with the following properties:
-
-- [`naturalWidth`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/naturalWidth)
-- [`naturalHeight`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement/naturalHeight)
+The callback function will be called with one argument, a reference to the underlying `<img>` element.
 
 ### onLoad
 
diff --git a/packages/next/client/future/image.tsx b/packages/next/client/future/image.tsx
index bef68231bd7c..24081c4b7d7a 100644
--- a/packages/next/client/future/image.tsx
+++ b/packages/next/client/future/image.tsx
@@ -47,10 +47,7 @@ type ImageLoaderPropsWithConfig = ImageLoaderProps & {
 
 type PlaceholderValue = 'blur' | 'empty'
 
-type OnLoadingComplete = (result: {
-  naturalWidth: number
-  naturalHeight: number
-}) => void
+type OnLoadingComplete = (img: HTMLImageElement) => void
 
 type ImgElementStyle = NonNullable<JSX.IntrinsicElements['img']['style']>
 
@@ -265,10 +262,7 @@ function handleLoading(
       setBlurComplete(true)
     }
     if (onLoadingCompleteRef?.current) {
-      const { naturalWidth, naturalHeight } = img
-      // Pass back read-only primitive values but not the
-      // underlying DOM element because it could be misused.
-      onLoadingCompleteRef.current({ naturalWidth, naturalHeight })
+      onLoadingCompleteRef.current(img)
     }
     if (process.env.NODE_ENV !== 'production') {
       if (img.getAttribute('data-nimg') === 'future-fill') {
diff --git a/test/integration/image-future/default/pages/on-loading-complete.js b/test/integration/image-future/default/pages/on-loading-complete.js
index b89d655268e3..da60e069f319 100644
--- a/test/integration/image-future/default/pages/on-loading-complete.js
+++ b/test/integration/image-future/default/pages/on-loading-complete.js
@@ -105,13 +105,15 @@ function ImageWithMessage({ id, idToCount, setIdToCount, ...props }) {
       <div className="wrap">
         <Image
           id={`img${id}`}
-          onLoadingComplete={({ naturalWidth, naturalHeight }) => {
+          onLoadingComplete={(img) => {
+            const { naturalWidth, naturalHeight, nodeName } = img
             let count = idToCount[id] || 0
             count++
             idToCount[id] = count
             setIdToCount(idToCount)
+            const name = nodeName.toLocaleLowerCase()
             setMsg(
-              `loaded ${count} img${id} with dimensions ${naturalWidth}x${naturalHeight}`
+              `loaded ${count} ${name}${id} with dimensions ${naturalWidth}x${naturalHeight}`
             )
           }}
           {...props}

From 56c5abd3de120551d65f6d43c385c9c460672f6f Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 8 Sep 2022 08:43:20 -0700
Subject: [PATCH 22/69] Remove warning for swcMinify being enabled (#40359)

This removes the warning for `swcMinify` as a release candidate as it is
now being marked as stable.

x-ref: [slack
thread](https://vercel.slack.com/archives/CGU8HUTUH/p1662647498560729)

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 packages/next/server/config.ts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
index e5c1260a8d10..07406b6b32c0 100644
--- a/packages/next/server/config.ts
+++ b/packages/next/server/config.ts
@@ -511,10 +511,6 @@ function assignDefaults(userConfig: { [key: string]: any }) {
     result.compiler.removeConsole = (result.experimental as any).removeConsole
   }
 
-  if (result.swcMinify) {
-    Log.info('SWC minify release candidate enabled. https://nextjs.link/swcmin')
-  }
-
   if (result.experimental?.swcMinifyDebugOptions) {
     Log.warn(
       'SWC minify debug option specified. This option is for debugging minifier issues and will be removed once SWC minifier is stable.'

From 0376534a29324ded4b52ad9a39d7fa1938bac1ae Mon Sep 17 00:00:00 2001
From: Leon Si <leon@leonzalion.com>
Date: Thu, 8 Sep 2022 11:44:58 -0400
Subject: [PATCH 23/69] docs: fix typo (#40354)

<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 docs/migrating/incremental-adoption.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/migrating/incremental-adoption.md b/docs/migrating/incremental-adoption.md
index a52182e37667..4334ad640ec6 100644
--- a/docs/migrating/incremental-adoption.md
+++ b/docs/migrating/incremental-adoption.md
@@ -92,4 +92,4 @@ Once your monorepo is set up, push changes to your Git repository as usual and y
 
 ## Conclusion
 
-To learn more, read about [subpaths](/docs/api-reference/next.config.js/basepath.md) and [rewrites](/docs/api-reference/next.config.js/rewrites.md) or [deploy a Next.jsmonorepo](https://vercel.com/templates/next.js/monorepo).
+To learn more, read about [subpaths](/docs/api-reference/next.config.js/basepath.md) and [rewrites](/docs/api-reference/next.config.js/rewrites.md) or [deploy a Next.js monorepo](https://vercel.com/templates/next.js/monorepo).

From 9576a278b6d7b1b1562a095675500497ae6bd6ac Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 8 Sep 2022 08:48:54 -0700
Subject: [PATCH 24/69] v12.2.6-canary.13

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 ++--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 +++++++-------
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index dc5ab3db5feb..450e7435427e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.2.6-canary.12"
+  "version": "12.2.6-canary.13"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 45f18996dabe..b87647623a66 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 4617fbec97a4..c9a3d4d58fbd 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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.2.6-canary.12",
+    "@next/eslint-plugin-next": "12.2.6-canary.13",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 80240a527714..e96d8afecb8d 100644
--- 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.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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
index 18adefc11bdb..39e26ee312a4 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index ae97f89ed5c3..4917d36e919c 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index 73473cc501c5..c6886bb1c817 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index ec912d883e69..c6486435da59 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 945a51992ee1..5ac9ab58f229 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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
index 198897f4bf50..445d1e498542 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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
index 6b227552f52f..8d5544828b02 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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
index 4b5172b8236d..b8ea7be2130d 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index aa572d7b39f5..6437962bcf9d 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.2.6-canary.12",
+    "@next/env": "12.2.6-canary.13",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.2.6-canary.12",
-    "@next/polyfill-nomodule": "12.2.6-canary.12",
-    "@next/react-dev-overlay": "12.2.6-canary.12",
-    "@next/react-refresh-utils": "12.2.6-canary.12",
-    "@next/swc": "12.2.6-canary.12",
+    "@next/polyfill-module": "12.2.6-canary.13",
+    "@next/polyfill-nomodule": "12.2.6-canary.13",
+    "@next/react-dev-overlay": "12.2.6-canary.13",
+    "@next/react-refresh-utils": "12.2.6-canary.13",
+    "@next/swc": "12.2.6-canary.13",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index 11602ec757a0..a1f96790dc5e 100644
--- 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.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "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
index eb8a3c1762fe..dd9ea6620338 100644
--- 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.2.6-canary.12",
+  "version": "12.2.6-canary.13",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d204490f545a..0d6e4f010786 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -363,7 +363,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.2.6-canary.12
+      '@next/eslint-plugin-next': 12.2.6-canary.13
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -419,12 +419,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.2.6-canary.12
-      '@next/polyfill-module': 12.2.6-canary.12
-      '@next/polyfill-nomodule': 12.2.6-canary.12
-      '@next/react-dev-overlay': 12.2.6-canary.12
-      '@next/react-refresh-utils': 12.2.6-canary.12
-      '@next/swc': 12.2.6-canary.12
+      '@next/env': 12.2.6-canary.13
+      '@next/polyfill-module': 12.2.6-canary.13
+      '@next/polyfill-nomodule': 12.2.6-canary.13
+      '@next/react-dev-overlay': 12.2.6-canary.13
+      '@next/react-refresh-utils': 12.2.6-canary.13
+      '@next/swc': 12.2.6-canary.13
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0

From ba4c575334796db92c93957afa97ef483cea3f2e Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 8 Sep 2022 09:00:04 -0700
Subject: [PATCH 25/69] v12.3.0

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 ++--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 +++++++-------
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index 450e7435427e..2299fc6a2892 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.2.6-canary.13"
+  "version": "12.3.0"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index b87647623a66..9d5d6bbbea59 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index c9a3d4d58fbd..8d1f5a1527f6 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "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.2.6-canary.13",
+    "@next/eslint-plugin-next": "12.3.0",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index e96d8afecb8d..ae49513012ee 100644
--- 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.2.6-canary.13",
+  "version": "12.3.0",
   "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
index 39e26ee312a4..8e359412211d 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 4917d36e919c..7620d642f30f 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index c6886bb1c817..e54b40ee6dfc 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index c6486435da59..edc6bc183a99 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index 5ac9ab58f229..aa646820bcba 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "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
index 445d1e498542..2c5ffae3a4e9 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "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
index 8d5544828b02..2393b3243d5e 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "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
index b8ea7be2130d..0a3075d91e24 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index 6437962bcf9d..310749e59a4a 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.2.6-canary.13",
+  "version": "12.3.0",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.2.6-canary.13",
+    "@next/env": "12.3.0",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.2.6-canary.13",
-    "@next/polyfill-nomodule": "12.2.6-canary.13",
-    "@next/react-dev-overlay": "12.2.6-canary.13",
-    "@next/react-refresh-utils": "12.2.6-canary.13",
-    "@next/swc": "12.2.6-canary.13",
+    "@next/polyfill-module": "12.3.0",
+    "@next/polyfill-nomodule": "12.3.0",
+    "@next/react-dev-overlay": "12.3.0",
+    "@next/react-refresh-utils": "12.3.0",
+    "@next/swc": "12.3.0",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index a1f96790dc5e..fcd9f37f6dcf 100644
--- 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.2.6-canary.13",
+  "version": "12.3.0",
   "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
index dd9ea6620338..ef30d2385de0 100644
--- 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.2.6-canary.13",
+  "version": "12.3.0",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d6e4f010786..268f116d32d9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -363,7 +363,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.2.6-canary.13
+      '@next/eslint-plugin-next': 12.3.0
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -419,12 +419,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.2.6-canary.13
-      '@next/polyfill-module': 12.2.6-canary.13
-      '@next/polyfill-nomodule': 12.2.6-canary.13
-      '@next/react-dev-overlay': 12.2.6-canary.13
-      '@next/react-refresh-utils': 12.2.6-canary.13
-      '@next/swc': 12.2.6-canary.13
+      '@next/env': 12.3.0
+      '@next/polyfill-module': 12.3.0
+      '@next/polyfill-nomodule': 12.3.0
+      '@next/react-dev-overlay': 12.3.0
+      '@next/react-refresh-utils': 12.3.0
+      '@next/swc': 12.3.0
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0

From c8d3fa6a77186ec7805261312b0ce406efd46d79 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Thu, 8 Sep 2022 20:10:32 +0200
Subject: [PATCH 26/69] Update react-server-dom-webpack (#40356)

Bump `react-server-dom-webpack` for support of `experimental_use` API
---
 package.json                                  |   4 +-
 ...bpack-writer.browser.development.server.js | 212 +++++++++++++++++-
 ...ck-writer.browser.production.min.server.js |  72 +++---
 .../react-server-dom-webpack.development.js   |   9 +-
 ...react-server-dom-webpack.production.min.js |   4 +-
 packages/next/package.json                    |   2 +-
 pnpm-lock.yaml                                |  34 +--
 7 files changed, 267 insertions(+), 70 deletions(-)

diff --git a/package.json b/package.json
index 5f5ac0dfcb40..758a6b8200af 100644
--- a/package.json
+++ b/package.json
@@ -177,8 +177,8 @@
     "react-17": "npm:react@17.0.2",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@17.0.2",
-    "react-dom-exp": "npm:react-dom@0.0.0-experimental-0de3ddf56-20220825",
-    "react-exp": "npm:react@0.0.0-experimental-0de3ddf56-20220825",
+    "react-dom-exp": "npm:react-dom@0.0.0-experimental-7028ce745-20220907",
+    "react-exp": "npm:react@0.0.0-experimental-7028ce745-20220907",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
diff --git a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.development.server.js b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.development.server.js
index a4dfaa018c81..b5e1d259afd5 100644
--- a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.development.server.js
+++ b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.development.server.js
@@ -894,18 +894,109 @@ function readContext(context) {
   return value;
 }
 
+// Corresponds to ReactFiberWakeable module. Generally, changes to one module
+// should be reflected in the other.
+// TODO: Rename this module and the corresponding Fiber one to "Thenable"
+// instead of "Wakeable". Or some other more appropriate name.
+// TODO: Sparse arrays are bad for performance.
+function createThenableState() {
+  // The ThenableState is created the first time a component suspends. If it
+  // suspends again, we'll reuse the same state.
+  return [];
+}
+function trackSuspendedWakeable(wakeable) {
+  // If this wakeable isn't already a thenable, turn it into one now. Then,
+  // when we resume the work loop, we can check if its status is
+  // still pending.
+  // TODO: Get rid of the Wakeable type? It's superseded by UntrackedThenable.
+  var thenable = wakeable; // We use an expando to track the status and result of a thenable so that we
+  // can synchronously unwrap the value. Think of this as an extension of the
+  // Promise API, or a custom interface that is a superset of Thenable.
+  //
+  // If the thenable doesn't have a status, set it to "pending" and attach
+  // a listener that will update its status and result when it resolves.
+
+  switch (thenable.status) {
+    case 'pending':
+      // Since the status is already "pending", we can assume it will be updated
+      // when it resolves, either by React or something in userspace.
+      break;
+
+    case 'fulfilled':
+    case 'rejected':
+      // A thenable that already resolved shouldn't have been thrown, so this is
+      // unexpected. Suggests a mistake in a userspace data library. Don't track
+      // this thenable, because if we keep trying it will likely infinite loop
+      // without ever resolving.
+      // TODO: Log a warning?
+      break;
+
+    default:
+      {
+        // TODO: Only instrument the thenable if the status if not defined. If
+        // it's defined, but an unknown value, assume it's been instrumented by
+        // some custom userspace implementation.
+        var pendingThenable = thenable;
+        pendingThenable.status = 'pending';
+        pendingThenable.then(function (fulfilledValue) {
+          if (thenable.status === 'pending') {
+            var fulfilledThenable = thenable;
+            fulfilledThenable.status = 'fulfilled';
+            fulfilledThenable.value = fulfilledValue;
+          }
+        }, function (error) {
+          if (thenable.status === 'pending') {
+            var rejectedThenable = thenable;
+            rejectedThenable.status = 'rejected';
+            rejectedThenable.reason = error;
+          }
+        });
+        break;
+      }
+  }
+}
+function trackUsedThenable(thenableState, thenable, index) {
+  // This is only a separate function from trackSuspendedWakeable for symmetry
+  // with Fiber.
+  // TODO: Disallow throwing a thenable directly. It must go through `use` (or
+  // some equivalent for internal Suspense implementations). We can't do this in
+  // Fiber yet because it's a breaking change but we can do it in Server
+  // Components because Server Components aren't released yet.
+  thenableState[index] = thenable;
+}
+function getPreviouslyUsedThenableAtIndex(thenableState, index) {
+  if (thenableState !== null) {
+    var thenable = thenableState[index];
+
+    if (thenable !== undefined) {
+      return thenable;
+    }
+  }
+
+  return null;
+}
+
 var currentRequest = null;
+var thenableIndexCounter = 0;
+var thenableState = null;
 function prepareToUseHooksForRequest(request) {
   currentRequest = request;
 }
 function resetHooksForRequest() {
   currentRequest = null;
 }
+function prepareToUseHooksForComponent(prevThenableState) {
+  thenableIndexCounter = 0;
+  thenableState = prevThenableState;
+}
+function getThenableStateAfterSuspending() {
+  return thenableState;
+}
 
 function readContext$1(context) {
   {
     if (context.$$typeof !== REACT_SERVER_CONTEXT_TYPE) {
-      error('Only ServerContext is supported in Flight');
+      error('Only createServerContext is supported in Server Components.');
     }
 
     if (currentCache === null) {
@@ -958,7 +1049,8 @@ var Dispatcher = {
   },
   useMemoCache: function (size) {
     return new Array(size);
-  }
+  },
+  use:  use 
 };
 
 function unsupportedHook() {
@@ -990,6 +1082,80 @@ function useId() {
   return ':' + currentRequest.identifierPrefix + 'S' + id.toString(32) + ':';
 }
 
+function use(usable) {
+  if (usable !== null && typeof usable === 'object') {
+    if (typeof usable.then === 'function') {
+      // This is a thenable.
+      var thenable = usable; // Track the position of the thenable within this fiber.
+
+      var index = thenableIndexCounter;
+      thenableIndexCounter += 1;
+
+      switch (thenable.status) {
+        case 'fulfilled':
+          {
+            var fulfilledValue = thenable.value;
+            return fulfilledValue;
+          }
+
+        case 'rejected':
+          {
+            var rejectedError = thenable.reason;
+            throw rejectedError;
+          }
+
+        default:
+          {
+            var prevThenableAtIndex = getPreviouslyUsedThenableAtIndex(thenableState, index);
+
+            if (prevThenableAtIndex !== null) {
+              switch (prevThenableAtIndex.status) {
+                case 'fulfilled':
+                  {
+                    var _fulfilledValue = prevThenableAtIndex.value;
+                    return _fulfilledValue;
+                  }
+
+                case 'rejected':
+                  {
+                    var _rejectedError = prevThenableAtIndex.reason;
+                    throw _rejectedError;
+                  }
+
+                default:
+                  {
+                    // The thenable still hasn't resolved. Suspend with the same
+                    // thenable as last time to avoid redundant listeners.
+                    throw prevThenableAtIndex;
+                  }
+              }
+            } else {
+              // This is the first time something has been used at this index.
+              // Stash the thenable at the current index so we can reuse it during
+              // the next attempt.
+              if (thenableState === null) {
+                thenableState = createThenableState();
+              }
+
+              trackUsedThenable(thenableState, thenable, index); // Suspend.
+              // TODO: Throwing here is an implementation detail that allows us to
+              // unwind the call stack. But we shouldn't allow it to leak into
+              // userspace. Throw an opaque placeholder value instead of the
+              // actual thenable. If it doesn't get captured by the work loop, log
+              // a warning, because that means something in userspace must have
+              // caught it.
+
+              throw thenable;
+            }
+          }
+      }
+    }
+  } // eslint-disable-next-line react-internal/safe-string-coercion
+
+
+  throw new Error('An unsupported type was passed to use(): ' + String(usable));
+}
+
 var ContextRegistry = ReactSharedInternals.ContextRegistry;
 function getOrCreateServerContext(globalName) {
   if (!ContextRegistry[globalName]) {
@@ -1051,7 +1217,7 @@ function createRootContext(reqContext) {
 
 var POP = {};
 
-function attemptResolveElement(type, key, ref, props) {
+function attemptResolveElement(type, key, ref, props, prevThenableState) {
   if (ref !== null && ref !== undefined) {
     // When the ref moves to the regular props object this will implicitly
     // throw for functions. We could probably relax it to a DEV warning for other
@@ -1066,6 +1232,7 @@ function attemptResolveElement(type, key, ref, props) {
     } // This is a server-side component.
 
 
+    prepareToUseHooksForComponent(prevThenableState);
     return type(props);
   } else if (typeof type === 'string') {
     // This is a host element. E.g. HTML.
@@ -1094,18 +1261,19 @@ function attemptResolveElement(type, key, ref, props) {
           var payload = type._payload;
           var init = type._init;
           var wrappedType = init(payload);
-          return attemptResolveElement(wrappedType, key, ref, props);
+          return attemptResolveElement(wrappedType, key, ref, props, prevThenableState);
         }
 
       case REACT_FORWARD_REF_TYPE:
         {
           var render = type.render;
+          prepareToUseHooksForComponent(prevThenableState);
           return render(props, undefined);
         }
 
       case REACT_MEMO_TYPE:
         {
-          return attemptResolveElement(type.type, key, ref, props);
+          return attemptResolveElement(type.type, key, ref, props, prevThenableState);
         }
 
       case REACT_PROVIDER_TYPE:
@@ -1159,7 +1327,8 @@ function createTask(request, model, context, abortSet) {
     context: context,
     ping: function () {
       return pingTask(request, task);
-    }
+    },
+    thenableState: null
   };
   abortSet.add(task);
   return task;
@@ -1426,7 +1595,7 @@ function resolveModelToJSON(request, parent, key, value) {
             // TODO: Concatenate keys of parents onto children.
             var element = value; // Attempt to render the server component.
 
-            value = attemptResolveElement(element.type, element.key, element.ref, element.props);
+            value = attemptResolveElement(element.type, element.key, element.ref, element.props, null);
             break;
           }
 
@@ -1445,6 +1614,9 @@ function resolveModelToJSON(request, parent, key, value) {
         var newTask = createTask(request, value, getActiveContext(), request.abortableTasks);
         var ping = newTask.ping;
         x.then(ping, ping);
+        var wakeable = x;
+        trackSuspendedWakeable(wakeable);
+        newTask.thenableState = getThenableStateAfterSuspending();
         return serializeByRefID(newTask.id);
       } else {
         logRecoverableError(request, x); // Something errored. We'll still send everything we have up until this point.
@@ -1625,14 +1797,29 @@ function retryTask(request, task) {
   try {
     var _value3 = task.model;
 
-    while (typeof _value3 === 'object' && _value3 !== null && _value3.$$typeof === REACT_ELEMENT_TYPE) {
+    if (typeof _value3 === 'object' && _value3 !== null && _value3.$$typeof === REACT_ELEMENT_TYPE) {
       // TODO: Concatenate keys of parents onto children.
-      var element = _value3; // Attempt to render the server component.
+      var element = _value3; // When retrying a component, reuse the thenableState from the
+      // previous attempt.
+
+      var prevThenableState = task.thenableState; // Attempt to render the server component.
       // Doing this here lets us reuse this same task if the next component
       // also suspends.
 
       task.model = _value3;
-      _value3 = attemptResolveElement(element.type, element.key, element.ref, element.props);
+      _value3 = attemptResolveElement(element.type, element.key, element.ref, element.props, prevThenableState); // Successfully finished this component. We're going to keep rendering
+      // using the same task, but we reset its thenable state before continuing.
+
+      task.thenableState = null; // Keep rendering and reuse the same task. This inner loop is separate
+      // from the render above because we don't need to reset the thenable state
+      // until the next time something suspends and retries.
+
+      while (typeof _value3 === 'object' && _value3 !== null && _value3.$$typeof === REACT_ELEMENT_TYPE) {
+        // TODO: Concatenate keys of parents onto children.
+        var nextElement = _value3;
+        task.model = _value3;
+        _value3 = attemptResolveElement(nextElement.type, nextElement.key, nextElement.ref, nextElement.props, null);
+      }
     }
 
     var processedChunk = processModelChunk(request, task.id, _value3);
@@ -1644,6 +1831,9 @@ function retryTask(request, task) {
       // Something suspended again, let's pick it back up later.
       var ping = task.ping;
       x.then(ping, ping);
+      var wakeable = x;
+      trackSuspendedWakeable(wakeable);
+      task.thenableState = getThenableStateAfterSuspending();
       return;
     } else {
       request.abortableTasks.delete(task);
@@ -1690,7 +1880,7 @@ function abortTask(task, request, errorId) {
 
   var ref = serializeByValueID(errorId);
   var processedChunk = processReferenceChunk(request, task.id, ref);
-  request.completedJSONChunks.push(processedChunk);
+  request.completedErrorChunks.push(processedChunk);
 }
 
 function flushCompletedChunks(request, destination) {
diff --git a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.production.min.server.js b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.production.min.server.js
index 95a6f04e34bb..892fa9bace9b 100644
--- a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.production.min.server.js
+++ b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack-writer.browser.production.min.server.js
@@ -7,42 +7,44 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';var e=require("react"),l=null,m=0;function n(a,c){if(0!==c.length)if(512<c.length)0<m&&(a.enqueue(new Uint8Array(l.buffer,0,m)),l=new Uint8Array(512),m=0),a.enqueue(c);else{var d=l.length-m;d<c.length&&(0===d?a.enqueue(l):(l.set(c.subarray(0,d),m),a.enqueue(l),c=c.subarray(d)),l=new Uint8Array(512),m=0);l.set(c,m);m+=c.length}return!0}var p=new TextEncoder;function q(a){return p.encode(a)}function r(a,c){"function"===typeof a.error?a.error(c):a.close()}
-var u=JSON.stringify,v=Symbol.for("react.module.reference"),w=Symbol.for("react.element"),aa=Symbol.for("react.fragment"),z=Symbol.for("react.provider"),ba=Symbol.for("react.forward_ref"),ca=Symbol.for("react.memo"),A=Symbol.for("react.lazy"),B=Symbol.for("react.default_value");function C(a,c,d,b,f,g,h){this.acceptsBooleans=2===c||3===c||4===c;this.attributeName=b;this.attributeNamespace=f;this.mustUseProperty=d;this.propertyName=a;this.type=c;this.sanitizeURL=g;this.removeEmptyString=h}var da="children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ");
-da.push("innerText","textContent");da.forEach(function(a){new C(a,0,!1,a,null,!1,!1)});[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach(function(a){new C(a[0],1,!1,a[1],null,!1,!1)});["contentEditable","draggable","spellCheck","value"].forEach(function(a){new C(a,2,!1,a.toLowerCase(),null,!1,!1)});["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach(function(a){new C(a,2,!1,a,null,!1,!1)});
-"allowFullScreen async autoFocus autoPlay controls default defer disabled disablePictureInPicture disableRemotePlayback formNoValidate hidden loop noModule noValidate open playsInline readOnly required reversed scoped seamless itemScope".split(" ").forEach(function(a){new C(a,3,!1,a.toLowerCase(),null,!1,!1)});["checked","multiple","muted","selected"].forEach(function(a){new C(a,3,!0,a,null,!1,!1)});["capture","download"].forEach(function(a){new C(a,4,!1,a,null,!1,!1)});
-["cols","rows","size","span"].forEach(function(a){new C(a,6,!1,a,null,!1,!1)});["rowSpan","start"].forEach(function(a){new C(a,5,!1,a.toLowerCase(),null,!1,!1)});var D=/[\-:]([a-z])/g;function E(a){return a[1].toUpperCase()}
-"accent-height alignment-baseline arabic-form baseline-shift cap-height clip-path clip-rule color-interpolation color-interpolation-filters color-profile color-rendering dominant-baseline enable-background fill-opacity fill-rule flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x image-rendering letter-spacing lighting-color marker-end marker-mid marker-start overline-position overline-thickness paint-order panose-1 pointer-events rendering-intent shape-rendering stop-color stop-opacity strikethrough-position strikethrough-thickness stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-anchor text-decoration text-rendering underline-position underline-thickness unicode-bidi unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical vector-effect vert-adv-y vert-origin-x vert-origin-y word-spacing writing-mode xmlns:xlink x-height".split(" ").forEach(function(a){var c=a.replace(D,
-E);new C(c,1,!1,a,null,!1,!1)});"xlink:actuate xlink:arcrole xlink:role xlink:show xlink:title xlink:type".split(" ").forEach(function(a){var c=a.replace(D,E);new C(c,1,!1,a,"http://www.w3.org/1999/xlink",!1,!1)});["xml:base","xml:lang","xml:space"].forEach(function(a){var c=a.replace(D,E);new C(c,1,!1,a,"http://www.w3.org/XML/1998/namespace",!1,!1)});["tabIndex","crossOrigin"].forEach(function(a){new C(a,1,!1,a.toLowerCase(),null,!1,!1)});
-new C("xlinkHref",1,!1,"xlink:href","http://www.w3.org/1999/xlink",!0,!1);["src","href","action","formAction"].forEach(function(a){new C(a,1,!1,a.toLowerCase(),null,!0,!0)});
-var F={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,
-fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},ea=["Webkit","ms","Moz","O"];Object.keys(F).forEach(function(a){ea.forEach(function(c){c=c+a.charAt(0).toUpperCase()+a.substring(1);F[c]=F[a]})});var fa=Array.isArray;q("<script>");q("\x3c/script>");q('<script src="');q('<script type="module" src="');q('" integrity="');q('" async="">\x3c/script>');q("\x3c!-- --\x3e");q(' style="');q(":");q(";");q(" ");q('="');q('"');
+'use strict';var e=require("react"),l=null,m=0;function n(a,c){if(0!==c.length)if(512<c.length)0<m&&(a.enqueue(new Uint8Array(l.buffer,0,m)),l=new Uint8Array(512),m=0),a.enqueue(c);else{var d=l.length-m;d<c.length&&(0===d?a.enqueue(l):(l.set(c.subarray(0,d),m),a.enqueue(l),c=c.subarray(d)),l=new Uint8Array(512),m=0);l.set(c,m);m+=c.length}return!0}var p=new TextEncoder;function q(a){return p.encode(a)}function u(a,c){"function"===typeof a.error?a.error(c):a.close()}
+var v=JSON.stringify,w=Symbol.for("react.module.reference"),x=Symbol.for("react.element"),aa=Symbol.for("react.fragment"),ba=Symbol.for("react.provider"),ca=Symbol.for("react.forward_ref"),da=Symbol.for("react.memo"),y=Symbol.for("react.lazy"),ea=Symbol.for("react.default_value");function A(a,c,d,b,f,g,h){this.acceptsBooleans=2===c||3===c||4===c;this.attributeName=b;this.attributeNamespace=f;this.mustUseProperty=d;this.propertyName=a;this.type=c;this.sanitizeURL=g;this.removeEmptyString=h}
+var fa="children dangerouslySetInnerHTML defaultValue defaultChecked innerHTML suppressContentEditableWarning suppressHydrationWarning style".split(" ");fa.push("innerText","textContent");fa.forEach(function(a){new A(a,0,!1,a,null,!1,!1)});[["acceptCharset","accept-charset"],["className","class"],["htmlFor","for"],["httpEquiv","http-equiv"]].forEach(function(a){new A(a[0],1,!1,a[1],null,!1,!1)});
+["contentEditable","draggable","spellCheck","value"].forEach(function(a){new A(a,2,!1,a.toLowerCase(),null,!1,!1)});["autoReverse","externalResourcesRequired","focusable","preserveAlpha"].forEach(function(a){new A(a,2,!1,a,null,!1,!1)});
+"allowFullScreen async autoFocus autoPlay controls default defer disabled disablePictureInPicture disableRemotePlayback formNoValidate hidden loop noModule noValidate open playsInline readOnly required reversed scoped seamless itemScope".split(" ").forEach(function(a){new A(a,3,!1,a.toLowerCase(),null,!1,!1)});["checked","multiple","muted","selected"].forEach(function(a){new A(a,3,!0,a,null,!1,!1)});["capture","download"].forEach(function(a){new A(a,4,!1,a,null,!1,!1)});
+["cols","rows","size","span"].forEach(function(a){new A(a,6,!1,a,null,!1,!1)});["rowSpan","start"].forEach(function(a){new A(a,5,!1,a.toLowerCase(),null,!1,!1)});var B=/[\-:]([a-z])/g;function C(a){return a[1].toUpperCase()}
+"accent-height alignment-baseline arabic-form baseline-shift cap-height clip-path clip-rule color-interpolation color-interpolation-filters color-profile color-rendering dominant-baseline enable-background fill-opacity fill-rule flood-color flood-opacity font-family font-size font-size-adjust font-stretch font-style font-variant font-weight glyph-name glyph-orientation-horizontal glyph-orientation-vertical horiz-adv-x horiz-origin-x image-rendering letter-spacing lighting-color marker-end marker-mid marker-start overline-position overline-thickness paint-order panose-1 pointer-events rendering-intent shape-rendering stop-color stop-opacity strikethrough-position strikethrough-thickness stroke-dasharray stroke-dashoffset stroke-linecap stroke-linejoin stroke-miterlimit stroke-opacity stroke-width text-anchor text-decoration text-rendering underline-position underline-thickness unicode-bidi unicode-range units-per-em v-alphabetic v-hanging v-ideographic v-mathematical vector-effect vert-adv-y vert-origin-x vert-origin-y word-spacing writing-mode xmlns:xlink x-height".split(" ").forEach(function(a){var c=a.replace(B,
+C);new A(c,1,!1,a,null,!1,!1)});"xlink:actuate xlink:arcrole xlink:role xlink:show xlink:title xlink:type".split(" ").forEach(function(a){var c=a.replace(B,C);new A(c,1,!1,a,"http://www.w3.org/1999/xlink",!1,!1)});["xml:base","xml:lang","xml:space"].forEach(function(a){var c=a.replace(B,C);new A(c,1,!1,a,"http://www.w3.org/XML/1998/namespace",!1,!1)});["tabIndex","crossOrigin"].forEach(function(a){new A(a,1,!1,a.toLowerCase(),null,!1,!1)});
+new A("xlinkHref",1,!1,"xlink:href","http://www.w3.org/1999/xlink",!0,!1);["src","href","action","formAction"].forEach(function(a){new A(a,1,!1,a.toLowerCase(),null,!0,!0)});
+var D={animationIterationCount:!0,aspectRatio:!0,borderImageOutset:!0,borderImageSlice:!0,borderImageWidth:!0,boxFlex:!0,boxFlexGroup:!0,boxOrdinalGroup:!0,columnCount:!0,columns:!0,flex:!0,flexGrow:!0,flexPositive:!0,flexShrink:!0,flexNegative:!0,flexOrder:!0,gridArea:!0,gridRow:!0,gridRowEnd:!0,gridRowSpan:!0,gridRowStart:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnSpan:!0,gridColumnStart:!0,fontWeight:!0,lineClamp:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,tabSize:!0,widows:!0,zIndex:!0,zoom:!0,
+fillOpacity:!0,floodOpacity:!0,stopOpacity:!0,strokeDasharray:!0,strokeDashoffset:!0,strokeMiterlimit:!0,strokeOpacity:!0,strokeWidth:!0},ha=["Webkit","ms","Moz","O"];Object.keys(D).forEach(function(a){ha.forEach(function(c){c=c+a.charAt(0).toUpperCase()+a.substring(1);D[c]=D[a]})});var ia=Array.isArray;q("<script>");q("\x3c/script>");q('<script src="');q('<script type="module" src="');q('" integrity="');q('" async="">\x3c/script>');q("\x3c!-- --\x3e");q(' style="');q(":");q(";");q(" ");q('="');q('"');
 q('=""');q(">");q("/>");q(' selected=""');q("\n");q("<!DOCTYPE html>");q("</");q(">");q('<template id="');q('"></template>');q("\x3c!--$--\x3e");q('\x3c!--$?--\x3e<template id="');q('"></template>');q("\x3c!--$!--\x3e");q("\x3c!--/$--\x3e");q("<template");q('"');q(' data-dgst="');q(' data-msg="');q(' data-stck="');q("></template>");q('<div hidden id="');q('">');q("</div>");q('<svg aria-hidden="true" style="display:none" id="');q('">');q("</svg>");q('<math aria-hidden="true" style="display:none" id="');
 q('">');q("</math>");q('<table hidden id="');q('">');q("</table>");q('<table hidden><tbody id="');q('">');q("</tbody></table>");q('<table hidden><tr id="');q('">');q("</tr></table>");q('<table hidden><colgroup id="');q('">');q("</colgroup></table>");q('function $RS(a,b){a=document.getElementById(a);b=document.getElementById(b);for(a.parentNode.removeChild(a);a.firstChild;)b.parentNode.insertBefore(a.firstChild,b);b.parentNode.removeChild(b)};$RS("');q('$RS("');q('","');q('")\x3c/script>');q('function $RC(a,b){a=document.getElementById(a);b=document.getElementById(b);b.parentNode.removeChild(b);if(a){a=a.previousSibling;var f=a.parentNode,c=a.nextSibling,e=0;do{if(c&&8===c.nodeType){var d=c.data;if("/$"===d)if(0===e)break;else e--;else"$"!==d&&"$?"!==d&&"$!"!==d||e++}d=c.nextSibling;f.removeChild(c);c=d}while(c);for(;b.firstChild;)f.insertBefore(b.firstChild,c);a.data="$";a._reactRetry&&a._reactRetry()}};$RC("');
-q('$RC("');q('","');q('")\x3c/script>');q('function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.dgst=c),d&&(a.msg=d),e&&(a.stck=e),b._reactRetry&&b._reactRetry())};$RX("');q('$RX("');q('"');q(")\x3c/script>");q(",");var H=null;
-function I(a,c){if(a!==c){a.context._currentValue=a.parentValue;a=a.parent;var d=c.parent;if(null===a){if(null!==d)throw Error("The stacks must reach the root at the same time. This is a bug in React.");}else{if(null===d)throw Error("The stacks must reach the root at the same time. This is a bug in React.");I(a,d);c.context._currentValue=c.value}}}function ha(a){a.context._currentValue=a.parentValue;a=a.parent;null!==a&&ha(a)}
-function ia(a){var c=a.parent;null!==c&&ia(c);a.context._currentValue=a.value}function ja(a,c){a.context._currentValue=a.parentValue;a=a.parent;if(null===a)throw Error("The depth must equal at least at zero before reaching the root. This is a bug in React.");a.depth===c.depth?I(a,c):ja(a,c)}
-function ka(a,c){var d=c.parent;if(null===d)throw Error("The depth must equal at least at zero before reaching the root. This is a bug in React.");a.depth===d.depth?I(a,d):ka(a,d);c.context._currentValue=c.value}function J(a){var c=H;c!==a&&(null===c?ia(a):null===a?ha(c):c.depth===a.depth?I(c,a):c.depth>a.depth?ja(c,a):ka(c,a),H=a)}function la(a,c){var d=a._currentValue;a._currentValue=c;var b=H;return H=a={parent:b,depth:null===b?0:b.depth+1,context:a,parentValue:d,value:c}}var K=null;
-function ma(a){return a._currentValue}
-var pa={useMemo:function(a){return a()},useCallback:function(a){return a},useDebugValue:function(){},useDeferredValue:L,useTransition:L,getCacheForType:function(a){if(!M)throw Error("Reading the cache is only supported while rendering.");var c=M.get(a);void 0===c&&(c=a(),M.set(a,c));return c},readContext:ma,useContext:ma,useReducer:L,useRef:L,useState:L,useInsertionEffect:L,useLayoutEffect:L,useImperativeHandle:L,useEffect:L,useId:na,useMutableSource:L,useSyncExternalStore:L,useCacheRefresh:function(){return oa},
-useMemoCache:function(a){return Array(a)}};function L(){throw Error("This Hook is not supported in Server Components.");}function oa(){if(!M)throw Error("Refreshing the cache is not supported in Server Components.");}var M=null;function na(){if(null===K)throw Error("useId can only be used while React is rendering");var a=K.identifierCount++;return":"+K.identifierPrefix+"S"+a.toString(32)+":"}var qa=e.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,N=qa.ContextRegistry,O=qa.ReactCurrentDispatcher;
-function ra(a){console.error(a)}
-function sa(a,c,d,b,f){var g=new Set,h=[],k={status:0,fatalError:null,destination:null,bundlerConfig:c,cache:new Map,nextChunkId:0,pendingChunks:0,abortableTasks:g,pingedTasks:h,completedModuleChunks:[],completedJSONChunks:[],completedErrorChunks:[],writtenSymbols:new Map,writtenModules:new Map,writtenProviders:new Map,identifierPrefix:f||"",identifierCount:1,onError:void 0===d?ra:d,toJSON:function(a,b){return ta(k,this,a,b)}};k.pendingChunks++;c=ua(b);a=va(k,a,c,g);h.push(a);return k}var wa={};
-function P(a,c,d,b){if(null!==d&&void 0!==d)throw Error("Refs cannot be used in server components, nor passed to client components.");if("function"===typeof a)return a.$$typeof===v?[w,a,c,b]:a(b);if("string"===typeof a)return[w,a,c,b];if("symbol"===typeof a)return a===aa?b.children:[w,a,c,b];if(null!=a&&"object"===typeof a){if(a.$$typeof===v)return[w,a,c,b];switch(a.$$typeof){case A:var f=a._init;a=f(a._payload);return P(a,c,d,b);case ba:return c=a.render,c(b,void 0);case ca:return P(a.type,c,d,b);
-case z:return la(a._context,b.value),[w,a,c,{value:b.value,children:b.children,__pop:wa}]}}throw Error("Unsupported server component type: "+Q(a));}function va(a,c,d,b){var f={id:a.nextChunkId++,status:0,model:c,context:d,ping:function(){var b=a.pingedTasks;b.push(f);1===b.length&&xa(a)}};b.add(f);return f}
-function ya(a,c,d,b){var f=b.filepath+"#"+b.name+(b.async?"#async":""),g=a.writtenModules,h=g.get(f);if(void 0!==h)return c[0]===w&&"1"===d?"@"+h.toString(16):"$"+h.toString(16);try{var k=a.bundlerConfig[b.filepath][b.name];var x=b.async?{id:k.id,chunks:k.chunks,name:k.name,async:!0}:k;a.pendingChunks++;var y=a.nextChunkId++,R=u(x),S="M"+y.toString(16)+":"+R+"\n";var T=p.encode(S);a.completedModuleChunks.push(T);g.set(f,y);return c[0]===w&&"1"===d?"@"+y.toString(16):"$"+y.toString(16)}catch(G){return a.pendingChunks++,
-c=a.nextChunkId++,U(a,c,G),"$"+c.toString(16)}}function za(a){return Object.prototype.toString.call(a).replace(/^\[object (.*)\]$/,function(a,d){return d})}function V(a){var c=JSON.stringify(a);return'"'+a+'"'===c?a:c}function Q(a){switch(typeof a){case "string":return JSON.stringify(10>=a.length?a:a.substr(0,10)+"...");case "object":if(fa(a))return"[...]";a=za(a);return"Object"===a?"{...}":a;case "function":return"function";default:return String(a)}}
-function W(a,c){if(fa(a)){for(var d="[",b=0;b<a.length;b++){0<b&&(d+=", ");if(6<b){d+="...";break}var f=a[b];d=""+b===c&&"object"===typeof f&&null!==f?d+W(f):d+Q(f)}return d+"]"}d="{";b=Object.keys(a);for(f=0;f<b.length;f++){0<f&&(d+=", ");if(6<f){d+="...";break}var g=b[f];d+=V(g)+": ";var h=a[g];d=g===c&&"object"===typeof h&&null!==h?d+W(h):d+Q(h)}return d+"}"}
-function ta(a,c,d,b){switch(b){case w:return"$"}for(;"object"===typeof b&&null!==b&&(b.$$typeof===w||b.$$typeof===A);)try{switch(b.$$typeof){case w:var f=b;b=P(f.type,f.key,f.ref,f.props);break;case A:var g=b._init;b=g(b._payload)}}catch(h){if("object"===typeof h&&null!==h&&"function"===typeof h.then)return a.pendingChunks++,a=va(a,b,H,a.abortableTasks),b=a.ping,h.then(b,b),"@"+a.id.toString(16);X(a,h);a.pendingChunks++;b=a.nextChunkId++;U(a,b,h);return"@"+b.toString(16)}if(null===b)return null;if("object"===
-typeof b){if(b.$$typeof===v)return ya(a,c,d,b);if(b.$$typeof===z)return f=b._context._globalName,c=a.writtenProviders,b=c.get(d),void 0===b&&(a.pendingChunks++,b=a.nextChunkId++,c.set(f,b),d="P"+b.toString(16)+":"+f+"\n",d=p.encode(d),a.completedJSONChunks.push(d)),"$"+b.toString(16);if(b===wa){a=H;if(null===a)throw Error("Tried to pop a Context at the root of the app. This is a bug in React.");b=a.parentValue;a.context._currentValue=b===B?a.context._defaultValue:b;H=a.parent;return}return b}if("string"===
-typeof b)return a="$"===b[0]||"@"===b[0]?"$"+b:b,a;if("boolean"===typeof b||"number"===typeof b||"undefined"===typeof b)return b;if("function"===typeof b){if(b.$$typeof===v)return ya(a,c,d,b);if(/^on[A-Z]/.test(d))throw Error("Event handlers cannot be passed to client component props. Remove "+(V(d)+" from these props if possible: "+W(c)+"\nIf you need interactivity, consider converting part of this to a client component."));throw Error("Functions cannot be passed directly to client components because they're not serializable. Remove "+
-(V(d)+" ("+(b.displayName||b.name||"function")+") from this object, or avoid the entire object: "+W(c)));}if("symbol"===typeof b){f=a.writtenSymbols;g=f.get(b);if(void 0!==g)return"$"+g.toString(16);g=b.description;if(Symbol.for(g)!==b)throw Error("Only global symbols received from Symbol.for(...) can be passed to client components. The symbol Symbol.for("+(b.description+") cannot be found among global symbols. Remove ")+(V(d)+" from this object, or avoid the entire object: "+W(c)));a.pendingChunks++;
-d=a.nextChunkId++;c=u(g);c="S"+d.toString(16)+":"+c+"\n";c=p.encode(c);a.completedModuleChunks.push(c);f.set(b,d);return"$"+d.toString(16)}if("bigint"===typeof b)throw Error("BigInt ("+b+") is not yet supported in client component props. Remove "+(V(d)+" from this object or use a plain number instead: "+W(c)));throw Error("Type "+typeof b+" is not supported in client component props. Remove "+(V(d)+" from this object, or avoid the entire object: "+W(c)));}function X(a,c){a=a.onError;a(c)}
-function Y(a,c){null!==a.destination?(a.status=2,r(a.destination,c)):(a.status=1,a.fatalError=c)}function U(a,c,d){var b="";try{if(d instanceof Error){var f=String(d.message);b=String(d.stack)}else f="Error: "+d}catch(g){f="An error occurred but serializing the error message failed."}d={message:f,stack:b};c="E"+c.toString(16)+":"+u(d)+"\n";c=p.encode(c);a.completedErrorChunks.push(c)}
-function xa(a){var c=O.current,d=M;O.current=pa;M=a.cache;K=a;try{var b=a.pingedTasks;a.pingedTasks=[];for(var f=0;f<b.length;f++){var g=b[f];var h=a;if(0===g.status){J(g.context);try{for(var k=g.model;"object"===typeof k&&null!==k&&k.$$typeof===w;){var x=k;g.model=k;k=P(x.type,x.key,x.ref,x.props)}var y=g.id,R=u(k,h.toJSON),S="J"+y.toString(16)+":"+R+"\n";var T=p.encode(S);h.completedJSONChunks.push(T);h.abortableTasks.delete(g);g.status=1}catch(t){if("object"===typeof t&&null!==t&&"function"===
-typeof t.then){var G=g.ping;t.then(G,G)}else h.abortableTasks.delete(g),g.status=4,X(h,t),U(h,g.id,t)}}}null!==a.destination&&Z(a,a.destination)}catch(t){X(a,t),Y(a,t)}finally{O.current=c,M=d,K=null}}
+q('$RC("');q('","');q('")\x3c/script>');q('function $RX(b,c,d,e){var a=document.getElementById(b);a&&(b=a.previousSibling,b.data="$!",a=a.dataset,c&&(a.dgst=c),d&&(a.msg=d),e&&(a.stck=e),b._reactRetry&&b._reactRetry())};$RX("');q('$RX("');q('"');q(")\x3c/script>");q(",");var E=null;
+function F(a,c){if(a!==c){a.context._currentValue=a.parentValue;a=a.parent;var d=c.parent;if(null===a){if(null!==d)throw Error("The stacks must reach the root at the same time. This is a bug in React.");}else{if(null===d)throw Error("The stacks must reach the root at the same time. This is a bug in React.");F(a,d);c.context._currentValue=c.value}}}function ja(a){a.context._currentValue=a.parentValue;a=a.parent;null!==a&&ja(a)}
+function ka(a){var c=a.parent;null!==c&&ka(c);a.context._currentValue=a.value}function la(a,c){a.context._currentValue=a.parentValue;a=a.parent;if(null===a)throw Error("The depth must equal at least at zero before reaching the root. This is a bug in React.");a.depth===c.depth?F(a,c):la(a,c)}
+function ma(a,c){var d=c.parent;if(null===d)throw Error("The depth must equal at least at zero before reaching the root. This is a bug in React.");a.depth===d.depth?F(a,d):ma(a,d);c.context._currentValue=c.value}function G(a){var c=E;c!==a&&(null===c?ka(a):null===a?ja(c):c.depth===a.depth?F(c,a):c.depth>a.depth?la(c,a):ma(c,a),E=a)}function na(a,c){var d=a._currentValue;a._currentValue=c;var b=E;return E=a={parent:b,depth:null===b?0:b.depth+1,context:a,parentValue:d,value:c}}
+function oa(a){switch(a.status){case "pending":break;case "fulfilled":case "rejected":break;default:a.status="pending",a.then(function(c){"pending"===a.status&&(a.status="fulfilled",a.value=c)},function(c){"pending"===a.status&&(a.status="rejected",a.reason=c)})}}var H=null,I=0,J=null;function pa(a){return a._currentValue}
+var ua={useMemo:function(a){return a()},useCallback:function(a){return a},useDebugValue:function(){},useDeferredValue:K,useTransition:K,getCacheForType:function(a){if(!L)throw Error("Reading the cache is only supported while rendering.");var c=L.get(a);void 0===c&&(c=a(),L.set(a,c));return c},readContext:pa,useContext:pa,useReducer:K,useRef:K,useState:K,useInsertionEffect:K,useLayoutEffect:K,useImperativeHandle:K,useEffect:K,useId:qa,useMutableSource:K,useSyncExternalStore:K,useCacheRefresh:function(){return sa},
+useMemoCache:function(a){return Array(a)},use:ta};function K(){throw Error("This Hook is not supported in Server Components.");}function sa(){if(!L)throw Error("Refreshing the cache is not supported in Server Components.");}var L=null;function qa(){if(null===H)throw Error("useId can only be used while React is rendering");var a=H.identifierCount++;return":"+H.identifierPrefix+"S"+a.toString(32)+":"}
+function ta(a){if(null!==a&&"object"===typeof a&&"function"===typeof a.then){var c=I;I+=1;switch(a.status){case "fulfilled":return a.value;case "rejected":throw a.reason;default:a:{if(null!==J){var d=J[c];if(void 0!==d)break a}d=null}if(null!==d)switch(d.status){case "fulfilled":return d.value;case "rejected":throw d.reason;default:throw d;}else throw null===J&&(J=[]),J[c]=a,a;}}throw Error("An unsupported type was passed to use(): "+String(a));}
+var va=e.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,M=va.ContextRegistry,N=va.ReactCurrentDispatcher;function wa(a){console.error(a)}
+function xa(a,c,d,b,f){var g=new Set,h=[],k={status:0,fatalError:null,destination:null,bundlerConfig:c,cache:new Map,nextChunkId:0,pendingChunks:0,abortableTasks:g,pingedTasks:h,completedModuleChunks:[],completedJSONChunks:[],completedErrorChunks:[],writtenSymbols:new Map,writtenModules:new Map,writtenProviders:new Map,identifierPrefix:f||"",identifierCount:1,onError:void 0===d?wa:d,toJSON:function(a,b){return ya(k,this,a,b)}};k.pendingChunks++;c=za(b);a=Aa(k,a,c,g);h.push(a);return k}var Ba={};
+function O(a,c,d,b,f){if(null!==d&&void 0!==d)throw Error("Refs cannot be used in server components, nor passed to client components.");if("function"===typeof a){if(a.$$typeof===w)return[x,a,c,b];I=0;J=f;return a(b)}if("string"===typeof a)return[x,a,c,b];if("symbol"===typeof a)return a===aa?b.children:[x,a,c,b];if(null!=a&&"object"===typeof a){if(a.$$typeof===w)return[x,a,c,b];switch(a.$$typeof){case y:var g=a._init;a=g(a._payload);return O(a,c,d,b,f);case ca:return c=a.render,I=0,J=f,c(b,void 0);
+case da:return O(a.type,c,d,b,f);case ba:return na(a._context,b.value),[x,a,c,{value:b.value,children:b.children,__pop:Ba}]}}throw Error("Unsupported server component type: "+P(a));}function Aa(a,c,d,b){var f={id:a.nextChunkId++,status:0,model:c,context:d,ping:function(){var b=a.pingedTasks;b.push(f);1===b.length&&Ca(a)},thenableState:null};b.add(f);return f}
+function Da(a,c,d,b){var f=b.filepath+"#"+b.name+(b.async?"#async":""),g=a.writtenModules,h=g.get(f);if(void 0!==h)return c[0]===x&&"1"===d?"@"+h.toString(16):"$"+h.toString(16);try{var k=a.bundlerConfig[b.filepath][b.name];var r=b.async?{id:k.id,chunks:k.chunks,name:k.name,async:!0}:k;a.pendingChunks++;var z=a.nextChunkId++,S=v(r),T="M"+z.toString(16)+":"+S+"\n";var U=p.encode(T);a.completedModuleChunks.push(U);g.set(f,z);return c[0]===x&&"1"===d?"@"+z.toString(16):"$"+z.toString(16)}catch(V){return a.pendingChunks++,
+c=a.nextChunkId++,Q(a,c,V),"$"+c.toString(16)}}function Ea(a){return Object.prototype.toString.call(a).replace(/^\[object (.*)\]$/,function(a,d){return d})}function R(a){var c=JSON.stringify(a);return'"'+a+'"'===c?a:c}function P(a){switch(typeof a){case "string":return JSON.stringify(10>=a.length?a:a.substr(0,10)+"...");case "object":if(ia(a))return"[...]";a=Ea(a);return"Object"===a?"{...}":a;case "function":return"function";default:return String(a)}}
+function W(a,c){if(ia(a)){for(var d="[",b=0;b<a.length;b++){0<b&&(d+=", ");if(6<b){d+="...";break}var f=a[b];d=""+b===c&&"object"===typeof f&&null!==f?d+W(f):d+P(f)}return d+"]"}d="{";b=Object.keys(a);for(f=0;f<b.length;f++){0<f&&(d+=", ");if(6<f){d+="...";break}var g=b[f];d+=R(g)+": ";var h=a[g];d=g===c&&"object"===typeof h&&null!==h?d+W(h):d+P(h)}return d+"}"}
+function ya(a,c,d,b){switch(b){case x:return"$"}for(;"object"===typeof b&&null!==b&&(b.$$typeof===x||b.$$typeof===y);)try{switch(b.$$typeof){case x:var f=b;b=O(f.type,f.key,f.ref,f.props,null);break;case y:var g=b._init;b=g(b._payload)}}catch(h){if("object"===typeof h&&null!==h&&"function"===typeof h.then)return a.pendingChunks++,a=Aa(a,b,E,a.abortableTasks),b=a.ping,h.then(b,b),oa(h),a.thenableState=J,"@"+a.id.toString(16);X(a,h);a.pendingChunks++;b=a.nextChunkId++;Q(a,b,h);return"@"+b.toString(16)}if(null===
+b)return null;if("object"===typeof b){if(b.$$typeof===w)return Da(a,c,d,b);if(b.$$typeof===ba)return f=b._context._globalName,c=a.writtenProviders,b=c.get(d),void 0===b&&(a.pendingChunks++,b=a.nextChunkId++,c.set(f,b),d="P"+b.toString(16)+":"+f+"\n",d=p.encode(d),a.completedJSONChunks.push(d)),"$"+b.toString(16);if(b===Ba){a=E;if(null===a)throw Error("Tried to pop a Context at the root of the app. This is a bug in React.");b=a.parentValue;a.context._currentValue=b===ea?a.context._defaultValue:b;E=
+a.parent;return}return b}if("string"===typeof b)return a="$"===b[0]||"@"===b[0]?"$"+b:b,a;if("boolean"===typeof b||"number"===typeof b||"undefined"===typeof b)return b;if("function"===typeof b){if(b.$$typeof===w)return Da(a,c,d,b);if(/^on[A-Z]/.test(d))throw Error("Event handlers cannot be passed to client component props. Remove "+(R(d)+" from these props if possible: "+W(c)+"\nIf you need interactivity, consider converting part of this to a client component."));throw Error("Functions cannot be passed directly to client components because they're not serializable. Remove "+
+(R(d)+" ("+(b.displayName||b.name||"function")+") from this object, or avoid the entire object: "+W(c)));}if("symbol"===typeof b){f=a.writtenSymbols;g=f.get(b);if(void 0!==g)return"$"+g.toString(16);g=b.description;if(Symbol.for(g)!==b)throw Error("Only global symbols received from Symbol.for(...) can be passed to client components. The symbol Symbol.for("+(b.description+") cannot be found among global symbols. Remove ")+(R(d)+" from this object, or avoid the entire object: "+W(c)));a.pendingChunks++;
+d=a.nextChunkId++;c=v(g);c="S"+d.toString(16)+":"+c+"\n";c=p.encode(c);a.completedModuleChunks.push(c);f.set(b,d);return"$"+d.toString(16)}if("bigint"===typeof b)throw Error("BigInt ("+b+") is not yet supported in client component props. Remove "+(R(d)+" from this object or use a plain number instead: "+W(c)));throw Error("Type "+typeof b+" is not supported in client component props. Remove "+(R(d)+" from this object, or avoid the entire object: "+W(c)));}function X(a,c){a=a.onError;a(c)}
+function Y(a,c){null!==a.destination?(a.status=2,u(a.destination,c)):(a.status=1,a.fatalError=c)}function Q(a,c,d){var b="";try{if(d instanceof Error){var f=String(d.message);b=String(d.stack)}else f="Error: "+d}catch(g){f="An error occurred but serializing the error message failed."}d={message:f,stack:b};c="E"+c.toString(16)+":"+v(d)+"\n";c=p.encode(c);a.completedErrorChunks.push(c)}
+function Ca(a){var c=N.current,d=L;N.current=ua;L=a.cache;H=a;try{var b=a.pingedTasks;a.pingedTasks=[];for(var f=0;f<b.length;f++){var g=b[f];var h=a;if(0===g.status){G(g.context);try{var k=g.model;if("object"===typeof k&&null!==k&&k.$$typeof===x){var r=k,z=g.thenableState;g.model=k;k=O(r.type,r.key,r.ref,r.props,z);for(g.thenableState=null;"object"===typeof k&&null!==k&&k.$$typeof===x;)r=k,g.model=k,k=O(r.type,r.key,r.ref,r.props,null)}var S=g.id,T=v(k,h.toJSON),U="J"+S.toString(16)+":"+T+"\n";var V=
+p.encode(U);h.completedJSONChunks.push(V);h.abortableTasks.delete(g);g.status=1}catch(t){if("object"===typeof t&&null!==t&&"function"===typeof t.then){var ra=g.ping;t.then(ra,ra);oa(t);g.thenableState=J}else h.abortableTasks.delete(g),g.status=4,X(h,t),Q(h,g.id,t)}}}null!==a.destination&&Z(a,a.destination)}catch(t){X(a,t),Y(a,t)}finally{N.current=c,L=d,H=null}}
 function Z(a,c){l=new Uint8Array(512);m=0;try{for(var d=a.completedModuleChunks,b=0;b<d.length;b++)if(a.pendingChunks--,!n(c,d[b])){a.destination=null;b++;break}d.splice(0,b);var f=a.completedJSONChunks;for(b=0;b<f.length;b++)if(a.pendingChunks--,!n(c,f[b])){a.destination=null;b++;break}f.splice(0,b);var g=a.completedErrorChunks;for(b=0;b<g.length;b++)if(a.pendingChunks--,!n(c,g[b])){a.destination=null;b++;break}g.splice(0,b)}finally{l&&0<m&&(c.enqueue(new Uint8Array(l.buffer,0,m)),l=null,m=0)}0===
-a.pendingChunks&&c.close()}function Aa(a,c){try{var d=a.abortableTasks;if(0<d.size){var b=void 0===c?Error("The render was aborted by the server without a reason."):c;X(a,b);a.pendingChunks++;var f=a.nextChunkId++;U(a,f,b);d.forEach(function(b){b.status=3;var c="$"+f.toString(16);b=b.id;c=u(c);c="J"+b.toString(16)+":"+c+"\n";c=p.encode(c);a.completedJSONChunks.push(c)});d.clear()}null!==a.destination&&Z(a,a.destination)}catch(g){X(a,g),Y(a,g)}}
-function ua(a){if(a){var c=H;J(null);for(var d=0;d<a.length;d++){var b=a[d],f=b[0];b=b[1];N[f]||(N[f]=e.createServerContext(f,B));la(N[f],b)}a=H;J(c);return a}return null}
-exports.renderToReadableStream=function(a,c,d){var b=sa(a,c,d?d.onError:void 0,d?d.context:void 0,d?d.identifierPrefix:void 0);if(d&&d.signal){var f=d.signal;if(f.aborted)Aa(b,f.reason);else{var g=function(){Aa(b,f.reason);f.removeEventListener("abort",g)};f.addEventListener("abort",g)}}return new ReadableStream({type:"bytes",start:function(){xa(b)},pull:function(a){if(1===b.status)b.status=2,r(a,b.fatalError);else if(2!==b.status&&null===b.destination){b.destination=a;try{Z(b,a)}catch(k){X(b,k),
+a.pendingChunks&&c.close()}function Fa(a,c){try{var d=a.abortableTasks;if(0<d.size){var b=void 0===c?Error("The render was aborted by the server without a reason."):c;X(a,b);a.pendingChunks++;var f=a.nextChunkId++;Q(a,f,b);d.forEach(function(b){b.status=3;var c="$"+f.toString(16);b=b.id;c=v(c);c="J"+b.toString(16)+":"+c+"\n";c=p.encode(c);a.completedErrorChunks.push(c)});d.clear()}null!==a.destination&&Z(a,a.destination)}catch(g){X(a,g),Y(a,g)}}
+function za(a){if(a){var c=E;G(null);for(var d=0;d<a.length;d++){var b=a[d],f=b[0];b=b[1];M[f]||(M[f]=e.createServerContext(f,ea));na(M[f],b)}a=E;G(c);return a}return null}
+exports.renderToReadableStream=function(a,c,d){var b=xa(a,c,d?d.onError:void 0,d?d.context:void 0,d?d.identifierPrefix:void 0);if(d&&d.signal){var f=d.signal;if(f.aborted)Fa(b,f.reason);else{var g=function(){Fa(b,f.reason);f.removeEventListener("abort",g)};f.addEventListener("abort",g)}}return new ReadableStream({type:"bytes",start:function(){Ca(b)},pull:function(a){if(1===b.status)b.status=2,u(a,b.fatalError);else if(2!==b.status&&null===b.destination){b.destination=a;try{Z(b,a)}catch(k){X(b,k),
 Y(b,k)}}},cancel:function(){}},{highWaterMark:0})};
diff --git a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.development.js b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.development.js
index 2c7bd8674846..d66fbcb2eee9 100644
--- a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.development.js
+++ b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.development.js
@@ -384,6 +384,11 @@ function parseModelString(response, parentObject, value) {
         } else {
           var id = parseInt(value.substring(1), 16);
           var chunk = getChunk(response, id);
+
+          if (chunk._status === PENDING) {
+            throw new Error("We didn't expect to see a forward reference. This is a bug in the React Server.");
+          }
+
           return readChunk(chunk);
         }
       }
@@ -606,14 +611,14 @@ function startReadingFromStream(response, stream) {
 
     var buffer = value;
     processBinaryChunk(response, buffer);
-    return reader.read().then(progress, error);
+    return reader.read().then(progress).catch(error);
   }
 
   function error(e) {
     reportGlobalError(response, e);
   }
 
-  reader.read().then(progress, error);
+  reader.read().then(progress).catch(error);
 }
 
 function createFromReadableStream(stream, options) {
diff --git a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.production.min.js b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.production.min.js
index 235527efebc6..ad576fe6be77 100644
--- a/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.production.min.js
+++ b/packages/next/compiled/react-server-dom-webpack/cjs/react-server-dom-webpack.production.min.js
@@ -11,10 +11,10 @@
 var r=Symbol.for("react.element"),t=Symbol.for("react.lazy"),u=Symbol.for("react.default_value"),v=h.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ContextRegistry;function w(a){v[a]||(v[a]=h.createServerContext(a,u));return v[a]}function x(a,b,c){this._status=a;this._value=b;this._response=c}x.prototype.then=function(a){0===this._status?(null===this._value&&(this._value=[]),this._value.push(a)):a()};
 function y(a){switch(a._status){case 3:return a._value;case 1:var b=JSON.parse(a._value,a._response._fromJSON);a._status=3;return a._value=b;case 2:b=a._value;if(b.async){var c=p.get(b.id);if("fulfilled"===c.status)c=c.value;else{if("rejected"===c.status)throw c.reason;throw c;}}else{c=b.chunks;for(var d=0;d<c.length;d++){var e=m.get(c[d]);if(null!==e)throw e;}c=globalThis.__next_require__(b.id)}b="*"===b.name?c:""===b.name?c.__esModule?c.default:c:c[b.name];a._status=3;return a._value=b;case 0:throw a;default:throw a._value;
 }}function z(){var a=A(this,0);return y(a)}function B(a,b){return new x(3,b,a)}function C(a){if(null!==a)for(var b=0;b<a.length;b++)(0,a[b])()}function D(a,b){if(0===a._status){var c=a._value;a._status=4;a._value=b;C(c)}}function E(a,b){a._chunks.forEach(function(a){D(a,b)})}function A(a,b){var c=a._chunks,d=c.get(b);d||(d=new x(0,null,a),c.set(b,d));return d}
-function G(a,b,c){switch(c[0]){case "$":if("$"===c)return r;if("$"===c[1]||"@"===c[1])return c.substring(1);b=parseInt(c.substring(1),16);a=A(a,b);return y(a);case "@":return b=parseInt(c.substring(1),16),a=A(a,b),{$$typeof:t,_payload:a,_init:y}}return c}function H(a){E(a,Error("Connection closed."))}
+function G(a,b,c){switch(c[0]){case "$":if("$"===c)return r;if("$"===c[1]||"@"===c[1])return c.substring(1);b=parseInt(c.substring(1),16);a=A(a,b);if(0===a._status)throw Error("We didn't expect to see a forward reference. This is a bug in the React Server.");return y(a);case "@":return b=parseInt(c.substring(1),16),a=A(a,b),{$$typeof:t,_payload:a,_init:y}}return c}function H(a){E(a,Error("Connection closed."))}
 function I(a,b){if(""!==b){var c=b[0],d=b.indexOf(":",1),e=parseInt(b.substring(1,d),16);d=b.substring(d+1);switch(c){case "J":b=a._chunks;(c=b.get(e))?0===c._status&&(a=c._value,c._status=1,c._value=d,C(a)):b.set(e,new x(1,d,a));break;case "M":b=a._chunks;c=b.get(e);d=JSON.parse(d,a._fromJSON);var f=a._bundlerConfig;f&&(f=f[d.id][d.name],d=d.async?{id:f.id,chunks:f.chunks,name:f.name,async:!0}:f);q(d);c?0===c._status&&(a=c._value,c._status=2,c._value=d,C(a)):b.set(e,new x(2,d,a));break;case "P":a._chunks.set(e,
 B(a,w(d).Provider));break;case "S":c=JSON.parse(d);a._chunks.set(e,B(a,Symbol.for(c)));break;case "E":b=JSON.parse(d);c=Error(b.message);c.stack=b.stack;b=a._chunks;(d=b.get(e))?D(d,c):b.set(e,new x(4,c,a));break;default:throw Error("Error parsing the data. It's probably an error code or network corruption.");}}}
 function J(a){return function(b,c){return"string"===typeof c?G(a,this,c):"object"===typeof c&&null!==c?(b=c[0]===r?{$$typeof:r,type:c[1],key:c[2],ref:null,props:c[3],_owner:null}:c,b):c}}function K(a){var b=new TextDecoder,c=new Map;a={_bundlerConfig:a,_chunks:c,readRoot:z,_partialRow:"",_stringDecoder:b};a._fromJSON=J(a);return a}
-function L(a,b){function c(b){var f=b.value;if(b.done)H(a);else{b=f;f=a._stringDecoder;for(var k=b.indexOf(10);-1<k;){var g=a._partialRow;var n=b.subarray(0,k);n=f.decode(n);I(a,g+n);a._partialRow="";b=b.subarray(k+1);k=b.indexOf(10)}a._partialRow+=f.decode(b,l);return e.read().then(c,d)}}function d(b){E(a,b)}var e=b.getReader();e.read().then(c,d)}exports.createFromFetch=function(a,b){var c=K(b&&b.moduleMap?b.moduleMap:null);a.then(function(a){L(c,a.body)},function(a){E(c,a)});return c};
+function L(a,b){function c(b){var f=b.value;if(b.done)H(a);else{b=f;f=a._stringDecoder;for(var k=b.indexOf(10);-1<k;){var g=a._partialRow;var n=b.subarray(0,k);n=f.decode(n);I(a,g+n);a._partialRow="";b=b.subarray(k+1);k=b.indexOf(10)}a._partialRow+=f.decode(b,l);return e.read().then(c).catch(d)}}function d(b){E(a,b)}var e=b.getReader();e.read().then(c).catch(d)}exports.createFromFetch=function(a,b){var c=K(b&&b.moduleMap?b.moduleMap:null);a.then(function(a){L(c,a.body)},function(a){E(c,a)});return c};
 exports.createFromReadableStream=function(a,b){b=K(b&&b.moduleMap?b.moduleMap:null);L(b,a);return b};
 exports.createFromXHR=function(a,b){function c(){for(var b=a.responseText,c=f,d=b.indexOf("\n",c);-1<d;)c=e._partialRow+b.substring(c,d),I(e,c),e._partialRow="",c=d+1,d=b.indexOf("\n",c);e._partialRow+=b.substring(c);f=b.length}function d(){E(e,new TypeError("Network error"))}var e=K(b&&b.moduleMap?b.moduleMap:null),f=0;a.addEventListener("progress",c);a.addEventListener("load",function(){c();H(e)});a.addEventListener("error",d);a.addEventListener("abort",d);a.addEventListener("timeout",d);return e};
diff --git a/packages/next/package.json b/packages/next/package.json
index 310749e59a4a..86af955b4779 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -244,7 +244,7 @@
     "raw-body": "2.4.1",
     "react-is": "17.0.2",
     "react-refresh": "0.12.0",
-    "react-server-dom-webpack": "0.0.0-experimental-0de3ddf56-20220825",
+    "react-server-dom-webpack": "0.0.0-experimental-7028ce745-20220907",
     "regenerator-runtime": "0.13.4",
     "sass-loader": "12.4.0",
     "schema-utils2": "npm:schema-utils@2.7.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 268f116d32d9..94d2c42e8c53 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -139,8 +139,8 @@ importers:
       react-17: npm:react@17.0.2
       react-dom: 18.2.0
       react-dom-17: npm:react-dom@17.0.2
-      react-dom-exp: npm:react-dom@0.0.0-experimental-0de3ddf56-20220825
-      react-exp: npm:react@0.0.0-experimental-0de3ddf56-20220825
+      react-dom-exp: npm:react-dom@0.0.0-experimental-7028ce745-20220907
+      react-exp: npm:react@0.0.0-experimental-7028ce745-20220907
       react-ssr-prepass: 1.0.8
       react-virtualized: 9.22.3
       relay-compiler: 13.0.2
@@ -293,8 +293,8 @@ importers:
       react-17: /react/17.0.2
       react-dom: 18.2.0_react@18.2.0
       react-dom-17: /react-dom/17.0.2_react@18.2.0
-      react-dom-exp: /react-dom/0.0.0-experimental-0de3ddf56-20220825_react@18.2.0
-      react-exp: /react/0.0.0-experimental-0de3ddf56-20220825
+      react-dom-exp: /react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0
+      react-exp: /react/0.0.0-experimental-7028ce745-20220907
       react-ssr-prepass: 1.0.8_qncsgtzehe3fgiqp6tr7lwq6fm
       react-virtualized: 9.22.3_biqbaboplfbrettd7655fr4n2y
       relay-compiler: 13.0.2
@@ -546,7 +546,7 @@ importers:
       raw-body: 2.4.1
       react-is: 17.0.2
       react-refresh: 0.12.0
-      react-server-dom-webpack: 0.0.0-experimental-0de3ddf56-20220825
+      react-server-dom-webpack: 0.0.0-experimental-7028ce745-20220907
       regenerator-runtime: 0.13.4
       sass-loader: 12.4.0
       schema-utils2: npm:schema-utils@2.7.1
@@ -735,7 +735,7 @@ importers:
       raw-body: 2.4.1
       react-is: 17.0.2
       react-refresh: 0.12.0
-      react-server-dom-webpack: 0.0.0-experimental-0de3ddf56-20220825_webpack@5.74.0
+      react-server-dom-webpack: 0.0.0-experimental-7028ce745-20220907_webpack@5.74.0
       regenerator-runtime: 0.13.4
       sass-loader: 12.4.0_webpack@5.74.0
       schema-utils2: /schema-utils/2.7.1
@@ -24206,17 +24206,17 @@ packages:
       strip-json-comments: 2.0.1
     dev: true
 
-  /react-dom/0.0.0-experimental-0de3ddf56-20220825_react@18.2.0:
+  /react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0:
     resolution:
       {
-        integrity: sha512-d2pS60dObYaVw4cybVNlQ7JL+Mkpz6MVZo35KgsUzU4IUUywxrc09JJivOGiOyJTwTShITAgOvn/c/LZjlTpcg==,
+        integrity: sha512-vNt0UKStPB47hPjpk6I1JEnxjl3vb0VItCtpZolzcNtYlMyfDmZFInh6IGiMtfBpm6Fp1LCztfopAnuiYoEb3Q==,
       }
     peerDependencies:
-      react: 0.0.0-experimental-0de3ddf56-20220825
+      react: 0.0.0-experimental-7028ce745-20220907
     dependencies:
       loose-envify: 1.4.0
       react: 18.2.0
-      scheduler: 0.0.0-experimental-0de3ddf56-20220825
+      scheduler: 0.0.0-experimental-7028ce745-20220907
     dev: true
 
   /react-dom/17.0.2_react@18.2.0:
@@ -24281,14 +24281,14 @@ packages:
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /react-server-dom-webpack/0.0.0-experimental-0de3ddf56-20220825_webpack@5.74.0:
+  /react-server-dom-webpack/0.0.0-experimental-7028ce745-20220907_webpack@5.74.0:
     resolution:
       {
-        integrity: sha512-mowgFHsHjlGnL2YcedTXQMXmJaP3tKPjXjY3tyZVRVH7AaLRa+SMPEjx5GFCzz1nn6W0x/NQlCvqxV+F35nytg==,
+        integrity: sha512-DqVpIa9DdgQNre2urGq5brXRrgtd6jqCUO4Ax5yBAHvmWW5L2XkU3jI+YCMMZdxVwcP+NIJoB9mkIsFyIo8NAQ==,
       }
     engines: { node: '>=0.10.0' }
     peerDependencies:
-      react: 0.0.0-experimental-0de3ddf56-20220825
+      react: 0.0.0-experimental-7028ce745-20220907
       webpack: ^5.59.0
     dependencies:
       acorn: 6.4.2
@@ -24330,10 +24330,10 @@ packages:
       react-lifecycles-compat: 3.0.4
     dev: true
 
-  /react/0.0.0-experimental-0de3ddf56-20220825:
+  /react/0.0.0-experimental-7028ce745-20220907:
     resolution:
       {
-        integrity: sha512-4KH+Ylv+P0SsKAjjpGALztqHBkqoh01GFh8hJkCAPJ7fAx6yLDY7i4XeoDutqo6okWnJncq7ixUoyru4hXFn4A==,
+        integrity: sha512-GJkc7NNWnUV7imij/n8YxJTQEY+OsE8qSmHB4esfFV/Gdi5zFOtzXr9LEB8CItAIoIpZ0eK1LXcOAO3cenDzLQ==,
       }
     engines: { node: '>=0.10.0' }
     dependencies:
@@ -25663,10 +25663,10 @@ packages:
       xmlchars: 2.2.0
     dev: true
 
-  /scheduler/0.0.0-experimental-0de3ddf56-20220825:
+  /scheduler/0.0.0-experimental-7028ce745-20220907:
     resolution:
       {
-        integrity: sha512-cMaG6fmnYZvH2C5LuMGw//oHBskpicjdJ+GbLs7nAQLiuYl6sXzmqQeGgDLJvd76hcBz2aK2tEKZMHrmwuWVcA==,
+        integrity: sha512-vmk4QI8sXQYFk7rtB9omwlsyNOhdsai4BKvud+XE+CfZuI5iTV+Nzj2EQq19PcfS7cmf1UOQ83wgv4yGgsefUQ==,
       }
     dependencies:
       loose-envify: 1.4.0

From a24872b4ab692137ecb815062ff15b3c2b4f9667 Mon Sep 17 00:00:00 2001
From: Shu Ding <g@shud.in>
Date: Thu, 8 Sep 2022 21:09:33 +0200
Subject: [PATCH 27/69] Fix flight manifest to include all chunks (#40365)

When a client module is imported by both a module from an `app` entry and a module from `pages` entry, it is possible that it is included in the `pages` chunk eventually. The current check makes the manifest incomplete in that case.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 .../next/build/webpack/plugins/flight-manifest-plugin.ts    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
index d300c27d7209..a7c32f98293f 100644
--- a/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
+++ b/packages/next/build/webpack/plugins/flight-manifest-plugin.ts
@@ -121,12 +121,6 @@ export class FlightManifestPlugin {
         id: ModuleId,
         mod: webpack.NormalModule
       ) {
-        // if appDir is enabled we shouldn't process chunks from
-        // the pages dir
-        if (chunk.name?.startsWith('pages/') && appDir) {
-          return
-        }
-
         const isCSSModule =
           mod.type === 'css/mini-extract' ||
           (mod.loaders &&

From ea33b84089c0570b7ae34bae3d9c47ab7612b596 Mon Sep 17 00:00:00 2001
From: Jasham <jasham009@gmail.com>
Date: Fri, 9 Sep 2022 02:08:26 +0530
Subject: [PATCH 28/69] docs: fix typos (#40342)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 docs/going-to-production.md |  6 +++---
 docs/testing.md             |  8 ++++----
 docs/upgrading.md           | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/docs/going-to-production.md b/docs/going-to-production.md
index 78ad8d33fe8b..53d3f39d4a6a 100644
--- a/docs/going-to-production.md
+++ b/docs/going-to-production.md
@@ -72,7 +72,7 @@ export async function getServerSideProps({ req, res }) {
 By default, `Cache-Control` headers will be set differently depending on how your page fetches data.
 
 - If the page uses `getServerSideProps` or `getInitialProps`, it will use the default `Cache-Control` header set by `next start` in order to prevent accidental caching of responses that cannot be cached. If you want a different cache behavior while using `getServerSideProps`, use `res.setHeader('Cache-Control', 'value_you_prefer')` inside of the function as shown above.
-- If the page is using `getStaticProps`, it will have a `Cache-Control` header of `s-maxage=REVALIDATE_SECONDS, stale-while-revalidate`, or if `revalidate` is _not_ used , `s-maxage=31536000, stale-while-revalidate` to cache for the maximum age possible.
+- If the page is using `getStaticProps`, it will have a `Cache-Control` header of `s-maxage=REVALIDATE_SECONDS, stale-while-revalidate`, or if `revalidate` is _not_ used, `s-maxage=31536000, stale-while-revalidate` to cache for the maximum age possible.
 
 > **Note:** Your deployment provider must support caching for dynamic responses. If you are self-hosting, you will need to add this logic yourself using a key/value store like Redis. If you are using Vercel, [Edge Caching works without configuration](https://vercel.com/docs/edge-network/caching?utm_source=next-site&utm_medium=docs&utm_campaign=next-website).
 
@@ -90,7 +90,7 @@ To reduce the amount of JavaScript sent to the browser, you can use the followin
 - [Import Cost](https://marketplace.visualstudio.com/items?itemName=wix.vscode-import-cost) – Display the size of the imported package inside VSCode.
 - [Package Phobia](https://packagephobia.com/) – Find the cost of adding a new dev dependency to your project.
 - [Bundle Phobia](https://bundlephobia.com/) - Analyze how much a dependency can increase bundle sizes.
-- [Webpack Bundle Analyzer](https://github.com/vercel/next.js/tree/canary/packages/next-bundle-analyzer) – Visualize size of webpack output files with an interactive, zoomable treemap.
+- [Webpack Bundle Analyzer](https://github.com/vercel/next.js/tree/canary/packages/next-bundle-analyzer) – Visualize the size of webpack output files with an interactive, zoomable treemap.
 - [bundlejs](https://bundlejs.com/) - An online tool to quickly bundle & minify your projects, while viewing the compressed gzip/brotli bundle size, all running locally on your browser.
 
 Each file inside your `pages/` directory will automatically be code split into its own JavaScript bundle during `next build`. You can also use [Dynamic Imports](/docs/advanced-features/dynamic-import.md) to lazy-load components and libraries. For example, you might want to defer loading your modal code until a user clicks the open button.
@@ -142,7 +142,7 @@ Once you are able to measure the loading performance, use the following strategi
   - Setting up your Code Editor to view import costs and sizes
   - Finding alternative smaller packages
   - Dynamically loading components and dependencies
-  - For more in depth information, review this [guide](https://papyrus.dev/@PapyrusBlog/how-we-reduced-next.js-page-size-by-3.5x-and-achieved-a-98-lighthouse-score) and this [performance checklist](https://dev.to/endymion1818/nextjs-performance-checklist-5gjb).
+  - For more in-depth information, review this [guide](https://papyrus.dev/@PapyrusBlog/how-we-reduced-next.js-page-size-by-3.5x-and-achieved-a-98-lighthouse-score) and this [performance checklist](https://dev.to/endymion1818/nextjs-performance-checklist-5gjb).
 
 ## Related
 
diff --git a/docs/testing.md b/docs/testing.md
index e3504d418de3..c8ad384536ee 100644
--- a/docs/testing.md
+++ b/docs/testing.md
@@ -145,7 +145,7 @@ Playwright is a testing framework that lets you automate Chromium, Firefox, and
 
 ### Quickstart
 
-The fastest way to get started, is to use `create-next-app` with the [with-playwright example](https://github.com/vercel/next.js/tree/canary/examples/with-playwright). This will create a Next.js project complete with Playwright all set up.
+The fastest way to get started is to use `create-next-app` with the [with-playwright example](https://github.com/vercel/next.js/tree/canary/examples/with-playwright). This will create a Next.js project complete with Playwright all set up.
 
 ```bash
 npx create-next-app@latest --example with-playwright with-playwright-app
@@ -214,7 +214,7 @@ test('should navigate to the about page', async ({ page }) => {
   await page.goto('http://localhost:3000/')
   // Find an element with the text 'About Page' and click on it
   await page.click('text=About')
-  // The new url should be "/about" (baseURL is used there)
+  // The new URL should be "/about" (baseURL is used there)
   await expect(page).toHaveURL('http://localhost:3000/about')
   // The new page should contain an h1 with "About Page"
   await expect(page.locator('h1')).toContainText('About Page')
@@ -307,7 +307,7 @@ Under the hood, `next/jest` is automatically configuring Jest for you, including
 
 ### Setting up Jest (with Babel)
 
-If you opt-out of the [Rust Compiler](https://nextjs.org/docs/advanced-features/compiler), you will need to manually configure Jest and install `babel-jest` and `identity-obj-proxy` in addition to the packages above.
+If you opt out of the [Rust Compiler](https://nextjs.org/docs/advanced-features/compiler), you will need to manually configure Jest and install `babel-jest` and `identity-obj-proxy` in addition to the packages above.
 
 Here are the recommended options to configure Jest for Next.js:
 
@@ -440,7 +440,7 @@ Add the Jest executable in watch mode to the `package.json` scripts:
 
 **Create your first tests**
 
-Your project is now ready to run tests. Follow Jests convention by adding tests to the `__tests__` folder in your project's root directory.
+Your project is now ready to run tests. Follow Jest's convention by adding tests to the `__tests__` folder in your project's root directory.
 
 For example, we can add a test to check if the `<Home />` component successfully renders a heading:
 
diff --git a/docs/upgrading.md b/docs/upgrading.md
index 2ba95e79e9c6..e8c4f5b6cb8c 100644
--- a/docs/upgrading.md
+++ b/docs/upgrading.md
@@ -44,7 +44,7 @@ yarn add next@12
 
 ### SWC replacing Babel
 
-Next.js now uses Rust-based compiler [SWC](https://swc.rs/) to compile JavaScript/TypeScript. This new compiler is up to 17x faster than Babel when compiling individual files and up to 5x faster Fast Refresh.
+Next.js now uses a Rust-based compiler, [SWC](https://swc.rs/), to compile JavaScript/TypeScript. This new compiler is up to 17x faster than Babel when compiling individual files and allows for up to 5x faster Fast Refresh.
 
 Next.js provides full backwards compatibility with applications that have [custom Babel configuration](https://nextjs.org/docs/advanced-features/customizing-babel-config). All transformations that Next.js handles by default like styled-jsx and tree-shaking of `getStaticProps` / `getStaticPaths` / `getServerSideProps` have been ported to Rust.
 
@@ -72,15 +72,15 @@ Minification using SWC is an opt-in flag to ensure it can be tested against more
 
 ### Improvements to styled-jsx CSS parsing
 
-On top of the Rust-based compiler we've implemented a new CSS parser based on the CSS parser that was used for the styled-jsx Babel transform. This new parser has improved handling of CSS and now errors when invalid CSS is used that would previously slip through and cause unexpected behavior.
+On top of the Rust-based compiler, we've implemented a new CSS parser based on the CSS parser that was used for the styled-jsx Babel transform. This new parser has improved handling of CSS and now errors when invalid CSS is used that would previously slip through and cause unexpected behavior.
 
-Because of this change invalid CSS will throw an error during development and `next build`. This change only affects styled-jsx usage.
+Because of this change, invalid CSS will throw an error during development and `next build`. This change only affects styled-jsx usage.
 
 ### `next/image` changed wrapping element
 
 `next/image` now renders the `<img>` inside a `<span>` instead of `<div>`.
 
-If your application has specific CSS targeting span, for example `.container span`, upgrading to Next.js 12 might incorrectly match the wrapping element inside the `<Image>` component. You can avoid this by restricting the selector to a specific class such as `.container span.item` and updating the relevant component with that className, such as `<span className="item" />`.
+If your application has specific CSS targeting span, for example, `.container span`, upgrading to Next.js 12 might incorrectly match the wrapping element inside the `<Image>` component. You can avoid this by restricting the selector to a specific class such as `.container span.item` and updating the relevant component with that className, such as `<span className="item" />`.
 
 If your application has specific CSS targeting the `next/image` `<div>` tag, for example `.container div`, it may not match anymore. You can update the selector `.container span`, or preferably, add a new `<div className="wrapper">` wrapping the `<Image>` component and target that instead such as `.container .wrapper`.
 
@@ -341,7 +341,7 @@ TypeScript Definitions are published with the `next` package, so you need to uni
 
 The following types are different:
 
-> This list was created by the community to help you upgrade, if you find other differences please send a pull-request to this list to help other users.
+> This list was created by the community to help you upgrade, if you find other differences please send a pull request to this list to help other users.
 
 From:
 
@@ -359,7 +359,7 @@ import { AppContext, AppInitialProps } from 'next/app'
 import { DocumentContext, DocumentInitialProps } from 'next/document'
 ```
 
-#### The `config` key is now an export on a page
+#### The `config` key is now a named export on a page
 
 You may no longer export a custom variable named `config` from a page (i.e. `export { config }` / `export const config ...`).
 This exported variable is now used to specify page-level Next.js configuration like Opt-in AMP and API Route features.
@@ -385,7 +385,7 @@ const DynamicComponentWithCustomLoading = dynamic(
 
 Next.js now has the concept of page-level configuration, so the `withAmp` higher-order component has been removed for consistency.
 
-This change can be **automatically migrated by running the following commands in the root of your Next.js project:**
+This change can be **automatically migrated by running the following commands at the root of your Next.js project:**
 
 ```bash
 curl -L https://github.com/vercel/next-codemod/archive/master.tar.gz | tar -xz --strip=2 next-codemod-master/transforms/withamp-to-config.js npx jscodeshift -t ./withamp-to-config.js pages/**/*.js

From a234abfae6e208668b66f6238a51ff93c6a2b11c Mon Sep 17 00:00:00 2001
From: Kiko Beats <josefrancisco.verdu@gmail.com>
Date: Thu, 8 Sep 2022 23:27:17 +0200
Subject: [PATCH 29/69] docs: fix middleware path (#40340)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Hello,

Just update the docs to be aligned with the current middleware implementation 🙂

Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
---
 docs/advanced-features/middleware.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/middleware.md b/docs/advanced-features/middleware.md
index 22dd0988b816..3d2029b3ff93 100644
--- a/docs/advanced-features/middleware.md
+++ b/docs/advanced-features/middleware.md
@@ -31,7 +31,7 @@ To begin using Middleware, follow the steps below:
 npm install next@latest
 ```
 
-2. Create a `middleware.ts` (or `.js`) file at the same level as your `pages` directory
+2. Create a `middleware.ts` (or `.js`) file at the root or in the `src` directory (same level as your `pages`)
 3. Export a middleware function from the `middleware.ts` file:
 
 ```typescript

From 1858fa966c485f2fc5a0cfe44a2eb3e43cae27ef Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Thu, 8 Sep 2022 23:57:56 +0200
Subject: [PATCH 30/69] Fix page url for edge routes in app dir (#40361)

For edge routes in app dir, we passed the page name as url so that the
url will be incorrect:

* a non-dynamic route `/dashboard` will become `/dashboard/page`
* a dynamic route `/dynamic/[id]` with url `/dyanmic/123` will still hit
`/dynamic/page/[id]/page`

This PR uses normalized `params.page` with interoplated as correct
pathname for the page.
---
 packages/next/server/next-server.ts           | 23 ++++++++-----------
 test/e2e/app-dir/rsc-basic.test.ts            | 14 +++++++++++
 .../app/edge/dynamic/[id]/page.server.js      |  7 ++++++
 .../rsc-basic/app/edge/dynamic/page.server.js |  7 ++++++
 test/e2e/app-dir/rsc-basic/next.config.js     | 10 ++++++++
 5 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 test/e2e/app-dir/rsc-basic/app/edge/dynamic/[id]/page.server.js
 create mode 100644 test/e2e/app-dir/rsc-basic/app/edge/dynamic/page.server.js

diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index 27316dd1fd3e..f3cb0d914bbf 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -763,7 +763,6 @@ export default class NextNodeServer extends BaseServer {
           params,
           page,
           appPaths: null,
-          isAppPath: false,
         })
 
         if (handledAsEdgeFunction) {
@@ -913,7 +912,6 @@ export default class NextNodeServer extends BaseServer {
             params: ctx.renderOpts.params,
             page,
             appPaths,
-            isAppPath,
           })
           return null
         }
@@ -2031,12 +2029,12 @@ export default class NextNodeServer extends BaseServer {
     params: Params | undefined
     page: string
     appPaths: string[] | null
-    isAppPath: boolean
     onWarning?: (warning: Error) => void
   }): Promise<FetchEventResult | null> {
     let middlewareInfo: ReturnType<typeof this.getEdgeFunctionInfo> | undefined
 
-    const page = params.page
+    const { query, page } = params
+
     await this.ensureEdgeFunction({ page, appPaths: params.appPaths })
     middlewareInfo = this.getEdgeFunctionInfo({
       page,
@@ -2048,21 +2046,20 @@ export default class NextNodeServer extends BaseServer {
     }
 
     // For middleware to "fetch" we must always provide an absolute URL
-    const isDataReq = !!params.query.__nextDataReq
-    const query = urlQueryToSearchParams(params.query).toString()
-    const locale = params.query.__nextLocale
-    // Use original pathname (without `/page`) instead of appPath for url
-    let normalizedPathname = params.page
+    const locale = query.__nextLocale
+    const isDataReq = !!query.__nextDataReq
+    const queryString = urlQueryToSearchParams(query).toString()
 
     if (isDataReq) {
       params.req.headers['x-nextjs-data'] = '1'
     }
 
+    let normalizedPathname = normalizeAppPath(page)
     if (isDynamicRoute(normalizedPathname)) {
-      const routeRegex = getNamedRouteRegex(params.page)
+      const routeRegex = getNamedRouteRegex(normalizedPathname)
       normalizedPathname = interpolateDynamicPath(
-        params.page,
-        Object.assign({}, params.params, params.query),
+        normalizedPathname,
+        Object.assign({}, params.params, query),
         routeRegex
       )
     }
@@ -2070,7 +2067,7 @@ export default class NextNodeServer extends BaseServer {
     const url = `${getRequestMeta(params.req, '_protocol')}://${
       this.hostname
     }:${this.port}${locale ? `/${locale}` : ''}${normalizedPathname}${
-      query ? `?${query}` : ''
+      queryString ? `?${queryString}` : ''
     }`
 
     if (!url.startsWith('http')) {
diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic.test.ts
index c9996fe5ec0d..0debb6818399 100644
--- a/test/e2e/app-dir/rsc-basic.test.ts
+++ b/test/e2e/app-dir/rsc-basic.test.ts
@@ -340,6 +340,20 @@ describe('app dir - react server components', () => {
     expect(head).toMatch(/{color:(\s*)blue;?}/)
   })
 
+  it('should stick to the url without trailing /page suffix', async () => {
+    const browser = await webdriver(next.url, '/edge/dynamic')
+    const indexUrl = await browser.url()
+
+    await browser.loadPage(`${next.url}/edge/dynamic/123`, {
+      disableCache: false,
+      beforePageLoad: null,
+    })
+
+    const dynamicRouteUrl = await browser.url()
+    expect(indexUrl).toBe(`${next.url}/edge/dynamic`)
+    expect(dynamicRouteUrl).toBe(`${next.url}/edge/dynamic/123`)
+  })
+
   it('should support streaming for flight response', async () => {
     await fetchViaHTTP(next.url, '/?__flight__=1').then(async (response) => {
       const result = await resolveStreamResponse(response)
diff --git a/test/e2e/app-dir/rsc-basic/app/edge/dynamic/[id]/page.server.js b/test/e2e/app-dir/rsc-basic/app/edge/dynamic/[id]/page.server.js
new file mode 100644
index 000000000000..87bac2ff6be9
--- /dev/null
+++ b/test/e2e/app-dir/rsc-basic/app/edge/dynamic/[id]/page.server.js
@@ -0,0 +1,7 @@
+export default function page() {
+  return 'dynamic route [id] page'
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+}
diff --git a/test/e2e/app-dir/rsc-basic/app/edge/dynamic/page.server.js b/test/e2e/app-dir/rsc-basic/app/edge/dynamic/page.server.js
new file mode 100644
index 000000000000..1b83f0120a6a
--- /dev/null
+++ b/test/e2e/app-dir/rsc-basic/app/edge/dynamic/page.server.js
@@ -0,0 +1,7 @@
+export default function page() {
+  return 'dynamic route index page'
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+}
diff --git a/test/e2e/app-dir/rsc-basic/next.config.js b/test/e2e/app-dir/rsc-basic/next.config.js
index ca13fceaff38..eab44b6855ae 100644
--- a/test/e2e/app-dir/rsc-basic/next.config.js
+++ b/test/e2e/app-dir/rsc-basic/next.config.js
@@ -7,4 +7,14 @@ module.exports = {
     appDir: true,
     serverComponents: true,
   },
+  rewrites: async () => {
+    return {
+      afterFiles: [
+        {
+          source: '/rewritten-to-edge-dynamic',
+          destination: '/edge/dynamic',
+        },
+      ],
+    }
+  },
 }

From c6ef857d5792bc201c85e73ebaea8f6b83cdf643 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <accounts+github@wyattjoh.ca>
Date: Thu, 8 Sep 2022 16:17:15 -0600
Subject: [PATCH 31/69] Subresource Integrity for App Directory (#39729)

<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

This serves to add support for [Subresource
Integrity](https://developer.mozilla.org/en-US/docs/Web/Security/Subresource_Integrity)
hashes for scripts added from the new app directory. This also has
support for utilizing nonce values passed from request headers (expected
to be generated per request in middleware) in the bootstrapping scripts
via the `Content-Security-Policy` header as such:

```
Content-Security-Policy: script-src 'nonce-2726c7f26c'
```

Which results in the inline scripts having a new `nonce` attribute hash
added. These features combined support for setting an aggressive Content
Security Policy on scripts loaded.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [x] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)

Co-authored-by: Steven <steven@ceriously.com>
---
 errors/manifest.json                          |   4 +
 errors/nonce-contained-invalid-characters.md  |  20 +++
 package.json                                  |   1 +
 packages/next/build/entries.ts                |   1 +
 packages/next/build/utils.ts                  |  34 ++---
 packages/next/build/webpack-config.ts         |  11 +-
 .../loaders/next-edge-ssr-loader/index.ts     |   6 +
 .../loaders/next-edge-ssr-loader/render.ts    |   3 +
 .../webpack/plugins/middleware-plugin.ts      |  29 ++++-
 .../plugins/subresource-integrity-plugin.ts   |  71 ++++++++++
 packages/next/export/worker.ts                |  20 +--
 packages/next/server/app-render.tsx           |  92 +++++++++++--
 packages/next/server/base-server.ts           |   3 +-
 packages/next/server/config-schema.ts         |   9 ++
 packages/next/server/config-shared.ts         |   4 +
 .../next/server/dev/static-paths-worker.ts    |   8 +-
 packages/next/server/htmlescape.ts            |   2 +-
 packages/next/server/load-components.ts       |  19 ++-
 packages/next/server/next-server.ts           |  66 +++++-----
 packages/next/shared/lib/constants.ts         |   1 +
 pnpm-lock.yaml                                |   2 +
 test/e2e/app-dir/app/next.config.js           |   3 +
 test/e2e/app-dir/index.test.ts                | 123 ++++++++++++++++++
 test/integration/image-optimizer/test/util.ts |  17 ++-
 test/lib/next-test-utils.js                   |  21 ++-
 .../required-server-files-i18n.test.ts        |   8 +-
 test/production/required-server-files.test.ts |   8 +-
 27 files changed, 482 insertions(+), 104 deletions(-)
 create mode 100644 errors/nonce-contained-invalid-characters.md
 create mode 100644 packages/next/build/webpack/plugins/subresource-integrity-plugin.ts

diff --git a/errors/manifest.json b/errors/manifest.json
index 3f013867de55..42134b6ca26f 100644
--- a/errors/manifest.json
+++ b/errors/manifest.json
@@ -729,6 +729,10 @@
         {
           "title": "middleware-parse-user-agent",
           "path": "/errors/middleware-parse-user-agent.md"
+        },
+        {
+          "title": "nonce-contained-invalid-characters",
+          "path": "/errors/nonce-contained-invalid-characters.md"
         }
       ]
     }
diff --git a/errors/nonce-contained-invalid-characters.md b/errors/nonce-contained-invalid-characters.md
new file mode 100644
index 000000000000..3befd0651f9f
--- /dev/null
+++ b/errors/nonce-contained-invalid-characters.md
@@ -0,0 +1,20 @@
+# nonce contained invalid characters
+
+#### Why This Error Occurred
+
+This happens when there is a request that contains a `Content-Security-Policy`
+header that contains a `script-src` directive with a nonce value that contains
+invalid characters (any one of `<>&` characters). For example:
+
+- `'nonce-<script />'`: not allowed
+- `'nonce-/>script<>'`: not allowed
+- `'nonce-PHNjcmlwdCAvPg=='`: allowed
+- `'nonce-Lz5zY3JpcHQ8Pg=='`: allowed
+
+#### Possible Ways to Fix It
+
+Replace the nonce value with a base64 encoded value.
+
+### Useful Links
+
+- [Content Security Policy Sources](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/Sources#sources)
diff --git a/package.json b/package.json
index 758a6b8200af..bfab57a860fc 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,7 @@
     "@types/http-proxy": "1.17.3",
     "@types/jest": "24.0.13",
     "@types/node": "13.11.0",
+    "@types/node-fetch": "2.6.1",
     "@types/react": "16.9.17",
     "@types/react-dom": "16.9.4",
     "@types/relay-runtime": "13.0.0",
diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index acd695ece191..f58536b2eb7f 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -212,6 +212,7 @@ export function getEdgeServerEntry(opts: {
     stringifiedConfig: JSON.stringify(opts.config),
     pagesType: opts.pagesType,
     appDirLoader: Buffer.from(opts.appDirLoader || '').toString('base64'),
+    sriEnabled: !opts.isDev && !!opts.config.experimental.sri?.algorithm,
   }
 
   return {
diff --git a/packages/next/build/utils.ts b/packages/next/build/utils.ts
index fa114b46ef03..5e04a963c108 100644
--- a/packages/next/build/utils.ts
+++ b/packages/next/build/utils.ts
@@ -1082,13 +1082,13 @@ export async function isPageStatic({
           getStaticProps: mod.getStaticProps,
         }
       } else {
-        componentsResult = await loadComponents(
+        componentsResult = await loadComponents({
           distDir,
-          page,
+          pathname: page,
           serverless,
-          false,
-          false
-        )
+          hasServerComponents: false,
+          isAppPath: false,
+        })
       }
       const Comp = componentsResult.Component
 
@@ -1214,13 +1214,13 @@ export async function hasCustomGetInitialProps(
 ): Promise<boolean> {
   require('../shared/lib/runtime-config').setConfig(runtimeEnvConfig)
 
-  const components = await loadComponents(
+  const components = await loadComponents({
     distDir,
-    page,
-    isLikeServerless,
-    false,
-    false
-  )
+    pathname: page,
+    serverless: isLikeServerless,
+    hasServerComponents: false,
+    isAppPath: false,
+  })
   let mod = components.ComponentMod
 
   if (checkingApp) {
@@ -1239,13 +1239,13 @@ export async function getNamedExports(
   runtimeEnvConfig: any
 ): Promise<Array<string>> {
   require('../shared/lib/runtime-config').setConfig(runtimeEnvConfig)
-  const components = await loadComponents(
+  const components = await loadComponents({
     distDir,
-    page,
-    isLikeServerless,
-    false,
-    false
-  )
+    pathname: page,
+    serverless: isLikeServerless,
+    hasServerComponents: false,
+    isAppPath: false,
+  })
   let mod = components.ComponentMod
 
   return Object.keys(mod)
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 02f1012f7497..452a2afdc307 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -61,6 +61,7 @@ import loadJsConfig from './load-jsconfig'
 import { loadBindings } from './swc'
 import { clientComponentRegex } from './webpack/loaders/utils'
 import { AppBuildManifestPlugin } from './webpack/plugins/app-build-manifest-plugin'
+import { SubresourceIntegrityPlugin } from './webpack/plugins/subresource-integrity-plugin'
 
 const NEXT_PROJECT_ROOT = pathJoin(__dirname, '..', '..')
 const NEXT_PROJECT_ROOT_DIST = pathJoin(NEXT_PROJECT_ROOT, 'dist')
@@ -1750,7 +1751,11 @@ export default async function getBaseWebpackConfig(
         }),
       // MiddlewarePlugin should be after DefinePlugin so  NEXT_PUBLIC_*
       // replacement is done before its process.env.* handling
-      isEdgeServer && new MiddlewarePlugin({ dev }),
+      isEdgeServer &&
+        new MiddlewarePlugin({
+          dev,
+          sriEnabled: !dev && !!config.experimental.sri?.algorithm,
+        }),
       isClient &&
         new BuildManifestPlugin({
           buildId,
@@ -1800,6 +1805,10 @@ export default async function getBaseWebpackConfig(
               dev,
               isEdgeServer,
             })),
+      !dev &&
+        isClient &&
+        !!config.experimental.sri?.algorithm &&
+        new SubresourceIntegrityPlugin(config.experimental.sri.algorithm),
       !dev &&
         isClient &&
         new (require('./webpack/plugins/telemetry-plugin').TelemetryPlugin)(
diff --git a/packages/next/build/webpack/loaders/next-edge-ssr-loader/index.ts b/packages/next/build/webpack/loaders/next-edge-ssr-loader/index.ts
index 527aae70d77d..cd47aadac311 100644
--- a/packages/next/build/webpack/loaders/next-edge-ssr-loader/index.ts
+++ b/packages/next/build/webpack/loaders/next-edge-ssr-loader/index.ts
@@ -14,6 +14,7 @@ export type EdgeSSRLoaderQuery = {
   stringifiedConfig: string
   appDirLoader?: string
   pagesType?: 'app' | 'pages' | 'root'
+  sriEnabled: boolean
 }
 
 export default async function edgeSSRLoader(this: any) {
@@ -30,6 +31,7 @@ export default async function edgeSSRLoader(this: any) {
     stringifiedConfig,
     appDirLoader: appDirLoaderBase64,
     pagesType,
+    sriEnabled,
   } = this.getOptions()
 
   const appDirLoader = Buffer.from(
@@ -94,6 +96,9 @@ export default async function edgeSSRLoader(this: any) {
     const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST
     const rscManifest = self.__RSC_MANIFEST
     const rscCssManifest = self.__RSC_CSS_MANIFEST
+    const subresourceIntegrityManifest = ${
+      sriEnabled ? 'self.__SUBRESOURCE_INTEGRITY_MANIFEST' : 'undefined'
+    }
 
     const render = getRender({
       dev: ${dev},
@@ -109,6 +114,7 @@ export default async function edgeSSRLoader(this: any) {
       reactLoadableManifest,
       serverComponentManifest: ${isServerComponent} ? rscManifest : null,
       serverCSSManifest: ${isServerComponent} ? rscCssManifest : null,
+      subresourceIntegrityManifest,
       config: ${stringifiedConfig},
       buildId: ${JSON.stringify(buildId)},
     })
diff --git a/packages/next/build/webpack/loaders/next-edge-ssr-loader/render.ts b/packages/next/build/webpack/loaders/next-edge-ssr-loader/render.ts
index 2424b0cdffbe..49d335551858 100644
--- a/packages/next/build/webpack/loaders/next-edge-ssr-loader/render.ts
+++ b/packages/next/build/webpack/loaders/next-edge-ssr-loader/render.ts
@@ -23,6 +23,7 @@ export function getRender({
   appRenderToHTML,
   pagesRenderToHTML,
   serverComponentManifest,
+  subresourceIntegrityManifest,
   serverCSSManifest,
   config,
   buildId,
@@ -38,6 +39,7 @@ export function getRender({
   Document: DocumentType
   buildManifest: BuildManifest
   reactLoadableManifest: ReactLoadableManifest
+  subresourceIntegrityManifest?: Record<string, string>
   serverComponentManifest: any
   serverCSSManifest: any
   appServerMod: any
@@ -48,6 +50,7 @@ export function getRender({
     dev,
     buildManifest,
     reactLoadableManifest,
+    subresourceIntegrityManifest,
     Document,
     App: appMod.default as AppType,
   }
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index 6711ade2f916..b2b8ca87af78 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -17,6 +17,7 @@ import {
   MIDDLEWARE_REACT_LOADABLE_MANIFEST,
   NEXT_CLIENT_SSR_ENTRY_SUFFIX,
   FLIGHT_SERVER_CSS_MANIFEST,
+  SUBRESOURCE_INTEGRITY_MANIFEST,
 } from '../../../shared/lib/constants'
 
 export interface EdgeFunctionDefinition {
@@ -74,12 +75,19 @@ function isUsingIndirectEvalAndUsedByExports(args: {
   return false
 }
 
-function getEntryFiles(entryFiles: string[], meta: EntryMetadata) {
+function getEntryFiles(
+  entryFiles: string[],
+  meta: EntryMetadata,
+  opts: { sriEnabled: boolean }
+) {
   const files: string[] = []
   if (meta.edgeSSR) {
     if (meta.edgeSSR.isServerComponent) {
       files.push(`server/${FLIGHT_MANIFEST}.js`)
       files.push(`server/${FLIGHT_SERVER_CSS_MANIFEST}.js`)
+      if (opts.sriEnabled) {
+        files.push(`server/${SUBRESOURCE_INTEGRITY_MANIFEST}.js`)
+      }
       files.push(
         ...entryFiles
           .filter(
@@ -112,8 +120,9 @@ function getEntryFiles(entryFiles: string[], meta: EntryMetadata) {
 function getCreateAssets(params: {
   compilation: webpack.Compilation
   metadataByEntry: Map<string, EntryMetadata>
+  opts: { sriEnabled: boolean }
 }) {
-  const { compilation, metadataByEntry } = params
+  const { compilation, metadataByEntry, opts } = params
   return (assets: any) => {
     const middlewareManifest: MiddlewareManifest = {
       sortedMiddleware: [],
@@ -145,7 +154,7 @@ function getCreateAssets(params: {
 
       const edgeFunctionDefinition: EdgeFunctionDefinition = {
         env: Array.from(metadata.env),
-        files: getEntryFiles(entrypoint.getFiles(), metadata),
+        files: getEntryFiles(entrypoint.getFiles(), metadata, opts),
         name: entrypoint.name,
         page: page,
         matchers,
@@ -708,13 +717,15 @@ function getExtractMetadata(params: {
 }
 
 export default class MiddlewarePlugin {
-  dev: boolean
+  private readonly dev: boolean
+  private readonly sriEnabled: boolean
 
-  constructor({ dev }: { dev: boolean }) {
+  constructor({ dev, sriEnabled }: { dev: boolean; sriEnabled: boolean }) {
     this.dev = dev
+    this.sriEnabled = sriEnabled
   }
 
-  apply(compiler: webpack.Compiler) {
+  public apply(compiler: webpack.Compiler) {
     compiler.hooks.compilation.tap(NAME, (compilation, params) => {
       const { hooks } = params.normalModuleFactory
       /**
@@ -751,7 +762,11 @@ export default class MiddlewarePlugin {
           name: 'NextJsMiddlewareManifest',
           stage: (webpack as any).Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
         },
-        getCreateAssets({ compilation, metadataByEntry })
+        getCreateAssets({
+          compilation,
+          metadataByEntry,
+          opts: { sriEnabled: this.sriEnabled },
+        })
       )
     })
   }
diff --git a/packages/next/build/webpack/plugins/subresource-integrity-plugin.ts b/packages/next/build/webpack/plugins/subresource-integrity-plugin.ts
new file mode 100644
index 000000000000..58f085f5ae21
--- /dev/null
+++ b/packages/next/build/webpack/plugins/subresource-integrity-plugin.ts
@@ -0,0 +1,71 @@
+import { webpack, sources } from 'next/dist/compiled/webpack/webpack'
+import crypto from 'crypto'
+import { SUBRESOURCE_INTEGRITY_MANIFEST } from '../../../shared/lib/constants'
+
+const PLUGIN_NAME = 'SubresourceIntegrityPlugin'
+
+export type SubresourceIntegrityAlgorithm = 'sha256' | 'sha384' | 'sha512'
+
+export class SubresourceIntegrityPlugin {
+  constructor(private readonly algorithm: SubresourceIntegrityAlgorithm) {}
+
+  public apply(compiler: webpack.Compiler) {
+    compiler.hooks.make.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.afterOptimizeAssets.tap(
+        {
+          name: PLUGIN_NAME,
+          stage: webpack.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
+        },
+        (assets) => {
+          // Collect all the entrypoint files.
+          let files = new Set<string>()
+          for (const entrypoint of compilation.entrypoints.values()) {
+            const iterator = entrypoint?.getFiles()
+            if (!iterator) {
+              continue
+            }
+
+            for (const file of iterator) {
+              files.add(file)
+            }
+          }
+
+          // For each file, deduped, calculate the file hash.
+          const hashes: Record<string, string> = {}
+          for (const file of files.values()) {
+            // Get the buffer for the asset.
+            const asset = assets[file]
+            if (!asset) {
+              throw new Error(`could not get asset: ${file}`)
+            }
+
+            // Get the buffer for the asset.
+            const buffer = asset.buffer()
+
+            // Create the hash for the content.
+            const hash = crypto
+              .createHash(this.algorithm)
+              .update(buffer)
+              .digest()
+              .toString('base64')
+
+            hashes[file] = `${this.algorithm}-${hash}`
+          }
+
+          const json = JSON.stringify(hashes, null, 2)
+          const file = 'server/' + SUBRESOURCE_INTEGRITY_MANIFEST
+          assets[file + '.js'] = new sources.RawSource(
+            'self.__SUBRESOURCE_INTEGRITY_MANIFEST=' + json
+            // Work around webpack 4 type of RawSource being used
+            // TODO: use webpack 5 type by default
+          ) as unknown as webpack.sources.RawSource
+          assets[file + '.json'] = new sources.RawSource(
+            json
+            // Work around webpack 4 type of RawSource being used
+            // TODO: use webpack 5 type by default
+          ) as unknown as webpack.sources.RawSource
+        }
+      )
+    })
+  }
+}
diff --git a/packages/next/export/worker.ts b/packages/next/export/worker.ts
index 51655364d667..66d43f35dc00 100644
--- a/packages/next/export/worker.ts
+++ b/packages/next/export/worker.ts
@@ -290,13 +290,13 @@ export default async function exportPage({
           getServerSideProps,
           getStaticProps,
           pageConfig,
-        } = await loadComponents(
+        } = await loadComponents({
           distDir,
-          page,
+          pathname: page,
           serverless,
-          !!serverComponents,
-          isAppPath
-        )
+          hasServerComponents: !!serverComponents,
+          isAppPath,
+        })
         const ampState = {
           ampFirst: pageConfig?.amp === true,
           hasQuery: Boolean(query.amp),
@@ -357,13 +357,13 @@ export default async function exportPage({
           throw new Error(`Failed to render serverless page`)
         }
       } else {
-        const components = await loadComponents(
+        const components = await loadComponents({
           distDir,
-          page,
+          pathname: page,
           serverless,
-          !!serverComponents,
-          isAppPath
-        )
+          hasServerComponents: !!serverComponents,
+          isAppPath,
+        })
         const ampState = {
           ampFirst: components.pageConfig?.amp === true,
           hasQuery: Boolean(query.amp),
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 24f651fcf737..b71191b4b720 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -17,7 +17,7 @@ import {
   continueFromInitialStream,
 } from './node-web-streams-helper'
 import { isDynamicRoute } from '../shared/lib/router/utils'
-import { htmlEscapeJsonString } from './htmlescape'
+import { ESCAPE_REGEX, htmlEscapeJsonString } from './htmlescape'
 import { shouldUseReactRoot, stripInternalQueries } from './utils'
 import { NextApiRequestCookies } from './api-utils'
 import { matchSegment } from '../client/components/match-segments'
@@ -135,7 +135,8 @@ function useFlightResponse(
   writable: WritableStream<Uint8Array>,
   cachePrefix: string,
   req: ReadableStream<Uint8Array>,
-  serverComponentManifest: any
+  serverComponentManifest: any,
+  nonce?: string
 ) {
   const id = cachePrefix + ',' + (React as any).useId()
   let entry = rscCache.get(id)
@@ -150,13 +151,17 @@ function useFlightResponse(
     // We only attach CSS chunks to the inlined data.
     const forwardReader = forwardStream.getReader()
     const writer = writable.getWriter()
+    const startScriptTag = nonce
+      ? `<script nonce=${JSON.stringify(nonce)}>`
+      : '<script>'
+
     function process() {
       forwardReader.read().then(({ done, value }) => {
         if (!bootstrapped) {
           bootstrapped = true
           writer.write(
             encodeText(
-              `<script>(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
+              `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
                 JSON.stringify([0, id])
               )})</script>`
             )
@@ -167,7 +172,7 @@ function useFlightResponse(
           writer.close()
         } else {
           const responsePartial = decodeText(value)
-          const scripts = `<script>(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
+          const scripts = `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
             JSON.stringify([1, id, responsePartial])
           )})</script>`
 
@@ -205,7 +210,8 @@ function createServerComponentRenderer(
     serverContexts: Array<
       [ServerContextName: string, JSONValue: Object | number | string]
     >
-  }
+  },
+  nonce?: string
 ) {
   // We need to expose the `__webpack_require__` API globally for
   // react-server-dom-webpack. This is a hack until we find a better way.
@@ -240,7 +246,8 @@ function createServerComponentRenderer(
       writable,
       cachePrefix,
       reqStream,
-      serverComponentManifest
+      serverComponentManifest,
+      nonce
     )
     return response.readRoot()
   }
@@ -406,6 +413,56 @@ function getCssInlinedLinkTags(
   return [...chunks]
 }
 
+function getScriptNonceFromHeader(cspHeaderValue: string): string | undefined {
+  const directives = cspHeaderValue
+    // Directives are split by ';'.
+    .split(';')
+    .map((directive) => directive.trim())
+
+  // First try to find the directive for the 'script-src', otherwise try to
+  // fallback to the 'default-src'.
+  const directive =
+    directives.find((dir) => dir.startsWith('script-src')) ||
+    directives.find((dir) => dir.startsWith('default-src'))
+
+  // If no directive could be found, then we're done.
+  if (!directive) {
+    return
+  }
+
+  // Extract the nonce from the directive
+  const nonce = directive
+    .split(' ')
+    // Remove the 'strict-src'/'default-src' string, this can't be the nonce.
+    .slice(1)
+    .map((source) => source.trim())
+    // Find the first source with the 'nonce-' prefix.
+    .find(
+      (source) =>
+        source.startsWith("'nonce-") &&
+        source.length > 8 &&
+        source.endsWith("'")
+    )
+    // Grab the nonce by trimming the 'nonce-' prefix.
+    ?.slice(7, -1)
+
+  // If we could't find the nonce, then we're done.
+  if (!nonce) {
+    return
+  }
+
+  // Don't accept the nonce value if it contains HTML escape characters.
+  // Technically, the spec requires a base64'd value, but this is just an
+  // extra layer.
+  if (ESCAPE_REGEX.test(nonce)) {
+    throw new Error(
+      'Nonce value from Content-Security-Policy contained HTML escape characters.\nLearn more: https://nextjs.org/docs/messages/nonce-contained-invalid-characters'
+    )
+  }
+
+  return nonce
+}
+
 export async function renderToHTMLOrFlight(
   req: IncomingMessage,
   res: ServerResponse,
@@ -426,6 +483,7 @@ export async function renderToHTMLOrFlight(
 
   const {
     buildManifest,
+    subresourceIntegrityManifest,
     serverComponentManifest,
     serverCSSManifest = {},
     supportsDynamicHTML,
@@ -999,6 +1057,13 @@ export async function renderToHTMLOrFlight(
   // TODO-APP: validate req.url as it gets passed to render.
   const initialCanonicalUrl = req.url!
 
+  // Get the nonce from the incomming request if it has one.
+  const csp = req.headers['content-security-policy']
+  let nonce: string | undefined
+  if (csp && typeof csp === 'string') {
+    nonce = getScriptNonceFromHeader(csp)
+  }
+
   /**
    * A new React Component that renders the provided React Component
    * using Flight which can then be rendered to HTML.
@@ -1027,7 +1092,8 @@ export async function renderToHTMLOrFlight(
       transformStream: serverComponentsInlinedTransformStream,
       serverComponentManifest,
       serverContexts,
-    }
+    },
+    nonce
   )
 
   const flushEffectsCallbacks: Set<() => React.ReactNode> = new Set()
@@ -1080,10 +1146,16 @@ export async function renderToHTMLOrFlight(
       ReactDOMServer,
       element: content,
       streamOptions: {
+        nonce,
         // Include hydration scripts in the HTML
-        bootstrapScripts: buildManifest.rootMainFiles.map(
-          (src) => `${renderOpts.assetPrefix || ''}/_next/` + src
-        ),
+        bootstrapScripts: subresourceIntegrityManifest
+          ? buildManifest.rootMainFiles.map((src) => ({
+              src: `${renderOpts.assetPrefix || ''}/_next/` + src,
+              integrity: subresourceIntegrityManifest[src],
+            }))
+          : buildManifest.rootMainFiles.map(
+              (src) => `${renderOpts.assetPrefix || ''}/_next/` + src
+            ),
       },
     })
 
diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
index a518b36cfcfb..411983b3ed9f 100644
--- a/packages/next/server/base-server.ts
+++ b/packages/next/server/base-server.ts
@@ -245,6 +245,7 @@ export default abstract class Server<ServerOptions extends Options = Options> {
     params: Params
     isAppPath: boolean
     appPaths?: string[] | null
+    sriEnabled?: boolean
   }): Promise<FindComponentsResult | null>
   protected abstract getFontManifest(): FontManifest | undefined
   protected abstract getPrerenderManifest(): PrerenderManifest
@@ -1546,8 +1547,8 @@ export default abstract class Server<ServerOptions extends Options = Options> {
       params: ctx.renderOpts.params || {},
       isAppPath: Array.isArray(appPaths),
       appPaths,
+      sriEnabled: !!this.nextConfig.experimental.sri?.algorithm,
     })
-
     if (result) {
       try {
         return await this.renderToResponseWithComponents(ctx, result)
diff --git a/packages/next/server/config-schema.ts b/packages/next/server/config-schema.ts
index 1ed39ed3c9e6..984d0df6b77d 100644
--- a/packages/next/server/config-schema.ts
+++ b/packages/next/server/config-schema.ts
@@ -338,6 +338,15 @@ const configSchema = {
         sharedPool: {
           type: 'boolean',
         },
+        sri: {
+          properties: {
+            algorithm: {
+              enum: ['sha256', 'sha384', 'sha512'] as any,
+              type: 'string',
+            },
+          },
+          type: 'object',
+        },
         swcFileReading: {
           type: 'boolean',
         },
diff --git a/packages/next/server/config-shared.ts b/packages/next/server/config-shared.ts
index b0bf627bfb9d..e0e0ddcfe639 100644
--- a/packages/next/server/config-shared.ts
+++ b/packages/next/server/config-shared.ts
@@ -7,6 +7,7 @@ import {
   imageConfigDefault,
 } from '../shared/lib/image-config'
 import { ServerRuntime } from 'next/types'
+import { SubresourceIntegrityAlgorithm } from '../build/webpack/plugins/subresource-integrity-plugin'
 
 export type NextConfigComplete = Required<NextConfig> & {
   images: Required<ImageConfigComplete>
@@ -146,6 +147,9 @@ export interface ExperimentalConfig {
    * [webpack/webpack#ModuleNotoundError.js#L13-L42](https://github.com/webpack/webpack/blob/2a0536cf510768111a3a6dceeb14cb79b9f59273/lib/ModuleNotFoundError.js#L13-L42)
    */
   fallbackNodePolyfills?: false
+  sri?: {
+    algorithm?: SubresourceIntegrityAlgorithm
+  }
 }
 
 export type ExportPathMap = {
diff --git a/packages/next/server/dev/static-paths-worker.ts b/packages/next/server/dev/static-paths-worker.ts
index 185948d7f2d1..e56d018b1f26 100644
--- a/packages/next/server/dev/static-paths-worker.ts
+++ b/packages/next/server/dev/static-paths-worker.ts
@@ -38,13 +38,13 @@ export async function loadStaticPaths(
   require('../../shared/lib/runtime-config').setConfig(config)
   setHttpAgentOptions(httpAgentOptions)
 
-  const components = await loadComponents(
+  const components = await loadComponents({
     distDir,
     pathname,
     serverless,
-    false,
-    false
-  )
+    hasServerComponents: false,
+    isAppPath: false,
+  })
 
   if (!components.getStaticPaths) {
     // we shouldn't get to this point since the worker should
diff --git a/packages/next/server/htmlescape.ts b/packages/next/server/htmlescape.ts
index 7bcda3c3570b..fa06e75df98a 100644
--- a/packages/next/server/htmlescape.ts
+++ b/packages/next/server/htmlescape.ts
@@ -9,7 +9,7 @@ const ESCAPE_LOOKUP: { [match: string]: string } = {
   '\u2029': '\\u2029',
 }
 
-const ESCAPE_REGEX = /[&><\u2028\u2029]/g
+export const ESCAPE_REGEX = /[&><\u2028\u2029]/g
 
 export function htmlEscapeJsonString(str: string): string {
   return str.replace(ESCAPE_REGEX, (match) => ESCAPE_LOOKUP[match])
diff --git a/packages/next/server/load-components.ts b/packages/next/server/load-components.ts
index 5cbf543ccc40..8f9f5431ff9e 100644
--- a/packages/next/server/load-components.ts
+++ b/packages/next/server/load-components.ts
@@ -30,6 +30,7 @@ export type LoadComponentsReturnType = {
   Component: NextComponentType
   pageConfig: PageConfig
   buildManifest: BuildManifest
+  subresourceIntegrityManifest?: Record<string, string>
   reactLoadableManifest: ReactLoadableManifest
   serverComponentManifest?: any
   Document: DocumentType
@@ -59,13 +60,19 @@ export async function loadDefaultErrorComponents(distDir: string) {
   }
 }
 
-export async function loadComponents(
-  distDir: string,
-  pathname: string,
-  serverless: boolean,
-  hasServerComponents: boolean,
+export async function loadComponents({
+  distDir,
+  pathname,
+  serverless,
+  hasServerComponents,
+  isAppPath,
+}: {
+  distDir: string
+  pathname: string
+  serverless: boolean
+  hasServerComponents: boolean
   isAppPath: boolean
-): Promise<LoadComponentsReturnType> {
+}): Promise<LoadComponentsReturnType> {
   if (serverless) {
     const ComponentMod = await requirePage(pathname, distDir, serverless)
     if (typeof ComponentMod === 'string') {
diff --git a/packages/next/server/next-server.ts b/packages/next/server/next-server.ts
index f3cb0d914bbf..be21b05c9e85 100644
--- a/packages/next/server/next-server.ts
+++ b/packages/next/server/next-server.ts
@@ -248,20 +248,20 @@ export default class NextNodeServer extends BaseServer {
     if (!options.dev) {
       // pre-warm _document and _app as these will be
       // needed for most requests
-      loadComponents(
-        this.distDir,
-        '/_document',
-        this._isLikeServerless,
-        false,
-        false
-      ).catch(() => {})
-      loadComponents(
-        this.distDir,
-        '/_app',
-        this._isLikeServerless,
-        false,
-        false
-      ).catch(() => {})
+      loadComponents({
+        distDir: this.distDir,
+        pathname: '/_document',
+        serverless: this._isLikeServerless,
+        hasServerComponents: false,
+        isAppPath: false,
+      }).catch(() => {})
+      loadComponents({
+        distDir: this.distDir,
+        pathname: '/_app',
+        serverless: this._isLikeServerless,
+        hasServerComponents: false,
+        isAppPath: false,
+      }).catch(() => {})
     }
   }
 
@@ -932,39 +932,37 @@ export default class NextNodeServer extends BaseServer {
     params: Params | null
     isAppPath: boolean
   }): Promise<FindComponentsResult | null> {
-    let paths = [
+    const paths: string[] = [pathname]
+    if (query.amp) {
       // try serving a static AMP version first
-      query.amp
-        ? (isAppPath
-            ? normalizeAppPath(pathname)
-            : normalizePagePath(pathname)) + '.amp'
-        : null,
-      pathname,
-    ].filter(Boolean)
+      paths.unshift(
+        (isAppPath ? normalizeAppPath(pathname) : normalizePagePath(pathname)) +
+          '.amp'
+      )
+    }
 
     if (query.__nextLocale) {
-      paths = [
+      paths.unshift(
         ...paths.map(
           (path) => `/${query.__nextLocale}${path === '/' ? '' : path}`
-        ),
-        ...paths,
-      ]
+        )
+      )
     }
 
     for (const pagePath of paths) {
       try {
-        const components = await loadComponents(
-          this.distDir,
-          pagePath!,
-          !this.renderOpts.dev && this._isLikeServerless,
-          !!this.renderOpts.serverComponents,
-          isAppPath
-        )
+        const components = await loadComponents({
+          distDir: this.distDir,
+          pathname: pagePath,
+          serverless: !this.renderOpts.dev && this._isLikeServerless,
+          hasServerComponents: !!this.renderOpts.serverComponents,
+          isAppPath,
+        })
 
         if (
           query.__nextLocale &&
           typeof components.Component === 'string' &&
-          !pagePath?.startsWith(`/${query.__nextLocale}`)
+          !pagePath.startsWith(`/${query.__nextLocale}`)
         ) {
           // if loading an static HTML file the locale is required
           // to be present since all HTML files are output under their locale
diff --git a/packages/next/shared/lib/constants.ts b/packages/next/shared/lib/constants.ts
index c314f8517b5b..f17d05ba0f83 100644
--- a/packages/next/shared/lib/constants.ts
+++ b/packages/next/shared/lib/constants.ts
@@ -26,6 +26,7 @@ export const APP_PATHS_MANIFEST = 'app-paths-manifest.json'
 export const APP_PATH_ROUTES_MANIFEST = 'app-path-routes-manifest.json'
 export const BUILD_MANIFEST = 'build-manifest.json'
 export const APP_BUILD_MANIFEST = 'app-build-manifest.json'
+export const SUBRESOURCE_INTEGRITY_MANIFEST = 'subresource-integrity-manifest'
 export const EXPORT_MARKER = 'export-marker.json'
 export const EXPORT_DETAIL = 'export-detail.json'
 export const PRERENDER_MANIFEST = 'prerender-manifest.json'
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 94d2c42e8c53..5c59a89ecd0b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -40,6 +40,7 @@ importers:
       '@types/http-proxy': 1.17.3
       '@types/jest': 24.0.13
       '@types/node': 13.11.0
+      '@types/node-fetch': 2.6.1
       '@types/react': 16.9.17
       '@types/react-dom': 16.9.4
       '@types/relay-runtime': 13.0.0
@@ -194,6 +195,7 @@ importers:
       '@types/http-proxy': 1.17.3
       '@types/jest': 24.0.13
       '@types/node': 13.11.0
+      '@types/node-fetch': 2.6.1
       '@types/react': 16.9.17
       '@types/react-dom': 16.9.4
       '@types/relay-runtime': 13.0.0
diff --git a/test/e2e/app-dir/app/next.config.js b/test/e2e/app-dir/app/next.config.js
index 087742808cea..0e04741a08bf 100644
--- a/test/e2e/app-dir/app/next.config.js
+++ b/test/e2e/app-dir/app/next.config.js
@@ -4,6 +4,9 @@ module.exports = {
     serverComponents: true,
     legacyBrowsers: false,
     browsersListForSwc: true,
+    sri: {
+      algorithm: 'sha256',
+    },
   },
   // assetPrefix: '/assets',
   rewrites: async () => {
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 6ff89b275888..e92332aa0c8c 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -1,4 +1,5 @@
 import { createNext, FileRef } from 'e2e-utils'
+import crypto from 'crypto'
 import { NextInstance } from 'test/lib/next-modes/base'
 import { check, fetchViaHTTP, renderViaHTTP, waitFor } from 'next-test-utils'
 import path from 'path'
@@ -1194,6 +1195,128 @@ describe('app dir', () => {
         })
       })
     })
+    ;(isDev ? describe.skip : describe)('Subresource Integrity', () => {
+      function fetchWithPolicy(policy: string | null) {
+        return fetchViaHTTP(next.url, '/dashboard', undefined, {
+          headers: policy
+            ? {
+                'Content-Security-Policy': policy,
+              }
+            : {},
+        })
+      }
+
+      async function renderWithPolicy(policy: string | null) {
+        const res = await fetchWithPolicy(policy)
+
+        expect(res.ok).toBe(true)
+
+        const html = await res.text()
+
+        return cheerio.load(html)
+      }
+
+      it('does not include nonce when not enabled', async () => {
+        const policies = [
+          `script-src 'nonce-'`, // invalid nonce
+          'style-src "nonce-cmFuZG9tCg=="', // no script or default src
+          '', // empty string
+        ]
+
+        for (const policy of policies) {
+          const $ = await renderWithPolicy(policy)
+
+          // Find all the script tags without src attributes and with nonce
+          // attributes.
+          const elements = $('script[nonce]:not([src])')
+
+          // Expect there to be none.
+          expect(elements.length).toBe(0)
+        }
+      })
+
+      it('includes a nonce value with inline scripts when Content-Security-Policy header is defined', async () => {
+        // A random nonce value, base64 encoded.
+        const nonce = 'cmFuZG9tCg=='
+
+        // Validate all the cases where we could parse the nonce.
+        const policies = [
+          `script-src 'nonce-${nonce}'`, // base case
+          `   script-src   'nonce-${nonce}' `, // extra space added around sources and directive
+          `style-src 'self'; script-src 'nonce-${nonce}'`, // extra directives
+          `script-src 'self' 'nonce-${nonce}' 'nonce-othernonce'`, // extra nonces
+          `default-src 'nonce-othernonce'; script-src 'nonce-${nonce}';`, // script and then fallback case
+          `default-src 'nonce-${nonce}'`, // fallback case
+        ]
+
+        for (const policy of policies) {
+          const $ = await renderWithPolicy(policy)
+
+          // Find all the script tags without src attributes.
+          const elements = $('script:not([src])')
+
+          // Expect there to be at least 1 script tag without a src attribute.
+          expect(elements.length).toBeGreaterThan(0)
+
+          // Expect all inline scripts to have the nonce value.
+          elements.each((i, el) => {
+            expect(el.attribs['nonce']).toBe(nonce)
+          })
+        }
+      })
+
+      it('includes an integrity attribute on scripts', async () => {
+        const html = await renderViaHTTP(next.url, '/dashboard')
+
+        const $ = cheerio.load(html)
+
+        // Find all the script tags with src attributes.
+        const elements = $('script[src]')
+
+        // Expect there to be at least 1 script tag with a src attribute.
+        expect(elements.length).toBeGreaterThan(0)
+
+        // Collect all the scripts with integrity hashes so we can verify them.
+        const files: [string, string][] = []
+
+        // For each of these attributes, ensure that there's an integrity
+        // attribute and starts with the correct integrity hash prefix.
+        elements.each((i, el) => {
+          const integrity = el.attribs['integrity']
+          expect(integrity).toBeDefined()
+          expect(integrity).toStartWith('sha256-')
+
+          const src = el.attribs['src']
+          expect(src).toBeDefined()
+
+          files.push([src, integrity])
+        })
+
+        // For each script tag, ensure that the integrity attribute is the
+        // correct hash of the script tag.
+        for (const [src, integrity] of files) {
+          const res = await fetchViaHTTP(next.url, src)
+          expect(res.status).toBe(200)
+          const content = await res.text()
+
+          const hash = crypto
+            .createHash('sha256')
+            .update(content)
+            .digest()
+            .toString('base64')
+
+          expect(integrity).toEndWith(hash)
+        }
+      })
+
+      it('throws when escape characters are included in nonce', async () => {
+        const res = await fetchWithPolicy(
+          `script-src 'nonce-"><script></script>"'`
+        )
+
+        expect(res.status).toBe(500)
+      })
+    })
   }
 
   describe('without assetPrefix', () => {
diff --git a/test/integration/image-optimizer/test/util.ts b/test/integration/image-optimizer/test/util.ts
index aa37a5aef7c7..0937682c742c 100644
--- a/test/integration/image-optimizer/test/util.ts
+++ b/test/integration/image-optimizer/test/util.ts
@@ -15,6 +15,7 @@ import {
   waitFor,
 } from 'next-test-utils'
 import isAnimated from 'next/dist/compiled/is-animated'
+import type { RequestInit } from 'node-fetch'
 
 const largeSize = 1080 // defaults defined in server/config.ts
 const sharpMissingText = `For production Image Optimization with Next.js, the optional 'sharp' package is strongly recommended`
@@ -115,10 +116,15 @@ async function expectAvifSmallerThanWebp(w, q, appPort) {
   expect(avif).toBeLessThanOrEqual(webp)
 }
 
-async function fetchWithDuration(...args) {
-  console.warn('Fetching', args[1], args[2])
+async function fetchWithDuration(
+  appPort: string | number,
+  pathname: string,
+  query?: Record<string, any> | string,
+  opts?: RequestInit
+) {
+  console.warn('Fetching', pathname, query)
   const start = Date.now()
-  const res = await fetchViaHTTP(...args)
+  const res = await fetchViaHTTP(appPort, pathname, query, opts)
   const buffer = await res.buffer()
   const duration = Date.now() - start
   return { duration, buffer, res }
@@ -140,7 +146,10 @@ export function runTests(ctx) {
         slowImageServer.port
       }/slow.png?delay=${1}&status=308`
       const query = { url, w: ctx.w, q: 39 }
-      const opts = { headers: { accept: 'image/webp' }, redirect: 'manual' }
+      const opts: RequestInit = {
+        headers: { accept: 'image/webp' },
+        redirect: 'manual',
+      }
 
       const res = await fetchViaHTTP(ctx.appPort, '/_next/image', query, opts)
       expect(res.status).toBe(500)
diff --git a/test/lib/next-test-utils.js b/test/lib/next-test-utils.js
index d46441e156f3..6d07d22915e0 100644
--- a/test/lib/next-test-utils.js
+++ b/test/lib/next-test-utils.js
@@ -83,6 +83,12 @@ export function initNextServerScript(
   })
 }
 
+/**
+ * @param {string | number} appPortOrUrl
+ * @param {string} [url]
+ * @param {string} [hostname]
+ * @returns
+ */
 export function getFullUrl(appPortOrUrl, url, hostname) {
   let fullUrl =
     typeof appPortOrUrl === 'string' && appPortOrUrl.startsWith('http')
@@ -110,11 +116,24 @@ export function renderViaAPI(app, pathname, query) {
   return app.renderToHTML({ url }, {}, pathname, query)
 }
 
+/**
+ * @param {string | number} appPort
+ * @param {string} pathname
+ * @param {Record<string, any> | string | undefined} [query]
+ * @param {import('node-fetch').RequestInit} [opts]
+ * @returns {Promise<string>}
+ */
 export function renderViaHTTP(appPort, pathname, query, opts) {
   return fetchViaHTTP(appPort, pathname, query, opts).then((res) => res.text())
 }
 
-/** @return {Promise<Response & {buffer: any} & {headers: any}>} */
+/**
+ * @param {string | number} appPort
+ * @param {string} pathname
+ * @param {Record<string, any> | string | undefined} [query]
+ * @param {import('node-fetch').RequestInit} [opts]
+ * @returns {Promise<Response & {buffer: any} & {headers: any}>}
+ */
 export function fetchViaHTTP(appPort, pathname, query, opts) {
   const url = `${pathname}${
     typeof query === 'string' ? query : query ? `?${qs.stringify(query)}` : ''
diff --git a/test/production/required-server-files-i18n.test.ts b/test/production/required-server-files-i18n.test.ts
index 17c5df1c80df..8d290d779df5 100644
--- a/test/production/required-server-files-i18n.test.ts
+++ b/test/production/required-server-files-i18n.test.ts
@@ -171,7 +171,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'show')
 
     const res = await fetchViaHTTP(appPort, '/gsp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
@@ -182,7 +182,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'hide')
 
     const res2 = await fetchViaHTTP(appPort, '/gsp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res2.status).toBe(404)
     expect(res2.headers.get('cache-control')).toBe(
@@ -194,7 +194,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'show')
 
     const res = await fetchViaHTTP(appPort, '/gssp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
@@ -204,7 +204,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'hide')
 
     const res2 = await fetchViaHTTP(appPort, '/gssp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     await next.patchFile('standalone/data.txt', 'show')
 
diff --git a/test/production/required-server-files.test.ts b/test/production/required-server-files.test.ts
index 1d97b5bc5be3..de7d1bcc26c3 100644
--- a/test/production/required-server-files.test.ts
+++ b/test/production/required-server-files.test.ts
@@ -422,7 +422,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'show')
 
     const res = await fetchViaHTTP(appPort, '/gsp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
@@ -433,7 +433,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'hide')
 
     const res2 = await fetchViaHTTP(appPort, '/gsp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res2.status).toBe(404)
     expect(res2.headers.get('cache-control')).toBe(
@@ -445,7 +445,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'show')
 
     const res = await fetchViaHTTP(appPort, '/gssp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     expect(res.status).toBe(200)
     expect(res.headers.get('cache-control')).toBe(
@@ -455,7 +455,7 @@ describe('should set-up next', () => {
     await next.patchFile('standalone/data.txt', 'hide')
 
     const res2 = await fetchViaHTTP(appPort, '/gssp', undefined, {
-      redirect: 'manual ',
+      redirect: 'manual',
     })
     await next.patchFile('standalone/data.txt', 'show')
 

From 614f0d8e19a80cbb5f707b2201c7fb3ec5f3a831 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Thu, 8 Sep 2022 15:18:23 -0700
Subject: [PATCH 32/69] v12.3.1-canary.0

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 +--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 ++++-----
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 30 +++++++-------------
 16 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/lerna.json b/lerna.json
index 2299fc6a2892..fe214ba233be 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.3.0"
+  "version": "12.3.1-canary.0"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 9d5d6bbbea59..89a0a642c35b 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 8d1f5a1527f6..6ea37f6f39b7 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "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.3.0",
+    "@next/eslint-plugin-next": "12.3.1-canary.0",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index ae49513012ee..225d52346f13 100644
--- 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.3.0",
+  "version": "12.3.1-canary.0",
   "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
index 8e359412211d..0e5171eb281c 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 7620d642f30f..0ea8a161c2db 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index e54b40ee6dfc..abfafb9eb423 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index edc6bc183a99..aca139aa0cbc 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index aa646820bcba..cce62d780fd2 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "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
index 2c5ffae3a4e9..d9de25b34de5 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "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
index 2393b3243d5e..8476dc35b9eb 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "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
index 0a3075d91e24..6c10e67d141b 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index 86af955b4779..c5afcef6fe3b 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.3.0",
+  "version": "12.3.1-canary.0",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.3.0",
+    "@next/env": "12.3.1-canary.0",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.3.0",
-    "@next/polyfill-nomodule": "12.3.0",
-    "@next/react-dev-overlay": "12.3.0",
-    "@next/react-refresh-utils": "12.3.0",
-    "@next/swc": "12.3.0",
+    "@next/polyfill-module": "12.3.1-canary.0",
+    "@next/polyfill-nomodule": "12.3.1-canary.0",
+    "@next/react-dev-overlay": "12.3.1-canary.0",
+    "@next/react-refresh-utils": "12.3.1-canary.0",
+    "@next/swc": "12.3.1-canary.0",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index fcd9f37f6dcf..ecbf133e549a 100644
--- 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.3.0",
+  "version": "12.3.1-canary.0",
   "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
index ef30d2385de0..d66abadd4b70 100644
--- 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.3.0",
+  "version": "12.3.1-canary.0",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5c59a89ecd0b..5cbe4a27ab64 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -205,7 +205,7 @@ importers:
       '@types/trusted-types': 2.0.2
       '@typescript-eslint/eslint-plugin': 4.29.1_qxyn66xcaddhgaahwkbomftvi4
       '@typescript-eslint/parser': 4.29.1_6x3mpmmsttbpxxsctsorxedanu
-      '@vercel/fetch': 6.1.1_wbqoqouw2iimn65bqgaw3lwmza
+      '@vercel/fetch': 6.1.1_fii5qhbaymjqmfm7e2spxc5z4m
       '@webassemblyjs/ast': 1.11.1
       '@webassemblyjs/floating-point-hex-parser': 1.11.1
       '@webassemblyjs/helper-api-error': 1.11.1
@@ -365,7 +365,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.3.0
+      '@next/eslint-plugin-next': 12.3.1-canary.0
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -421,12 +421,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.3.0
-      '@next/polyfill-module': 12.3.0
-      '@next/polyfill-nomodule': 12.3.0
-      '@next/react-dev-overlay': 12.3.0
-      '@next/react-refresh-utils': 12.3.0
-      '@next/swc': 12.3.0
+      '@next/env': 12.3.1-canary.0
+      '@next/polyfill-module': 12.3.1-canary.0
+      '@next/polyfill-nomodule': 12.3.1-canary.0
+      '@next/react-dev-overlay': 12.3.1-canary.0
+      '@next/react-refresh-utils': 12.3.1-canary.0
+      '@next/swc': 12.3.1-canary.0
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0
@@ -7277,16 +7277,6 @@ packages:
       form-data: 3.0.1
     dev: true
 
-  /@types/node-fetch/2.6.2:
-    resolution:
-      {
-        integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==,
-      }
-    dependencies:
-      '@types/node': 17.0.21
-      form-data: 3.0.1
-    dev: true
-
   /@types/node/10.12.18:
     resolution:
       {
@@ -7892,7 +7882,7 @@ packages:
       - supports-color
     dev: true
 
-  /@vercel/fetch/6.1.1_wbqoqouw2iimn65bqgaw3lwmza:
+  /@vercel/fetch/6.1.1_fii5qhbaymjqmfm7e2spxc5z4m:
     resolution:
       {
         integrity: sha512-nddCkgpA0aVIqOlzh+qVlzDNcQq0cSnqefM+x6SciGI4GCvVZeaZ7WEowgX8I/HwBAq8Uj5Bdnd+r0+sYsJsig==,
@@ -7902,7 +7892,7 @@ packages:
       node-fetch: '2'
     dependencies:
       '@types/async-retry': 1.2.1
-      '@types/node-fetch': 2.6.2
+      '@types/node-fetch': 2.6.1
       '@vercel/fetch-cached-dns': 2.0.2_node-fetch@2.6.7
       '@vercel/fetch-retry': 5.0.3_node-fetch@2.6.7
       agentkeepalive: 3.4.1

From 9ab5c012bffd9ca410978577d38b9a7a8e8db6d6 Mon Sep 17 00:00:00 2001
From: rubytree33 <110690041+rubytree33@users.noreply.github.com>
Date: Thu, 8 Sep 2022 19:35:33 -0700
Subject: [PATCH 33/69] Stop build warning about `experimental: { esmExternals:
 'loose' }` (#40377)

Fixes #40368.

## Bug

- [x] Related issues linked using `fixes #number`
- [ ] ~~Integration tests added~~ [none applicable]
- [ ] ~~Errors have helpful link attached, see `contributing.md`~~ [no new errors]
---
 packages/next/server/config-schema.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/next/server/config-schema.ts b/packages/next/server/config-schema.ts
index 984d0df6b77d..6c06e28a48b3 100644
--- a/packages/next/server/config-schema.ts
+++ b/packages/next/server/config-schema.ts
@@ -253,7 +253,14 @@ const configSchema = {
           type: 'boolean',
         },
         esmExternals: {
-          type: 'boolean',
+          oneOf: [
+            {
+              type: 'boolean',
+            },
+            {
+              const: 'loose',
+            },
+          ] as any,
         },
         externalDir: {
           type: 'boolean',

From a3a20dcbc1358f0362b74717c2fc3fa1e97a06b1 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Fri, 9 Sep 2022 14:44:12 +0200
Subject: [PATCH 34/69] Add template and error file types (#39808)

Co-authored-by: Jiachi Liu <inbox@huozhi.im>
---
 .../build/webpack/loaders/next-app-loader.ts  |  62 ++++++---
 packages/next/client/app-index.tsx            |  28 ++--
 .../components/layout-router.client.tsx       | 116 +++++++++++++---
 .../render-from-template-context.client.tsx   |   7 +
 packages/next/server/app-render.tsx           | 124 +++++++++++++-----
 .../next/shared/lib/app-router-context.ts     |   3 +
 packages/next/shared/lib/constants.ts         |   2 +-
 .../app/error/clientcomponent/error.client.js |  10 ++
 .../app/error/clientcomponent/page.client.js  |  18 +++
 .../ssr-error-client-component/page.client.js |   3 +
 .../clientcomponent/other/page.server.js      |  11 ++
 .../template/clientcomponent/page.server.js   |  12 ++
 .../clientcomponent/template.client.js        |  12 ++
 .../servercomponent/other/page.server.js      |  11 ++
 .../template/servercomponent/page.server.js   |  12 ++
 .../servercomponent/template.server.js        |  10 ++
 test/e2e/app-dir/index.test.ts                | 100 ++++++++++++++
 17 files changed, 448 insertions(+), 93 deletions(-)
 create mode 100644 packages/next/client/components/render-from-template-context.client.tsx
 create mode 100644 test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
 create mode 100644 test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
 create mode 100644 test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
 create mode 100644 test/e2e/app-dir/app/app/template/clientcomponent/other/page.server.js
 create mode 100644 test/e2e/app-dir/app/app/template/clientcomponent/page.server.js
 create mode 100644 test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
 create mode 100644 test/e2e/app-dir/app/app/template/servercomponent/other/page.server.js
 create mode 100644 test/e2e/app-dir/app/app/template/servercomponent/page.server.js
 create mode 100644 test/e2e/app-dir/app/app/template/servercomponent/template.server.js

diff --git a/packages/next/build/webpack/loaders/next-app-loader.ts b/packages/next/build/webpack/loaders/next-app-loader.ts
index 16c89ce73b35..3153b835c7db 100644
--- a/packages/next/build/webpack/loaders/next-app-loader.ts
+++ b/packages/next/build/webpack/loaders/next-app-loader.ts
@@ -1,7 +1,24 @@
 import type webpack from 'webpack'
+import type { ValueOf } from '../../../shared/lib/constants'
 import { NODE_RESOLVE_OPTIONS } from '../../webpack-config'
 import { getModuleBuildInfo } from './get-module-build-info'
 
+export const FILE_TYPES = {
+  layout: 'layout',
+  template: 'template',
+  error: 'error',
+  loading: 'loading',
+} as const
+
+// TODO-APP: check if this can be narrowed.
+type ComponentModule = () => any
+export type ComponentsType = {
+  readonly [componentKey in ValueOf<typeof FILE_TYPES>]?: ComponentModule
+} & {
+  readonly layoutOrPagePath?: string
+  readonly page?: ComponentModule
+}
+
 async function createTreeCodeFromPath({
   pagePath,
   resolve,
@@ -39,7 +56,7 @@ async function createTreeCodeFromPath({
         const matchedPagePath = `${appDirPrefix}${parallelSegmentPath}`
         const resolvedPagePath = await resolve(matchedPagePath)
         // Use '' for segment as it's the page. There can't be a segment called '' so this is the safest way to add it.
-        props[parallelKey] = `['', {}, {filePath: ${JSON.stringify(
+        props[parallelKey] = `['', {}, {layoutOrPagePath: ${JSON.stringify(
           resolvedPagePath
         )}, page: () => require(${JSON.stringify(resolvedPagePath)})}]`
         continue
@@ -50,31 +67,33 @@ async function createTreeCodeFromPath({
         parallelSegment,
       ])
 
-      // For segmentPath === '' avoid double `/`
-      const layoutPath = `${appDirPrefix}${parallelSegmentPath}/layout`
-      // For segmentPath === '' avoid double `/`
-      const loadingPath = `${appDirPrefix}${parallelSegmentPath}/loading`
-
-      const resolvedLayoutPath = await resolve(layoutPath)
-      const resolvedLoadingPath = await resolve(loadingPath)
+      // `page` is not included here as it's added above.
+      const filePaths = await Promise.all(
+        Object.values(FILE_TYPES).map(async (file) => {
+          return [
+            file,
+            await resolve(`${appDirPrefix}${parallelSegmentPath}/${file}`),
+          ] as const
+        })
+      )
 
       props[parallelKey] = `[
         '${parallelSegment}',
         ${subtree},
         {
-          filePath: ${JSON.stringify(resolvedLayoutPath)},
-          ${
-            resolvedLayoutPath
-              ? `layout: () => require(${JSON.stringify(resolvedLayoutPath)}),`
-              : ''
-          }
-          ${
-            resolvedLoadingPath
-              ? `loading: () => require(${JSON.stringify(
-                  resolvedLoadingPath
-                )}),`
-              : ''
-          }
+          ${filePaths
+            .filter(([, filePath]) => filePath !== undefined)
+            .map(([file, filePath]) => {
+              if (filePath === undefined) {
+                return ''
+              }
+              return `${
+                file === FILE_TYPES.layout
+                  ? `layoutOrPagePath: '${filePath}',`
+                  : ''
+              }${file}: () => require(${JSON.stringify(filePath)}),`
+            })
+            .join('\n')}
         }
       ]`
     }
@@ -164,6 +183,7 @@ const nextAppLoader: webpack.LoaderDefinitionFunction<{
 
     export const AppRouter = require('next/dist/client/components/app-router.client.js').default
     export const LayoutRouter = require('next/dist/client/components/layout-router.client.js').default
+    export const RenderFromTemplateContext = require('next/dist/client/components/render-from-template-context.client.js').default
     export const HotReloader = ${
       // Disable HotReloader component in production
       this.mode === 'development'
diff --git a/packages/next/client/app-index.tsx b/packages/next/client/app-index.tsx
index 4f148f9b74d4..a1631e60685a 100644
--- a/packages/next/client/app-index.tsx
+++ b/packages/next/client/app-index.tsx
@@ -2,7 +2,6 @@
 import '../build/polyfills/polyfill-module'
 // @ts-ignore react-dom/client exists when using React 18
 import ReactDOMClient from 'react-dom/client'
-// @ts-ignore startTransition exists when using React 18
 import React from 'react'
 import { createFromReadableStream } from 'next/dist/compiled/react-server-dom-webpack'
 
@@ -44,21 +43,6 @@ export const version = process.env.__NEXT_VERSION
 
 const appElement: HTMLElement | Document | null = document
 
-let reactRoot: any = null
-
-function renderReactElement(
-  domEl: HTMLElement | Document,
-  fn: () => JSX.Element
-): void {
-  const reactEl = fn()
-  if (!reactRoot) {
-    // Unlike with createRoot, you don't need a separate root.render() call here
-    reactRoot = (ReactDOMClient as any).hydrateRoot(domEl, reactEl)
-  } else {
-    reactRoot.render(reactEl)
-  }
-}
-
 const getCacheKey = () => {
   const { pathname, search } = location
   return pathname + search
@@ -182,11 +166,19 @@ function RSCComponent(props: any) {
 }
 
 export function hydrate() {
-  renderReactElement(appElement!, () => (
+  const reactEl = (
     <React.StrictMode>
       <Root>
         <RSCComponent />
       </Root>
     </React.StrictMode>
-  ))
+  )
+
+  const isError = document.documentElement.id === '__next_error__'
+  const reactRoot = isError
+    ? (ReactDOMClient as any).createRoot(appElement)
+    : (ReactDOMClient as any).hydrateRoot(appElement, reactEl)
+  if (isError) {
+    reactRoot.render(reactEl)
+  }
 }
diff --git a/packages/next/client/components/layout-router.client.tsx b/packages/next/client/components/layout-router.client.tsx
index 63e7aa083c33..197764187e72 100644
--- a/packages/next/client/components/layout-router.client.tsx
+++ b/packages/next/client/components/layout-router.client.tsx
@@ -12,6 +12,7 @@ import type {
 import {
   LayoutRouterContext,
   GlobalLayoutRouterContext,
+  TemplateContext,
 } from '../../shared/lib/app-router-context'
 import { fetchServerResponse } from './app-router.client'
 // import { matchSegment } from './match-segments'
@@ -312,7 +313,7 @@ function LoadingBoundary({
 }: {
   children: React.ReactNode
   loading?: React.ReactNode
-}) {
+}): JSX.Element {
   if (loading) {
     return <React.Suspense fallback={loading}>{children}</React.Suspense>
   }
@@ -320,6 +321,65 @@ function LoadingBoundary({
   return <>{children}</>
 }
 
+type ErrorComponent = React.ComponentType<{ error: Error; reset: () => void }>
+interface ErrorBoundaryProps {
+  errorComponent: ErrorComponent
+}
+
+/**
+ * Handles errors through `getDerivedStateFromError`.
+ * Renders the provided error component and provides a way to `reset` the error boundary state.
+ */
+class ErrorBoundaryHandler extends React.Component<
+  ErrorBoundaryProps,
+  { error: Error | null }
+> {
+  constructor(props: ErrorBoundaryProps) {
+    super(props)
+    this.state = { error: null }
+  }
+
+  static getDerivedStateFromError(error: Error) {
+    return { error }
+  }
+
+  reset = () => {
+    this.setState({ error: null })
+  }
+
+  render() {
+    if (this.state.error) {
+      return (
+        <this.props.errorComponent
+          error={this.state.error}
+          reset={this.reset}
+        />
+      )
+    }
+
+    return this.props.children
+  }
+}
+
+/**
+ * Renders error boundary with the provided "errorComponent" property as the fallback.
+ * If no "errorComponent" property is provided it renders the children without an error boundary.
+ */
+function ErrorBoundary({
+  errorComponent,
+  children,
+}: ErrorBoundaryProps & { children: React.ReactNode }): JSX.Element {
+  if (errorComponent) {
+    return (
+      <ErrorBoundaryHandler errorComponent={errorComponent}>
+        {children}
+      </ErrorBoundaryHandler>
+    )
+  }
+
+  return <>{children}</>
+}
+
 /**
  * OuterLayoutRouter handles the current segment as well as <Offscreen> rendering of other segments.
  * It can be rendered next to each other with a different `parallelRouterKey`, allowing for Parallel routes.
@@ -328,12 +388,16 @@ export default function OuterLayoutRouter({
   parallelRouterKey,
   segmentPath,
   childProp,
+  error,
   loading,
+  template,
   rootLayoutIncluded,
 }: {
   parallelRouterKey: string
   segmentPath: FlightSegmentPath
   childProp: ChildProp
+  error: ErrorComponent
+  template: React.ReactNode
   loading: React.ReactNode | undefined
   rootLayoutIncluded: boolean
 }) {
@@ -371,23 +435,39 @@ export default function OuterLayoutRouter({
     <>
       {preservedSegments.map((preservedSegment) => {
         return (
-          // Loading boundary is render for each segment to ensure they have their own loading state.
-          // The loading boundary is passed to the router during rendering to ensure it can be immediately rendered when suspending on a Flight fetch.
-          <LoadingBoundary loading={loading} key={preservedSegment}>
-            <InnerLayoutRouter
-              parallelRouterKey={parallelRouterKey}
-              url={url}
-              tree={tree}
-              childNodes={childNodesForParallelRouter!}
-              childProp={
-                childPropSegment === preservedSegment ? childProp : null
-              }
-              segmentPath={segmentPath}
-              path={preservedSegment}
-              isActive={currentChildSegment === preservedSegment}
-              rootLayoutIncluded={rootLayoutIncluded}
-            />
-          </LoadingBoundary>
+          /*
+            - Error boundary
+              - Only renders error boundary if error component is provided.
+              - Rendered for each segment to ensure they have their own error state.
+            - Loading boundary
+              - Only renders suspense boundary if loading components is provided.
+              - Rendered for each segment to ensure they have their own loading state.
+              - Passed to the router during rendering to ensure it can be immediately rendered when suspending on a Flight fetch.
+          */
+          <TemplateContext.Provider
+            key={preservedSegment}
+            value={
+              <ErrorBoundary errorComponent={error}>
+                <LoadingBoundary loading={loading}>
+                  <InnerLayoutRouter
+                    parallelRouterKey={parallelRouterKey}
+                    url={url}
+                    tree={tree}
+                    childNodes={childNodesForParallelRouter!}
+                    childProp={
+                      childPropSegment === preservedSegment ? childProp : null
+                    }
+                    segmentPath={segmentPath}
+                    path={preservedSegment}
+                    isActive={currentChildSegment === preservedSegment}
+                    rootLayoutIncluded={rootLayoutIncluded}
+                  />
+                </LoadingBoundary>
+              </ErrorBoundary>
+            }
+          >
+            {template}
+          </TemplateContext.Provider>
         )
       })}
     </>
diff --git a/packages/next/client/components/render-from-template-context.client.tsx b/packages/next/client/components/render-from-template-context.client.tsx
new file mode 100644
index 000000000000..b3da594dca99
--- /dev/null
+++ b/packages/next/client/components/render-from-template-context.client.tsx
@@ -0,0 +1,7 @@
+import React, { useContext } from 'react'
+import { TemplateContext } from '../../shared/lib/app-router-context'
+
+export default function RenderFromTemplateContext(): JSX.Element {
+  const children = useContext(TemplateContext)
+  return <>{children}</>
+}
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index b71191b4b720..7fe57797fb4c 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -26,6 +26,7 @@ import {
   FlightManifest,
 } from '../build/webpack/plugins/flight-manifest-plugin'
 import { FlushEffectsContext } from '../client/components/hooks-client'
+import type { ComponentsType } from '../build/webpack/loaders/next-app-loader'
 
 // this needs to be required lazily so that `next-server` can set
 // the env before we require
@@ -290,12 +291,7 @@ export type Segment =
 type LoaderTree = [
   segment: string,
   parallelRoutes: { [parallelRouterKey: string]: LoaderTree },
-  components: {
-    filePath: string
-    layout?: () => any
-    loading?: () => any
-    page?: () => any
-  }
+  components: ComponentsType
 ]
 
 /**
@@ -524,6 +520,8 @@ export async function renderToHTMLOrFlight(
   const pageIsDynamic = isDynamicRoute(pathname)
   const LayoutRouter =
     ComponentMod.LayoutRouter as typeof import('../client/components/layout-router.client').default
+  const RenderFromTemplateContext =
+    ComponentMod.RenderFromTemplateContext as typeof import('../client/components/render-from-template-context.client').default
   const HotReloader = ComponentMod.HotReloader as
     | typeof import('../client/components/hot-reloader.client').default
     | null
@@ -654,7 +652,11 @@ export async function renderToHTMLOrFlight(
    */
   const createComponentTree = async ({
     createSegmentPath,
-    loaderTree: [segment, parallelRoutes, { filePath, layout, loading, page }],
+    loaderTree: [
+      segment,
+      parallelRoutes,
+      { layoutOrPagePath, layout, template, error, loading, page },
+    ],
     parentParams,
     firstItem,
     rootLayoutIncluded,
@@ -666,11 +668,17 @@ export async function renderToHTMLOrFlight(
     firstItem?: boolean
   }): Promise<{ Component: React.ComponentType }> => {
     // TODO-APP: enable stylesheet per layout/page
-    const stylesheets = getCssInlinedLinkTags(
-      serverComponentManifest,
-      serverCSSManifest!,
-      filePath
-    )
+    const stylesheets: string[] = layoutOrPagePath
+      ? getCssInlinedLinkTags(
+          serverComponentManifest,
+          serverCSSManifest!,
+          layoutOrPagePath
+        )
+      : []
+    const Template = template
+      ? await interopDefault(template())
+      : React.Fragment
+    const ErrorComponent = error ? await interopDefault(error()) : undefined
     const Loading = loading ? await interopDefault(loading()) : undefined
     const isLayout = typeof layout !== 'undefined'
     const isPage = typeof page !== 'undefined'
@@ -746,6 +754,12 @@ export async function renderToHTMLOrFlight(
                 parallelRouterKey={parallelRouteKey}
                 segmentPath={createSegmentPath(currentSegmentPath)}
                 loading={Loading ? <Loading /> : undefined}
+                error={ErrorComponent}
+                template={
+                  <Template>
+                    <RenderFromTemplateContext />
+                  </Template>
+                }
                 childProp={childProp}
                 rootLayoutIncluded={rootLayoutIncludedAtThisLevelOrAbove}
               />,
@@ -769,13 +783,21 @@ export async function renderToHTMLOrFlight(
               : childSegment,
           }
 
+          const segmentPath = createSegmentPath(currentSegmentPath)
+
           // This is turned back into an object below.
           return [
             parallelRouteKey,
             <LayoutRouter
               parallelRouterKey={parallelRouteKey}
-              segmentPath={createSegmentPath(currentSegmentPath)}
+              segmentPath={segmentPath}
+              error={ErrorComponent}
               loading={Loading ? <Loading /> : undefined}
+              template={
+                <Template>
+                  <RenderFromTemplateContext />
+                </Template>
+              }
               childProp={childProp}
               rootLayoutIncluded={rootLayoutIncludedAtThisLevelOrAbove}
             />,
@@ -1142,29 +1164,61 @@ export async function renderToHTMLOrFlight(
       return flushed
     }
 
-    const renderStream = await renderToInitialStream({
-      ReactDOMServer,
-      element: content,
-      streamOptions: {
-        nonce,
-        // Include hydration scripts in the HTML
-        bootstrapScripts: subresourceIntegrityManifest
-          ? buildManifest.rootMainFiles.map((src) => ({
-              src: `${renderOpts.assetPrefix || ''}/_next/` + src,
-              integrity: subresourceIntegrityManifest[src],
-            }))
-          : buildManifest.rootMainFiles.map(
-              (src) => `${renderOpts.assetPrefix || ''}/_next/` + src
-            ),
-      },
-    })
+    try {
+      const renderStream = await renderToInitialStream({
+        ReactDOMServer,
+        element: content,
+        streamOptions: {
+          nonce,
+          // Include hydration scripts in the HTML
+          bootstrapScripts: subresourceIntegrityManifest
+            ? buildManifest.rootMainFiles.map((src) => ({
+                src: `${renderOpts.assetPrefix || ''}/_next/` + src,
+                integrity: subresourceIntegrityManifest[src],
+              }))
+            : buildManifest.rootMainFiles.map(
+                (src) => `${renderOpts.assetPrefix || ''}/_next/` + src
+              ),
+        },
+      })
 
-    return await continueFromInitialStream(renderStream, {
-      dataStream: serverComponentsInlinedTransformStream?.readable,
-      generateStaticHTML: generateStaticHTML,
-      flushEffectHandler,
-      flushEffectsToHead: true,
-    })
+      return await continueFromInitialStream(renderStream, {
+        dataStream: serverComponentsInlinedTransformStream?.readable,
+        generateStaticHTML: generateStaticHTML,
+        flushEffectHandler,
+        flushEffectsToHead: true,
+      })
+    } catch (err) {
+      // TODO-APP: show error overlay in development. `element` should probably be wrapped in AppRouter for this case.
+      const renderStream = await renderToInitialStream({
+        ReactDOMServer,
+        element: (
+          <html id="__next_error__">
+            <head></head>
+            <body></body>
+          </html>
+        ),
+        streamOptions: {
+          nonce,
+          // Include hydration scripts in the HTML
+          bootstrapScripts: subresourceIntegrityManifest
+            ? buildManifest.rootMainFiles.map((src) => ({
+                src: `${renderOpts.assetPrefix || ''}/_next/` + src,
+                integrity: subresourceIntegrityManifest[src],
+              }))
+            : buildManifest.rootMainFiles.map(
+                (src) => `${renderOpts.assetPrefix || ''}/_next/` + src
+              ),
+        },
+      })
+
+      return await continueFromInitialStream(renderStream, {
+        dataStream: serverComponentsInlinedTransformStream?.readable,
+        generateStaticHTML: generateStaticHTML,
+        flushEffectHandler,
+        flushEffectsToHead: true,
+      })
+    }
   }
 
   return new RenderResult(await bodyResult())
diff --git a/packages/next/shared/lib/app-router-context.ts b/packages/next/shared/lib/app-router-context.ts
index 74f73d1916e8..f9a36be37dc3 100644
--- a/packages/next/shared/lib/app-router-context.ts
+++ b/packages/next/shared/lib/app-router-context.ts
@@ -66,8 +66,11 @@ export const GlobalLayoutRouterContext = React.createContext<{
   focusAndScrollRef: FocusAndScrollRef
 }>(null as any)
 
+export const TemplateContext = React.createContext<React.ReactNode>(null as any)
+
 if (process.env.NODE_ENV !== 'production') {
   AppRouterContext.displayName = 'AppRouterContext'
   LayoutRouterContext.displayName = 'LayoutRouterContext'
   GlobalLayoutRouterContext.displayName = 'GlobalLayoutRouterContext'
+  TemplateContext.displayName = 'TemplateContext'
 }
diff --git a/packages/next/shared/lib/constants.ts b/packages/next/shared/lib/constants.ts
index f17d05ba0f83..856c638eac75 100644
--- a/packages/next/shared/lib/constants.ts
+++ b/packages/next/shared/lib/constants.ts
@@ -1,4 +1,4 @@
-type ValueOf<T> = Required<T>[keyof T]
+export type ValueOf<T> = Required<T>[keyof T]
 
 export const COMPILER_NAMES = {
   client: 'client',
diff --git a/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js b/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
new file mode 100644
index 000000000000..cc0c3b620bfd
--- /dev/null
+++ b/test/e2e/app-dir/app/app/error/clientcomponent/error.client.js
@@ -0,0 +1,10 @@
+export default function ErrorBoundary({ error, reset }) {
+  return (
+    <>
+      <p id="error-boundary-message">An error occurred: {error.message}</p>
+      <button id="reset" onClick={() => reset()}>
+        Try again
+      </button>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js b/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
new file mode 100644
index 000000000000..8c3fe1a72901
--- /dev/null
+++ b/test/e2e/app-dir/app/app/error/clientcomponent/page.client.js
@@ -0,0 +1,18 @@
+import { useState } from 'react'
+
+export default function Page() {
+  const [clicked, setClicked] = useState(false)
+  if (clicked) {
+    throw new Error('this is a test')
+  }
+  return (
+    <button
+      id="error-trigger-button"
+      onClick={() => {
+        setClicked(true)
+      }}
+    >
+      Trigger Error!
+    </button>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js b/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
new file mode 100644
index 000000000000..1cca8f6810c8
--- /dev/null
+++ b/test/e2e/app-dir/app/app/error/ssr-error-client-component/page.client.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  throw new Error('Error during SSR')
+}
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/other/page.server.js b/test/e2e/app-dir/app/app/template/clientcomponent/other/page.server.js
new file mode 100644
index 000000000000..24c81bb71930
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/other/page.server.js
@@ -0,0 +1,11 @@
+import Link from 'next/link'
+export default function Page() {
+  return (
+    <>
+      <p id="other-page">Other Page</p>
+      <Link href="/template/clientcomponent">
+        <a id="link">To Page</a>
+      </Link>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/page.server.js b/test/e2e/app-dir/app/app/template/clientcomponent/page.server.js
new file mode 100644
index 000000000000..89378c7e29f1
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/page.server.js
@@ -0,0 +1,12 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <>
+      <p id="page">Page</p>
+      <Link href="/template/clientcomponent/other">
+        <a id="link">To Other</a>
+      </Link>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js b/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
new file mode 100644
index 000000000000..3f9960433a4e
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/clientcomponent/template.client.js
@@ -0,0 +1,12 @@
+import { useState } from 'react'
+
+export default function Template({ children }) {
+  const [count, setCount] = useState(0)
+  return (
+    <>
+      <h1>Template {count}</h1>
+      <button onClick={() => setCount(count + 1)}>Increment</button>
+      {children}
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/template/servercomponent/other/page.server.js b/test/e2e/app-dir/app/app/template/servercomponent/other/page.server.js
new file mode 100644
index 000000000000..2ed3a0fa15ce
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/servercomponent/other/page.server.js
@@ -0,0 +1,11 @@
+import Link from 'next/link'
+export default function Page() {
+  return (
+    <>
+      <p id="other-page">Other Page</p>
+      <Link href="/template/servercomponent">
+        <a id="link">To Page</a>
+      </Link>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/template/servercomponent/page.server.js b/test/e2e/app-dir/app/app/template/servercomponent/page.server.js
new file mode 100644
index 000000000000..27a7097ccd65
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/servercomponent/page.server.js
@@ -0,0 +1,12 @@
+import Link from 'next/link'
+
+export default function Page() {
+  return (
+    <>
+      <p id="page">Page</p>
+      <Link href="/template/servercomponent/other">
+        <a id="link">To Other</a>
+      </Link>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/app/app/template/servercomponent/template.server.js b/test/e2e/app-dir/app/app/template/servercomponent/template.server.js
new file mode 100644
index 000000000000..c3dc5dadb925
--- /dev/null
+++ b/test/e2e/app-dir/app/app/template/servercomponent/template.server.js
@@ -0,0 +1,10 @@
+export default function Template({ children }) {
+  return (
+    <>
+      <h1>
+        Template <span id="performance-now">{performance.now()}</span>
+      </h1>
+      {children}
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index e92332aa0c8c..4f98910d63c3 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -1317,6 +1317,106 @@ describe('app dir', () => {
         expect(res.status).toBe(500)
       })
     })
+
+    describe('template component', () => {
+      it('should render the template that holds state in a client component and reset on navigation', async () => {
+        const browser = await webdriver(next.url, '/template/clientcomponent')
+        expect(await browser.elementByCss('h1').text()).toBe('Template 0')
+        await browser.elementByCss('button').click()
+        expect(await browser.elementByCss('h1').text()).toBe('Template 1')
+
+        await browser.elementByCss('#link').click()
+        await browser.waitForElementByCss('#other-page')
+
+        expect(await browser.elementByCss('h1').text()).toBe('Template 0')
+        await browser.elementByCss('button').click()
+        expect(await browser.elementByCss('h1').text()).toBe('Template 1')
+
+        await browser.elementByCss('#link').click()
+        await browser.waitForElementByCss('#page')
+
+        expect(await browser.elementByCss('h1').text()).toBe('Template 0')
+      })
+
+      it('should render the template that is a server component and rerender on navigation', async () => {
+        const browser = await webdriver(next.url, '/template/servercomponent')
+        expect(await browser.elementByCss('h1').text()).toStartWith('Template')
+
+        const currentTime = await browser
+          .elementByCss('#performance-now')
+          .text()
+
+        await browser.elementByCss('#link').click()
+        await browser.waitForElementByCss('#other-page')
+
+        expect(await browser.elementByCss('h1').text()).toStartWith('Template')
+
+        // template should rerender on navigation even when it's a server component
+        expect(await browser.elementByCss('#performance-now').text()).toBe(
+          currentTime
+        )
+
+        await browser.elementByCss('#link').click()
+        await browser.waitForElementByCss('#page')
+
+        expect(await browser.elementByCss('#performance-now').text()).toBe(
+          currentTime
+        )
+      })
+    })
+
+    // TODO-APP: This is disabled for development as the error overlay needs to be reworked.
+    ;(isDev ? describe.skip : describe)('error component', () => {
+      it('should trigger error component when an error happens during rendering', async () => {
+        const browser = await webdriver(next.url, '/error/clientcomponent')
+        await browser
+          .elementByCss('#error-trigger-button')
+          .click()
+          .waitForElementByCss('#error-boundary-message')
+
+        expect(
+          await browser.elementByCss('#error-boundary-message').text()
+        ).toBe('An error occurred: this is a test')
+      })
+
+      it('should allow resetting error boundary', async () => {
+        const browser = await webdriver(next.url, '/error/clientcomponent')
+
+        // Try triggering and resetting a few times in a row
+        for (let i = 0; i < 5; i++) {
+          await browser
+            .elementByCss('#error-trigger-button')
+            .click()
+            .waitForElementByCss('#error-boundary-message')
+
+          expect(
+            await browser.elementByCss('#error-boundary-message').text()
+          ).toBe('An error occurred: this is a test')
+
+          await browser
+            .elementByCss('#reset')
+            .click()
+            .waitForElementByCss('#error-trigger-button')
+
+          expect(
+            await browser.elementByCss('#error-trigger-button').text()
+          ).toBe('Trigger Error!')
+        }
+      })
+
+      it('should hydrate empty shell to handle server-side rendering errors', async () => {
+        const browser = await webdriver(
+          next.url,
+          '/error/ssr-error-client-component'
+        )
+        const logs = await browser.log()
+        const errors = logs
+          .filter((x) => x.source === 'error')
+          .map((x) => x.message)
+          .join('\n')
+        expect(errors).toInclude('Error during SSR')
+      })
+    })
   }
 
   describe('without assetPrefix', () => {

From 13e423ccf61a96dc5c0ca5e10107e368d06c376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Fri, 9 Sep 2022 15:35:37 +0200
Subject: [PATCH 35/69] chore: fix examples (#40395)

Closes #40366

Rebass is not dependent on `styled-components` anymore. See:
https://rebassjs.org/migrating/#v4-breaking-changes

Closes #40367

Document has been converted (#39871) from class, so `this.props` threw
an error.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/with-rebass/.babelrc               |  9 ---------
 examples/with-rebass/package.json           | 11 ++---------
 examples/with-rebass/pages/_document.js     | 18 ------------------
 examples/with-strict-csp/pages/_document.js |  6 +++---
 4 files changed, 5 insertions(+), 39 deletions(-)
 delete mode 100644 examples/with-rebass/.babelrc
 delete mode 100644 examples/with-rebass/pages/_document.js

diff --git a/examples/with-rebass/.babelrc b/examples/with-rebass/.babelrc
deleted file mode 100644
index d9c3f919cedb..000000000000
--- a/examples/with-rebass/.babelrc
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "presets": ["next/babel"],
-  "plugins": [
-    [
-      "styled-components",
-      { "ssr": true, "displayName": true, "preprocess": false }
-    ]
-  ]
-}
diff --git a/examples/with-rebass/package.json b/examples/with-rebass/package.json
index d5fd2bd64cd0..bf29745bfe27 100644
--- a/examples/with-rebass/package.json
+++ b/examples/with-rebass/package.json
@@ -7,14 +7,7 @@
   },
   "dependencies": {
     "next": "latest",
-    "react": "^18.0.0",
-    "react-dom": "^18.0.0",
-    "rebass": "^4.0.7",
-    "styled-components": "^5.3.0"
-  },
-  "devDependencies": {
-    "babel-plugin-styled-components": "^2.0.7",
-    "babel-plugin-transform-object-assign": "^6.22.0",
-    "babel-plugin-transform-object-set-prototype-of-to-assign": "^6.22.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }
diff --git a/examples/with-rebass/pages/_document.js b/examples/with-rebass/pages/_document.js
deleted file mode 100644
index 2734d4e2736b..000000000000
--- a/examples/with-rebass/pages/_document.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Html, Head, Main, NextScript } from 'next/document'
-import { ServerStyleSheet } from 'styled-components'
-
-export default function Document() {
-  const sheet = new ServerStyleSheet()
-  const main = sheet.collectStyles(<Main />)
-  const styleTags = sheet.getStyleElement()
-
-  return (
-    <Html>
-      <Head>{styleTags}</Head>
-      <body>
-        <div className="root">{main}</div>
-        <NextScript />
-      </body>
-    </Html>
-  )
-}
diff --git a/examples/with-strict-csp/pages/_document.js b/examples/with-strict-csp/pages/_document.js
index c65a84322801..f85a7eaeb7ea 100644
--- a/examples/with-strict-csp/pages/_document.js
+++ b/examples/with-strict-csp/pages/_document.js
@@ -6,13 +6,13 @@ const cspHashOf = (text) => {
   hash.update(text)
   return `'sha256-${hash.digest('base64')}'`
 }
-export default function Document() {
+export default function Document(ctx) {
   let csp = `default-src 'self'; script-src 'self' ${cspHashOf(
-    NextScript.getInlineScriptSource(this.props)
+    NextScript.getInlineScriptSource(ctx)
   )}`
   if (process.env.NODE_ENV !== 'production') {
     csp = `style-src 'self' 'unsafe-inline'; font-src 'self' data:; default-src 'self'; script-src 'unsafe-eval' 'self' ${cspHashOf(
-      NextScript.getInlineScriptSource(this.props)
+      NextScript.getInlineScriptSource(ctx)
     )}`
   }
 

From d64fc54507b6d92e6236edfe23f3d8fd112df86a Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Fri, 9 Sep 2022 20:50:18 +0200
Subject: [PATCH 36/69] Temporarily disable unstable app test (#40408)

Disable this test and investigate it later

x-ref:
https://github.com/vercel/next.js/runs/8270347830?check_suite_focus=true
x-ref:
https://github.com/vercel/next.js/runs/8270348185?check_suite_focus=true
---
 test/e2e/app-dir/index.test.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 4f98910d63c3..4cd2ec592a71 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -379,7 +379,8 @@ describe('app dir', () => {
         }
       })
 
-      it('should soft replace', async () => {
+      // TODO-APP: investigate this test
+      it.skip('should soft replace', async () => {
         const browser = await webdriver(next.url, '/link-soft-replace')
 
         try {
@@ -1338,7 +1339,8 @@ describe('app dir', () => {
         expect(await browser.elementByCss('h1').text()).toBe('Template 0')
       })
 
-      it('should render the template that is a server component and rerender on navigation', async () => {
+      // TODO-APP: disable failing test and investigate later
+      it.skip('should render the template that is a server component and rerender on navigation', async () => {
         const browser = await webdriver(next.url, '/template/servercomponent')
         expect(await browser.elementByCss('h1').text()).toStartWith('Template')
 

From 38169e338559207f851fc6022c9d7638417d94a0 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <johnsonrobertandrew@gmail.com>
Date: Fri, 9 Sep 2022 14:12:36 -0500
Subject: [PATCH 37/69] Fix mdx docs (#40402)

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)

The MDX guide is missing `@mdx-js/react` as a required dependency in the
setup section.

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 docs/advanced-features/using-mdx.md | 2 +-
 packages/next-mdx/readme.md         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/advanced-features/using-mdx.md b/docs/advanced-features/using-mdx.md
index 6ed9b3f5756f..859db74188aa 100644
--- a/docs/advanced-features/using-mdx.md
+++ b/docs/advanced-features/using-mdx.md
@@ -33,7 +33,7 @@ The following steps outline how to setup `@next/mdx` in your Next.js project:
 1. Install the required packages:
 
    ```bash
-     npm install @next/mdx @mdx-js/loader
+     npm install @next/mdx @mdx-js/loader @mdx-js/react
    ```
 
 2. Require the package and configure to support top level `.mdx` pages. The following adds the `options` object key allowing you to pass in any plugins:
diff --git a/packages/next-mdx/readme.md b/packages/next-mdx/readme.md
index e45ac2c203d7..111d8b33dbc7 100644
--- a/packages/next-mdx/readme.md
+++ b/packages/next-mdx/readme.md
@@ -5,13 +5,13 @@ Use [MDX](https://github.com/mdx-js/mdx) with [Next.js](https://github.com/verce
 ## Installation
 
 ```
-npm install @next/mdx @mdx-js/loader
+npm install @next/mdx @mdx-js/loader @mdx-js/react
 ```
 
 or
 
 ```
-yarn add @next/mdx @mdx-js/loader
+yarn add @next/mdx @mdx-js/loader @mdx-js/react
 ```
 
 ## Usage

From b09592e6acb96f7dfdf1ab3b7d54f1bbbe8a046d Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Fri, 9 Sep 2022 21:31:36 +0200
Subject: [PATCH 38/69] Bump styled-jsx for showing displayName (#40411)

x-ref: https://github.com/vercel/styled-jsx/pull/813
---
 packages/next/package.json | 2 +-
 pnpm-lock.yaml             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/next/package.json b/packages/next/package.json
index c5afcef6fe3b..e822168419f4 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -74,7 +74,7 @@
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
-    "styled-jsx": "5.0.6",
+    "styled-jsx": "5.0.7",
     "use-sync-external-store": "1.2.0"
   },
   "peerDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5cbe4a27ab64..75ec1aab68be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -562,7 +562,7 @@ importers:
       string_decoder: 1.3.0
       string-hash: 1.1.3
       strip-ansi: 6.0.0
-      styled-jsx: 5.0.6
+      styled-jsx: 5.0.7
       tar: 6.1.11
       taskr: 1.1.0
       terser: 5.14.1
@@ -586,7 +586,7 @@ importers:
       '@swc/helpers': 0.4.11
       caniuse-lite: 1.0.30001332
       postcss: 8.4.14
-      styled-jsx: 5.0.6_@babel+core@7.18.0
+      styled-jsx: 5.0.7_@babel+core@7.18.0
       use-sync-external-store: 1.2.0
     devDependencies:
       '@ampproject/toolbox-optimizer': 2.8.3
@@ -26873,10 +26873,10 @@ packages:
       postcss-load-plugins: 2.3.0
     dev: true
 
-  /styled-jsx/5.0.6_@babel+core@7.18.0:
+  /styled-jsx/5.0.7_@babel+core@7.18.0:
     resolution:
       {
-        integrity: sha512-xOeROtkK5MGMDimBQ3J6iPId8q0t/BDoG5XN6oKkZClVz9ISF/hihN8OCn2LggMU6N32aXnrXBdn3auSqNS9fA==,
+        integrity: sha512-b3sUzamS086YLRuvnaDigdAewz1/EFYlHpYBP5mZovKEdQQOIIYq8lApylub3HHZ6xFjV051kkGU7cudJmrXEA==,
       }
     engines: { node: '>= 12.0.0' }
     peerDependencies:

From 3d23c3d9ee84ce9ca8a1216ac3a5196d1e24e22c Mon Sep 17 00:00:00 2001
From: Sukka <isukkaw@gmail.com>
Date: Sat, 10 Sep 2022 03:46:23 +0800
Subject: [PATCH 39/69] fix(#40388): `next/dynamic` should only add default
 loading without suspense (#40397)

The PR fixes #40388.

Currently, `next/dynamic` will try to provide a default `loading` to the
`loadableOptions` even when `suspense` is enabled, thus triggering the
incorrect warning. The PR fixes that. The corresponding integration test
case is also updated.

cc @huozhi

## Bug

- [x] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

Co-authored-by: huozhi <inbox@huozhi.im>
---
 packages/next/shared/lib/dynamic.tsx          | 53 ++++++++++---------
 .../next-dynamic/test/index.test.js           |  6 +++
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/packages/next/shared/lib/dynamic.tsx b/packages/next/shared/lib/dynamic.tsx
index 6e7dc8fa2290..b79caf271dc4 100644
--- a/packages/next/shared/lib/dynamic.tsx
+++ b/packages/next/shared/lib/dynamic.tsx
@@ -65,29 +65,33 @@ export default function dynamic<P = {}>(
   options?: DynamicOptions<P>
 ): React.ComponentType<P> {
   let loadableFn: LoadableFn<P> = Loadable
-  let loadableOptions: LoadableOptions<P> = {
-    // A loading component is not required, so we default it
-    loading: ({ error, isLoading, pastDelay }) => {
-      if (!pastDelay) return null
-      if (process.env.NODE_ENV === 'development') {
-        if (isLoading) {
+
+  let loadableOptions: LoadableOptions<P> = options?.suspense
+    ? {}
+    : // only provide a default loading component when suspense is disabled
+      {
+        // A loading component is not required, so we default it
+        loading: ({ error, isLoading, pastDelay }) => {
+          if (!pastDelay) return null
+          if (process.env.NODE_ENV === 'development') {
+            if (isLoading) {
+              return null
+            }
+            if (error) {
+              return (
+                <p>
+                  {error.message}
+                  <br />
+                  {error.stack}
+                </p>
+              )
+            }
+          }
+
           return null
-        }
-        if (error) {
-          return (
-            <p>
-              {error.message}
-              <br />
-              {error.stack}
-            </p>
-          )
-        }
+        },
       }
 
-      return null
-    },
-  }
-
   // Support for direct import(), eg: dynamic(import('../hello-world'))
   // Note that this is only kept for the edge case where someone is passing in a promise as first argument
   // The react-loadable babel plugin will turn dynamic(import('../hello-world')) into dynamic(() => import('../hello-world'))
@@ -112,8 +116,8 @@ export default function dynamic<P = {}>(
     )
   }
 
-  if (process.env.NODE_ENV !== 'production') {
-    if (loadableOptions.suspense) {
+  if (loadableOptions.suspense) {
+    if (process.env.NODE_ENV !== 'production') {
       /**
        * TODO: Currently, next/dynamic will opt-in to React.lazy if { suspense: true } is used
        * React 18 will always resolve the Suspense boundary on the server-side, effectively ignoring the ssr option
@@ -122,19 +126,20 @@ export default function dynamic<P = {}>(
        * React.lazy that can suspense on the server-side while only loading the component on the client-side
        */
       if (loadableOptions.ssr === false) {
-        loadableOptions.ssr = true
         console.warn(
           `"ssr: false" is ignored by next/dynamic because you can not enable "suspense" while disabling "ssr" at the same time. Read more: https://nextjs.org/docs/messages/invalid-dynamic-suspense`
         )
       }
 
       if (loadableOptions.loading != null) {
-        loadableOptions.loading = undefined
         console.warn(
           `"loading" is ignored by next/dynamic because you have enabled "suspense". Place your loading element in your suspense boundary's "fallback" prop instead. Read more: https://nextjs.org/docs/messages/invalid-dynamic-suspense`
         )
       }
     }
+
+    delete loadableOptions.ssr
+    delete loadableOptions.loading
   }
 
   // coming from build/babel/plugins/react-loadable-plugin.js
diff --git a/test/integration/next-dynamic/test/index.test.js b/test/integration/next-dynamic/test/index.test.js
index e0c8f9be9ae7..b926fdfca98a 100644
--- a/test/integration/next-dynamic/test/index.test.js
+++ b/test/integration/next-dynamic/test/index.test.js
@@ -31,6 +31,12 @@ function runTests() {
     // Failure case is 'Index<!-- -->3<!-- --><!-- -->'
     expect(text).toBe('Index<!-- -->1<!-- -->2<!-- -->3<!-- -->4<!-- -->4')
     expect(await browser.eval('window.caughtErrors')).toBe('')
+
+    // should not print "invalid-dynamic-suspense" warning in browser's console
+    const logs = (await browser.log()).map((log) => log.message).join('\n')
+    expect(logs).not.toContain(
+      'https://nextjs.org/docs/messages/invalid-dynamic-suspense'
+    )
   })
 }
 

From 6fb1121e8c437bb5342d4eddfdced9b611130604 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20Born=C3=B6?= <hannes.borno@vercel.com>
Date: Fri, 9 Sep 2022 22:09:15 +0200
Subject: [PATCH 40/69] Add missing trace for full reload event (#40393)

Added missing trace for `client-full-reload` event in hot reloader. Full
reload tests moved to hmr, think they make more sense there than on
their own.
---
 packages/next/server/dev/hot-reloader.ts      |  4 +
 test/development/basic/hmr.test.ts            | 83 ++++++++++++++++
 .../hmr/pages/hmr/anonymous-page-function.js  |  3 +
 .../basic/hmr/pages/hmr/runtime-error.js      |  4 +
 .../full-reload-warning/index.test.ts         | 97 -------------------
 5 files changed, 94 insertions(+), 97 deletions(-)
 create mode 100644 test/development/basic/hmr/pages/hmr/anonymous-page-function.js
 create mode 100644 test/development/basic/hmr/pages/hmr/runtime-error.js
 delete mode 100644 test/development/full-reload-warning/index.test.ts

diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
index 7a7584b43bdc..0130ed5a93ff 100644
--- a/packages/next/server/dev/hot-reloader.ts
+++ b/packages/next/server/dev/hot-reloader.ts
@@ -361,6 +361,10 @@ export default class HotReloader {
               break
             }
             case 'client-full-reload': {
+              traceChild = {
+                name: payload.event,
+                attrs: { stackTrace: payload.stackTrace ?? '' },
+              }
               Log.warn(
                 'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
               )
diff --git a/test/development/basic/hmr.test.ts b/test/development/basic/hmr.test.ts
index 48c49a704e69..1b852b8df2ab 100644
--- a/test/development/basic/hmr.test.ts
+++ b/test/development/basic/hmr.test.ts
@@ -776,11 +776,94 @@ describe('basic HMR', () => {
     })
   })
 
+  describe('Full reload', () => {
+    it('should warn about full reload in cli output - anonymous page function', async () => {
+      const start = next.cliOutput.length
+      const browser = await webdriver(
+        next.appPort,
+        `/hmr/anonymous-page-function`
+      )
+      expect(await browser.elementByCss('p').text()).toBe('hello world')
+      expect(next.cliOutput.slice(start)).not.toContain(
+        'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
+      )
+
+      const currentFileContent = await next.readFile(
+        './pages/hmr/anonymous-page-function.js'
+      )
+      const newFileContent = currentFileContent.replace(
+        '<p>hello world</p>',
+        '<p>hello world!!!</p>'
+      )
+      await next.patchFile(
+        './pages/hmr/anonymous-page-function.js',
+        newFileContent
+      )
+      await check(() => browser.elementByCss('p').text(), 'hello world!!!')
+
+      // CLI warning and stacktrace
+      expect(next.cliOutput.slice(start)).toContain(
+        'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
+      )
+      expect(next.cliOutput.slice(start)).toContain(
+        'Error: Aborted because ./pages/hmr/anonymous-page-function.js is not accepted'
+      )
+
+      // Browser warning
+      const browserLogs = await browser.log()
+      expect(
+        browserLogs.some(({ message }) =>
+          message.includes(
+            "Fast Refresh will perform a full reload when you edit a file that's imported by modules outside of the React rendering tree."
+          )
+        )
+      ).toBeTruthy()
+    })
+
+    it('should warn about full reload in cli output - runtime-error', async () => {
+      const start = next.cliOutput.length
+      const browser = await webdriver(next.appPort, `/hmr/runtime-error`)
+      await check(
+        () => getRedboxHeader(browser),
+        /ReferenceError: whoops is not defined/
+      )
+      expect(next.cliOutput.slice(start)).not.toContain(
+        'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
+      )
+
+      const currentFileContent = await next.readFile(
+        './pages/hmr/runtime-error.js'
+      )
+      const newFileContent = currentFileContent.replace('whoops', '"whoops"')
+      await next.patchFile('./pages/hmr/runtime-error.js', newFileContent)
+      await check(() => browser.elementByCss('body').text(), 'whoops')
+
+      // CLI warning and stacktrace
+      expect(next.cliOutput.slice(start)).toContain(
+        'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
+      )
+      expect(next.cliOutput.slice(start)).not.toContain(
+        'Error: Aborted because ./pages/runtime-error.js is not accepted'
+      )
+
+      // Browser warning
+      const browserLogs = await browser.log()
+      expect(
+        browserLogs.some(({ message }) =>
+          message.includes(
+            '[Fast Refresh] performing full reload because your application had an unrecoverable error'
+          )
+        )
+      ).toBeTruthy()
+    })
+  })
+
   it('should have client HMR events in trace file', async () => {
     const traceData = await next.readFile('.next/trace')
     expect(traceData).toContain('client-hmr-latency')
     expect(traceData).toContain('client-error')
     expect(traceData).toContain('client-success')
+    expect(traceData).toContain('client-full-reload')
   })
 
   it('should have correct compile timing after fixing error', async () => {
diff --git a/test/development/basic/hmr/pages/hmr/anonymous-page-function.js b/test/development/basic/hmr/pages/hmr/anonymous-page-function.js
new file mode 100644
index 000000000000..10e018391ed8
--- /dev/null
+++ b/test/development/basic/hmr/pages/hmr/anonymous-page-function.js
@@ -0,0 +1,3 @@
+export default function () {
+  return <p>hello world</p>
+}
diff --git a/test/development/basic/hmr/pages/hmr/runtime-error.js b/test/development/basic/hmr/pages/hmr/runtime-error.js
new file mode 100644
index 000000000000..8ee8aeb6ea45
--- /dev/null
+++ b/test/development/basic/hmr/pages/hmr/runtime-error.js
@@ -0,0 +1,4 @@
+export default function () {
+  // eslint-disable-next-line no-undef
+  return whoops
+}
diff --git a/test/development/full-reload-warning/index.test.ts b/test/development/full-reload-warning/index.test.ts
deleted file mode 100644
index 1ff815fa5664..000000000000
--- a/test/development/full-reload-warning/index.test.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-import { createNext } from 'e2e-utils'
-import { NextInstance } from 'test/lib/next-modes/base'
-import { check, getRedboxHeader } from 'next-test-utils'
-import webdriver from 'next-webdriver'
-
-describe('show a warning in CLI and browser when doing a full reload', () => {
-  let next: NextInstance
-
-  beforeEach(async () => {
-    next = await createNext({
-      files: {
-        'pages/anonymous-page-function.js': `
-          export default function() { 
-            return <p>hello world</p>
-          } 
-        `,
-        'pages/runtime-error.js': `
-        export default function() { 
-          return whoops
-        } 
-      `,
-      },
-      dependencies: {},
-    })
-  })
-  afterEach(() => next.destroy())
-
-  test('error', async () => {
-    const browser = await webdriver(next.url, `/anonymous-page-function`)
-    expect(await browser.elementByCss('p').text()).toBe('hello world')
-    expect(next.cliOutput).not.toContain(
-      'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
-    )
-
-    const currentFileContent = await next.readFile(
-      './pages/anonymous-page-function.js'
-    )
-    const newFileContent = currentFileContent.replace(
-      '<p>hello world</p>',
-      '<p>hello world!!!</p>'
-    )
-    await next.patchFile('./pages/anonymous-page-function.js', newFileContent)
-    await check(() => browser.elementByCss('p').text(), 'hello world!!!')
-
-    // CLI warning and stacktrace
-    expect(next.cliOutput).toContain(
-      'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
-    )
-    expect(next.cliOutput).toContain(
-      'Error: Aborted because ./pages/anonymous-page-function.js is not accepted'
-    )
-
-    // Browser warning
-    const browserLogs = await browser.log()
-    expect(
-      browserLogs.some(({ message }) =>
-        message.includes(
-          "Fast Refresh will perform a full reload when you edit a file that's imported by modules outside of the React rendering tree."
-        )
-      )
-    ).toBeTruthy()
-  })
-
-  test('runtime-error', async () => {
-    const browser = await webdriver(next.url, `/runtime-error`)
-    await check(
-      () => getRedboxHeader(browser),
-      /ReferenceError: whoops is not defined/
-    )
-    expect(next.cliOutput).not.toContain(
-      'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
-    )
-
-    const currentFileContent = await next.readFile('./pages/runtime-error.js')
-    const newFileContent = currentFileContent.replace('whoops', '"whoops"')
-    await next.patchFile('./pages/runtime-error.js', newFileContent)
-    await check(() => browser.elementByCss('body').text(), 'whoops')
-
-    // CLI warning and stacktrace
-    expect(next.cliOutput).toContain(
-      'Fast Refresh had to perform a full reload. Read more: https://nextjs.org/docs/basic-features/fast-refresh#how-it-works'
-    )
-    expect(next.cliOutput).not.toContain(
-      'Error: Aborted because ./pages/runtime-error.js is not accepted'
-    )
-
-    // Browser warning
-    const browserLogs = await browser.log()
-    expect(
-      browserLogs.some(({ message }) =>
-        message.includes(
-          '[Fast Refresh] performing full reload because your application had an unrecoverable error'
-        )
-      )
-    ).toBeTruthy()
-  })
-})

From 8bc587aa30099bdf3ee379fe0b1a2fe3387801cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Fri, 9 Sep 2022 22:32:58 +0200
Subject: [PATCH 41/69] feat(ts): expose `AppType` (#40391)

An alternative solution to #40371

Ref: #38867, https://github.com/t3-oss/create-t3-app/issues/412,
https://github.com/t3-oss/create-t3-app/pull/414

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 packages/next/pages/_app.tsx               |  3 ++-
 packages/next/shared/lib/utils.ts          |  6 +++---
 test/integration/typescript/pages/_app.tsx | 17 +++--------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/packages/next/pages/_app.tsx b/packages/next/pages/_app.tsx
index 691555628145..c646d0842fea 100644
--- a/packages/next/pages/_app.tsx
+++ b/packages/next/pages/_app.tsx
@@ -5,10 +5,11 @@ import {
   AppInitialProps,
   AppPropsType,
   NextWebVitalsMetric,
+  AppType,
 } from '../shared/lib/utils'
 import type { Router } from '../client/router'
 
-export { AppInitialProps }
+export { AppInitialProps, AppType }
 
 export { NextWebVitalsMetric }
 
diff --git a/packages/next/shared/lib/utils.ts b/packages/next/shared/lib/utils.ts
index ec5197e0c3b9..76b9eee3a520 100644
--- a/packages/next/shared/lib/utils.ts
+++ b/packages/next/shared/lib/utils.ts
@@ -27,10 +27,10 @@ export type DocumentType = NextComponentType<
   DocumentProps
 >
 
-export type AppType = NextComponentType<
+export type AppType<P = {}> = NextComponentType<
   AppContextType,
-  AppInitialProps,
-  AppPropsType
+  P,
+  AppPropsType<any, P>
 >
 
 export type AppTreeType = ComponentType<
diff --git a/test/integration/typescript/pages/_app.tsx b/test/integration/typescript/pages/_app.tsx
index bc26412e55da..adc878fa93ec 100644
--- a/test/integration/typescript/pages/_app.tsx
+++ b/test/integration/typescript/pages/_app.tsx
@@ -1,20 +1,9 @@
-// import App from "next/app";
-import type { AppProps /*, AppContext */ } from 'next/app'
+import type { AppType } from 'next/app'
 
-function MyApp({ Component, pageProps }: AppProps) {
+const MyApp: AppType<{ foo: string }> = ({ Component, pageProps }) => {
   return <Component {...pageProps} />
 }
 
-// Only uncomment this method if you have blocking data requirements for
-// every single page in your application. This disables the ability to
-// perform automatic static optimization, causing every page in your app to
-// be server-side rendered.
-//
-// MyApp.getInitialProps = async (appContext: AppContext) => {
-//   // calls page's `getInitialProps` and fills `appProps.pageProps`
-//   const appProps = await App.getInitialProps(appContext);
-
-//   return { ...appProps }
-// }
+MyApp.getInitialProps = () => ({ foo: 'bar' })
 
 export default MyApp

From fc3ef810ba3cfddd7763ad6fc498a6f2cddc3064 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Sun, 11 Sep 2022 11:39:32 -0700
Subject: [PATCH 42/69] Update dev watcher to ignore more accurately (#40412)

This ensures we ignore all except the files/directories we are explicitly wanting to watch to prevent watching/considering directories with massive amounts of files slowing down startup.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

Fixes: https://github.com/vercel/next.js/pull/38483#issuecomment-1242154665
---
 packages/next/server/dev/next-dev-server.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index d360778905f4..11cbc454c0cd 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -273,12 +273,10 @@ export default class DevServer extends Server {
         })
       }
 
-      const wp = (this.webpackWatcher = new Watchpack({
-        ignored: /([/\\]node_modules[/\\]|[/\\]\.next[/\\]|[/\\]\.git[/\\])/,
-      }))
       const pages = this.pagesDir ? [this.pagesDir] : []
       const app = this.appDir ? [this.appDir] : []
       const directories = [...pages, ...app]
+
       const files = this.pagesDir
         ? getPossibleMiddlewareFilenames(
             pathJoin(this.pagesDir, '..'),
@@ -303,6 +301,15 @@ export default class DevServer extends Server {
       ]
       files.push(...tsconfigPaths)
 
+      const wp = (this.webpackWatcher = new Watchpack({
+        ignored: (pathname: string) => {
+          return (
+            !files.some((file) => file.startsWith(pathname)) &&
+            !directories.some((dir) => pathname.startsWith(dir))
+          )
+        },
+      }))
+
       wp.watch({ directories: [this.dir], startTime: 0 })
       const fileWatchTimes = new Map()
       let enabledTypeScript = this.usingTypeScript

From 40fc066f09c0a987d563e3b869f48c388dd797aa Mon Sep 17 00:00:00 2001
From: Lee Robinson <me@leerob.io>
Date: Sun, 11 Sep 2022 19:12:14 -0500
Subject: [PATCH 43/69] Update Server Components documentation. (#40452)

This PR updates the server components documentation to make it more clear the benefit of server components and what their current status is inside Next.js.

It removes code snippets and CTAs for trying them out, as things have changed with the Layouts RFC since these docs were previously written. With the upcoming changes, server components will now be the default inside `app`. The list of supported and unsupported features was no longer accurate.

We will be providing more guidance as the layouts and routing changes are ready to be tested.

[Read the Layouts RFC](https://nextjs.org/blog/layouts-rfc) for more details.
---
 .../react-18/server-components.md             | 115 ++----------------
 1 file changed, 13 insertions(+), 102 deletions(-)

diff --git a/docs/advanced-features/react-18/server-components.md b/docs/advanced-features/react-18/server-components.md
index 906dab699bff..027a7d6690b1 100644
--- a/docs/advanced-features/react-18/server-components.md
+++ b/docs/advanced-features/react-18/server-components.md
@@ -1,116 +1,27 @@
 # React Server Components (RFC)
 
-Server Components allow us to render React components on the server. This is fundamentally different from server-side rendering (SSR) where you're pre-generating HTML on the server. With Server Components, there's **zero client-side JavaScript needed,** making page rendering faster. This improves the user experience of your application, pairing the best parts of server-rendering with client-side interactivity.
+React Server Components allow developers to build applications that span the server and client, combining the rich interactivity of client-side apps with the improved performance of traditional server rendering.
 
-### Next Router and Layouts RFC
+In an upcoming Next.js release, React and Next.js developers will be able to use Server Components inside the `app` directory as part of the changes outlined by the [Layouts RFC](https://nextjs.org/blog/layouts-rfc).
 
-We are currently implementing the [Next.js Router and Layouts RFC](https://nextjs.org/blog/layouts-rfc).
+## What are React Server Components?
 
-The new Next.js router will be built on top of React 18 features, including React Server Components.
+React Server Components improve the user experience of your application by pairing the best parts of server-rendering with client-side interactivity.
 
-One of the biggest proposed changes is that, by default, files inside a new `app` directory will be rendered on the server as React Server Components.
+With traditional React applications that are client-side only, developers often had to make tradeoffs between SEO and performance. Server Components enable developers to better leverage their server infrastructure and achieve great performance by default.
 
-This will allow you to automatically adopt React Server Components when migrating from `pages` to `app`.
+For example, large dependencies that previously would impact the JavaScript bundle size on the client can instead stay entirely on the server. By sending less JavaScript to the browser, the time to interactive for the page is decreased, leading to improved [Core Web Vitals](https://vercel.com/blog/core-web-vitals).
 
-You can find more information on the [RFC](https://nextjs.org/blog/layouts-rfc) and we welcome your feedback on [Github Discussions](https://github.com/vercel/next.js/discussions/37136).
+## React Server Components vs Server-Side Rendering
 
-### Server Components Conventions
+[Server-side Rendering](/docs/basic-features/pages.md#server-side-rendering) (SSR) dynamically builds your application into HTML on the server. This creates faster load times for users by offloading work from the user's device to the server, especially those with slower internet connections or older devices. However, developers still pay the cost to download, parse, and hydrate those components after the initial HTML loads.
 
-To run a component on the server, append `.server.js` to the end of the filename. For example, `./pages/home.server.js` will be treated as a Server Component.
+React Server Components, combined with Next.js server-side rendering, help eliminate the tradeoff of all-or-nothing data fetching. You can progressively show updates as your data comes in.
 
-For client components, append `.client.js` to the filename. For example, `./components/avatar.client.js`.
+## Using React Server Components with Next.js
 
-Server components can import server components and client components.
+The Next.js team at Vercel released the [Layouts RFC](https://nextjs.org/blog/layouts-rfc) a few months ago outlining the vision for the future of routing, layouts, and data fetching in the framework. These changes **aren't available yet**, but we can start learning about how they will be used.
 
-Client components **cannot** import server components.
+Pages and Layouts in `app` will be rendered as React Server Components by default. This improves performance by reducing the amount of JavaScript sent to the client for components that are not interactive. Client components will be able to be defined through either a file name extension or through a string literal in the file.
 
-Components without a `server` or `client` extension will be treated as shared components and can be imported by server components and client components. For example:
-
-```jsx
-// pages/home.server.js
-
-import { Suspense } from 'react'
-
-import Profile from '../components/profile.server'
-import Content from '../components/content.client'
-
-export default function Home() {
-  return (
-    <div>
-      <h1>Welcome to React Server Components</h1>
-      <Suspense fallback={'Loading...'}>
-        <Profile />
-      </Suspense>
-      <Content />
-    </div>
-  )
-}
-```
-
-The `<Home>` and `<Profile>` components will always be server-side rendered and streamed to the client, and will not be included by the client-side JavaScript. However, `<Content>` will still be hydrated on the client-side, like normal React components.
-
-> Make sure you're using default imports and exports for server components (`.server.js`). The support of named exports are a work in progress!
-
-To see a full example, check out the [vercel/next-react-server-components demo](https://github.com/vercel/next-react-server-components).
-
-## Supported Next.js APIs
-
-### `next/link` and `next/image`
-
-You can use `next/link` and `next/image` like before and they will be treated as client components to keep the interaction on client side.
-
-### `next/document`
-
-If you have a custom `_document`, you have to change your `_document` to a functional component like below to use server components. If you don't have one, Next.js will use the default `_document` component for you.
-
-```jsx
-// pages/_document.js
-import { Html, Head, Main, NextScript } from 'next/document'
-
-export default function Document() {
-  return (
-    <Html>
-      <Head />
-      <body>
-        <Main />
-        <NextScript />
-      </body>
-    </Html>
-  )
-}
-```
-
-### `next/app`
-
-The usage of `_app.js` is the same as [Custom App](/docs/advanced-features/custom-app). Using custom app as server component such as `_app.server.js` is not recommended, to keep align with non server components apps for client specific things like global CSS imports.
-
-### Routing
-
-Both basic routes with path and queries and dynamic routes are supported. If you need to access the router in server components(`.server.js`), they will receive `router` instance as a prop so that you can directly access them without using the `useRouter()` hook.
-
-```jsx
-// pages/index.server.js
-
-export default function Index({ router }) {
-  // You can access routing information by `router.pathname`, etc.
-  return 'hello'
-}
-```
-
-### Unsupported Next.js APIs
-
-While RSC and SSR streaming are still in the alpha stage, not all Next.js APIs are supported. The following Next.js APIs have limited functionality within Server Components. React 18 use without SSR streaming is not affected.
-
-#### React internals
-
-Most React hooks, such as `useContext`, `useState`, `useReducer`, `useEffect` and `useLayoutEffect`, are not supported as of today since server components are executed per request and aren't stateful.
-
-#### Data Fetching & Styling
-
-Like streaming SSR, styling and data fetching within `Suspense` on the server side are not well supported. We're still working on them.
-
-Page level exported methods like `getInitialProps`, `getStaticProps` and `getStaticPaths` are not supported.
-
-#### `next/head` and I18n
-
-We are still working on support for these features.
+We will be providing more updates about Server Components usage in Next.js soon.

From 3851d9065fd2cdf4b3dbef4a11667e4a224a5113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Mon, 12 Sep 2022 13:13:09 +0200
Subject: [PATCH 44/69] docs(middleware): fix broken link

---
 docs/api-reference/next/server.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-reference/next/server.md b/docs/api-reference/next/server.md
index e2f5c8e6fca0..5e83b10835e2 100644
--- a/docs/api-reference/next/server.md
+++ b/docs/api-reference/next/server.md
@@ -10,7 +10,7 @@ description: Learn about the server-only helpers for Middleware and Edge API Rou
 
 The `NextRequest` object is an extension of the native [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request) interface, with the following added methods and properties:
 
-- `cookies` - A [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) with cookies from the `Request`. See [Using cookies in Edge Middleware](#using-cookies-in-edge-middleware)
+- `cookies` - A [Map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Map) with cookies from the `Request`. See [Using cookies in Middleware](/docs/advanced-features/middleware#using-cookies)
 - `nextUrl`: Includes an extended, parsed, URL object that gives you access to Next.js specific properties such as `pathname`, `basePath`, `trailingSlash` and `i18n`. Includes the following properties:
   - `basePath` (`string`)
   - `buildId` (`string || undefined`)

From f92a4cee8ab449267c8133fd196af78c964995da Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Mon, 12 Sep 2022 14:45:37 +0200
Subject: [PATCH 45/69] Add failing case for location throw (#40445)

Found that the cause was that `React.useId()` returns the same value across requests whereas it was being used to create a unique key. On further inspection that code could be removed altogether as `id` was not used client-side and the `rscCache` map is no longer needed as the flight instance is already being created per request so it can live in the context of the request execution.


## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 packages/next/client/app-index.tsx            |   8 +-
 packages/next/server/app-render.tsx           | 101 +++++++++---------
 .../app/loading-bug/[categorySlug]/loading.js |   3 +
 .../loading-bug/[categorySlug]/page.server.js |  15 +++
 test/e2e/app-dir/index.test.ts                |  15 +++
 5 files changed, 88 insertions(+), 54 deletions(-)
 create mode 100644 test/e2e/app-dir/app/app/loading-bug/[categorySlug]/loading.js
 create mode 100644 test/e2e/app-dir/app/app/loading-bug/[categorySlug]/page.server.js

diff --git a/packages/next/client/app-index.tsx b/packages/next/client/app-index.tsx
index a1631e60685a..84fa2cb088d5 100644
--- a/packages/next/client/app-index.tsx
+++ b/packages/next/client/app-index.tsx
@@ -56,7 +56,9 @@ let initialServerDataWriter: ReadableStreamDefaultController | undefined =
 let initialServerDataLoaded = false
 let initialServerDataFlushed = false
 
-function nextServerDataCallback(seg: [number, string, string]) {
+function nextServerDataCallback(
+  seg: [isBootStrap: 0] | [isNotBootstrap: 1, responsePartial: string]
+): void {
   if (seg[0] === 0) {
     initialServerDataBuffer = []
   } else {
@@ -64,9 +66,9 @@ function nextServerDataCallback(seg: [number, string, string]) {
       throw new Error('Unexpected server data: missing bootstrap script.')
 
     if (initialServerDataWriter) {
-      initialServerDataWriter.enqueue(encoder.encode(seg[2]))
+      initialServerDataWriter.enqueue(encoder.encode(seg[1]))
     } else {
-      initialServerDataBuffer.push(seg[2])
+      initialServerDataBuffer.push(seg[1])
     }
   }
 }
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 7fe57797fb4c..c24206ba2420 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -54,8 +54,6 @@ function interopDefault(mod: any) {
   return mod.default || mod
 }
 
-const rscCache = new Map()
-
 // Shadowing check does not work with TypeScript enums
 // eslint-disable-next-line no-shadow
 const enum RecordStatus {
@@ -134,57 +132,59 @@ function preloadDataFetchingRecord(
  */
 function useFlightResponse(
   writable: WritableStream<Uint8Array>,
-  cachePrefix: string,
   req: ReadableStream<Uint8Array>,
   serverComponentManifest: any,
+  flightResponseRef: {
+    current: ReturnType<typeof createFromReadableStream> | null
+  },
   nonce?: string
 ) {
-  const id = cachePrefix + ',' + (React as any).useId()
-  let entry = rscCache.get(id)
-  if (!entry) {
-    const [renderStream, forwardStream] = readableStreamTee(req)
-    entry = createFromReadableStream(renderStream, {
-      moduleMap: serverComponentManifest.__ssr_module_mapping__,
-    })
-    rscCache.set(id, entry)
-
-    let bootstrapped = false
-    // We only attach CSS chunks to the inlined data.
-    const forwardReader = forwardStream.getReader()
-    const writer = writable.getWriter()
-    const startScriptTag = nonce
-      ? `<script nonce=${JSON.stringify(nonce)}>`
-      : '<script>'
-
-    function process() {
-      forwardReader.read().then(({ done, value }) => {
-        if (!bootstrapped) {
-          bootstrapped = true
-          writer.write(
-            encodeText(
-              `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
-                JSON.stringify([0, id])
-              )})</script>`
-            )
+  if (flightResponseRef.current) {
+    return flightResponseRef.current
+  }
+
+  const [renderStream, forwardStream] = readableStreamTee(req)
+  flightResponseRef.current = createFromReadableStream(renderStream, {
+    moduleMap: serverComponentManifest.__ssr_module_mapping__,
+  })
+
+  let bootstrapped = false
+  // We only attach CSS chunks to the inlined data.
+  const forwardReader = forwardStream.getReader()
+  const writer = writable.getWriter()
+  const startScriptTag = nonce
+    ? `<script nonce=${JSON.stringify(nonce)}>`
+    : '<script>'
+
+  function process() {
+    forwardReader.read().then(({ done, value }) => {
+      if (!bootstrapped) {
+        bootstrapped = true
+        writer.write(
+          encodeText(
+            `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
+              JSON.stringify([0])
+            )})</script>`
           )
-        }
-        if (done) {
-          rscCache.delete(id)
-          writer.close()
-        } else {
-          const responsePartial = decodeText(value)
-          const scripts = `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
-            JSON.stringify([1, id, responsePartial])
-          )})</script>`
-
-          writer.write(encodeText(scripts))
-          process()
-        }
-      })
-    }
-    process()
+        )
+      }
+      if (done) {
+        flightResponseRef.current = null
+        writer.close()
+      } else {
+        const responsePartial = decodeText(value)
+        const scripts = `${startScriptTag}(self.__next_s=self.__next_s||[]).push(${htmlEscapeJsonString(
+          JSON.stringify([1, responsePartial])
+        )})</script>`
+
+        writer.write(encodeText(scripts))
+        process()
+      }
+    })
   }
-  return entry
+  process()
+
+  return flightResponseRef.current
 }
 
 /**
@@ -200,12 +200,10 @@ function createServerComponentRenderer(
     }
   },
   {
-    cachePrefix,
     transformStream,
     serverComponentManifest,
     serverContexts,
   }: {
-    cachePrefix: string
     transformStream: TransformStream<Uint8Array, Uint8Array>
     serverComponentManifest: NonNullable<RenderOpts['serverComponentManifest']>
     serverContexts: Array<
@@ -240,14 +238,16 @@ function createServerComponentRenderer(
     return RSCStream
   }
 
+  const flightResponseRef = { current: null }
+
   const writable = transformStream.writable
   return function ServerComponentWrapper() {
     const reqStream = createRSCStream()
     const response = useFlightResponse(
       writable,
-      cachePrefix,
       reqStream,
       serverComponentManifest,
+      flightResponseRef,
       nonce
     )
     return response.readRoot()
@@ -1110,7 +1110,6 @@ export async function renderToHTMLOrFlight(
     },
     ComponentMod,
     {
-      cachePrefix: initialCanonicalUrl,
       transformStream: serverComponentsInlinedTransformStream,
       serverComponentManifest,
       serverContexts,
diff --git a/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/loading.js b/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/loading.js
new file mode 100644
index 000000000000..f1ca6af34151
--- /dev/null
+++ b/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/loading.js
@@ -0,0 +1,3 @@
+export default function Loading() {
+  return <h2>Loading...</h2>
+}
diff --git a/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/page.server.js b/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/page.server.js
new file mode 100644
index 000000000000..9352955a5043
--- /dev/null
+++ b/test/e2e/app-dir/app/app/loading-bug/[categorySlug]/page.server.js
@@ -0,0 +1,15 @@
+// @ts-ignore
+import { experimental_use as use } from 'react'
+
+const fetchCategory = async (categorySlug) => {
+  // artificial delay
+  await new Promise((resolve) => setTimeout(resolve, 3000))
+
+  return categorySlug + 'abc'
+}
+
+export default function Page({ params }) {
+  const category = use(fetchCategory(params.categorySlug))
+
+  return <div id="category-id">{category}</div>
+}
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 4cd2ec592a71..6af635e765ed 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -1419,6 +1419,21 @@ describe('app dir', () => {
         expect(errors).toInclude('Error during SSR')
       })
     })
+
+    describe('known bugs', () => {
+      it('should not share flight data between requests', async () => {
+        const fetches = await Promise.all(
+          [...new Array(5)].map(() =>
+            renderViaHTTP(next.url, '/loading-bug/electronics')
+          )
+        )
+
+        for (const text of fetches) {
+          const $ = cheerio.load(text)
+          expect($('#category-id').text()).toBe('electronicsabc')
+        }
+      })
+    })
   }
 
   describe('without assetPrefix', () => {

From c7d3f9d413a909672e0946b5223f230a935f0e75 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Mon, 12 Sep 2022 15:15:18 +0200
Subject: [PATCH 46/69] Drop legacy RSC handling in client for pages (#40472)

Remove the unused RSC handling for pages in both server router and client side in favor of using RSC in app dir
---
 packages/next/build/webpack-config.ts         |  26 +--
 packages/next/client/index.tsx                | 151 +-----------------
 packages/next/server/dev/next-dev-server.ts   |   1 -
 packages/next/server/render.tsx               |  15 --
 packages/next/shared/lib/constants.ts         |   1 -
 packages/next/shared/lib/router/router.ts     |  45 +-----
 packages/next/shared/lib/utils.ts             |   2 -
 .../react-refresh-utils/internal/helpers.ts   |   1 -
 8 files changed, 20 insertions(+), 222 deletions(-)

diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
index 452a2afdc307..a431bc0a55c7 100644
--- a/packages/next/build/webpack-config.ts
+++ b/packages/next/build/webpack-config.ts
@@ -93,7 +93,6 @@ export function getDefineEnv({
   isNodeServer,
   isEdgeServer,
   middlewareMatchers,
-  hasServerComponents,
 }: {
   dev?: boolean
   distDir: string
@@ -104,7 +103,6 @@ export function getDefineEnv({
   isEdgeServer?: boolean
   middlewareMatchers?: MiddlewareMatcher[]
   config: NextConfigComplete
-  hasServerComponents?: boolean
 }) {
   return {
     // internal field to identify the plugin config
@@ -178,7 +176,6 @@ export function getDefineEnv({
     ),
     'process.env.__NEXT_STRICT_MODE': JSON.stringify(config.reactStrictMode),
     'process.env.__NEXT_REACT_ROOT': JSON.stringify(hasReactRoot),
-    'process.env.__NEXT_RSC': JSON.stringify(hasServerComponents),
     'process.env.__NEXT_OPTIMIZE_FONTS': JSON.stringify(
       config.optimizeFonts && !dev
     ),
@@ -540,15 +537,23 @@ export default async function getBaseWebpackConfig(
     rewrites.afterFiles.length > 0 ||
     rewrites.fallback.length > 0
 
-  if (isClient && !hasReactRoot) {
-    if (config.experimental.runtime) {
-      throw new Error(
-        '`experimental.runtime` requires React 18 to be installed.'
-      )
+  // Only error in first one compiler (client) once
+  if (isClient) {
+    if (!hasReactRoot) {
+      if (config.experimental.runtime) {
+        throw new Error(
+          '`experimental.runtime` requires React 18 to be installed.'
+        )
+      }
+      if (config.experimental.serverComponents) {
+        throw new Error(
+          '`experimental.serverComponents` requires React 18 to be installed.'
+        )
+      }
     }
-    if (config.experimental.serverComponents) {
+    if (!config.experimental.appDir && config.experimental.serverComponents) {
       throw new Error(
-        '`experimental.serverComponents` requires React 18 to be installed.'
+        '`experimental.serverComponents` requires experimental.appDir to be enabled.'
       )
     }
   }
@@ -1680,7 +1685,6 @@ export default async function getBaseWebpackConfig(
           isNodeServer,
           isEdgeServer,
           middlewareMatchers,
-          hasServerComponents,
         })
       ),
       isClient &&
diff --git a/packages/next/client/index.tsx b/packages/next/client/index.tsx
index a4d62af4256a..7324cccd7d90 100644
--- a/packages/next/client/index.tsx
+++ b/packages/next/client/index.tsx
@@ -289,149 +289,6 @@ export async function initialize(opts: { webpackHMR?: any } = {}): Promise<{
   return { assetPrefix: prefix }
 }
 
-let RSCComponent: (props: any) => JSX.Element
-if (process.env.__NEXT_RSC) {
-  const getCacheKey = () => {
-    const { pathname, search } = location
-    return pathname + search
-  }
-
-  const {
-    createFromFetch,
-    createFromReadableStream,
-  } = require('next/dist/compiled/react-server-dom-webpack')
-  const encoder = new TextEncoder()
-
-  let initialServerDataBuffer: string[] | undefined = undefined
-  let initialServerDataWriter: ReadableStreamDefaultController | undefined =
-    undefined
-  let initialServerDataLoaded = false
-  let initialServerDataFlushed = false
-
-  function nextServerDataCallback(seg: [number, string, string]) {
-    if (seg[0] === 0) {
-      initialServerDataBuffer = []
-    } else {
-      if (!initialServerDataBuffer)
-        throw new Error('Unexpected server data: missing bootstrap script.')
-
-      if (initialServerDataWriter) {
-        initialServerDataWriter.enqueue(encoder.encode(seg[2]))
-      } else {
-        initialServerDataBuffer.push(seg[2])
-      }
-    }
-  }
-
-  // There might be race conditions between `nextServerDataRegisterWriter` and
-  // `DOMContentLoaded`. The former will be called when React starts to hydrate
-  // the root, the latter will be called when the DOM is fully loaded.
-  // For streaming, the former is called first due to partial hydration.
-  // For non-streaming, the latter can be called first.
-  // Hence, we use two variables `initialServerDataLoaded` and
-  // `initialServerDataFlushed` to make sure the writer will be closed and
-  // `initialServerDataBuffer` will be cleared in the right time.
-  function nextServerDataRegisterWriter(ctr: ReadableStreamDefaultController) {
-    if (initialServerDataBuffer) {
-      initialServerDataBuffer.forEach((val) => {
-        ctr.enqueue(encoder.encode(val))
-      })
-      if (initialServerDataLoaded && !initialServerDataFlushed) {
-        ctr.close()
-        initialServerDataFlushed = true
-        initialServerDataBuffer = undefined
-      }
-    }
-
-    initialServerDataWriter = ctr
-  }
-
-  // When `DOMContentLoaded`, we can close all pending writers to finish hydration.
-  const DOMContentLoaded = function () {
-    if (initialServerDataWriter && !initialServerDataFlushed) {
-      initialServerDataWriter.close()
-      initialServerDataFlushed = true
-      initialServerDataBuffer = undefined
-    }
-    initialServerDataLoaded = true
-  }
-  // It's possible that the DOM is already loaded.
-  if (document.readyState === 'loading') {
-    document.addEventListener('DOMContentLoaded', DOMContentLoaded, false)
-  } else {
-    DOMContentLoaded()
-  }
-
-  const nextServerDataLoadingGlobal = ((self as any).__next_s =
-    (self as any).__next_s || [])
-  nextServerDataLoadingGlobal.forEach(nextServerDataCallback)
-  nextServerDataLoadingGlobal.push = nextServerDataCallback
-
-  function createResponseCache() {
-    return new Map<string, any>()
-  }
-  const rscCache = createResponseCache()
-
-  function fetchFlight(href: string, props?: any) {
-    const url = new URL(href, location.origin)
-    const searchParams = url.searchParams
-    searchParams.append('__flight__', '1')
-    if (props) {
-      searchParams.append('__props__', JSON.stringify(props))
-    }
-    return fetch(url.toString())
-  }
-
-  function useServerResponse(cacheKey: string, serialized?: string) {
-    let response = rscCache.get(cacheKey)
-    if (response) return response
-
-    if (initialServerDataBuffer) {
-      const readable = new ReadableStream({
-        start(controller) {
-          nextServerDataRegisterWriter(controller)
-        },
-      })
-      response = createFromReadableStream(readable)
-    } else {
-      if (serialized) {
-        const readable = new ReadableStream({
-          start(controller) {
-            controller.enqueue(encoder.encode(serialized))
-            controller.close()
-          },
-        })
-        response = createFromReadableStream(readable)
-      } else {
-        response = createFromFetch(fetchFlight(getCacheKey()))
-      }
-    }
-
-    rscCache.set(cacheKey, response)
-    return response
-  }
-
-  const ServerRoot = ({
-    cacheKey,
-    serialized,
-  }: {
-    cacheKey: string
-    serialized?: string
-  }) => {
-    React.useEffect(() => {
-      rscCache.delete(cacheKey)
-    })
-    const response = useServerResponse(cacheKey, serialized)
-    return response.readRoot()
-  }
-
-  RSCComponent = (props: any) => {
-    const cacheKey = getCacheKey()
-    const { __flight__ } = props
-    return <ServerRoot cacheKey={cacheKey} serialized={__flight__} />
-  }
-}
-
 function renderApp(App: AppComponent, appProps: AppProps) {
   return <App {...appProps} />
 }
@@ -691,18 +548,15 @@ function Root({
 }
 
 function doRender(input: RenderRouteInfo): Promise<any> {
-  let { App, Component, props, err, __N_RSC }: RenderRouteInfo = input
+  let { App, Component, props, err }: RenderRouteInfo = input
   let styleSheets: StyleSheetTuple[] | undefined =
     'initial' in input ? undefined : input.styleSheets
   Component = Component || lastAppProps.Component
   props = props || lastAppProps.props
 
-  const isRSC =
-    process.env.__NEXT_RSC && 'initial' in input ? !!initialData.rsc : !!__N_RSC
-
   const appProps: AppProps = {
     ...props,
-    Component: isRSC ? RSCComponent : Component,
+    Component,
     err,
     router,
   }
@@ -1026,7 +880,6 @@ export async function hydrate(opts?: { beforeRender?: () => Promise<void> }) {
     defaultLocale,
     domainLocales: initialData.domainLocales,
     isPreview: initialData.isPreview,
-    isRsc: initialData.rsc,
   })
 
   initialMatchesMiddleware = await router._initialMatchesMiddlewarePromise
diff --git a/packages/next/server/dev/next-dev-server.ts b/packages/next/server/dev/next-dev-server.ts
index 11cbc454c0cd..d3176c140dd6 100644
--- a/packages/next/server/dev/next-dev-server.ts
+++ b/packages/next/server/dev/next-dev-server.ts
@@ -526,7 +526,6 @@ export default class DevServer extends Server {
                     hasReactRoot: this.hotReloader?.hasReactRoot,
                     isNodeServer,
                     isEdgeServer,
-                    hasServerComponents: this.hotReloader?.hasServerComponents,
                   })
 
                   Object.keys(plugin.definitions).forEach((key) => {
diff --git a/packages/next/server/render.tsx b/packages/next/server/render.tsx
index c352429e7bf6..2ec63d476a1b 100644
--- a/packages/next/server/render.tsx
+++ b/packages/next/server/render.tsx
@@ -375,7 +375,6 @@ export async function renderToHTML(
     getStaticProps,
     getStaticPaths,
     getServerSideProps,
-    serverComponentManifest,
     isDataReq,
     params,
     previewProps,
@@ -384,18 +383,11 @@ export async function renderToHTML(
     supportsDynamicHTML,
     images,
     runtime: globalRuntime,
-    ComponentMod,
     App,
   } = renderOpts
 
   let Document = renderOpts.Document
 
-  // We don't need to opt-into the flight inlining logic if the page isn't a RSC.
-  const isServerComponent =
-    !!process.env.__NEXT_REACT_ROOT &&
-    !!serverComponentManifest &&
-    !!ComponentMod.__next_rsc__?.server
-
   // Component will be wrapped by ServerComponentWrapper for RSC
   let Component: React.ComponentType<{}> | ((props: any) => JSX.Element) =
     renderOpts.Component
@@ -412,12 +404,6 @@ export async function renderToHTML(
   // next internal queries should be stripped out
   stripInternalQueries(query)
 
-  if (isServerComponent) {
-    throw new Error(
-      'Server Components are not supported from the pages/ directory.'
-    )
-  }
-
   const callMiddleware = async (method: string, args: any[], props = false) => {
     let results: any = props ? {} : []
 
@@ -1417,7 +1403,6 @@ export async function renderToHTML(
       err: renderOpts.err ? serializeError(dev, renderOpts.err) : undefined, // Error if one happened, otherwise don't sent in the resulting HTML
       gsp: !!getStaticProps ? true : undefined, // whether the page is getStaticProps
       gssp: !!getServerSideProps ? true : undefined, // whether the page is getServerSideProps
-      rsc: isServerComponent ? true : undefined, // whether the page is a server components page
       customServer, // whether the user is using a custom server
       gip: hasPageGetInitialProps ? true : undefined, // whether the page has getInitialProps
       appGip: !defaultAppGetInitialProps ? true : undefined, // whether the _app has getInitialProps
diff --git a/packages/next/shared/lib/constants.ts b/packages/next/shared/lib/constants.ts
index 856c638eac75..c334cf38fd34 100644
--- a/packages/next/shared/lib/constants.ts
+++ b/packages/next/shared/lib/constants.ts
@@ -86,7 +86,6 @@ export const TEMPORARY_REDIRECT_STATUS = 307
 export const PERMANENT_REDIRECT_STATUS = 308
 export const STATIC_PROPS_ID = '__N_SSG'
 export const SERVER_PROPS_ID = '__N_SSP'
-export const FLIGHT_PROPS_ID = '__N_RSC'
 export const GOOGLE_FONT_PROVIDER = 'https://fonts.googleapis.com/'
 export const OPTIMIZED_FONT_PROVIDERS = [
   { url: GOOGLE_FONT_PROVIDER, preconnect: 'https://fonts.gstatic.com' },
diff --git a/packages/next/shared/lib/router/router.ts b/packages/next/shared/lib/router/router.ts
index 5fab0820e1b6..1ad9a039b42a 100644
--- a/packages/next/shared/lib/router/router.ts
+++ b/packages/next/shared/lib/router/router.ts
@@ -564,7 +564,6 @@ export type CompletePrivateRouteInfo = {
   styleSheets: StyleSheetTuple[]
   __N_SSG?: boolean
   __N_SSP?: boolean
-  __N_RSC?: boolean
   props?: Record<string, any>
   err?: Error
   error?: any
@@ -881,7 +880,6 @@ export default class Router implements BaseRouter {
       defaultLocale,
       domainLocales,
       isPreview,
-      isRsc,
     }: {
       subscription: Subscription
       initialProps: any
@@ -896,7 +894,6 @@ export default class Router implements BaseRouter {
       defaultLocale?: string
       domainLocales?: DomainLocale[]
       isPreview?: boolean
-      isRsc?: boolean
     }
   ) {
     // represents the current component key
@@ -915,7 +912,6 @@ export default class Router implements BaseRouter {
         err,
         __N_SSG: initialProps && initialProps.__N_SSG,
         __N_SSP: initialProps && initialProps.__N_SSP,
-        __N_RSC: !!isRsc,
       }
     }
 
@@ -1993,7 +1989,6 @@ export default class Router implements BaseRouter {
             styleSheets: res.styleSheets,
             __N_SSG: res.mod.__N_SSG,
             __N_SSP: res.mod.__N_SSP,
-            __N_RSC: !!res.mod.__next_rsc__,
           })
         ))
 
@@ -2006,20 +2001,10 @@ export default class Router implements BaseRouter {
         }
       }
 
-      /**
-       * For server components, non-SSR pages will have statically optimized
-       * flight data in a production build. So only development and SSR pages
-       * will always have the real-time generated and streamed flight data.
-       */
-      const useStreamedFlightData =
-        routeInfo.__N_RSC &&
-        (process.env.NODE_ENV !== 'production' || routeInfo.__N_SSP)
-
-      const shouldFetchData =
-        routeInfo.__N_SSG || routeInfo.__N_SSP || routeInfo.__N_RSC
+      const shouldFetchData = routeInfo.__N_SSG || routeInfo.__N_SSP
 
       const { props, cacheKey } = await this._getData(async () => {
-        if (shouldFetchData && !useStreamedFlightData) {
+        if (shouldFetchData) {
           const { json, cacheKey: _cacheKey } = data?.json
             ? data
             : await fetchNextData({
@@ -2083,31 +2068,7 @@ export default class Router implements BaseRouter {
         ).catch(() => {})
       }
 
-      let flightInfo
-      if (routeInfo.__N_RSC) {
-        flightInfo = {
-          __flight__: useStreamedFlightData
-            ? (
-                await this._getData(() =>
-                  this._getFlightData(
-                    formatWithValidation({
-                      query: { ...query, __flight__: '1' },
-                      pathname: isDynamicRoute(route)
-                        ? interpolateAs(
-                            pathname,
-                            parseRelativeUrl(resolvedAs).pathname,
-                            query
-                          ).result
-                        : pathname,
-                    })
-                  )
-                )
-              ).data
-            : props.__flight__,
-        }
-      }
-
-      props.pageProps = Object.assign({}, props.pageProps, flightInfo)
+      props.pageProps = Object.assign({}, props.pageProps)
       routeInfo.props = props
       routeInfo.route = route
       routeInfo.query = query
diff --git a/packages/next/shared/lib/utils.ts b/packages/next/shared/lib/utils.ts
index 76b9eee3a520..67c486a83d1e 100644
--- a/packages/next/shared/lib/utils.ts
+++ b/packages/next/shared/lib/utils.ts
@@ -109,7 +109,6 @@ export type NEXT_DATA = {
   scriptLoader?: any[]
   isPreview?: boolean
   notFoundSrcPage?: string
-  rsc?: boolean
 }
 
 /**
@@ -177,7 +176,6 @@ export type AppPropsType<
   router: R
   __N_SSG?: boolean
   __N_SSP?: boolean
-  __N_RSC?: boolean
 }
 
 export type DocumentContext = NextPageContext & {
diff --git a/packages/react-refresh-utils/internal/helpers.ts b/packages/react-refresh-utils/internal/helpers.ts
index 7428b73196d1..9ff15e9808c4 100644
--- a/packages/react-refresh-utils/internal/helpers.ts
+++ b/packages/react-refresh-utils/internal/helpers.ts
@@ -48,7 +48,6 @@ function isSafeExport(key: string): boolean {
     key === '__esModule' ||
     key === '__N_SSG' ||
     key === '__N_SSP' ||
-    key === '__N_RSC' ||
     // TODO: remove this key from page config instead of allow listing it
     key === 'config'
   )

From 735575708ab2dad926f1b4e3064952cdaf4f76e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Mon, 12 Sep 2022 17:43:53 +0200
Subject: [PATCH 47/69] docs: move `swcMinify: true` out of "Experimental
 features" section (#40394)

See the blog post:
https://nextjs.org/blog/next-12-3##swc-minifier-stable

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 docs/advanced-features/compiler.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/compiler.md b/docs/advanced-features/compiler.md
index 3f2bb69033ef..6708b07d693d 100644
--- a/docs/advanced-features/compiler.md
+++ b/docs/advanced-features/compiler.md
@@ -9,6 +9,7 @@ description: Learn about the Next.js Compiler, written in Rust, which transforms
 
 | Version   | Changes                                                                                                                            |
 | --------- | ---------------------------------------------------------------------------------------------------------------------------------- |
+| `v12.3.0` | SWC Minifier [stable](https://nextjs.org/blog/next-12-3#swc-minifier-stable).                                                      |
 | `v12.2.0` | [SWC Plugins](#swc-plugins-Experimental) experimental support added.                                                               |
 | `v12.1.0` | Added support for Styled Components, Jest, Relay, Remove React Properties, Legacy Decorators, Remove Console, and jsxImportSource. |
 | `v12.0.0` | Next.js Compiler [introduced](https://nextjs.org/blog/next-12).                                                                    |
@@ -238,8 +239,6 @@ module.exports = {
 
 Only `importMap` in `@emotion/babel-plugin` is not supported for now.
 
-## Experimental Features
-
 ### Minification
 
 You can opt-in to using the Next.js compiler for minification. This is 7x faster than Terser.
@@ -254,6 +253,8 @@ module.exports = {
 
 If you have feedback about `swcMinify`, please share it on the [feedback discussion](https://github.com/vercel/next.js/discussions/30237).
 
+## Experimental Features
+
 ### Minifier debug options
 
 While the minifier is experimental, we are making the following options available for debugging purposes. They will not be available once the minifier is made stable.

From 804dc6bd103dbb9867b82d40e033fb33500a45df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90or=C4=91e=20Spasi=C4=87?=
 <34274884+Djo1e@users.noreply.github.com>
Date: Mon, 12 Sep 2022 18:15:33 +0200
Subject: [PATCH 48/69] fix: eslint no-script-component-in-head error url
 (#40422)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)


Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
---
 .../lib/rules/no-script-component-in-head.js                   | 3 +--
 .../eslint-plugin-next/no-script-component-in-head.test.ts     | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/eslint-plugin-next/lib/rules/no-script-component-in-head.js b/packages/eslint-plugin-next/lib/rules/no-script-component-in-head.js
index 379ef8e2d98c..9e342e738f42 100644
--- a/packages/eslint-plugin-next/lib/rules/no-script-component-in-head.js
+++ b/packages/eslint-plugin-next/lib/rules/no-script-component-in-head.js
@@ -1,5 +1,4 @@
-const url =
-  'https://nextjs.org/docs/messages/no-script-component-in-head-component'
+const url = 'https://nextjs.org/docs/messages/no-script-component-in-head'
 
 module.exports = {
   meta: {
diff --git a/test/unit/eslint-plugin-next/no-script-component-in-head.test.ts b/test/unit/eslint-plugin-next/no-script-component-in-head.test.ts
index a6882b12b961..c4ae01685660 100644
--- a/test/unit/eslint-plugin-next/no-script-component-in-head.test.ts
+++ b/test/unit/eslint-plugin-next/no-script-component-in-head.test.ts
@@ -44,7 +44,7 @@ ruleTester.run('no-script-in-head', rule, {
       errors: [
         {
           message:
-            '`next/script` should not be used in `next/head` component. Move `<Script />` outside of `<Head>` instead. See: https://nextjs.org/docs/messages/no-script-component-in-head-component',
+            '`next/script` should not be used in `next/head` component. Move `<Script />` outside of `<Head>` instead. See: https://nextjs.org/docs/messages/no-script-component-in-head',
         },
       ],
     },

From 53ce3bf248a570caf6b386e832d33c950e1cd43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Donny/=EA=B0=95=EB=8F=99=EC=9C=A4?= <kdy1997.dev@gmail.com>
Date: Tue, 13 Sep 2022 01:36:44 +0900
Subject: [PATCH 49/69] chore: Update swc (#40292)

This PR update swc crates to
https://github.com/swc-project/swc/commit/4c078b0ac3c26254ae94648e00fac90a4e31d34c

This PR applies
 - patches for the performance of minifier
 - https://github.com/swc-project/swc/pull/5796
   - Closes https://github.com/vercel/next.js/issues/40399
---
 packages/next-swc/Cargo.lock                  | 185 +++++++++---------
 packages/next-swc/crates/core/Cargo.toml      |   6 +-
 packages/next-swc/crates/emotion/Cargo.toml   |   8 +-
 .../crates/modularize_imports/Cargo.toml      |   8 +-
 packages/next-swc/crates/napi/Cargo.toml      |   2 +-
 .../crates/styled_components/Cargo.toml       |  10 +-
 .../next-swc/crates/styled_jsx/Cargo.toml     |  10 +-
 packages/next-swc/crates/wasm/Cargo.toml      |   2 +-
 8 files changed, 114 insertions(+), 117 deletions(-)

diff --git a/packages/next-swc/Cargo.lock b/packages/next-swc/Cargo.lock
index 23b20de523e3..7feebcb93851 100644
--- a/packages/next-swc/Cargo.lock
+++ b/packages/next-swc/Cargo.lock
@@ -77,9 +77,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
 [[package]]
 name = "ast_node"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87549fcb780f81054407f313a1693d102396c223f5c49ccc5d90b46a6cbef34a"
+checksum = "0a614981a880a40522cf6fbe8b1a8365eb253655939f812a9db03e8ba4e2cb1f"
 dependencies = [
  "darling",
  "pmutil",
@@ -162,9 +162,9 @@ dependencies = [
 
 [[package]]
 name = "binding_macros"
-version = "0.12.0"
+version = "0.14.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "148582743dcb4f3a872f6275a412e8e0c1b64023790fa33c8590e98e7b81d40e"
+checksum = "41b1ea69afade9429e482477df2bfd0f1feb6e3429c40d3e38f3265235c5b8ce"
 dependencies = [
  "anyhow",
  "console_error_panic_hook",
@@ -1531,7 +1531,7 @@ dependencies = [
 
 [[package]]
 name = "modularize_imports"
-version = "0.15.0"
+version = "0.17.1"
 dependencies = [
  "convert_case",
  "handlebars",
@@ -2929,7 +2929,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "styled_components"
-version = "0.40.0"
+version = "0.42.1"
 dependencies = [
  "Inflector",
  "once_cell",
@@ -2943,7 +2943,7 @@ dependencies = [
 
 [[package]]
 name = "styled_jsx"
-version = "0.15.0"
+version = "0.17.1"
 dependencies = [
  "easy-error",
  "swc_core",
@@ -2987,9 +2987,9 @@ dependencies = [
 
 [[package]]
 name = "swc"
-version = "0.224.0"
+version = "0.226.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6cc8d2e59e8d7a2650ea97193aaf50e4b1aa940e0476522a97e4913f63620ef"
+checksum = "8d8214d84f03d1d54ae304ec2d704ca658511c92c68b5025ea5128096cb9aed7"
 dependencies = [
  "ahash",
  "anyhow",
@@ -3036,9 +3036,9 @@ dependencies = [
 
 [[package]]
 name = "swc_atoms"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fb43a79c8affc20f5d52b7db093399585ce87674427adc60843dbc8ec242608"
+checksum = "60343f7e7a830f2724908e3e9ba38e5aa4a93e7b4bfe3bc92e50188a4f8300ec"
 dependencies = [
  "once_cell",
  "rkyv",
@@ -3050,9 +3050,9 @@ dependencies = [
 
 [[package]]
 name = "swc_bundler"
-version = "0.185.0"
+version = "0.187.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00a67427e87cddb6a9502530c966d22f7099cb42783a50712a2ec3cc05ded7f9"
+checksum = "2fd38e0c2c447186c1fd4ebcac4d4b45a43237d8dc1bcce82e8b613c43eda77d"
 dependencies = [
  "ahash",
  "anyhow",
@@ -3084,9 +3084,9 @@ dependencies = [
 
 [[package]]
 name = "swc_cached"
-version = "0.3.6"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96395ee002185e0b4bc9fa88e21b7065e77e9795d7e35dfcb02fc8085b5cd1ce"
+checksum = "7b7369f6f89364d8e96140cf0e0975e74aa1d3cb968139728b154b256b91550d"
 dependencies = [
  "ahash",
  "anyhow",
@@ -3099,16 +3099,15 @@ dependencies = [
 
 [[package]]
 name = "swc_common"
-version = "0.27.13"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cba38a2f1291fcf3f78f357802b8cec72ecf5e95808e9d937783e60cd3570b93"
+checksum = "edff0b912141ad8ea2e88547ca9f5c0b3e98236570776c96ea133f8f3b1a1108"
 dependencies = [
  "ahash",
  "anyhow",
  "ast_node",
  "atty",
  "better_scoped_tls",
- "bytecheck",
  "cfg-if 1.0.0",
  "debug_unreachable",
  "either",
@@ -3159,9 +3158,9 @@ dependencies = [
 
 [[package]]
 name = "swc_core"
-version = "0.20.4"
+version = "0.22.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e3327c208ae240cb71b1da1a660e2cdffb4b3316f402c75c9ebc979dc563b2"
+checksum = "e465646ecd731d09ea6c385334b6e6c5f8dc6c4c4b60ef2a77f21a682a57f906"
 dependencies = [
  "binding_macros",
  "swc",
@@ -3197,9 +3196,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_ast"
-version = "0.110.0"
+version = "0.111.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a509e0985a7f9fad59ffe2fca9c32e50f18d443a100b45e0caf3dcfdad3ffbcf"
+checksum = "df3bec08939dcca7299037110f4e374ecb7473ae293109d4906d9501f653f533"
 dependencies = [
  "is-macro",
  "serde",
@@ -3210,9 +3209,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_codegen"
-version = "0.120.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7285b5dcc1c196f8798f4391f94b7f97fc097c371d99337775ef07f2779682a6"
+checksum = "6554847c8efc4e1affa6fd372cb8c1381638105606a3175c66a82c394e10ec7f"
 dependencies = [
  "auto_impl",
  "bitflags",
@@ -3239,9 +3238,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_parser"
-version = "0.119.0"
+version = "0.120.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "680fc749baaf53a0ebb5ba09482c43701b3d523ab823005376e39cfb3e4ca213"
+checksum = "f1e544ae9e22af55b74f385e32a016ffc576a240ceedf8d94f51c9c1f84058c6"
 dependencies = [
  "bitflags",
  "lexical",
@@ -3253,9 +3252,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_prefixer"
-version = "0.121.0"
+version = "0.122.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774759d18cf8a0e2f5cab1d7fff457bb383f4b8e8c2fbe25a0a52e2a74c9a7be"
+checksum = "cbf069adc6b1ba68e3ac39731c2777ac2cbf13dcac99d023ce56571ec8075da6"
 dependencies = [
  "once_cell",
  "preset_env_base",
@@ -3270,9 +3269,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_utils"
-version = "0.107.0"
+version = "0.108.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b611f636a937f50361b8d18cfae08ae20fa1e3b659ab7d2e5ec7e774a6fbef4"
+checksum = "7e8c81463614236e311599ae864c6bd7c5db3ab255854c3d69aeaf5776cbb971"
 dependencies = [
  "once_cell",
  "serde",
@@ -3285,9 +3284,9 @@ dependencies = [
 
 [[package]]
 name = "swc_css_visit"
-version = "0.109.0"
+version = "0.110.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "706be455229bd4c5c5761295fb02ef13f82c26daa0ef8f6efd1d769805462fe6"
+checksum = "36a5cdfa29ebfbae02c8fac6a28b385094cc39eec50a08a3dfea9355af39b327"
 dependencies = [
  "serde",
  "swc_atoms",
@@ -3298,12 +3297,11 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_ast"
-version = "0.90.15"
+version = "0.91.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571989e199094be58d107e032c0b868f7b04a59a238e0a31bc9df8faf537dcd3"
+checksum = "3b4685a1a3da866f37616067c097276af9d53fc46269b83656f3736983510a3a"
 dependencies = [
  "bitflags",
- "bytecheck",
  "is-macro",
  "num-bigint",
  "rkyv",
@@ -3317,9 +3315,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_codegen"
-version = "0.123.0"
+version = "0.124.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "616548c924bb4834b0570078c8edb85c07f5033d438316c482693d8968686dbb"
+checksum = "c8d340fd209ece39d791f18670521254e9721afc3b54d6133da2ed71492e795c"
 dependencies = [
  "memchr",
  "num-bigint",
@@ -3349,9 +3347,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_ext_transforms"
-version = "0.87.0"
+version = "0.88.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24cc13886dcab94205e82358abd59b49a6ca06f15ee66f28c082d0277c4f0a1f"
+checksum = "ac83c6901143ef4b6e27ec11663c1ba720e540af975f1e914f75781ac3afac71"
 dependencies = [
  "phf",
  "swc_atoms",
@@ -3363,9 +3361,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_lints"
-version = "0.61.0"
+version = "0.63.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3240efa29a4a5968134622766cd122ae2cbb81c3bb3f3fdd9e81814f15d28b47"
+checksum = "35d077a94d07955222f5775dddfc4a021e570631dc6e7e6bef1777099eefc93c"
 dependencies = [
  "ahash",
  "auto_impl",
@@ -3384,9 +3382,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_loader"
-version = "0.39.4"
+version = "0.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ece6023a43222e3bd36e3d191fa5289c848245b97fbf0127d9c0923165648d18"
+checksum = "203d02530097a78677f684af316a703fc18270b120df6f7c22a6c32ff977a7e1"
 dependencies = [
  "ahash",
  "anyhow",
@@ -3406,9 +3404,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_minifier"
-version = "0.152.3"
+version = "0.154.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62550be2e2773991286ea412d5277b39c81f8a47b1fbcfe68af6bf8788c58722"
+checksum = "61bd03038ced37f965ada147cb2a7ac928162afa0e22aeaedb9495224222476a"
 dependencies = [
  "ahash",
  "arrayvec",
@@ -3440,9 +3438,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_parser"
-version = "0.118.5"
+version = "0.119.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da59bf24d3284fd5a93d0aee8f16d618ab43f032f7bdf9985553f4ba26584377"
+checksum = "00e4dfd30206132cb1e66a4a98182b2ae2480ac6407418fba98d2f80e60c53bd"
 dependencies = [
  "either",
  "enum_kind",
@@ -3459,9 +3457,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_preset_env"
-version = "0.167.0"
+version = "0.169.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d37f5aecc5e4e809946ea76021c00c80ca797471c1b1d36e9225643c999b36"
+checksum = "9f394fa11182401ed27a3ee8bcb9997f29e86aaa0a128c98b54dbc8150db9db4"
 dependencies = [
  "ahash",
  "anyhow",
@@ -3484,9 +3482,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_testing"
-version = "0.16.0"
+version = "0.17.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a333f88b7a6e373fe94911f145064044ab1ffb6f2dfd4bcd36ac7ea90026fa6"
+checksum = "6b812a560c37b954e4d6b0dde1eca35281ec397a9281560ba8275e3c23369a93"
 dependencies = [
  "anyhow",
  "hex",
@@ -3500,9 +3498,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms"
-version = "0.191.0"
+version = "0.193.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca874b86485f26b882110bc711e718707a28aeb8528b1880e46923f619706bc"
+checksum = "8f31a9ce0fede50283e66825dd436b54a186631f0f8fc7f55793f7fc8b7413e8"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3520,13 +3518,12 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_base"
-version = "0.106.1"
+version = "0.108.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1a5bd2f4633734c712b3539b60d5ee7151a93fa827f2b9b19ffb05accece2b0"
+checksum = "f549d34f9ba9f33989bc0680183609434cc4729b2bc6a31b516958493947d45a"
 dependencies = [
  "better_scoped_tls",
  "bitflags",
- "num_cpus",
  "once_cell",
  "phf",
  "rayon",
@@ -3544,9 +3541,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_classes"
-version = "0.95.0"
+version = "0.97.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bd6ef2fe490311bb13898a464f2a582374c50f81996fbcce7358674522f992a"
+checksum = "d2bb41eaa3febb1edfa7ba740ac6c99e3270ffd9339320fe5ba7a2fe44fcb309"
 dependencies = [
  "swc_atoms",
  "swc_common",
@@ -3558,9 +3555,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_compat"
-version = "0.129.0"
+version = "0.131.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce692c9efbfebbc068253eb4d1f97f18809878e4a3d6a85a6900cc507bf08c"
+checksum = "699e56d6e28dd26ab1fcc823be0de0bdcf486f9b5a3c5c700757b42d49ee87eb"
 dependencies = [
  "ahash",
  "arrayvec",
@@ -3599,9 +3596,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_module"
-version = "0.146.0"
+version = "0.148.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e39d8eca155d211e191d8b3a3ba44908d6aaa82e82152fca73524382e68d9fb3"
+checksum = "ecbc7b777d4a7ebf396fba2ed5f146cb6f76d55a8ebdb31fd0919819a8df3708"
 dependencies = [
  "Inflector",
  "ahash",
@@ -3627,9 +3624,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_optimization"
-version = "0.160.3"
+version = "0.162.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60929573686464dd117839acef42287205407865385eed448e5625dd4ff5214b"
+checksum = "ed2ee11129360ab9f13eaa932844f88df02970300d2684545265890cec46e11b"
 dependencies = [
  "ahash",
  "dashmap",
@@ -3653,9 +3650,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_proposal"
-version = "0.137.0"
+version = "0.139.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb2b44281820a732b88b26da3448846ac82e6338af133928b7a879b14ea40e59"
+checksum = "231f536b837d0a4fe5c1b36466909bdcfdda6cd57ed31809bda4a4976cd0adac"
 dependencies = [
  "either",
  "serde",
@@ -3672,9 +3669,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_react"
-version = "0.148.0"
+version = "0.150.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b148e31430d71af020a9eaed963f55126a150036a8de708fcfd03e6a1b852159"
+checksum = "2abe0bc888b67344d4e890c9bfd3716176849f35f881263b51d2405ec1efaee3"
 dependencies = [
  "ahash",
  "base64 0.13.0",
@@ -3699,9 +3696,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_testing"
-version = "0.108.0"
+version = "0.110.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780945cfbf7755795b5c5d2755c28c17a9cb87ce2549e3597eae66967d63053b"
+checksum = "d5280e6d5e250085f25a84f03ab044b9bb1aa751013eb85540e254d1c17be2a4"
 dependencies = [
  "ansi_term",
  "anyhow",
@@ -3723,9 +3720,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_transforms_typescript"
-version = "0.152.0"
+version = "0.154.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acba735ad42b7658045c7bb43b8989dfe2681c97b627f264b760d4ca300e670"
+checksum = "f34ac7c3ebcae7a383d277a73554311122065db17aa46474c15488be1ce99a40"
 dependencies = [
  "serde",
  "swc_atoms",
@@ -3739,11 +3736,12 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_utils"
-version = "0.101.0"
+version = "0.102.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64bf09a91b69dc0ffa57a7bde2a8131be8dbe09997e95b9a51b08ba76e7384fb"
+checksum = "0bddd1a279d48e3cca2ee3977040cab764941241669329239a3243d44db10656"
 dependencies = [
  "indexmap",
+ "num_cpus",
  "once_cell",
  "rayon",
  "swc_atoms",
@@ -3756,9 +3754,9 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_visit"
-version = "0.76.6"
+version = "0.77.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02cb4c2c4213d603543e7232db69e763a9292953db511b0ed5d1bf8c1b227b90"
+checksum = "62095bb4acbee86b182c26b2d2e45b629eaa5687649adf09391f5d13fac96079"
 dependencies = [
  "num-bigint",
  "swc_atoms",
@@ -3770,7 +3768,7 @@ dependencies = [
 
 [[package]]
 name = "swc_emotion"
-version = "0.17.0"
+version = "0.19.1"
 dependencies = [
  "base64 0.13.0",
  "byteorder",
@@ -3800,9 +3798,9 @@ dependencies = [
 
 [[package]]
 name = "swc_error_reporters"
-version = "0.11.4"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0171a43e5d90cdea0efbf5844e3780f8650a22e4152b0c49549387d5f6b3da"
+checksum = "05b79de61e6d5a424a3b098d77a26084b38c32be114622bafa7260dc0f030ab4"
 dependencies = [
  "anyhow",
  "miette",
@@ -3813,9 +3811,9 @@ dependencies = [
 
 [[package]]
 name = "swc_fast_graph"
-version = "0.15.5"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "056b5c705601d607480e67add408af73144712b445db5872ee2483d76acffb55"
+checksum = "63a86b91f3d2135f202e399d3fd641ddb491db22f71b228e8498327f1255e64b"
 dependencies = [
  "ahash",
  "indexmap",
@@ -3825,9 +3823,9 @@ dependencies = [
 
 [[package]]
 name = "swc_graph_analyzer"
-version = "0.16.4"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba02e0726abddde48fecef483fb0b067c88a6c0da736b91d3ef424be3cfcaa39"
+checksum = "d41a0e2ceb3834422c0dd0d6ecd9cbdc3d79f6b1d72f5c6c69cf01f2819aed99"
 dependencies = [
  "ahash",
  "auto_impl",
@@ -3860,9 +3858,9 @@ dependencies = [
 
 [[package]]
 name = "swc_node_comments"
-version = "0.14.4"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809a8d29020a11b0171f033110c9d0bd260b8797429f9e26672afd8353a14cce"
+checksum = "fb3e725f1331dbaf5a611d6c2f438dfab8bbacc533c68702a0ff80c54474bc01"
 dependencies = [
  "ahash",
  "dashmap",
@@ -3872,12 +3870,11 @@ dependencies = [
 
 [[package]]
 name = "swc_plugin_proxy"
-version = "0.18.13"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f4cbccf3bf3b808d10371c4e0890b7a5871926519077c0a343ada9b6012aa1e"
+checksum = "fc3ef97400d703ee77d385b32e575f345270e1d22492fc654a570fa81d13e943"
 dependencies = [
  "better_scoped_tls",
- "bytecheck",
  "rkyv",
  "swc_common",
  "swc_ecma_ast",
@@ -3887,9 +3884,9 @@ dependencies = [
 
 [[package]]
 name = "swc_plugin_runner"
-version = "0.73.1"
+version = "0.74.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabaa68c69344c1fdf7e802e7d059d7f5f08ee9afdbacb3470a4f6e115b7887e"
+checksum = "d1b116d97058176c148615a06aea31dc86cfdb4cdb6c544eecb1f8fc18b78942"
 dependencies = [
  "anyhow",
  "once_cell",
@@ -3907,9 +3904,9 @@ dependencies = [
 
 [[package]]
 name = "swc_timer"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f94c875f92763879d638174414a94762cd8f865d237ad75b34094c18395bc796"
+checksum = "7608e49fb80b82bf85086a9abe5c3458ad6ec63da274b6eced3e41976cae1b3b"
 dependencies = [
  "tracing",
 ]
@@ -4001,9 +3998,9 @@ dependencies = [
 
 [[package]]
 name = "testing"
-version = "0.29.4"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee5d89dc2a392aab3a29a2d4e430e4ec3692fd3bd91d0a54bc092f4b8ea26d96"
+checksum = "a0405c4a90862fd9e264da30ed20cd04ea94ba25d6d4f7a228b2c902dcd05aea"
 dependencies = [
  "ansi_term",
  "difference",
diff --git a/packages/next-swc/crates/core/Cargo.toml b/packages/next-swc/crates/core/Cargo.toml
index 49c55aae4f92..16dba355becf 100644
--- a/packages/next-swc/crates/core/Cargo.toml
+++ b/packages/next-swc/crates/core/Cargo.toml
@@ -28,7 +28,7 @@ styled_jsx = {path="../styled_jsx"}
 modularize_imports = {path="../modularize_imports"}
 tracing = { version = "0.1.32", features = ["release_max_level_info"] }
 
-swc_core = { version = "0.20.4", features = [
+swc_core = { version = "0.22.4", features = [
   "common_concurrent",
   "ecma_ast",
   "ecma_visit",
@@ -47,6 +47,6 @@ swc_core = { version = "0.20.4", features = [
 ] }
 
 [dev-dependencies]
-swc_core = { version = "0.20.4", features = ["testing_transform"] }
-testing = "0.29.4"
+swc_core = { version = "0.22.4", features = ["testing_transform"] }
+testing = "0.30.0"
 walkdir = "2.3.2"
diff --git a/packages/next-swc/crates/emotion/Cargo.toml b/packages/next-swc/crates/emotion/Cargo.toml
index ecf9a8f784c6..1476debe5558 100644
--- a/packages/next-swc/crates/emotion/Cargo.toml
+++ b/packages/next-swc/crates/emotion/Cargo.toml
@@ -5,7 +5,7 @@ description = "AST Transforms for emotion"
 license = "Apache-2.0"
 name = "swc_emotion"
 repository = "https://github.com/vercel/next.js.git"
-version = "0.17.0"
+version = "0.19.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -19,9 +19,9 @@ regex = "1.5"
 serde = "1"
 sourcemap = "6.0.1"
 tracing = { version = "0.1.32", features = ["release_max_level_info"] }
-swc_core = { version = "0.20.4", features = ["common_concurrent", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] }
+swc_core = { version = "0.22.4", features = ["common", "ecma_ast","ecma_codegen", "ecma_utils", "ecma_visit", "trace_macro"] }
 
 [dev-dependencies]
-swc_core = { version = "0.20.4", features = ["testing_transform", "ecma_transforms_react"] }
-testing = "0.29.4"
+swc_core = { version = "0.22.4", features = ["testing_transform", "ecma_transforms_react"] }
+testing = "0.30.0"
 serde_json = "1"
diff --git a/packages/next-swc/crates/modularize_imports/Cargo.toml b/packages/next-swc/crates/modularize_imports/Cargo.toml
index 9cc850592acf..07fe8de07bcd 100644
--- a/packages/next-swc/crates/modularize_imports/Cargo.toml
+++ b/packages/next-swc/crates/modularize_imports/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 license = "Apache-2.0"
 name = "modularize_imports"
 repository = "https://github.com/vercel/next.js.git"
-version = "0.15.0"
+version = "0.17.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -15,8 +15,8 @@ handlebars = "4.2.1"
 once_cell = "1.13.0"
 regex = "1.5"
 serde = "1"
-swc_core = { version = "0.20.4", features = ["cached", "ecma_ast", "ecma_visit"] }
+swc_core = { version = "0.22.4", features = ["cached", "ecma_ast", "ecma_visit"] }
 
 [dev-dependencies]
-swc_core = { version = "0.20.4", features = ["testing_transform"] }
-testing = "0.29.4"
+swc_core = { version = "0.22.4", features = ["testing_transform"] }
+testing = "0.30.0"
diff --git a/packages/next-swc/crates/napi/Cargo.toml b/packages/next-swc/crates/napi/Cargo.toml
index 83d8b862754a..d60a369bf550 100644
--- a/packages/next-swc/crates/napi/Cargo.toml
+++ b/packages/next-swc/crates/napi/Cargo.toml
@@ -30,7 +30,7 @@ next-swc = {version = "0.0.0", path = "../core"}
 once_cell = "1.13.0"
 serde = "1"
 serde_json = "1"
-swc_core = { version = "0.20.4", features = [
+swc_core = { version = "0.22.4", features = [
   "allocator_node",
   "base_concurrent", # concurrent?
   "common_concurrent",
diff --git a/packages/next-swc/crates/styled_components/Cargo.toml b/packages/next-swc/crates/styled_components/Cargo.toml
index a4ed8723a5b8..7349de3b475d 100644
--- a/packages/next-swc/crates/styled_components/Cargo.toml
+++ b/packages/next-swc/crates/styled_components/Cargo.toml
@@ -6,7 +6,7 @@ include = ["Cargo.toml", "src/**/*.rs"]
 license = "Apache-2.0"
 name = "styled_components"
 repository = "https://github.com/vercel/next.js.git"
-version = "0.40.0"
+version = "0.42.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -16,8 +16,8 @@ once_cell = "1.13.0"
 regex = {version = "1.5.4", features = ["std", "perf"], default-features = false}
 serde = {version = "1.0.130", features = ["derive"]}
 tracing = "0.1.32"
-swc_core = { version = "0.20.4", features = [
-  "common_concurrent",
+swc_core = { version = "0.22.4", features = [
+  "common",
   "ecma_ast",
   "ecma_utils",
   "ecma_visit"
@@ -25,8 +25,8 @@ swc_core = { version = "0.20.4", features = [
 
 [dev-dependencies]
 serde_json = "1"
-testing = "0.29.4"
-swc_core = { version = "0.20.4", features = [
+testing = "0.30.0"
+swc_core = { version = "0.22.4", features = [
   "ecma_parser",
   "ecma_transforms",
   "testing_transform"
diff --git a/packages/next-swc/crates/styled_jsx/Cargo.toml b/packages/next-swc/crates/styled_jsx/Cargo.toml
index 953d3ed4768f..d5ad87af3150 100644
--- a/packages/next-swc/crates/styled_jsx/Cargo.toml
+++ b/packages/next-swc/crates/styled_jsx/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2018"
 license = "Apache-2.0"
 name = "styled_jsx"
 repository = "https://github.com/vercel/next.js.git"
-version = "0.15.0"
+version = "0.17.1"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -13,8 +13,8 @@ version = "0.15.0"
 easy-error = "1.0.0"
 tracing = "0.1.32"
 
-swc_core = { version = "0.20.4", features = [
-  "common_concurrent",
+swc_core = { version = "0.22.4", features = [
+  "common",
   "css_ast",
   "css_codegen",
   "css_parser",
@@ -27,7 +27,7 @@ swc_core = { version = "0.20.4", features = [
 ] }
 
 [dev-dependencies]
-testing = "0.29.4"
-swc_core = { version = "0.20.4", features = [
+testing = "0.30.0"
+swc_core = { version = "0.22.4", features = [
   "testing_transform"
 ] }
diff --git a/packages/next-swc/crates/wasm/Cargo.toml b/packages/next-swc/crates/wasm/Cargo.toml
index 56ef94e1e695..c98c6275e09c 100644
--- a/packages/next-swc/crates/wasm/Cargo.toml
+++ b/packages/next-swc/crates/wasm/Cargo.toml
@@ -31,7 +31,7 @@ wasm-bindgen-futures = "0.4.8"
 getrandom = { version = "0.2.5", optional = true, default-features = false }
 js-sys = "0.3.59"
 
-swc_core = { version = "0.20.4", features = [
+swc_core = { version = "0.22.4", features = [
   "common_concurrent",
   "binding_macro_wasm",
   "ecma_codegen",

From 2872deef64a58b4769049bc3c35d59c29e68b838 Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Mon, 12 Sep 2022 09:58:25 -0700
Subject: [PATCH 50/69] v12.3.1-canary.1

---
 lerna.json                                   |  2 +-
 packages/create-next-app/package.json        |  2 +-
 packages/eslint-config-next/package.json     |  4 ++--
 packages/eslint-plugin-next/package.json     |  2 +-
 packages/next-bundle-analyzer/package.json   |  2 +-
 packages/next-codemod/package.json           |  2 +-
 packages/next-env/package.json               |  2 +-
 packages/next-mdx/package.json               |  2 +-
 packages/next-plugin-storybook/package.json  |  2 +-
 packages/next-polyfill-module/package.json   |  2 +-
 packages/next-polyfill-nomodule/package.json |  2 +-
 packages/next-swc/package.json               |  2 +-
 packages/next/package.json                   | 14 +++++++-------
 packages/react-dev-overlay/package.json      |  2 +-
 packages/react-refresh-utils/package.json    |  2 +-
 pnpm-lock.yaml                               | 14 +++++++-------
 16 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lerna.json b/lerna.json
index fe214ba233be..c26fa2b698a2 100644
--- a/lerna.json
+++ b/lerna.json
@@ -16,5 +16,5 @@
       "registry": "https://registry.npmjs.org/"
     }
   },
-  "version": "12.3.1-canary.0"
+  "version": "12.3.1-canary.1"
 }
diff --git a/packages/create-next-app/package.json b/packages/create-next-app/package.json
index 89a0a642c35b..4ac8a833b88a 100644
--- a/packages/create-next-app/package.json
+++ b/packages/create-next-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-next-app",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "keywords": [
     "react",
     "next",
diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index 6ea37f6f39b7..c46b3c036089 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eslint-config-next",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-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.3.1-canary.0",
+    "@next/eslint-plugin-next": "12.3.1-canary.1",
     "@rushstack/eslint-patch": "^1.1.3",
     "@typescript-eslint/parser": "^5.21.0",
     "eslint-import-resolver-node": "^0.3.6",
diff --git a/packages/eslint-plugin-next/package.json b/packages/eslint-plugin-next/package.json
index 225d52346f13..2ba3a8c9b83a 100644
--- 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.3.1-canary.0",
+  "version": "12.3.1-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
index 0e5171eb281c..e7b19681aef3 100644
--- a/packages/next-bundle-analyzer/package.json
+++ b/packages/next-bundle-analyzer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/bundle-analyzer",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "main": "index.js",
   "types": "index.d.ts",
   "license": "MIT",
diff --git a/packages/next-codemod/package.json b/packages/next-codemod/package.json
index 0ea8a161c2db..366727b45806 100644
--- a/packages/next-codemod/package.json
+++ b/packages/next-codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/codemod",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "license": "MIT",
   "dependencies": {
     "chalk": "4.1.0",
diff --git a/packages/next-env/package.json b/packages/next-env/package.json
index abfafb9eb423..28155cdf7a8d 100644
--- a/packages/next-env/package.json
+++ b/packages/next-env/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/env",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "keywords": [
     "react",
     "next",
diff --git a/packages/next-mdx/package.json b/packages/next-mdx/package.json
index aca139aa0cbc..8308095d6472 100644
--- a/packages/next-mdx/package.json
+++ b/packages/next-mdx/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/mdx",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "main": "index.js",
   "license": "MIT",
   "repository": {
diff --git a/packages/next-plugin-storybook/package.json b/packages/next-plugin-storybook/package.json
index cce62d780fd2..111ccef17a94 100644
--- a/packages/next-plugin-storybook/package.json
+++ b/packages/next-plugin-storybook/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/plugin-storybook",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-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
index d9de25b34de5..cbd4c8eb1537 100644
--- a/packages/next-polyfill-module/package.json
+++ b/packages/next-polyfill-module/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-module",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-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
index 8476dc35b9eb..41e42880e376 100644
--- a/packages/next-polyfill-nomodule/package.json
+++ b/packages/next-polyfill-nomodule/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/polyfill-nomodule",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-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
index 6c10e67d141b..9af069c9e001 100644
--- a/packages/next-swc/package.json
+++ b/packages/next-swc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@next/swc",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "private": true,
   "scripts": {
     "build-native": "napi build --platform -p next-swc-napi --cargo-name next_swc_napi native --features plugin",
diff --git a/packages/next/package.json b/packages/next/package.json
index e822168419f4..b824e41bce2c 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "12.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -70,7 +70,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "12.3.1-canary.0",
+    "@next/env": "12.3.1-canary.1",
     "@swc/helpers": "0.4.11",
     "caniuse-lite": "^1.0.30001332",
     "postcss": "8.4.14",
@@ -121,11 +121,11 @@
     "@hapi/accept": "5.0.2",
     "@napi-rs/cli": "2.7.0",
     "@napi-rs/triples": "1.1.0",
-    "@next/polyfill-module": "12.3.1-canary.0",
-    "@next/polyfill-nomodule": "12.3.1-canary.0",
-    "@next/react-dev-overlay": "12.3.1-canary.0",
-    "@next/react-refresh-utils": "12.3.1-canary.0",
-    "@next/swc": "12.3.1-canary.0",
+    "@next/polyfill-module": "12.3.1-canary.1",
+    "@next/polyfill-nomodule": "12.3.1-canary.1",
+    "@next/react-dev-overlay": "12.3.1-canary.1",
+    "@next/react-refresh-utils": "12.3.1-canary.1",
+    "@next/swc": "12.3.1-canary.1",
     "@segment/ajv-human-errors": "2.1.2",
     "@taskr/clear": "1.1.0",
     "@taskr/esnext": "1.1.0",
diff --git a/packages/react-dev-overlay/package.json b/packages/react-dev-overlay/package.json
index ecbf133e549a..80899a2748f5 100644
--- 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.3.1-canary.0",
+  "version": "12.3.1-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
index d66abadd4b70..cf50b43de1a3 100644
--- 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.3.1-canary.0",
+  "version": "12.3.1-canary.1",
   "description": "An experimental package providing utilities for React Refresh.",
   "repository": {
     "url": "vercel/next.js",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 75ec1aab68be..857906a80f28 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -365,7 +365,7 @@ importers:
 
   packages/eslint-config-next:
     specifiers:
-      '@next/eslint-plugin-next': 12.3.1-canary.0
+      '@next/eslint-plugin-next': 12.3.1-canary.1
       '@rushstack/eslint-patch': ^1.1.3
       '@typescript-eslint/parser': ^5.21.0
       eslint-import-resolver-node: ^0.3.6
@@ -421,12 +421,12 @@ importers:
       '@hapi/accept': 5.0.2
       '@napi-rs/cli': 2.7.0
       '@napi-rs/triples': 1.1.0
-      '@next/env': 12.3.1-canary.0
-      '@next/polyfill-module': 12.3.1-canary.0
-      '@next/polyfill-nomodule': 12.3.1-canary.0
-      '@next/react-dev-overlay': 12.3.1-canary.0
-      '@next/react-refresh-utils': 12.3.1-canary.0
-      '@next/swc': 12.3.1-canary.0
+      '@next/env': 12.3.1-canary.1
+      '@next/polyfill-module': 12.3.1-canary.1
+      '@next/polyfill-nomodule': 12.3.1-canary.1
+      '@next/react-dev-overlay': 12.3.1-canary.1
+      '@next/react-refresh-utils': 12.3.1-canary.1
+      '@next/swc': 12.3.1-canary.1
       '@segment/ajv-human-errors': 2.1.2
       '@swc/helpers': 0.4.11
       '@taskr/clear': 1.1.0

From d6f5ebf773f28026e230885b783c611510688c43 Mon Sep 17 00:00:00 2001
From: "M.K. Safi" <msafi@msafi.com>
Date: Mon, 12 Sep 2022 11:31:23 -0700
Subject: [PATCH 51/69] Clarify use of `loading` property (#40488)

I was a little confused by the `loading` property having the value `<header />`. I think that property is meant to show a loading state while the file is being loaded? If my assumption is correct, I think this change makes sense.
---
 docs/advanced-features/dynamic-import.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/advanced-features/dynamic-import.md b/docs/advanced-features/dynamic-import.md
index f80aa5b831e7..118165d399cc 100644
--- a/docs/advanced-features/dynamic-import.md
+++ b/docs/advanced-features/dynamic-import.md
@@ -42,7 +42,7 @@ If you are not using React 18, you can use the `loading` attribute in place of t
 
 ```jsx
 const DynamicHeader = dynamic(() => import('../components/header'), {
-  loading: () => <header />,
+  loading: () => <div>Loading...</div>,
 })
 ```
 

From d83ceeec080fb5ab52df31d57978b1ce14139133 Mon Sep 17 00:00:00 2001
From: Thomas Knickman <tom.knickman@vercel.com>
Date: Mon, 12 Sep 2022 14:46:16 -0400
Subject: [PATCH 52/69] chore(examples): update turborepo examples link
 (#40487)

## Documentation / Examples

We now maintain a landing page of all monorepo examples with Next.js apps. We can point users here instead.

- [X] Make sure the linting passes by running `pnpm lint`
- [X] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/with-turbo/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/with-turbo/README.md b/examples/with-turbo/README.md
index 4e403d41ec38..dc116013fb15 100644
--- a/examples/with-turbo/README.md
+++ b/examples/with-turbo/README.md
@@ -1,3 +1,3 @@
 The official examples are maintained by the Turborepo team:
 
-- [Typescript](https://github.com/vercel/turborepo/tree/main/examples/basic)
+- [Turborepo + Next.js Examples](https://github.com/vercel/turborepo/tree/main/examples/with-nextjs)

From 97ac34446877a166d37157b682032b96f19ab1bb Mon Sep 17 00:00:00 2001
From: Damien Simonin Feugas <damien@vercel.com>
Date: Tue, 13 Sep 2022 00:01:00 +0200
Subject: [PATCH 53/69] feat(edge): allows configuring Dynamic code execution
 guard (#39539)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 📖  What's in there?

Dynamic code evaluation (`eval()`, `new Function()`, ...) is not
supported on the edge runtime, hence why we fail the build when
detecting such statement in the middleware or `experimental-edge` routes
at build time.

However, there could be false positives, which static analysis and
tree-shaking can not exclude:
- `qs` through these dependencies (get-intrinsic:
[source](https://github.com/ljharb/get-intrinsic/blob/main/index.js#L12))
- `function-bind`
([source](https://github.com/Raynos/function-bind/blob/master/implementation.js#L42))
- `has`
([source](https://github.com/tarruda/has/blob/master/src/index.js#L5))

This PR leverages the existing `config` export to let user allow some of
their files.
it’s meant for allowing users to import 3rd party modules who embed
dynamic code evaluation, but do not use it (because or code paths), and
can't be tree-shaked.

By default, it’s keeping the existing behavior: warn in dev, fails to
build.
If users allow dynamic code, and that code is reached at runtime, their
app stills breaks.

### 🧪 How to test?

- (existing) integration tests for disallowing dynamic code evaluation:
`pnpm testheadless --testPathPattern=runtime-dynamic`
- (new) integration tests for allowing dynamic code evaluation: `pnpm
testheadless --testPathPattern=runtime-configurable`
- (amended) production tests for validating the new configuration keys:
`pnpm testheadless --testPathPattern=config-validations`

To try it live, you could have an application such as:
```js
// lib/index.js
/* eslint-disable no-eval */
export function hasUnusedDynamic() {
  if ((() => false)()) {
    eval('100')
  }
}

export function hasDynamic() {
  eval('100')
}

// pages/index.jsx
export default function Page({ edgeRoute }) {
  return <p>{edgeRoute}</p>
}

export const getServerSideProps = async (req) => {
  const res = await fetch(`http://localhost:3000/api/route`)
  const data = await res.json()
  return { props: { edgeRoute: data.ok ? `Hi from the edge route` : '' } }
}

// pages/api/route.js
import { hasDynamic } from '../../lib'

export default async function handle() {
  hasDynamic()
  return Response.json({ ok: true })
}

export const config = {
  runtime: 'experimental-edge' ,
  allowDynamic: '/lib/**'
}
```

Playing with `config.allowDynamic`, you should be able to:
- build the app even if it uses `eval()` (it will obviously fail at
runtime)
- build the app that _imports but does not use_ `eval()`
- run the app in dev, even if it uses `eval()` with no warning

### 🆙 Notes to reviewers

Before adding documentation and telemetry, I'd like to collect comments
on a couple of points:
- the overall design for this feature: is a list of globs useful and
easy enough?
- should the globs be relative to the application root (current
implementation) to to the edge route/middleware file?
- (especially to @sokra) is the implementation idiomatic enough? I've
leverage loaders to read the _entry point_ configuration once, then the
ModuleGraph to get it back during the parsing phase. I couldn't re-use
the existing `getExtractMetadata()` facility since it's happening late
after the parsing.
- there's a glitch with `import { ServerRuntime } from '../../types'` in
`get-page-static-info.ts`
([here](https://github.com/vercel/next.js/pull/39539/files#diff-cb7ac6392c3dd707c5edab159c3144ec114eafea92dad5d98f4eedfc612174d2L12)).
I had to use `next/types` because it was failing during lint. Any clue
why?

### ☑️ Checklist

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
- [x] Documentation added
- [x] Telemetry added. In case of a feature if it's used or not.
- [x] Errors have helpful link attached, see `contributing.md`
---
 docs/api-reference/edge-runtime.md            |  19 +
 errors/edge-dynamic-code-evaluation.md        |  34 ++
 errors/manifest.json                          |   4 +
 errors/middleware-dynamic-wasm-compilation.md |   2 +-
 .../build/analysis/get-page-static-info.ts    |  32 +-
 packages/next/build/entries.ts                |   7 +-
 .../webpack/loaders/get-module-build-info.ts  |   1 +
 .../loaders/next-edge-function-loader.ts      |   4 +-
 .../webpack/loaders/next-middleware-loader.ts |   3 +
 packages/next/build/webpack/loaders/utils.ts  |  16 +
 .../webpack/plugins/middleware-plugin.ts      | 203 ++++++---
 packages/next/server/dev/hot-reloader.ts      |   1 +
 packages/next/server/web/sandbox/context.ts   |   7 +-
 .../lib/index.js                              |   1 +
 .../middleware.js                             |  10 +
 .../pages/api/route.js                        |   8 +
 .../pages/index.js                            |   3 +
 .../test/index.test.js                        | 390 ++++++++++++++++++
 .../edge-config-validations/index.test.ts     |  35 ++
 test/readme.md                                |   2 +-
 20 files changed, 706 insertions(+), 76 deletions(-)
 create mode 100644 errors/edge-dynamic-code-evaluation.md
 create mode 100644 test/integration/edge-runtime-configurable-guards/lib/index.js
 create mode 100644 test/integration/edge-runtime-configurable-guards/middleware.js
 create mode 100644 test/integration/edge-runtime-configurable-guards/pages/api/route.js
 create mode 100644 test/integration/edge-runtime-configurable-guards/pages/index.js
 create mode 100644 test/integration/edge-runtime-configurable-guards/test/index.test.js
 create mode 100644 test/production/edge-config-validations/index.test.ts

diff --git a/docs/api-reference/edge-runtime.md b/docs/api-reference/edge-runtime.md
index c62a84973bf4..7993c3a6e80f 100644
--- a/docs/api-reference/edge-runtime.md
+++ b/docs/api-reference/edge-runtime.md
@@ -136,6 +136,25 @@ The following JavaScript language features are disabled, and **will not work:**
 
 - `eval`: Evaluates JavaScript code represented as a string
 - `new Function(evalString)`: Creates a new function with the code provided as an argument
+- `WebAssembly.compile`
+- `WebAssembly.instantiate` with [a buffer parameter](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiate#primary_overload_%E2%80%94_taking_wasm_binary_code)
+
+In rare cases, your code could contain (or import) some dynamic code evaluation statements which _can not be reached at runtime_ and which can not be removed by treeshaking.
+You can relax the check to allow specific files with your Middleware or Edge API Route exported configuration:
+
+```javascript
+export const config = {
+  runtime: 'experimental-edge', // for Edge API Routes only
+  allowDynamic: [
+    '/lib/utilities.js', // allows a single file
+    '/node_modules/function-bind/**', // use a glob to allow anything in the function-bind 3rd party module
+  ],
+}
+```
+
+`allowDynamic` is a [glob](https://github.com/micromatch/micromatch#matching-features), or an array of globs, ignoring dynamic code evaluation for specific files. The globs are relative to your application root folder.
+
+Be warned that if these statements are executed on the Edge, _they will throw and cause a runtime error_.
 
 ## Related
 
diff --git a/errors/edge-dynamic-code-evaluation.md b/errors/edge-dynamic-code-evaluation.md
new file mode 100644
index 000000000000..29a5e74b6329
--- /dev/null
+++ b/errors/edge-dynamic-code-evaluation.md
@@ -0,0 +1,34 @@
+# Dynamic code evaluation is not available in Middlewares or Edge API Routes
+
+#### Why This Error Occurred
+
+`eval()`, `new Function()` or compiling WASM binaries dynamically is not allowed in Middlewares or Edge API Routes.
+Specifically, the following APIs are not supported:
+
+- `eval()`
+- `new Function()`
+- `WebAssembly.compile`
+- `WebAssembly.instantiate` with [a buffer parameter](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/WebAssembly/instantiate#primary_overload_%E2%80%94_taking_wasm_binary_code)
+
+#### Possible Ways to Fix It
+
+You can bundle your WASM binaries using `import`:
+
+```typescript
+import { NextResponse } from 'next/server'
+import squareWasm from './square.wasm?module'
+
+export default async function middleware() {
+  const m = await WebAssembly.instantiate(squareWasm)
+  const answer = m.exports.square(9)
+
+  const response = NextResponse.next()
+  response.headers.set('x-square', answer.toString())
+  return response
+}
+```
+
+In rare cases, your code could contain (or import) some dynamic code evaluation statements which _can not be reached at runtime_ and which can not be removed by treeshaking.
+You can relax the check to allow specific files with your Middleware or Edge API Route exported [configuration](https://nextjs.org/docs/api-reference/edge-runtime#unsupported-apis).
+
+Be warned that if these statements are executed on the Edge, _they will throw and cause a runtime error_.
diff --git a/errors/manifest.json b/errors/manifest.json
index 42134b6ca26f..41bb35c7d600 100644
--- a/errors/manifest.json
+++ b/errors/manifest.json
@@ -714,6 +714,10 @@
           "title": "middleware-dynamic-wasm-compilation",
           "path": "/errors/middleware-dynamic-wasm-compilation.md"
         },
+        {
+          "title": "edge-dynamic-code-evaluation",
+          "path": "/errors/edge-dynamic-code-evaluation.md"
+        },
         {
           "title": "node-module-in-edge-runtime",
           "path": "/errors/node-module-in-edge-runtime.md"
diff --git a/errors/middleware-dynamic-wasm-compilation.md b/errors/middleware-dynamic-wasm-compilation.md
index 7b5272a41d50..ffe3b85546f4 100644
--- a/errors/middleware-dynamic-wasm-compilation.md
+++ b/errors/middleware-dynamic-wasm-compilation.md
@@ -19,8 +19,8 @@ import squareWasm from './square.wasm?module'
 export default async function middleware() {
   const m = await WebAssembly.instantiate(squareWasm)
   const answer = m.exports.square(9)
-
   const response = NextResponse.next()
+
   response.headers.set('x-square', answer.toString())
   return response
 }
diff --git a/packages/next/build/analysis/get-page-static-info.ts b/packages/next/build/analysis/get-page-static-info.ts
index 37d95e9bdcdd..8b6155a86fb5 100644
--- a/packages/next/build/analysis/get-page-static-info.ts
+++ b/packages/next/build/analysis/get-page-static-info.ts
@@ -12,9 +12,11 @@ import * as Log from '../output/log'
 import { SERVER_RUNTIME } from '../../lib/constants'
 import { ServerRuntime } from 'next/types'
 import { checkCustomRoutes } from '../../lib/load-custom-routes'
+import { matcher } from 'next/dist/compiled/micromatch'
 
 export interface MiddlewareConfig {
   matchers: MiddlewareMatcher[]
+  allowDynamicGlobs: string[]
 }
 
 export interface MiddlewareMatcher {
@@ -162,6 +164,7 @@ function getMiddlewareMatchers(
 }
 
 function getMiddlewareConfig(
+  pageFilePath: string,
   config: any,
   nextConfig: NextConfig
 ): Partial<MiddlewareConfig> {
@@ -171,6 +174,23 @@ function getMiddlewareConfig(
     result.matchers = getMiddlewareMatchers(config.matcher, nextConfig)
   }
 
+  if (config.allowDynamic) {
+    result.allowDynamicGlobs = Array.isArray(config.allowDynamic)
+      ? config.allowDynamic
+      : [config.allowDynamic]
+    for (const glob of result.allowDynamicGlobs ?? []) {
+      try {
+        matcher(glob)
+      } catch (err) {
+        throw new Error(
+          `${pageFilePath} exported 'config.allowDynamic' contains invalid pattern '${glob}': ${
+            (err as Error).message
+          }`
+        )
+      }
+    }
+  }
+
   return result
 }
 
@@ -223,7 +243,11 @@ export async function getPageStaticInfo(params: {
   const { isDev, pageFilePath, nextConfig, page } = params
 
   const fileContent = (await tryToReadFile(pageFilePath, !isDev)) || ''
-  if (/runtime|getStaticProps|getServerSideProps|matcher/.test(fileContent)) {
+  if (
+    /runtime|getStaticProps|getServerSideProps|matcher|allowDynamic/.test(
+      fileContent
+    )
+  ) {
     const swcAST = await parseModule(pageFilePath, fileContent)
     const { ssg, ssr } = checkExports(swcAST)
 
@@ -268,7 +292,11 @@ export async function getPageStaticInfo(params: {
       warnAboutExperimentalEdgeApiFunctions()
     }
 
-    const middlewareConfig = getMiddlewareConfig(config, nextConfig)
+    const middlewareConfig = getMiddlewareConfig(
+      page ?? 'middleware/edge API route',
+      config,
+      nextConfig
+    )
 
     return {
       ssr,
diff --git a/packages/next/build/entries.ts b/packages/next/build/entries.ts
index f58536b2eb7f..aeb86af4f849 100644
--- a/packages/next/build/entries.ts
+++ b/packages/next/build/entries.ts
@@ -48,6 +48,7 @@ import { serverComponentRegex } from './webpack/loaders/utils'
 import { ServerRuntime } from '../types'
 import { normalizeAppPath } from '../shared/lib/router/utils/app-paths'
 import { encodeMatchers } from './webpack/loaders/next-middleware-loader'
+import { EdgeFunctionLoaderOptions } from './webpack/loaders/next-edge-function-loader'
 
 type ObjectValue<T> = T extends { [key: string]: infer V } ? V : never
 
@@ -163,6 +164,7 @@ interface CreateEntrypointsParams {
 }
 
 export function getEdgeServerEntry(opts: {
+  rootDir: string
   absolutePagePath: string
   buildId: string
   bundlePath: string
@@ -179,6 +181,7 @@ export function getEdgeServerEntry(opts: {
     const loaderParams: MiddlewareLoaderOptions = {
       absolutePagePath: opts.absolutePagePath,
       page: opts.page,
+      rootDir: opts.rootDir,
       matchers: opts.middleware?.matchers
         ? encodeMatchers(opts.middleware.matchers)
         : '',
@@ -188,9 +191,10 @@ export function getEdgeServerEntry(opts: {
   }
 
   if (opts.page.startsWith('/api/') || opts.page === '/api') {
-    const loaderParams: MiddlewareLoaderOptions = {
+    const loaderParams: EdgeFunctionLoaderOptions = {
       absolutePagePath: opts.absolutePagePath,
       page: opts.page,
+      rootDir: opts.rootDir,
     }
 
     return `next-edge-function-loader?${stringify(loaderParams)}!`
@@ -487,6 +491,7 @@ export async function createEntrypoints(params: CreateEntrypointsParams) {
 
           edgeServer[serverBundlePath] = getEdgeServerEntry({
             ...params,
+            rootDir,
             absolutePagePath: mappings[page],
             bundlePath: clientBundlePath,
             isDev: false,
diff --git a/packages/next/build/webpack/loaders/get-module-build-info.ts b/packages/next/build/webpack/loaders/get-module-build-info.ts
index fa43fa1701ee..848399cd32a0 100644
--- a/packages/next/build/webpack/loaders/get-module-build-info.ts
+++ b/packages/next/build/webpack/loaders/get-module-build-info.ts
@@ -16,6 +16,7 @@ export function getModuleBuildInfo(webpackModule: webpack.Module) {
     usingIndirectEval?: boolean | Set<string>
     route?: RouteMeta
     importLocByPath?: Map<string, any>
+    rootDir?: string
   }
 }
 
diff --git a/packages/next/build/webpack/loaders/next-edge-function-loader.ts b/packages/next/build/webpack/loaders/next-edge-function-loader.ts
index fb382d50ac03..ba56808f47c4 100644
--- a/packages/next/build/webpack/loaders/next-edge-function-loader.ts
+++ b/packages/next/build/webpack/loaders/next-edge-function-loader.ts
@@ -4,16 +4,18 @@ import { stringifyRequest } from '../stringify-request'
 export type EdgeFunctionLoaderOptions = {
   absolutePagePath: string
   page: string
+  rootDir: string
 }
 
 export default function middlewareLoader(this: any) {
-  const { absolutePagePath, page }: EdgeFunctionLoaderOptions =
+  const { absolutePagePath, page, rootDir }: EdgeFunctionLoaderOptions =
     this.getOptions()
   const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
   const buildInfo = getModuleBuildInfo(this._module)
   buildInfo.nextEdgeApiFunction = {
     page: page || '/',
   }
+  buildInfo.rootDir = rootDir
 
   return `
         import { adapter, enhanceGlobals } from 'next/dist/server/web/adapter'
diff --git a/packages/next/build/webpack/loaders/next-middleware-loader.ts b/packages/next/build/webpack/loaders/next-middleware-loader.ts
index f125a5780a18..a7f5e40420d2 100644
--- a/packages/next/build/webpack/loaders/next-middleware-loader.ts
+++ b/packages/next/build/webpack/loaders/next-middleware-loader.ts
@@ -6,6 +6,7 @@ import { MIDDLEWARE_LOCATION_REGEXP } from '../../../lib/constants'
 export type MiddlewareLoaderOptions = {
   absolutePagePath: string
   page: string
+  rootDir: string
   matchers?: string
 }
 
@@ -25,6 +26,7 @@ export default function middlewareLoader(this: any) {
   const {
     absolutePagePath,
     page,
+    rootDir,
     matchers: encodedMatchers,
   }: MiddlewareLoaderOptions = this.getOptions()
   const matchers = encodedMatchers ? decodeMatchers(encodedMatchers) : undefined
@@ -35,6 +37,7 @@ export default function middlewareLoader(this: any) {
     page:
       page.replace(new RegExp(`/${MIDDLEWARE_LOCATION_REGEXP}$`), '') || '/',
   }
+  buildInfo.rootDir = rootDir
 
   return `
         import { adapter, blockUnallowedResponse, enhanceGlobals } from 'next/dist/server/web/adapter'
diff --git a/packages/next/build/webpack/loaders/utils.ts b/packages/next/build/webpack/loaders/utils.ts
index f5274be13148..6537f2943a9d 100644
--- a/packages/next/build/webpack/loaders/utils.ts
+++ b/packages/next/build/webpack/loaders/utils.ts
@@ -1,3 +1,5 @@
+import { getPageStaticInfo } from '../../analysis/get-page-static-info'
+
 export const defaultJsFileExtensions = ['js', 'mjs', 'jsx', 'ts', 'tsx']
 const imageExtensions = ['jpg', 'jpeg', 'png', 'webp', 'avif']
 const nextClientComponents = [
@@ -47,3 +49,17 @@ export const clientComponentRegex = new RegExp(
 export const serverComponentRegex = new RegExp(
   `\\.server(\\.(${defaultJsFileExtensions.join('|')}))?$`
 )
+
+export async function loadEdgeFunctionConfigFromFile(
+  absolutePagePath: string,
+  resolve: (context: string, request: string) => Promise<string>
+) {
+  const pageFilePath = await resolve('/', absolutePagePath)
+  return (
+    await getPageStaticInfo({
+      nextConfig: {},
+      pageFilePath,
+      isDev: false,
+    })
+  ).middleware
+}
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index b2b8ca87af78..cd841609ffb2 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -8,6 +8,7 @@ import { getNamedMiddlewareRegex } from '../../../shared/lib/router/utils/route-
 import { getModuleBuildInfo } from '../loaders/get-module-build-info'
 import { getSortedRoutes } from '../../../shared/lib/router/utils'
 import { webpack, sources } from 'next/dist/compiled/webpack/webpack'
+import { isMatch } from 'next/dist/compiled/micromatch'
 import {
   EDGE_RUNTIME_WEBPACK,
   EDGE_UNSUPPORTED_NODE_APIS,
@@ -19,6 +20,12 @@ import {
   FLIGHT_SERVER_CSS_MANIFEST,
   SUBRESOURCE_INTEGRITY_MANIFEST,
 } from '../../../shared/lib/constants'
+import {
+  getPageStaticInfo,
+  MiddlewareConfig,
+} from '../../analysis/get-page-static-info'
+import { Telemetry } from '../../../telemetry/storage'
+import { traceGlobals } from '../../../trace/shared'
 
 export interface EdgeFunctionDefinition {
   env: string[]
@@ -54,18 +61,18 @@ const NAME = 'MiddlewarePlugin'
  * simply truthy it will return true.
  */
 function isUsingIndirectEvalAndUsedByExports(args: {
-  entryModule: webpack.Module
+  module: webpack.Module
   moduleGraph: webpack.ModuleGraph
   runtime: any
   usingIndirectEval: true | Set<string>
   wp: typeof webpack
 }): boolean {
-  const { moduleGraph, runtime, entryModule, usingIndirectEval, wp } = args
+  const { moduleGraph, runtime, module, usingIndirectEval, wp } = args
   if (typeof usingIndirectEval === 'boolean') {
     return usingIndirectEval
   }
 
-  const exportsInfo = moduleGraph.getExportsInfo(entryModule)
+  const exportsInfo = moduleGraph.getExportsInfo(module)
   for (const exportName of usingIndirectEval) {
     if (exportsInfo.getUsed(exportName, runtime) !== wp.UsageState.Unused) {
       return true
@@ -242,6 +249,15 @@ function isNodeJsModule(moduleName: string) {
   return require('module').builtinModules.includes(moduleName)
 }
 
+function isDynamicCodeEvaluationAllowed(
+  fileName: string,
+  edgeFunctionConfig?: Partial<MiddlewareConfig>,
+  rootDir?: string
+) {
+  const name = fileName.replace(rootDir ?? '', '')
+  return isMatch(name, edgeFunctionConfig?.allowDynamicGlobs ?? [])
+}
+
 function buildUnsupportedApiError({
   apiName,
   loc,
@@ -364,18 +380,16 @@ function getCodeAnalyzer(params: {
         return
       }
 
-      if (dev) {
-        const { ConstDependency } = wp.dependencies
-        const dep1 = new ConstDependency(
-          '__next_eval__(function() { return ',
-          expr.range[0]
-        )
-        dep1.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep1)
-        const dep2 = new ConstDependency('})', expr.range[1])
-        dep2.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep2)
-      }
+      const { ConstDependency } = wp.dependencies
+      const dep1 = new ConstDependency(
+        '__next_eval__(function() { return ',
+        expr.range[0]
+      )
+      dep1.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep1)
+      const dep2 = new ConstDependency('})', expr.range[1])
+      dep2.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep2)
 
       handleExpression()
       return true
@@ -391,18 +405,16 @@ function getCodeAnalyzer(params: {
         return
       }
 
-      if (dev) {
-        const { ConstDependency } = wp.dependencies
-        const dep1 = new ConstDependency(
-          '__next_webassembly_compile__(function() { return ',
-          expr.range[0]
-        )
-        dep1.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep1)
-        const dep2 = new ConstDependency('})', expr.range[1])
-        dep2.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep2)
-      }
+      const { ConstDependency } = wp.dependencies
+      const dep1 = new ConstDependency(
+        '__next_webassembly_compile__(function() { return ',
+        expr.range[0]
+      )
+      dep1.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep1)
+      const dep2 = new ConstDependency('})', expr.range[1])
+      dep2.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep2)
 
       handleExpression()
     }
@@ -421,18 +433,16 @@ function getCodeAnalyzer(params: {
         return
       }
 
-      if (dev) {
-        const { ConstDependency } = wp.dependencies
-        const dep1 = new ConstDependency(
-          '__next_webassembly_instantiate__(function() { return ',
-          expr.range[0]
-        )
-        dep1.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep1)
-        const dep2 = new ConstDependency('})', expr.range[1])
-        dep2.loc = expr.loc
-        parser.state.module.addPresentationalDependency(dep2)
-      }
+      const { ConstDependency } = wp.dependencies
+      const dep1 = new ConstDependency(
+        '__next_webassembly_instantiate__(function() { return ',
+        expr.range[0]
+      )
+      dep1.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep1)
+      const dep2 = new ConstDependency('})', expr.range[1])
+      dep2.loc = expr.loc
+      parser.state.module.addPresentationalDependency(dep2)
     }
 
     /**
@@ -586,6 +596,35 @@ Learn More: https://nextjs.org/docs/messages/node-module-in-edge-runtime`,
   }
 }
 
+async function findEntryEdgeFunctionConfig(
+  entryDependency: any,
+  resolver: webpack.Resolver
+) {
+  if (entryDependency?.request?.startsWith('next-')) {
+    const absolutePagePath =
+      new URL(entryDependency.request, 'http://example.org').searchParams.get(
+        'absolutePagePath'
+      ) ?? ''
+    const pageFilePath = await new Promise((resolve) =>
+      resolver.resolve({}, '/', absolutePagePath, {}, (err, path) =>
+        resolve(err || path)
+      )
+    )
+    if (typeof pageFilePath === 'string') {
+      return {
+        file: pageFilePath,
+        config: (
+          await getPageStaticInfo({
+            nextConfig: {},
+            pageFilePath,
+            isDev: false,
+          })
+        ).middleware,
+      }
+    }
+  }
+}
+
 function getExtractMetadata(params: {
   compilation: webpack.Compilation
   compiler: webpack.Compiler
@@ -594,26 +633,36 @@ function getExtractMetadata(params: {
 }) {
   const { dev, compilation, metadataByEntry, compiler } = params
   const { webpack: wp } = compiler
-  return () => {
+  return async () => {
     metadataByEntry.clear()
+    const resolver = compilation.resolverFactory.get('normal')
+    const telemetry: Telemetry = traceGlobals.get('telemetry')
 
-    for (const [entryName, entryData] of compilation.entries) {
-      if (entryData.options.runtime !== EDGE_RUNTIME_WEBPACK) {
+    for (const [entryName, entry] of compilation.entries) {
+      if (entry.options.runtime !== EDGE_RUNTIME_WEBPACK) {
         // Only process edge runtime entries
         continue
       }
+      const entryDependency = entry.dependencies?.[0]
+      const edgeFunctionConfig = await findEntryEdgeFunctionConfig(
+        entryDependency,
+        resolver
+      )
+      const { rootDir } = getModuleBuildInfo(
+        compilation.moduleGraph.getResolvedModule(entryDependency)
+      )
 
       const { moduleGraph } = compilation
-      const entryModules = new Set<webpack.Module>()
+      const modules = new Set<webpack.NormalModule>()
       const addEntriesFromDependency = (dependency: any) => {
         const module = moduleGraph.getModule(dependency)
         if (module) {
-          entryModules.add(module)
+          modules.add(module as webpack.NormalModule)
         }
       }
 
-      entryData.dependencies.forEach(addEntriesFromDependency)
-      entryData.includeDependencies.forEach(addEntriesFromDependency)
+      entry.dependencies.forEach(addEntriesFromDependency)
+      entry.includeDependencies.forEach(addEntriesFromDependency)
 
       const entryMetadata: EntryMetadata = {
         env: new Set<string>(),
@@ -621,8 +670,8 @@ function getExtractMetadata(params: {
         assetBindings: new Map(),
       }
 
-      for (const entryModule of entryModules) {
-        const buildInfo = getModuleBuildInfo(entryModule)
+      for (const module of modules) {
+        const buildInfo = getModuleBuildInfo(module)
 
         /**
          * When building for production checks if the module is using `eval`
@@ -633,31 +682,52 @@ function getExtractMetadata(params: {
           !dev &&
           buildInfo.usingIndirectEval &&
           isUsingIndirectEvalAndUsedByExports({
-            entryModule: entryModule,
-            moduleGraph: moduleGraph,
+            module,
+            moduleGraph,
             runtime: wp.util.runtime.getEntryRuntime(compilation, entryName),
             usingIndirectEval: buildInfo.usingIndirectEval,
             wp,
           })
         ) {
-          const id = entryModule.identifier()
+          const id = module.identifier()
           if (/node_modules[\\/]regenerator-runtime[\\/]runtime\.js/.test(id)) {
             continue
           }
 
-          compilation.errors.push(
-            buildWebpackError({
-              message: `Dynamic Code Evaluation (e. g. 'eval', 'new Function', 'WebAssembly.compile') not allowed in Edge Runtime ${
-                typeof buildInfo.usingIndirectEval !== 'boolean'
-                  ? `\nUsed by ${Array.from(buildInfo.usingIndirectEval).join(
-                      ', '
-                    )}`
-                  : ''
-              }`,
-              entryModule,
-              compilation,
+          if (edgeFunctionConfig?.config?.allowDynamicGlobs) {
+            telemetry.record({
+              eventName: 'NEXT_EDGE_ALLOW_DYNAMIC_USED',
+              payload: {
+                ...edgeFunctionConfig,
+                file: edgeFunctionConfig.file.replace(rootDir ?? '', ''),
+                fileWithDynamicCode: module.userRequest.replace(
+                  rootDir ?? '',
+                  ''
+                ),
+              },
             })
-          )
+          }
+          if (
+            !isDynamicCodeEvaluationAllowed(
+              module.userRequest,
+              edgeFunctionConfig?.config,
+              rootDir
+            )
+          ) {
+            compilation.errors.push(
+              buildWebpackError({
+                message: `Dynamic Code Evaluation (e. g. 'eval', 'new Function', 'WebAssembly.compile') not allowed in Edge Runtime ${
+                  typeof buildInfo.usingIndirectEval !== 'boolean'
+                    ? `\nUsed by ${Array.from(buildInfo.usingIndirectEval).join(
+                        ', '
+                      )}`
+                    : ''
+                }\nLearn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`,
+                entryModule: module,
+                compilation,
+              })
+            )
+          }
         }
 
         /**
@@ -704,9 +774,9 @@ function getExtractMetadata(params: {
          * Append to the list of modules to process outgoingConnections from
          * the module that is being processed.
          */
-        for (const conn of moduleGraph.getOutgoingConnections(entryModule)) {
+        for (const conn of moduleGraph.getOutgoingConnections(module)) {
           if (conn.module) {
-            entryModules.add(conn.module)
+            modules.add(conn.module as webpack.NormalModule)
           }
         }
       }
@@ -715,7 +785,6 @@ function getExtractMetadata(params: {
     }
   }
 }
-
 export default class MiddlewarePlugin {
   private readonly dev: boolean
   private readonly sriEnabled: boolean
@@ -744,7 +813,7 @@ export default class MiddlewarePlugin {
        * Extract all metadata for the entry points in a Map object.
        */
       const metadataByEntry = new Map<string, EntryMetadata>()
-      compilation.hooks.afterOptimizeModules.tap(
+      compilation.hooks.finishModules.tapPromise(
         NAME,
         getExtractMetadata({
           compilation,
diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
index 0130ed5a93ff..c0b2ea637e37 100644
--- a/packages/next/server/dev/hot-reloader.ts
+++ b/packages/next/server/dev/hot-reloader.ts
@@ -640,6 +640,7 @@ export default class HotReloader {
                   name: bundlePath,
                   value: getEdgeServerEntry({
                     absolutePagePath: entryData.absolutePagePath,
+                    rootDir: this.dir,
                     buildId: this.buildId,
                     bundlePath,
                     config: this.config,
diff --git a/packages/next/server/web/sandbox/context.ts b/packages/next/server/web/sandbox/context.ts
index 65b076daa3ae..d905ddc7625f 100644
--- a/packages/next/server/web/sandbox/context.ts
+++ b/packages/next/server/web/sandbox/context.ts
@@ -148,7 +148,8 @@ async function createModuleContext(options: ModuleContextOptions) {
         if (!warnedEvals.has(key)) {
           const warning = getServerError(
             new Error(
-              `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+              `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime
+Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`
             ),
             COMPILER_NAMES.edgeServer
           )
@@ -166,7 +167,7 @@ async function createModuleContext(options: ModuleContextOptions) {
           if (!warnedWasmCodegens.has(key)) {
             const warning = getServerError(
               new Error(`Dynamic WASM code generation (e. g. 'WebAssembly.compile') not allowed in Edge Runtime.
-Learn More: https://nextjs.org/docs/messages/middleware-dynamic-wasm-compilation`),
+Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`),
               COMPILER_NAMES.edgeServer
             )
             warning.name = 'DynamicWasmCodeGenerationWarning'
@@ -193,7 +194,7 @@ Learn More: https://nextjs.org/docs/messages/middleware-dynamic-wasm-compilation
           if (instantiatedFromBuffer && !warnedWasmCodegens.has(key)) {
             const warning = getServerError(
               new Error(`Dynamic WASM code generation ('WebAssembly.instantiate' with a buffer parameter) not allowed in Edge Runtime.
-Learn More: https://nextjs.org/docs/messages/middleware-dynamic-wasm-compilation`),
+Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`),
               COMPILER_NAMES.edgeServer
             )
             warning.name = 'DynamicWasmCodeGenerationWarning'
diff --git a/test/integration/edge-runtime-configurable-guards/lib/index.js b/test/integration/edge-runtime-configurable-guards/lib/index.js
new file mode 100644
index 000000000000..8fa47bde2f62
--- /dev/null
+++ b/test/integration/edge-runtime-configurable-guards/lib/index.js
@@ -0,0 +1 @@
+// populated by tests
diff --git a/test/integration/edge-runtime-configurable-guards/middleware.js b/test/integration/edge-runtime-configurable-guards/middleware.js
new file mode 100644
index 000000000000..361c04d84d89
--- /dev/null
+++ b/test/integration/edge-runtime-configurable-guards/middleware.js
@@ -0,0 +1,10 @@
+import { NextResponse } from 'next/server'
+
+// populated with tests
+export default () => {
+  return NextResponse.next()
+}
+
+export const config = {
+  matcher: '/',
+}
diff --git a/test/integration/edge-runtime-configurable-guards/pages/api/route.js b/test/integration/edge-runtime-configurable-guards/pages/api/route.js
new file mode 100644
index 000000000000..9d808b1a2bb6
--- /dev/null
+++ b/test/integration/edge-runtime-configurable-guards/pages/api/route.js
@@ -0,0 +1,8 @@
+// populated by tests
+export default () => {
+  return Response.json({ ok: true })
+}
+
+export const config = {
+  runtime: 'experimental-edge',
+}
diff --git a/test/integration/edge-runtime-configurable-guards/pages/index.js b/test/integration/edge-runtime-configurable-guards/pages/index.js
new file mode 100644
index 000000000000..c5cc676685b6
--- /dev/null
+++ b/test/integration/edge-runtime-configurable-guards/pages/index.js
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <div>ok</div>
+}
diff --git a/test/integration/edge-runtime-configurable-guards/test/index.test.js b/test/integration/edge-runtime-configurable-guards/test/index.test.js
new file mode 100644
index 000000000000..7d72ba70111a
--- /dev/null
+++ b/test/integration/edge-runtime-configurable-guards/test/index.test.js
@@ -0,0 +1,390 @@
+/* eslint-env jest */
+
+import { join } from 'path'
+import {
+  fetchViaHTTP,
+  File,
+  findPort,
+  killApp,
+  launchApp,
+  nextBuild,
+  nextStart,
+  waitFor,
+} from 'next-test-utils'
+import { remove } from 'fs-extra'
+
+jest.setTimeout(1000 * 60 * 2)
+
+const context = {
+  appDir: join(__dirname, '../'),
+  logs: { output: '', stdout: '', stderr: '' },
+  api: new File(join(__dirname, '../pages/api/route.js')),
+  middleware: new File(join(__dirname, '../middleware.js')),
+  lib: new File(join(__dirname, '../lib/index.js')),
+}
+const appOption = {
+  env: { __NEXT_TEST_WITH_DEVTOOL: 1 },
+  onStdout(msg) {
+    context.logs.output += msg
+    context.logs.stdout += msg
+  },
+  onStderr(msg) {
+    context.logs.output += msg
+    context.logs.stderr += msg
+  },
+}
+const routeUrl = '/api/route'
+const middlewareUrl = '/'
+const TELEMETRY_EVENT_NAME = 'NEXT_EDGE_ALLOW_DYNAMIC_USED'
+
+describe('Edge runtime configurable guards', () => {
+  beforeEach(async () => {
+    await remove(join(__dirname, '../.next'))
+    context.appPort = await findPort()
+    context.logs = { output: '', stdout: '', stderr: '' }
+  })
+
+  afterEach(() => {
+    if (context.app) {
+      killApp(context.app)
+    }
+    context.api.restore()
+    context.middleware.restore()
+    context.lib.restore()
+  })
+
+  describe('Multiple functions with different configurations', () => {
+    beforeEach(() => {
+      context.middleware.write(`
+        import { NextResponse } from 'next/server'
+
+        export default () => {
+          eval('100')
+          return NextResponse.next()
+        }
+        export const config = {
+          allowDynamic: '/middleware.js'
+        }
+      `)
+      context.api.write(`
+        export default async function handler(request) {
+          eval('100')
+          return Response.json({ result: true })
+        }
+        export const config = {
+          runtime: 'experimental-edge',
+          allowDynamic: '/lib/**'
+        }
+      `)
+    })
+
+    it('warns in dev for allowed code', async () => {
+      context.app = await launchApp(context.appDir, context.appPort, appOption)
+      const res = await fetchViaHTTP(context.appPort, middlewareUrl)
+      await waitFor(500)
+      expect(res.status).toBe(200)
+      expect(context.logs.output).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+      )
+    })
+
+    it('warns in dev for unallowed code', async () => {
+      context.app = await launchApp(context.appDir, context.appPort, appOption)
+      const res = await fetchViaHTTP(context.appPort, routeUrl)
+      await waitFor(500)
+      expect(res.status).toBe(200)
+      expect(context.logs.output).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+      )
+    })
+
+    it('fails to build because of unallowed code', async () => {
+      const output = await nextBuild(context.appDir, undefined, {
+        stdout: true,
+        stderr: true,
+        env: { NEXT_TELEMETRY_DEBUG: 1 },
+      })
+      expect(output.stderr).toContain(`Build failed`)
+      expect(output.stderr).toContain(`./pages/api/route.js`)
+      expect(output.stderr).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function', 'WebAssembly.compile') not allowed in Edge Runtime`
+      )
+      expect(output.stderr).toContain(`Used by default`)
+      expect(output.stderr).toContain(TELEMETRY_EVENT_NAME)
+    })
+  })
+
+  describe.each([
+    {
+      title: 'Edge API',
+      url: routeUrl,
+      init() {
+        context.api.write(`
+          export default async function handler(request) {
+            eval('100')
+            return Response.json({ result: true })
+          }
+          export const config = {
+            runtime: 'experimental-edge',
+            allowDynamic: '**'
+          }
+        `)
+      },
+    },
+    {
+      title: 'Middleware',
+      url: middlewareUrl,
+      init() {
+        context.middleware.write(`
+          import { NextResponse } from 'next/server'
+
+          export default () => {
+            eval('100')
+            return NextResponse.next()
+          }
+          export const config = {
+            allowDynamic: '**'
+          }
+        `)
+      },
+    },
+    {
+      title: 'Edge API using lib',
+      url: routeUrl,
+      init() {
+        context.api.write(`
+          import { hasDynamic } from '../../lib'
+          export default async function handler(request) {
+            await hasDynamic()
+            return Response.json({ result: true })
+          }
+          export const config = {
+            runtime: 'experimental-edge',
+            allowDynamic: '/lib/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasDynamic() {
+            eval('100')
+          }
+        `)
+      },
+    },
+    {
+      title: 'Middleware using lib',
+      url: middlewareUrl,
+      init() {
+        context.middleware.write(`
+          import { NextResponse } from 'next/server'
+          import { hasDynamic } from './lib'
+
+          // populated with tests
+          export default async function () {
+            await hasDynamic()
+            return NextResponse.next()
+          }
+          export const config = {
+            allowDynamic: '/lib/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasDynamic() {
+            eval('100')
+          }
+        `)
+      },
+    },
+  ])('$title with allowed, used dynamic code', ({ init, url }) => {
+    beforeEach(() => init())
+
+    it('still warns in dev at runtime', async () => {
+      context.app = await launchApp(context.appDir, context.appPort, appOption)
+      const res = await fetchViaHTTP(context.appPort, url)
+      await waitFor(500)
+      expect(res.status).toBe(200)
+      expect(context.logs.output).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+      )
+    })
+  })
+
+  describe.each([
+    {
+      title: 'Edge API',
+      url: routeUrl,
+      init() {
+        context.api.write(`
+          export default async function handler(request) {
+            if ((() => false)()) {
+              eval('100')
+            }
+            return Response.json({ result: true })
+          }
+          export const config = {
+            runtime: 'experimental-edge',
+            allowDynamic: '**'
+          }
+        `)
+      },
+    },
+    {
+      title: 'Middleware',
+      url: middlewareUrl,
+      init() {
+        context.middleware.write(`
+          import { NextResponse } from 'next/server'
+          // populated with tests
+          export default () => {
+            if ((() => false)()) {
+              eval('100')
+            }
+            return NextResponse.next()
+          }
+          export const config = {
+            allowDynamic: '**'
+          }
+        `)
+      },
+    },
+    {
+      title: 'Edge API using lib',
+      url: routeUrl,
+      init() {
+        context.api.write(`
+          import { hasUnusedDynamic } from '../../lib'
+          export default async function handler(request) {
+            await hasUnusedDynamic()
+            return Response.json({ result: true })
+          }
+          export const config = {
+            runtime: 'experimental-edge',
+            allowDynamic: '/lib/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasUnusedDynamic() {
+            if ((() => false)()) {
+              eval('100')
+            }
+          }
+        `)
+      },
+    },
+    {
+      title: 'Middleware using lib',
+      url: middlewareUrl,
+      init() {
+        context.middleware.write(`
+          import { NextResponse } from 'next/server'
+          import { hasUnusedDynamic } from './lib'
+          // populated with tests
+          export default async function () {
+            await hasUnusedDynamic()
+            return NextResponse.next()
+          }
+          export const config = {
+            allowDynamic: '/lib/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasUnusedDynamic() {
+            if ((() => false)()) {
+              eval('100')
+            }
+          }
+        `)
+      },
+    },
+  ])('$title with allowed, unused dynamic code', ({ init, url }) => {
+    beforeEach(() => init())
+
+    it('build and does not warn at runtime', async () => {
+      const output = await nextBuild(context.appDir, undefined, {
+        stdout: true,
+        stderr: true,
+        env: { NEXT_TELEMETRY_DEBUG: 1 },
+      })
+      expect(output.stderr).not.toContain(`Build failed`)
+      expect(output.stderr).toContain(TELEMETRY_EVENT_NAME)
+      context.app = await nextStart(context.appDir, context.appPort, appOption)
+      const res = await fetchViaHTTP(context.appPort, url)
+      expect(res.status).toBe(200)
+      expect(context.logs.output).not.toContain(`warn`)
+      expect(context.logs.output).not.toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+      )
+    })
+  })
+
+  describe.each([
+    {
+      title: 'Edge API using lib',
+      url: routeUrl,
+      init() {
+        context.api.write(`
+          import { hasDynamic } from '../../lib'
+          export default async function handler(request) {
+            await hasDynamic()
+            return Response.json({ result: true })
+          }
+          export const config = {
+            runtime: 'experimental-edge',
+            allowDynamic: '/pages/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasDynamic() {
+            eval('100')
+          }
+        `)
+      },
+    },
+    {
+      title: 'Middleware using lib',
+      url: middlewareUrl,
+      init() {
+        context.middleware.write(`
+          import { NextResponse } from 'next/server'
+          import { hasDynamic } from './lib'
+          export default async function () {
+            await hasDynamic()
+            return NextResponse.next()
+          }
+          export const config = {
+            allowDynamic: '/pages/**'
+          }
+        `)
+        context.lib.write(`
+          export async function hasDynamic() {
+            eval('100')
+          }
+        `)
+      },
+    },
+  ])('$title with unallowed, used dynamic code', ({ init, url }) => {
+    beforeEach(() => init())
+
+    it('warns in dev at runtime', async () => {
+      context.app = await launchApp(context.appDir, context.appPort, appOption)
+      const res = await fetchViaHTTP(context.appPort, url)
+      await waitFor(500)
+      expect(res.status).toBe(200)
+      expect(context.logs.output).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function') not allowed in Edge Runtime`
+      )
+    })
+
+    it('fails to build because of dynamic code evaluation', async () => {
+      const output = await nextBuild(context.appDir, undefined, {
+        stdout: true,
+        stderr: true,
+        env: { NEXT_TELEMETRY_DEBUG: 1 },
+      })
+      expect(output.stderr).toContain(`Build failed`)
+      expect(output.stderr).toContain(
+        `Dynamic Code Evaluation (e. g. 'eval', 'new Function', 'WebAssembly.compile') not allowed in Edge Runtime`
+      )
+      expect(output.stderr).toContain(TELEMETRY_EVENT_NAME)
+    })
+  })
+})
diff --git a/test/production/edge-config-validations/index.test.ts b/test/production/edge-config-validations/index.test.ts
new file mode 100644
index 000000000000..ef0df8f55d00
--- /dev/null
+++ b/test/production/edge-config-validations/index.test.ts
@@ -0,0 +1,35 @@
+import { createNext } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
+
+describe('Edge config validations', () => {
+  let next: NextInstance
+
+  afterAll(() => next.destroy())
+
+  it('fails to build when allowDynamic is not a string', async () => {
+    next = await createNext({
+      skipStart: true,
+      files: {
+        'pages/index.js': `
+          export default function Page() { 
+            return <p>hello world</p>
+          } 
+        `,
+        'middleware.js': `
+          import { NextResponse } from 'next/server'
+          export default async function middleware(request) {
+            return NextResponse.next()
+          }
+
+          eval('toto')
+
+          export const config = { allowDynamic: true }
+        `,
+      },
+    })
+    await expect(next.start()).rejects.toThrow('next build failed')
+    expect(next.cliOutput).toMatch(
+      `/middleware exported 'config.allowDynamic' contains invalid pattern 'true': Expected pattern to be a non-empty string`
+    )
+  })
+})
diff --git a/test/readme.md b/test/readme.md
index 574c5fda5124..b9c28639e55f 100644
--- a/test/readme.md
+++ b/test/readme.md
@@ -2,7 +2,7 @@
 
 ## Getting Started
 
-You can set-up a new test using `yarn new-test` which will start from a template related to the test type.
+You can set-up a new test using `pnpnm new-test` which will start from a template related to the test type.
 
 ## Test Types in Next.js
 

From 8bf6a873034993a09a882a25aab8123af0653d2e Mon Sep 17 00:00:00 2001
From: JJ Kasper <jj@jjsweb.site>
Date: Mon, 12 Sep 2022 15:32:18 -0700
Subject: [PATCH 54/69] Rename allowDynamic to unstable_allowDynamic (#40496)

Follow-up to https://github.com/vercel/next.js/pull/39539 as discussed
this renames to `unstable_` prefix initially while we test this out
further.

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 docs/api-reference/edge-runtime.md            |  4 ++--
 .../build/analysis/get-page-static-info.ts    | 18 +++++++-------
 .../webpack/plugins/middleware-plugin.ts      |  4 ++--
 .../test/index.test.js                        | 24 +++++++++----------
 .../edge-config-validations/index.test.ts     |  6 ++---
 5 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/docs/api-reference/edge-runtime.md b/docs/api-reference/edge-runtime.md
index 7993c3a6e80f..3a6bccc0ae73 100644
--- a/docs/api-reference/edge-runtime.md
+++ b/docs/api-reference/edge-runtime.md
@@ -145,14 +145,14 @@ You can relax the check to allow specific files with your Middleware or Edge API
 ```javascript
 export const config = {
   runtime: 'experimental-edge', // for Edge API Routes only
-  allowDynamic: [
+  unstable_allowDynamic: [
     '/lib/utilities.js', // allows a single file
     '/node_modules/function-bind/**', // use a glob to allow anything in the function-bind 3rd party module
   ],
 }
 ```
 
-`allowDynamic` is a [glob](https://github.com/micromatch/micromatch#matching-features), or an array of globs, ignoring dynamic code evaluation for specific files. The globs are relative to your application root folder.
+`unstable_allowDynamic` is a [glob](https://github.com/micromatch/micromatch#matching-features), or an array of globs, ignoring dynamic code evaluation for specific files. The globs are relative to your application root folder.
 
 Be warned that if these statements are executed on the Edge, _they will throw and cause a runtime error_.
 
diff --git a/packages/next/build/analysis/get-page-static-info.ts b/packages/next/build/analysis/get-page-static-info.ts
index 8b6155a86fb5..1afb4e062538 100644
--- a/packages/next/build/analysis/get-page-static-info.ts
+++ b/packages/next/build/analysis/get-page-static-info.ts
@@ -16,7 +16,7 @@ import { matcher } from 'next/dist/compiled/micromatch'
 
 export interface MiddlewareConfig {
   matchers: MiddlewareMatcher[]
-  allowDynamicGlobs: string[]
+  unstable_allowDynamicGlobs: string[]
 }
 
 export interface MiddlewareMatcher {
@@ -174,16 +174,18 @@ function getMiddlewareConfig(
     result.matchers = getMiddlewareMatchers(config.matcher, nextConfig)
   }
 
-  if (config.allowDynamic) {
-    result.allowDynamicGlobs = Array.isArray(config.allowDynamic)
-      ? config.allowDynamic
-      : [config.allowDynamic]
-    for (const glob of result.allowDynamicGlobs ?? []) {
+  if (config.unstable_allowDynamic) {
+    result.unstable_allowDynamicGlobs = Array.isArray(
+      config.unstable_allowDynamic
+    )
+      ? config.unstable_allowDynamic
+      : [config.unstable_allowDynamic]
+    for (const glob of result.unstable_allowDynamicGlobs ?? []) {
       try {
         matcher(glob)
       } catch (err) {
         throw new Error(
-          `${pageFilePath} exported 'config.allowDynamic' contains invalid pattern '${glob}': ${
+          `${pageFilePath} exported 'config.unstable_allowDynamic' contains invalid pattern '${glob}': ${
             (err as Error).message
           }`
         )
@@ -244,7 +246,7 @@ export async function getPageStaticInfo(params: {
 
   const fileContent = (await tryToReadFile(pageFilePath, !isDev)) || ''
   if (
-    /runtime|getStaticProps|getServerSideProps|matcher|allowDynamic/.test(
+    /runtime|getStaticProps|getServerSideProps|matcher|unstable_allowDynamic/.test(
       fileContent
     )
   ) {
diff --git a/packages/next/build/webpack/plugins/middleware-plugin.ts b/packages/next/build/webpack/plugins/middleware-plugin.ts
index cd841609ffb2..ebc7dc14e235 100644
--- a/packages/next/build/webpack/plugins/middleware-plugin.ts
+++ b/packages/next/build/webpack/plugins/middleware-plugin.ts
@@ -255,7 +255,7 @@ function isDynamicCodeEvaluationAllowed(
   rootDir?: string
 ) {
   const name = fileName.replace(rootDir ?? '', '')
-  return isMatch(name, edgeFunctionConfig?.allowDynamicGlobs ?? [])
+  return isMatch(name, edgeFunctionConfig?.unstable_allowDynamicGlobs ?? [])
 }
 
 function buildUnsupportedApiError({
@@ -694,7 +694,7 @@ function getExtractMetadata(params: {
             continue
           }
 
-          if (edgeFunctionConfig?.config?.allowDynamicGlobs) {
+          if (edgeFunctionConfig?.config?.unstable_allowDynamicGlobs) {
             telemetry.record({
               eventName: 'NEXT_EDGE_ALLOW_DYNAMIC_USED',
               payload: {
diff --git a/test/integration/edge-runtime-configurable-guards/test/index.test.js b/test/integration/edge-runtime-configurable-guards/test/index.test.js
index 7d72ba70111a..bc218a0f0326 100644
--- a/test/integration/edge-runtime-configurable-guards/test/index.test.js
+++ b/test/integration/edge-runtime-configurable-guards/test/index.test.js
@@ -63,7 +63,7 @@ describe('Edge runtime configurable guards', () => {
           return NextResponse.next()
         }
         export const config = {
-          allowDynamic: '/middleware.js'
+          unstable_allowDynamic: '/middleware.js'
         }
       `)
       context.api.write(`
@@ -73,7 +73,7 @@ describe('Edge runtime configurable guards', () => {
         }
         export const config = {
           runtime: 'experimental-edge',
-          allowDynamic: '/lib/**'
+          unstable_allowDynamic: '/lib/**'
         }
       `)
     })
@@ -126,7 +126,7 @@ describe('Edge runtime configurable guards', () => {
           }
           export const config = {
             runtime: 'experimental-edge',
-            allowDynamic: '**'
+            unstable_allowDynamic: '**'
           }
         `)
       },
@@ -143,7 +143,7 @@ describe('Edge runtime configurable guards', () => {
             return NextResponse.next()
           }
           export const config = {
-            allowDynamic: '**'
+            unstable_allowDynamic: '**'
           }
         `)
       },
@@ -160,7 +160,7 @@ describe('Edge runtime configurable guards', () => {
           }
           export const config = {
             runtime: 'experimental-edge',
-            allowDynamic: '/lib/**'
+            unstable_allowDynamic: '/lib/**'
           }
         `)
         context.lib.write(`
@@ -184,7 +184,7 @@ describe('Edge runtime configurable guards', () => {
             return NextResponse.next()
           }
           export const config = {
-            allowDynamic: '/lib/**'
+            unstable_allowDynamic: '/lib/**'
           }
         `)
         context.lib.write(`
@@ -222,7 +222,7 @@ describe('Edge runtime configurable guards', () => {
           }
           export const config = {
             runtime: 'experimental-edge',
-            allowDynamic: '**'
+            unstable_allowDynamic: '**'
           }
         `)
       },
@@ -241,7 +241,7 @@ describe('Edge runtime configurable guards', () => {
             return NextResponse.next()
           }
           export const config = {
-            allowDynamic: '**'
+            unstable_allowDynamic: '**'
           }
         `)
       },
@@ -258,7 +258,7 @@ describe('Edge runtime configurable guards', () => {
           }
           export const config = {
             runtime: 'experimental-edge',
-            allowDynamic: '/lib/**'
+            unstable_allowDynamic: '/lib/**'
           }
         `)
         context.lib.write(`
@@ -283,7 +283,7 @@ describe('Edge runtime configurable guards', () => {
             return NextResponse.next()
           }
           export const config = {
-            allowDynamic: '/lib/**'
+            unstable_allowDynamic: '/lib/**'
           }
         `)
         context.lib.write(`
@@ -329,7 +329,7 @@ describe('Edge runtime configurable guards', () => {
           }
           export const config = {
             runtime: 'experimental-edge',
-            allowDynamic: '/pages/**'
+            unstable_allowDynamic: '/pages/**'
           }
         `)
         context.lib.write(`
@@ -351,7 +351,7 @@ describe('Edge runtime configurable guards', () => {
             return NextResponse.next()
           }
           export const config = {
-            allowDynamic: '/pages/**'
+            unstable_allowDynamic: '/pages/**'
           }
         `)
         context.lib.write(`
diff --git a/test/production/edge-config-validations/index.test.ts b/test/production/edge-config-validations/index.test.ts
index ef0df8f55d00..d531172c34c2 100644
--- a/test/production/edge-config-validations/index.test.ts
+++ b/test/production/edge-config-validations/index.test.ts
@@ -6,7 +6,7 @@ describe('Edge config validations', () => {
 
   afterAll(() => next.destroy())
 
-  it('fails to build when allowDynamic is not a string', async () => {
+  it('fails to build when unstable_allowDynamic is not a string', async () => {
     next = await createNext({
       skipStart: true,
       files: {
@@ -23,13 +23,13 @@ describe('Edge config validations', () => {
 
           eval('toto')
 
-          export const config = { allowDynamic: true }
+          export const config = { unstable_allowDynamic: true }
         `,
       },
     })
     await expect(next.start()).rejects.toThrow('next build failed')
     expect(next.cliOutput).toMatch(
-      `/middleware exported 'config.allowDynamic' contains invalid pattern 'true': Expected pattern to be a non-empty string`
+      `/middleware exported 'config.unstable_allowDynamic' contains invalid pattern 'true': Expected pattern to be a non-empty string`
     )
   })
 })

From 421029cf61e7fd99974f625ad18c598f0f3de871 Mon Sep 17 00:00:00 2001
From: Malte Ubl <cramforce@users.noreply.github.com>
Date: Mon, 12 Sep 2022 17:27:43 -0700
Subject: [PATCH 55/69] Don't execute prefetches for bot user agents (#40435)

Such bots typically navigate websites using hard navigations (as they
crawl one URL at a time). Respectively, they do not benefit from
prefetches at all, while increasing the cost of both the crawl and
operating the site.

<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [x] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`
---
 packages/next/server/base-server.ts           |  3 +-
 packages/next/server/utils.ts                 |  6 ----
 packages/next/shared/lib/router/router.ts     |  7 ++++
 .../next/shared/lib/router/utils/is-bot.ts    |  5 +++
 .../preload-viewport/pages/bot-user-agent.js  | 22 +++++++++++++
 .../preload-viewport/test/index.test.js       | 32 +++++++++++++++++++
 6 files changed, 68 insertions(+), 7 deletions(-)
 create mode 100644 packages/next/shared/lib/router/utils/is-bot.ts
 create mode 100644 test/integration/preload-viewport/pages/bot-user-agent.js

diff --git a/packages/next/server/base-server.ts b/packages/next/server/base-server.ts
index 411983b3ed9f..4bee04739af3 100644
--- a/packages/next/server/base-server.ts
+++ b/packages/next/server/base-server.ts
@@ -48,7 +48,8 @@ import Router from './router'
 
 import { setRevalidateHeaders } from './send-payload/revalidate-headers'
 import { execOnce } from '../shared/lib/utils'
-import { isBlockedPage, isBot } from './utils'
+import { isBlockedPage } from './utils'
+import { isBot } from '../shared/lib/router/utils/is-bot'
 import RenderResult from './render-result'
 import { removeTrailingSlash } from '../shared/lib/router/utils/remove-trailing-slash'
 import { denormalizePagePath } from '../shared/lib/page-path/denormalize-page-path'
diff --git a/packages/next/server/utils.ts b/packages/next/server/utils.ts
index 856f5f703262..9e4ca33e9abb 100644
--- a/packages/next/server/utils.ts
+++ b/packages/next/server/utils.ts
@@ -17,12 +17,6 @@ export function cleanAmpPath(pathname: string): string {
   return pathname
 }
 
-export function isBot(userAgent: string): boolean {
-  return /Googlebot|Mediapartners-Google|AdsBot-Google|googleweblight|Storebot-Google|Google-PageRenderer|Bingbot|BingPreview|Slurp|DuckDuckBot|baiduspider|yandex|sogou|LinkedInBot|bitlybot|tumblr|vkShare|quora link preview|facebookexternalhit|facebookcatalog|Twitterbot|applebot|redditbot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|ia_archiver/i.test(
-    userAgent
-  )
-}
-
 export function isTargetLikeServerless(target: string) {
   const isServerless = target === 'serverless'
   const isServerlessTrace = target === 'experimental-serverless-trace'
diff --git a/packages/next/shared/lib/router/router.ts b/packages/next/shared/lib/router/router.ts
index 1ad9a039b42a..cf1180fd6766 100644
--- a/packages/next/shared/lib/router/router.ts
+++ b/packages/next/shared/lib/router/router.ts
@@ -47,6 +47,7 @@ import { hasBasePath } from '../../../client/has-base-path'
 import { getNextPathnameInfo } from './utils/get-next-pathname-info'
 import { formatNextPathnameInfo } from './utils/format-next-pathname-info'
 import { compareRouterStates } from './utils/compare-states'
+import { isBot } from './utils/is-bot'
 
 declare global {
   interface Window {
@@ -2171,6 +2172,12 @@ export default class Router implements BaseRouter {
     asPath: string = url,
     options: PrefetchOptions = {}
   ): Promise<void> {
+    if (typeof window !== 'undefined' && isBot(window.navigator.userAgent)) {
+      // No prefetches for bots that render the link since they are typically navigating
+      // links via the equivalent of a hard navigation and hence never utilize these
+      // prefetches.
+      return
+    }
     let parsed = parseRelativeUrl(url)
 
     let { pathname, query } = parsed
diff --git a/packages/next/shared/lib/router/utils/is-bot.ts b/packages/next/shared/lib/router/utils/is-bot.ts
new file mode 100644
index 000000000000..c512679b4381
--- /dev/null
+++ b/packages/next/shared/lib/router/utils/is-bot.ts
@@ -0,0 +1,5 @@
+export function isBot(userAgent: string): boolean {
+  return /Googlebot|Mediapartners-Google|AdsBot-Google|googleweblight|Storebot-Google|Google-PageRenderer|Bingbot|BingPreview|Slurp|DuckDuckBot|baiduspider|yandex|sogou|LinkedInBot|bitlybot|tumblr|vkShare|quora link preview|facebookexternalhit|facebookcatalog|Twitterbot|applebot|redditbot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|ia_archiver/i.test(
+    userAgent
+  )
+}
diff --git a/test/integration/preload-viewport/pages/bot-user-agent.js b/test/integration/preload-viewport/pages/bot-user-agent.js
new file mode 100644
index 000000000000..aa524d955850
--- /dev/null
+++ b/test/integration/preload-viewport/pages/bot-user-agent.js
@@ -0,0 +1,22 @@
+import Head from 'next/head'
+import Link from 'next/link'
+
+export default () => {
+  return (
+    <div>
+      <Head>
+        <script
+          dangerouslySetInnerHTML={{
+            __html: `Object.defineProperty(navigator, 'userAgent', {
+              value: new URLSearchParams(location.search).get("useragent"),
+            });`,
+          }}
+        ></script>
+      </Head>
+      <br />
+      <Link href="/another">
+        <a id="link-another">to /another</a>
+      </Link>
+    </div>
+  )
+}
diff --git a/test/integration/preload-viewport/test/index.test.js b/test/integration/preload-viewport/test/index.test.js
index b8aad8d5a45f..9f0e023ea54c 100644
--- a/test/integration/preload-viewport/test/index.test.js
+++ b/test/integration/preload-viewport/test/index.test.js
@@ -110,6 +110,38 @@ describe('Prefetching Links in viewport', () => {
     }
   })
 
+  it('should prefetch with non-bot UA', async () => {
+    let browser
+    try {
+      browser = await webdriver(
+        appPort,
+        `/bot-user-agent?useragent=${encodeURIComponent(
+          'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 Safari/537.36'
+        )}`
+      )
+      const links = await browser.elementsByCss('link[rel=prefetch]')
+      expect(links).toHaveLength(1)
+    } finally {
+      if (browser) await browser.close()
+    }
+  })
+
+  it('should not prefetch with bot UA', async () => {
+    let browser
+    try {
+      browser = await webdriver(
+        appPort,
+        `/bot-user-agent?useragent=${encodeURIComponent(
+          'Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MMB29P) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/W.X.Y.Z Mobile Safari/537.36 (compatible; Googlebot/2.1; +http://www.google.com/bot.html)'
+        )}`
+      )
+      const links = await browser.elementsByCss('link[rel=prefetch]')
+      expect(links).toHaveLength(0)
+    } finally {
+      if (browser) await browser.close()
+    }
+  })
+
   it('should prefetch rewritten href with link in viewport onload', async () => {
     let browser
     try {

From 0a093c0e8275f3aa809dca5fd6b8a0a20f66b7ed Mon Sep 17 00:00:00 2001
From: Ryan Parker <ryan.parker3@outlook.com>
Date: Mon, 12 Sep 2022 17:44:43 -0700
Subject: [PATCH 56/69] docs(errors/large-page-data): how to see data being
 passed to page (#40491)

## Summary

This PR adds a note about how to see the data that this error is complaining about:

```sh
Warning: data for page "/" is xxx which exceeds the threshold of 128 kB, this amount of data can reduce performance.
```

This debug trick was something I came across in a [discussion](https://github.com/vercel/next.js/discussions/39880) and I thought it would be helpful to others like it was for me.

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)


Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
---
 errors/large-page-data.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/errors/large-page-data.md b/errors/large-page-data.md
index 9969b380299e..6a195072f43f 100644
--- a/errors/large-page-data.md
+++ b/errors/large-page-data.md
@@ -8,6 +8,12 @@ One of your pages includes a large amount of page data (>= 128kB). This can nega
 
 Reduce the amount of data returned from `getStaticProps`, `getServerSideProps`, or `getInitialProps` to only the essential data to render the page. The default threshold of 128kB can be configured in `largePageDataBytes` if absolutely necessary and the performance implications are understood.
 
+To inspect the props passed to your page, you can inspect the below element's content in your browser devtools:
+
+```sh
+document.getElementById("__NEXT_DATA__").text
+```
+
 ### Useful Links
 
 - [Data Fetching Documentation](https://nextjs.org/docs/basic-features/data-fetching/overview)

From 3f2b4bc904f9704be7ada9891cf80cb1373f37fe Mon Sep 17 00:00:00 2001
From: Victor Boucher <victory-boucher@hotmail.com>
Date: Tue, 13 Sep 2022 03:06:58 +0200
Subject: [PATCH 57/69] docs(basic-features/script): update script version
 history (#40263)

Made an addition to the version history within the Script component
docs. In the docs there are examples where the Script component is being
used within a _document.js/tsx file, but it does not get mentioned that
this is only supported from version 12.2.2 onwards.

## Documentation / Examples
- [x] Make sure the linting passes by running `pnpm lint`

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 docs/basic-features/script.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/basic-features/script.md b/docs/basic-features/script.md
index 33df31800f43..0f92fad1c3d2 100644
--- a/docs/basic-features/script.md
+++ b/docs/basic-features/script.md
@@ -19,10 +19,11 @@ description: Next.js helps you optimize loading third-party scripts with the bui
 <details>
   <summary><b>Version History</b></summary>
 
-| Version   | Changes                   |
-| --------- | ------------------------- |
-| `v12.2.4` | `onReady` prop added.     |
-| `v11.0.0` | `next/script` introduced. |
+| Version   | Changes                                                                   |
+| --------- | ------------------------------------------------------------------------- |
+| `v12.2.4` | `onReady` prop added.                                                     |
+| `v12.2.2` | Allow `next/script` with `beforeInteractive` to be placed in `_document`. |
+| `v11.0.0` | `next/script` introduced.                                                 |
 
 </details>
 

From f33c23c1442357d2ec82ed0378ff336d64f4cdd4 Mon Sep 17 00:00:00 2001
From: Steven Tey <stevensteel97@gmail.com>
Date: Mon, 12 Sep 2022 18:26:40 -0700
Subject: [PATCH 58/69] Added "negative matcher" documentation (#40282)

<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)

Co-authored-by: JJ Kasper <jj@jjsweb.site>
---
 docs/advanced-features/middleware.md | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/advanced-features/middleware.md b/docs/advanced-features/middleware.md
index 3d2029b3ff93..7812da86b3aa 100644
--- a/docs/advanced-features/middleware.md
+++ b/docs/advanced-features/middleware.md
@@ -88,6 +88,22 @@ export const config = {
 }
 ```
 
+The `matcher` config allows full regex so matching like negative lookaheads or character matching is supported. An example of a negative lookahead to match all except specific paths can be seen here:
+
+```js
+export const config = {
+  matcher: [
+    /*
+     * Match all request paths except for the ones starting with:
+     * - api (API routes)
+     * - static (static files)
+     * - favicon.ico (favicon file)
+     */
+    '/((?!api|static|favicon.ico).*)',
+  ],
+}
+```
+
 > **Note:** The `matcher` values need to be constants so they can be statically analyzed at build-time. Dynamic values such as variables will be ignored.
 
 Configured matchers:
@@ -101,8 +117,6 @@ Read more details on [path-to-regexp](https://github.com/pillarjs/path-to-regexp
 
 > **Note:** For backward compatibility, Next.js always considers `/public` as `/public/index`. Therefore, a matcher of `/public/:path` will match.
 
-> **Note:** It is not possible to exclude middleware from matching static path starting with `_next/`. This allow enforcing security with middleware.
-
 ### Conditional Statements
 
 ```typescript

From d0903a5c5be184f3656a9c8dc2f5c297cb280a4b Mon Sep 17 00:00:00 2001
From: JDansercoer <jasper@codictive.be>
Date: Tue, 13 Sep 2022 03:55:44 +0200
Subject: [PATCH 59/69] Update semver of eslint-plugin-react (#40246)

`eslint-plugin-react` has a broken version between v7.31.2-6. Upping the version range ensure that only functioning packages get installed.

Fixes #40245



## Bug

- [x] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`


Co-authored-by: JJ Kasper <22380829+ijjk@users.noreply.github.com>
---
 packages/eslint-config-next/package.json |   2 +-
 packages/next/compiled/assert/assert.js  |   4 +-
 packages/next/compiled/util/util.js      |   2 +-
 pnpm-lock.yaml                           | 291 ++++++++++++++++++++---
 4 files changed, 265 insertions(+), 34 deletions(-)

diff --git a/packages/eslint-config-next/package.json b/packages/eslint-config-next/package.json
index c46b3c036089..ce5dd619aa38 100644
--- a/packages/eslint-config-next/package.json
+++ b/packages/eslint-config-next/package.json
@@ -16,7 +16,7 @@
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsx-a11y": "^6.5.1",
-    "eslint-plugin-react": "^7.29.4",
+    "eslint-plugin-react": "^7.31.7",
     "eslint-plugin-react-hooks": "^4.5.0"
   },
   "peerDependencies": {
diff --git a/packages/next/compiled/assert/assert.js b/packages/next/compiled/assert/assert.js
index 0f53af4925ad..7a6161991d9e 100644
--- a/packages/next/compiled/assert/assert.js
+++ b/packages/next/compiled/assert/assert.js
@@ -1,7 +1,7 @@
-(function(){var e={992:function(e){e.exports=function(e,r,n){if(e.filter)return e.filter(r,n);if(void 0===e||null===e)throw new TypeError;if("function"!=typeof r)throw new TypeError;var o=[];for(var i=0;i<e.length;i++){if(!t.call(e,i))continue;var a=e[i];if(r.call(n,a,i,e))o.push(a)}return o};var t=Object.prototype.hasOwnProperty},167:function(e,t,r){"use strict";function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}var n=r(23),o=n.codes,i=o.ERR_AMBIGUOUS_ARGUMENT,a=o.ERR_INVALID_ARG_TYPE,c=o.ERR_INVALID_ARG_VALUE,u=o.ERR_INVALID_RETURN_VALUE,f=o.ERR_MISSING_ARGS;var s=r(832);var l=r(177),p=l.inspect;var y=r(177).types,g=y.isPromise,v=y.isRegExp;var d=Object.assign?Object.assign:r(604).assign;var b=Object.is?Object.is:r(208);var h=new Map;var m;var S;var E;var O;var A;function lazyLoadComparison(){var e=r(176);m=e.isDeepEqual;S=e.isDeepStrictEqual}var w=/[\x00-\x08\x0b\x0c\x0e-\x1f]/g;var j=null&&["\\u0000","\\u0001","\\u0002","\\u0003","\\u0004","\\u0005","\\u0006","\\u0007","\\b","","","\\u000b","\\f","","\\u000e","\\u000f","\\u0010","\\u0011","\\u0012","\\u0013","\\u0014","\\u0015","\\u0016","\\u0017","\\u0018","\\u0019","\\u001a","\\u001b","\\u001c","\\u001d","\\u001e","\\u001f"];var _=function escapeFn(e){return j[e.charCodeAt(0)]};var P=false;var x=e.exports=ok;var k={};function innerFail(e){if(e.message instanceof Error)throw e.message;throw new s(e)}function fail(e,t,r,n,o){var i=arguments.length;var a;if(i===0){a="Failed"}else if(i===1){r=e;e=undefined}else{if(P===false){P=true;var c=process.emitWarning?process.emitWarning:console.warn.bind(console);c("assert.fail() with more than one argument is deprecated. "+"Please use assert.strictEqual() instead or only pass a message.","DeprecationWarning","DEP0094")}if(i===2)n="!="}if(r instanceof Error)throw r;var u={actual:e,expected:t,operator:n===undefined?"fail":n,stackStartFn:o||fail};if(r!==undefined){u.message=r}var f=new s(u);if(a){f.message=a;f.generatedMessage=true}throw f}x.fail=fail;x.AssertionError=s;function innerOk(e,t,r,n){if(!r){var o=false;if(t===0){o=true;n="No value argument passed to `assert.ok()`"}else if(n instanceof Error){throw n}var i=new s({actual:r,expected:true,message:n,operator:"==",stackStartFn:e});i.generatedMessage=o;throw i}}function ok(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++){t[r]=arguments[r]}innerOk.apply(void 0,[ok,t.length].concat(t))}x.ok=ok;x.equal=function equal(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(e!=t){innerFail({actual:e,expected:t,message:r,operator:"==",stackStartFn:equal})}};x.notEqual=function notEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(e==t){innerFail({actual:e,expected:t,message:r,operator:"!=",stackStartFn:notEqual})}};x.deepEqual=function deepEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(!m(e,t)){innerFail({actual:e,expected:t,message:r,operator:"deepEqual",stackStartFn:deepEqual})}};x.notDeepEqual=function notDeepEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(m(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notDeepEqual",stackStartFn:notDeepEqual})}};x.deepStrictEqual=function deepStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(!S(e,t)){innerFail({actual:e,expected:t,message:r,operator:"deepStrictEqual",stackStartFn:deepStrictEqual})}};x.notDeepStrictEqual=notDeepStrictEqual;function notDeepStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(S(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notDeepStrictEqual",stackStartFn:notDeepStrictEqual})}}x.strictEqual=function strictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(!b(e,t)){innerFail({actual:e,expected:t,message:r,operator:"strictEqual",stackStartFn:strictEqual})}};x.notStrictEqual=function notStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(b(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notStrictEqual",stackStartFn:notStrictEqual})}};var T=function Comparison(e,t,r){var n=this;_classCallCheck(this,Comparison);t.forEach((function(t){if(t in e){if(r!==undefined&&typeof r[t]==="string"&&v(e[t])&&e[t].test(r[t])){n[t]=r[t]}else{n[t]=e[t]}}}))};function compareExceptionKey(e,t,r,n,o,i){if(!(r in e)||!S(e[r],t[r])){if(!n){var a=new T(e,o);var c=new T(t,o,e);var u=new s({actual:a,expected:c,operator:"deepStrictEqual",stackStartFn:i});u.actual=e;u.expected=t;u.operator=i.name;throw u}innerFail({actual:e,expected:t,message:n,operator:i.name,stackStartFn:i})}}function expectedException(e,t,r,n){if(typeof t!=="function"){if(v(t))return t.test(e);if(arguments.length===2){throw new a("expected",["Function","RegExp"],t)}if(_typeof(e)!=="object"||e===null){var o=new s({actual:e,expected:t,message:r,operator:"deepStrictEqual",stackStartFn:n});o.operator=n.name;throw o}var i=Object.keys(t);if(t instanceof Error){i.push("name","message")}else if(i.length===0){throw new c("error",t,"may not be an empty object")}if(m===undefined)lazyLoadComparison();i.forEach((function(o){if(typeof e[o]==="string"&&v(t[o])&&t[o].test(e[o])){return}compareExceptionKey(e,t,o,r,i,n)}));return true}if(t.prototype!==undefined&&e instanceof t){return true}if(Error.isPrototypeOf(t)){return false}return t.call({},e)===true}function getActual(e){if(typeof e!=="function"){throw new a("fn","Function",e)}try{e()}catch(e){return e}return k}function checkIsPromise(e){return g(e)||e!==null&&_typeof(e)==="object"&&typeof e.then==="function"&&typeof e.catch==="function"}function waitForActual(e){return Promise.resolve().then((function(){var t;if(typeof e==="function"){t=e();if(!checkIsPromise(t)){throw new u("instance of Promise","promiseFn",t)}}else if(checkIsPromise(e)){t=e}else{throw new a("promiseFn",["Function","Promise"],e)}return Promise.resolve().then((function(){return t})).then((function(){return k})).catch((function(e){return e}))}))}function expectsError(e,t,r,n){if(typeof r==="string"){if(arguments.length===4){throw new a("error",["Object","Error","Function","RegExp"],r)}if(_typeof(t)==="object"&&t!==null){if(t.message===r){throw new i("error/message",'The error message "'.concat(t.message,'" is identical to the message.'))}}else if(t===r){throw new i("error/message",'The error "'.concat(t,'" is identical to the message.'))}n=r;r=undefined}else if(r!=null&&_typeof(r)!=="object"&&typeof r!=="function"){throw new a("error",["Object","Error","Function","RegExp"],r)}if(t===k){var o="";if(r&&r.name){o+=" (".concat(r.name,")")}o+=n?": ".concat(n):".";var c=e.name==="rejects"?"rejection":"exception";innerFail({actual:undefined,expected:r,operator:e.name,message:"Missing expected ".concat(c).concat(o),stackStartFn:e})}if(r&&!expectedException(t,r,n,e)){throw t}}function expectsNoError(e,t,r,n){if(t===k)return;if(typeof r==="string"){n=r;r=undefined}if(!r||expectedException(t,r)){var o=n?": ".concat(n):".";var i=e.name==="doesNotReject"?"rejection":"exception";innerFail({actual:t,expected:r,operator:e.name,message:"Got unwanted ".concat(i).concat(o,"\n")+'Actual message: "'.concat(t&&t.message,'"'),stackStartFn:e})}throw t}x.throws=function throws(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}expectsError.apply(void 0,[throws,getActual(e)].concat(r))};x.rejects=function rejects(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}return waitForActual(e).then((function(e){return expectsError.apply(void 0,[rejects,e].concat(r))}))};x.doesNotThrow=function doesNotThrow(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}expectsNoError.apply(void 0,[doesNotThrow,getActual(e)].concat(r))};x.doesNotReject=function doesNotReject(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}return waitForActual(e).then((function(e){return expectsNoError.apply(void 0,[doesNotReject,e].concat(r))}))};x.ifError=function ifError(e){if(e!==null&&e!==undefined){var t="ifError got unwanted exception: ";if(_typeof(e)==="object"&&typeof e.message==="string"){if(e.message.length===0&&e.constructor){t+=e.constructor.name}else{t+=e.message}}else{t+=p(e)}var r=new s({actual:e,expected:null,operator:"ifError",message:t,stackStartFn:ifError});var n=e.stack;if(typeof n==="string"){var o=n.split("\n");o.shift();var i=r.stack.split("\n");for(var a=0;a<o.length;a++){var c=i.indexOf(o[a]);if(c!==-1){i=i.slice(0,c);break}}r.stack="".concat(i.join("\n"),"\n").concat(o.join("\n"))}throw r}};function strict(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++){t[r]=arguments[r]}innerOk.apply(void 0,[strict,t.length].concat(t))}x.strict=d(strict,x,{equal:x.strictEqual,deepEqual:x.deepStrictEqual,notEqual:x.notStrictEqual,notDeepEqual:x.notDeepStrictEqual});x.strict.strict=x.strict},832:function(e,t,r){"use strict";function _objectSpread(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]!=null?arguments[t]:{};var n=Object.keys(r);if(typeof Object.getOwnPropertySymbols==="function"){n=n.concat(Object.getOwnPropertySymbols(r).filter((function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable})))}n.forEach((function(t){_defineProperty(e,t,r[t])}))}return e}function _defineProperty(e,t,r){if(t in e){Object.defineProperty(e,t,{value:r,enumerable:true,configurable:true,writable:true})}else{e[t]=r}return e}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||false;n.configurable=true;if("value"in n)n.writable=true;Object.defineProperty(e,n.key,n)}}function _createClass(e,t,r){if(t)_defineProperties(e.prototype,t);if(r)_defineProperties(e,r);return e}function _possibleConstructorReturn(e,t){if(t&&(_typeof(t)==="object"||typeof t==="function")){return t}return _assertThisInitialized(e)}function _assertThisInitialized(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return e}function _inherits(e,t){if(typeof t!=="function"&&t!==null){throw new TypeError("Super expression must either be null or a function")}e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:true,configurable:true}});if(t)_setPrototypeOf(e,t)}function _wrapNativeSuper(e){var t=typeof Map==="function"?new Map:undefined;_wrapNativeSuper=function _wrapNativeSuper(e){if(e===null||!_isNativeFunction(e))return e;if(typeof e!=="function"){throw new TypeError("Super expression must either be null or a function")}if(typeof t!=="undefined"){if(t.has(e))return t.get(e);t.set(e,Wrapper)}function Wrapper(){return _construct(e,arguments,_getPrototypeOf(this).constructor)}Wrapper.prototype=Object.create(e.prototype,{constructor:{value:Wrapper,enumerable:false,writable:true,configurable:true}});return _setPrototypeOf(Wrapper,e)};return _wrapNativeSuper(e)}function isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Date.prototype.toString.call(Reflect.construct(Date,[],(function(){})));return true}catch(e){return false}}function _construct(e,t,r){if(isNativeReflectConstruct()){_construct=Reflect.construct}else{_construct=function _construct(e,t,r){var n=[null];n.push.apply(n,t);var o=Function.bind.apply(e,n);var i=new o;if(r)_setPrototypeOf(i,r.prototype);return i}}return _construct.apply(null,arguments)}function _isNativeFunction(e){return Function.toString.call(e).indexOf("[native code]")!==-1}function _setPrototypeOf(e,t){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(e,t){e.__proto__=t;return e};return _setPrototypeOf(e,t)}function _getPrototypeOf(e){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)};return _getPrototypeOf(e)}function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}var n=r(177),o=n.inspect;var i=r(23),a=i.codes.ERR_INVALID_ARG_TYPE;function endsWith(e,t,r){if(r===undefined||r>e.length){r=e.length}return e.substring(r-t.length,r)===t}function repeat(e,t){t=Math.floor(t);if(e.length==0||t==0)return"";var r=e.length*t;t=Math.floor(Math.log(t)/Math.log(2));while(t){e+=e;t--}e+=e.substring(0,r-e.length);return e}var c="";var u="";var f="";var s="";var l={deepStrictEqual:"Expected values to be strictly deep-equal:",strictEqual:"Expected values to be strictly equal:",strictEqualObject:'Expected "actual" to be reference-equal to "expected":',deepEqual:"Expected values to be loosely deep-equal:",equal:"Expected values to be loosely equal:",notDeepStrictEqual:'Expected "actual" not to be strictly deep-equal to:',notStrictEqual:'Expected "actual" to be strictly unequal to:',notStrictEqualObject:'Expected "actual" not to be reference-equal to "expected":',notDeepEqual:'Expected "actual" not to be loosely deep-equal to:',notEqual:'Expected "actual" to be loosely unequal to:',notIdentical:"Values identical but not reference-equal:"};var p=10;function copyError(e){var t=Object.keys(e);var r=Object.create(Object.getPrototypeOf(e));t.forEach((function(t){r[t]=e[t]}));Object.defineProperty(r,"message",{value:e.message});return r}function inspectValue(e){return o(e,{compact:false,customInspect:false,depth:1e3,maxArrayLength:Infinity,showHidden:false,breakLength:Infinity,showProxy:false,sorted:true,getters:true})}function createErrDiff(e,t,r){var n="";var o="";var i=0;var a="";var y=false;var g=inspectValue(e);var v=g.split("\n");var d=inspectValue(t).split("\n");var b=0;var h="";if(r==="strictEqual"&&_typeof(e)==="object"&&_typeof(t)==="object"&&e!==null&&t!==null){r="strictEqualObject"}if(v.length===1&&d.length===1&&v[0]!==d[0]){var m=v[0].length+d[0].length;if(m<=p){if((_typeof(e)!=="object"||e===null)&&(_typeof(t)!=="object"||t===null)&&(e!==0||t!==0)){return"".concat(l[r],"\n\n")+"".concat(v[0]," !== ").concat(d[0],"\n")}}else if(r!=="strictEqualObject"){var S=process.stderr&&process.stderr.isTTY?process.stderr.columns:80;if(m<S){while(v[0][b]===d[0][b]){b++}if(b>2){h="\n  ".concat(repeat(" ",b),"^");b=0}}}}var E=v[v.length-1];var O=d[d.length-1];while(E===O){if(b++<2){a="\n  ".concat(E).concat(a)}else{n=E}v.pop();d.pop();if(v.length===0||d.length===0)break;E=v[v.length-1];O=d[d.length-1]}var A=Math.max(v.length,d.length);if(A===0){var w=g.split("\n");if(w.length>30){w[26]="".concat(c,"...").concat(s);while(w.length>27){w.pop()}}return"".concat(l.notIdentical,"\n\n").concat(w.join("\n"),"\n")}if(b>3){a="\n".concat(c,"...").concat(s).concat(a);y=true}if(n!==""){a="\n  ".concat(n).concat(a);n=""}var j=0;var _=l[r]+"\n".concat(u,"+ actual").concat(s," ").concat(f,"- expected").concat(s);var P=" ".concat(c,"...").concat(s," Lines skipped");for(b=0;b<A;b++){var x=b-i;if(v.length<b+1){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(d[b-2]);j++}o+="\n  ".concat(d[b-1]);j++}i=b;n+="\n".concat(f,"-").concat(s," ").concat(d[b]);j++}else if(d.length<b+1){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(v[b-2]);j++}o+="\n  ".concat(v[b-1]);j++}i=b;o+="\n".concat(u,"+").concat(s," ").concat(v[b]);j++}else{var k=d[b];var T=v[b];var I=T!==k&&(!endsWith(T,",")||T.slice(0,-1)!==k);if(I&&endsWith(k,",")&&k.slice(0,-1)===T){I=false;T+=","}if(I){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(v[b-2]);j++}o+="\n  ".concat(v[b-1]);j++}i=b;o+="\n".concat(u,"+").concat(s," ").concat(T);n+="\n".concat(f,"-").concat(s," ").concat(k);j+=2}else{o+=n;n="";if(x===1||b===0){o+="\n  ".concat(T);j++}}}if(j>20&&b<A-2){return"".concat(_).concat(P,"\n").concat(o,"\n").concat(c,"...").concat(s).concat(n,"\n")+"".concat(c,"...").concat(s)}}return"".concat(_).concat(y?P:"","\n").concat(o).concat(n).concat(a).concat(h)}var y=function(e){_inherits(AssertionError,e);function AssertionError(e){var t;_classCallCheck(this,AssertionError);if(_typeof(e)!=="object"||e===null){throw new a("options","Object",e)}var r=e.message,n=e.operator,o=e.stackStartFn;var i=e.actual,p=e.expected;var y=Error.stackTraceLimit;Error.stackTraceLimit=0;if(r!=null){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,String(r)))}else{if(process.stderr&&process.stderr.isTTY){if(process.stderr&&process.stderr.getColorDepth&&process.stderr.getColorDepth()!==1){c="";u="";s="";f=""}else{c="";u="";s="";f=""}}if(_typeof(i)==="object"&&i!==null&&_typeof(p)==="object"&&p!==null&&"stack"in i&&i instanceof Error&&"stack"in p&&p instanceof Error){i=copyError(i);p=copyError(p)}if(n==="deepStrictEqual"||n==="strictEqual"){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,createErrDiff(i,p,n)))}else if(n==="notDeepStrictEqual"||n==="notStrictEqual"){var g=l[n];var v=inspectValue(i).split("\n");if(n==="notStrictEqual"&&_typeof(i)==="object"&&i!==null){g=l.notStrictEqualObject}if(v.length>30){v[26]="".concat(c,"...").concat(s);while(v.length>27){v.pop()}}if(v.length===1){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(g," ").concat(v[0])))}else{t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(g,"\n\n").concat(v.join("\n"),"\n")))}}else{var d=inspectValue(i);var b="";var h=l[n];if(n==="notDeepEqual"||n==="notEqual"){d="".concat(l[n],"\n\n").concat(d);if(d.length>1024){d="".concat(d.slice(0,1021),"...")}}else{b="".concat(inspectValue(p));if(d.length>512){d="".concat(d.slice(0,509),"...")}if(b.length>512){b="".concat(b.slice(0,509),"...")}if(n==="deepEqual"||n==="equal"){d="".concat(h,"\n\n").concat(d,"\n\nshould equal\n\n")}else{b=" ".concat(n," ").concat(b)}}t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(d).concat(b)))}}Error.stackTraceLimit=y;t.generatedMessage=!r;Object.defineProperty(_assertThisInitialized(t),"name",{value:"AssertionError [ERR_ASSERTION]",enumerable:false,writable:true,configurable:true});t.code="ERR_ASSERTION";t.actual=i;t.expected=p;t.operator=n;if(Error.captureStackTrace){Error.captureStackTrace(_assertThisInitialized(t),o)}t.stack;t.name="AssertionError";return _possibleConstructorReturn(t)}_createClass(AssertionError,[{key:"toString",value:function toString(){return"".concat(this.name," [").concat(this.code,"]: ").concat(this.message)}},{key:o.custom,value:function value(e,t){return o(this,_objectSpread({},t,{customInspect:false,depth:0}))}}]);return AssertionError}(_wrapNativeSuper(Error));e.exports=y},23:function(e,t,r){"use strict";function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}function _possibleConstructorReturn(e,t){if(t&&(_typeof(t)==="object"||typeof t==="function")){return t}return _assertThisInitialized(e)}function _assertThisInitialized(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return e}function _getPrototypeOf(e){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)};return _getPrototypeOf(e)}function _inherits(e,t){if(typeof t!=="function"&&t!==null){throw new TypeError("Super expression must either be null or a function")}e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:true,configurable:true}});if(t)_setPrototypeOf(e,t)}function _setPrototypeOf(e,t){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(e,t){e.__proto__=t;return e};return _setPrototypeOf(e,t)}var n={};var o;var i;function createErrorType(e,t,r){if(!r){r=Error}function getMessage(e,r,n){if(typeof t==="string"){return t}else{return t(e,r,n)}}var o=function(t){_inherits(NodeError,t);function NodeError(t,r,n){var o;_classCallCheck(this,NodeError);o=_possibleConstructorReturn(this,_getPrototypeOf(NodeError).call(this,getMessage(t,r,n)));o.code=e;return o}return NodeError}(r);n[e]=o}function oneOf(e,t){if(Array.isArray(e)){var r=e.length;e=e.map((function(e){return String(e)}));if(r>2){return"one of ".concat(t," ").concat(e.slice(0,r-1).join(", "),", or ")+e[r-1]}else if(r===2){return"one of ".concat(t," ").concat(e[0]," or ").concat(e[1])}else{return"of ".concat(t," ").concat(e[0])}}else{return"of ".concat(t," ").concat(String(e))}}function startsWith(e,t,r){return e.substr(!r||r<0?0:+r,t.length)===t}function endsWith(e,t,r){if(r===undefined||r>e.length){r=e.length}return e.substring(r-t.length,r)===t}function includes(e,t,r){if(typeof r!=="number"){r=0}if(r+t.length>e.length){return false}else{return e.indexOf(t,r)!==-1}}createErrorType("ERR_AMBIGUOUS_ARGUMENT",'The "%s" argument is ambiguous. %s',TypeError);createErrorType("ERR_INVALID_ARG_TYPE",(function(e,t,n){if(o===undefined)o=r(167);o(typeof e==="string","'name' must be a string");var i;if(typeof t==="string"&&startsWith(t,"not ")){i="must not be";t=t.replace(/^not /,"")}else{i="must be"}var a;if(endsWith(e," argument")){a="The ".concat(e," ").concat(i," ").concat(oneOf(t,"type"))}else{var c=includes(e,".")?"property":"argument";a='The "'.concat(e,'" ').concat(c," ").concat(i," ").concat(oneOf(t,"type"))}a+=". Received type ".concat(_typeof(n));return a}),TypeError);createErrorType("ERR_INVALID_ARG_VALUE",(function(e,t){var n=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"is invalid";if(i===undefined)i=r(177);var o=i.inspect(t);if(o.length>128){o="".concat(o.slice(0,128),"...")}return"The argument '".concat(e,"' ").concat(n,". Received ").concat(o)}),TypeError,RangeError);createErrorType("ERR_INVALID_RETURN_VALUE",(function(e,t,r){var n;if(r&&r.constructor&&r.constructor.name){n="instance of ".concat(r.constructor.name)}else{n="type ".concat(_typeof(r))}return"Expected ".concat(e,' to be returned from the "').concat(t,'"')+" function but got ".concat(n,".")}),TypeError);createErrorType("ERR_MISSING_ARGS",(function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++){t[n]=arguments[n]}if(o===undefined)o=r(167);o(t.length>0,"At least one arg needs to be specified");var i="The ";var a=t.length;t=t.map((function(e){return'"'.concat(e,'"')}));switch(a){case 1:i+="".concat(t[0]," argument");break;case 2:i+="".concat(t[0]," and ").concat(t[1]," arguments");break;default:i+=t.slice(0,a-1).join(", ");i+=", and ".concat(t[a-1]," arguments");break}return"".concat(i," must be specified")}),TypeError);e.exports.codes=n},176:function(e,t,r){"use strict";function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function _iterableToArrayLimit(e,t){var r=[];var n=true;var o=false;var i=undefined;try{for(var a=e[Symbol.iterator](),c;!(n=(c=a.next()).done);n=true){r.push(c.value);if(t&&r.length===t)break}}catch(e){o=true;i=e}finally{try{if(!n&&a["return"]!=null)a["return"]()}finally{if(o)throw i}}return r}function _arrayWithHoles(e){if(Array.isArray(e))return e}function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}var n=/a/g.flags!==undefined;var o=function arrayFromSet(e){var t=[];e.forEach((function(e){return t.push(e)}));return t};var i=function arrayFromMap(e){var t=[];e.forEach((function(e,r){return t.push([r,e])}));return t};var a=Object.is?Object.is:r(208);var c=Object.getOwnPropertySymbols?Object.getOwnPropertySymbols:function(){return[]};var u=Number.isNaN?Number.isNaN:r(718);function uncurryThis(e){return e.call.bind(e)}var f=uncurryThis(Object.prototype.hasOwnProperty);var s=uncurryThis(Object.prototype.propertyIsEnumerable);var l=uncurryThis(Object.prototype.toString);var p=r(177).types,y=p.isAnyArrayBuffer,g=p.isArrayBufferView,v=p.isDate,d=p.isMap,b=p.isRegExp,h=p.isSet,m=p.isNativeError,S=p.isBoxedPrimitive,E=p.isNumberObject,O=p.isStringObject,A=p.isBooleanObject,w=p.isBigIntObject,j=p.isSymbolObject,_=p.isFloat32Array,P=p.isFloat64Array;function isNonIndex(e){if(e.length===0||e.length>10)return true;for(var t=0;t<e.length;t++){var r=e.charCodeAt(t);if(r<48||r>57)return true}return e.length===10&&e>=Math.pow(2,32)}function getOwnNonIndexProperties(e){return Object.keys(e).filter(isNonIndex).concat(c(e).filter(Object.prototype.propertyIsEnumerable.bind(e)))}
+(function(){var e={992:function(e){e.exports=function(e,r,n){if(e.filter)return e.filter(r,n);if(void 0===e||null===e)throw new TypeError;if("function"!=typeof r)throw new TypeError;var o=[];for(var i=0;i<e.length;i++){if(!t.call(e,i))continue;var a=e[i];if(r.call(n,a,i,e))o.push(a)}return o};var t=Object.prototype.hasOwnProperty},167:function(e,t,r){"use strict";function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}var n=r(23),o=n.codes,i=o.ERR_AMBIGUOUS_ARGUMENT,a=o.ERR_INVALID_ARG_TYPE,c=o.ERR_INVALID_ARG_VALUE,u=o.ERR_INVALID_RETURN_VALUE,f=o.ERR_MISSING_ARGS;var s=r(545);var l=r(177),p=l.inspect;var y=r(177).types,g=y.isPromise,v=y.isRegExp;var d=Object.assign?Object.assign:r(604).assign;var b=Object.is?Object.is:r(208);var h=new Map;var m;var S;var E;var O;var w;function lazyLoadComparison(){var e=r(176);m=e.isDeepEqual;S=e.isDeepStrictEqual}var A=/[\x00-\x08\x0b\x0c\x0e-\x1f]/g;var j=null&&["\\u0000","\\u0001","\\u0002","\\u0003","\\u0004","\\u0005","\\u0006","\\u0007","\\b","","","\\u000b","\\f","","\\u000e","\\u000f","\\u0010","\\u0011","\\u0012","\\u0013","\\u0014","\\u0015","\\u0016","\\u0017","\\u0018","\\u0019","\\u001a","\\u001b","\\u001c","\\u001d","\\u001e","\\u001f"];var P=function escapeFn(e){return j[e.charCodeAt(0)]};var _=false;var x=e.exports=ok;var k={};function innerFail(e){if(e.message instanceof Error)throw e.message;throw new s(e)}function fail(e,t,r,n,o){var i=arguments.length;var a;if(i===0){a="Failed"}else if(i===1){r=e;e=undefined}else{if(_===false){_=true;var c=process.emitWarning?process.emitWarning:console.warn.bind(console);c("assert.fail() with more than one argument is deprecated. "+"Please use assert.strictEqual() instead or only pass a message.","DeprecationWarning","DEP0094")}if(i===2)n="!="}if(r instanceof Error)throw r;var u={actual:e,expected:t,operator:n===undefined?"fail":n,stackStartFn:o||fail};if(r!==undefined){u.message=r}var f=new s(u);if(a){f.message=a;f.generatedMessage=true}throw f}x.fail=fail;x.AssertionError=s;function innerOk(e,t,r,n){if(!r){var o=false;if(t===0){o=true;n="No value argument passed to `assert.ok()`"}else if(n instanceof Error){throw n}var i=new s({actual:r,expected:true,message:n,operator:"==",stackStartFn:e});i.generatedMessage=o;throw i}}function ok(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++){t[r]=arguments[r]}innerOk.apply(void 0,[ok,t.length].concat(t))}x.ok=ok;x.equal=function equal(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(e!=t){innerFail({actual:e,expected:t,message:r,operator:"==",stackStartFn:equal})}};x.notEqual=function notEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(e==t){innerFail({actual:e,expected:t,message:r,operator:"!=",stackStartFn:notEqual})}};x.deepEqual=function deepEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(!m(e,t)){innerFail({actual:e,expected:t,message:r,operator:"deepEqual",stackStartFn:deepEqual})}};x.notDeepEqual=function notDeepEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(m(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notDeepEqual",stackStartFn:notDeepEqual})}};x.deepStrictEqual=function deepStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(!S(e,t)){innerFail({actual:e,expected:t,message:r,operator:"deepStrictEqual",stackStartFn:deepStrictEqual})}};x.notDeepStrictEqual=notDeepStrictEqual;function notDeepStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(m===undefined)lazyLoadComparison();if(S(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notDeepStrictEqual",stackStartFn:notDeepStrictEqual})}}x.strictEqual=function strictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(!b(e,t)){innerFail({actual:e,expected:t,message:r,operator:"strictEqual",stackStartFn:strictEqual})}};x.notStrictEqual=function notStrictEqual(e,t,r){if(arguments.length<2){throw new f("actual","expected")}if(b(e,t)){innerFail({actual:e,expected:t,message:r,operator:"notStrictEqual",stackStartFn:notStrictEqual})}};var T=function Comparison(e,t,r){var n=this;_classCallCheck(this,Comparison);t.forEach((function(t){if(t in e){if(r!==undefined&&typeof r[t]==="string"&&v(e[t])&&e[t].test(r[t])){n[t]=r[t]}else{n[t]=e[t]}}}))};function compareExceptionKey(e,t,r,n,o,i){if(!(r in e)||!S(e[r],t[r])){if(!n){var a=new T(e,o);var c=new T(t,o,e);var u=new s({actual:a,expected:c,operator:"deepStrictEqual",stackStartFn:i});u.actual=e;u.expected=t;u.operator=i.name;throw u}innerFail({actual:e,expected:t,message:n,operator:i.name,stackStartFn:i})}}function expectedException(e,t,r,n){if(typeof t!=="function"){if(v(t))return t.test(e);if(arguments.length===2){throw new a("expected",["Function","RegExp"],t)}if(_typeof(e)!=="object"||e===null){var o=new s({actual:e,expected:t,message:r,operator:"deepStrictEqual",stackStartFn:n});o.operator=n.name;throw o}var i=Object.keys(t);if(t instanceof Error){i.push("name","message")}else if(i.length===0){throw new c("error",t,"may not be an empty object")}if(m===undefined)lazyLoadComparison();i.forEach((function(o){if(typeof e[o]==="string"&&v(t[o])&&t[o].test(e[o])){return}compareExceptionKey(e,t,o,r,i,n)}));return true}if(t.prototype!==undefined&&e instanceof t){return true}if(Error.isPrototypeOf(t)){return false}return t.call({},e)===true}function getActual(e){if(typeof e!=="function"){throw new a("fn","Function",e)}try{e()}catch(e){return e}return k}function checkIsPromise(e){return g(e)||e!==null&&_typeof(e)==="object"&&typeof e.then==="function"&&typeof e.catch==="function"}function waitForActual(e){return Promise.resolve().then((function(){var t;if(typeof e==="function"){t=e();if(!checkIsPromise(t)){throw new u("instance of Promise","promiseFn",t)}}else if(checkIsPromise(e)){t=e}else{throw new a("promiseFn",["Function","Promise"],e)}return Promise.resolve().then((function(){return t})).then((function(){return k})).catch((function(e){return e}))}))}function expectsError(e,t,r,n){if(typeof r==="string"){if(arguments.length===4){throw new a("error",["Object","Error","Function","RegExp"],r)}if(_typeof(t)==="object"&&t!==null){if(t.message===r){throw new i("error/message",'The error message "'.concat(t.message,'" is identical to the message.'))}}else if(t===r){throw new i("error/message",'The error "'.concat(t,'" is identical to the message.'))}n=r;r=undefined}else if(r!=null&&_typeof(r)!=="object"&&typeof r!=="function"){throw new a("error",["Object","Error","Function","RegExp"],r)}if(t===k){var o="";if(r&&r.name){o+=" (".concat(r.name,")")}o+=n?": ".concat(n):".";var c=e.name==="rejects"?"rejection":"exception";innerFail({actual:undefined,expected:r,operator:e.name,message:"Missing expected ".concat(c).concat(o),stackStartFn:e})}if(r&&!expectedException(t,r,n,e)){throw t}}function expectsNoError(e,t,r,n){if(t===k)return;if(typeof r==="string"){n=r;r=undefined}if(!r||expectedException(t,r)){var o=n?": ".concat(n):".";var i=e.name==="doesNotReject"?"rejection":"exception";innerFail({actual:t,expected:r,operator:e.name,message:"Got unwanted ".concat(i).concat(o,"\n")+'Actual message: "'.concat(t&&t.message,'"'),stackStartFn:e})}throw t}x.throws=function throws(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}expectsError.apply(void 0,[throws,getActual(e)].concat(r))};x.rejects=function rejects(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}return waitForActual(e).then((function(e){return expectsError.apply(void 0,[rejects,e].concat(r))}))};x.doesNotThrow=function doesNotThrow(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}expectsNoError.apply(void 0,[doesNotThrow,getActual(e)].concat(r))};x.doesNotReject=function doesNotReject(e){for(var t=arguments.length,r=new Array(t>1?t-1:0),n=1;n<t;n++){r[n-1]=arguments[n]}return waitForActual(e).then((function(e){return expectsNoError.apply(void 0,[doesNotReject,e].concat(r))}))};x.ifError=function ifError(e){if(e!==null&&e!==undefined){var t="ifError got unwanted exception: ";if(_typeof(e)==="object"&&typeof e.message==="string"){if(e.message.length===0&&e.constructor){t+=e.constructor.name}else{t+=e.message}}else{t+=p(e)}var r=new s({actual:e,expected:null,operator:"ifError",message:t,stackStartFn:ifError});var n=e.stack;if(typeof n==="string"){var o=n.split("\n");o.shift();var i=r.stack.split("\n");for(var a=0;a<o.length;a++){var c=i.indexOf(o[a]);if(c!==-1){i=i.slice(0,c);break}}r.stack="".concat(i.join("\n"),"\n").concat(o.join("\n"))}throw r}};function strict(){for(var e=arguments.length,t=new Array(e),r=0;r<e;r++){t[r]=arguments[r]}innerOk.apply(void 0,[strict,t.length].concat(t))}x.strict=d(strict,x,{equal:x.strictEqual,deepEqual:x.deepStrictEqual,notEqual:x.notStrictEqual,notDeepEqual:x.notDeepStrictEqual});x.strict.strict=x.strict},545:function(e,t,r){"use strict";function _objectSpread(e){for(var t=1;t<arguments.length;t++){var r=arguments[t]!=null?arguments[t]:{};var n=Object.keys(r);if(typeof Object.getOwnPropertySymbols==="function"){n=n.concat(Object.getOwnPropertySymbols(r).filter((function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable})))}n.forEach((function(t){_defineProperty(e,t,r[t])}))}return e}function _defineProperty(e,t,r){if(t in e){Object.defineProperty(e,t,{value:r,enumerable:true,configurable:true,writable:true})}else{e[t]=r}return e}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||false;n.configurable=true;if("value"in n)n.writable=true;Object.defineProperty(e,n.key,n)}}function _createClass(e,t,r){if(t)_defineProperties(e.prototype,t);if(r)_defineProperties(e,r);return e}function _possibleConstructorReturn(e,t){if(t&&(_typeof(t)==="object"||typeof t==="function")){return t}return _assertThisInitialized(e)}function _assertThisInitialized(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return e}function _inherits(e,t){if(typeof t!=="function"&&t!==null){throw new TypeError("Super expression must either be null or a function")}e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:true,configurable:true}});if(t)_setPrototypeOf(e,t)}function _wrapNativeSuper(e){var t=typeof Map==="function"?new Map:undefined;_wrapNativeSuper=function _wrapNativeSuper(e){if(e===null||!_isNativeFunction(e))return e;if(typeof e!=="function"){throw new TypeError("Super expression must either be null or a function")}if(typeof t!=="undefined"){if(t.has(e))return t.get(e);t.set(e,Wrapper)}function Wrapper(){return _construct(e,arguments,_getPrototypeOf(this).constructor)}Wrapper.prototype=Object.create(e.prototype,{constructor:{value:Wrapper,enumerable:false,writable:true,configurable:true}});return _setPrototypeOf(Wrapper,e)};return _wrapNativeSuper(e)}function isNativeReflectConstruct(){if(typeof Reflect==="undefined"||!Reflect.construct)return false;if(Reflect.construct.sham)return false;if(typeof Proxy==="function")return true;try{Date.prototype.toString.call(Reflect.construct(Date,[],(function(){})));return true}catch(e){return false}}function _construct(e,t,r){if(isNativeReflectConstruct()){_construct=Reflect.construct}else{_construct=function _construct(e,t,r){var n=[null];n.push.apply(n,t);var o=Function.bind.apply(e,n);var i=new o;if(r)_setPrototypeOf(i,r.prototype);return i}}return _construct.apply(null,arguments)}function _isNativeFunction(e){return Function.toString.call(e).indexOf("[native code]")!==-1}function _setPrototypeOf(e,t){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(e,t){e.__proto__=t;return e};return _setPrototypeOf(e,t)}function _getPrototypeOf(e){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)};return _getPrototypeOf(e)}function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}var n=r(177),o=n.inspect;var i=r(23),a=i.codes.ERR_INVALID_ARG_TYPE;function endsWith(e,t,r){if(r===undefined||r>e.length){r=e.length}return e.substring(r-t.length,r)===t}function repeat(e,t){t=Math.floor(t);if(e.length==0||t==0)return"";var r=e.length*t;t=Math.floor(Math.log(t)/Math.log(2));while(t){e+=e;t--}e+=e.substring(0,r-e.length);return e}var c="";var u="";var f="";var s="";var l={deepStrictEqual:"Expected values to be strictly deep-equal:",strictEqual:"Expected values to be strictly equal:",strictEqualObject:'Expected "actual" to be reference-equal to "expected":',deepEqual:"Expected values to be loosely deep-equal:",equal:"Expected values to be loosely equal:",notDeepStrictEqual:'Expected "actual" not to be strictly deep-equal to:',notStrictEqual:'Expected "actual" to be strictly unequal to:',notStrictEqualObject:'Expected "actual" not to be reference-equal to "expected":',notDeepEqual:'Expected "actual" not to be loosely deep-equal to:',notEqual:'Expected "actual" to be loosely unequal to:',notIdentical:"Values identical but not reference-equal:"};var p=10;function copyError(e){var t=Object.keys(e);var r=Object.create(Object.getPrototypeOf(e));t.forEach((function(t){r[t]=e[t]}));Object.defineProperty(r,"message",{value:e.message});return r}function inspectValue(e){return o(e,{compact:false,customInspect:false,depth:1e3,maxArrayLength:Infinity,showHidden:false,breakLength:Infinity,showProxy:false,sorted:true,getters:true})}function createErrDiff(e,t,r){var n="";var o="";var i=0;var a="";var y=false;var g=inspectValue(e);var v=g.split("\n");var d=inspectValue(t).split("\n");var b=0;var h="";if(r==="strictEqual"&&_typeof(e)==="object"&&_typeof(t)==="object"&&e!==null&&t!==null){r="strictEqualObject"}if(v.length===1&&d.length===1&&v[0]!==d[0]){var m=v[0].length+d[0].length;if(m<=p){if((_typeof(e)!=="object"||e===null)&&(_typeof(t)!=="object"||t===null)&&(e!==0||t!==0)){return"".concat(l[r],"\n\n")+"".concat(v[0]," !== ").concat(d[0],"\n")}}else if(r!=="strictEqualObject"){var S=process.stderr&&process.stderr.isTTY?process.stderr.columns:80;if(m<S){while(v[0][b]===d[0][b]){b++}if(b>2){h="\n  ".concat(repeat(" ",b),"^");b=0}}}}var E=v[v.length-1];var O=d[d.length-1];while(E===O){if(b++<2){a="\n  ".concat(E).concat(a)}else{n=E}v.pop();d.pop();if(v.length===0||d.length===0)break;E=v[v.length-1];O=d[d.length-1]}var w=Math.max(v.length,d.length);if(w===0){var A=g.split("\n");if(A.length>30){A[26]="".concat(c,"...").concat(s);while(A.length>27){A.pop()}}return"".concat(l.notIdentical,"\n\n").concat(A.join("\n"),"\n")}if(b>3){a="\n".concat(c,"...").concat(s).concat(a);y=true}if(n!==""){a="\n  ".concat(n).concat(a);n=""}var j=0;var P=l[r]+"\n".concat(u,"+ actual").concat(s," ").concat(f,"- expected").concat(s);var _=" ".concat(c,"...").concat(s," Lines skipped");for(b=0;b<w;b++){var x=b-i;if(v.length<b+1){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(d[b-2]);j++}o+="\n  ".concat(d[b-1]);j++}i=b;n+="\n".concat(f,"-").concat(s," ").concat(d[b]);j++}else if(d.length<b+1){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(v[b-2]);j++}o+="\n  ".concat(v[b-1]);j++}i=b;o+="\n".concat(u,"+").concat(s," ").concat(v[b]);j++}else{var k=d[b];var T=v[b];var I=T!==k&&(!endsWith(T,",")||T.slice(0,-1)!==k);if(I&&endsWith(k,",")&&k.slice(0,-1)===T){I=false;T+=","}if(I){if(x>1&&b>2){if(x>4){o+="\n".concat(c,"...").concat(s);y=true}else if(x>3){o+="\n  ".concat(v[b-2]);j++}o+="\n  ".concat(v[b-1]);j++}i=b;o+="\n".concat(u,"+").concat(s," ").concat(T);n+="\n".concat(f,"-").concat(s," ").concat(k);j+=2}else{o+=n;n="";if(x===1||b===0){o+="\n  ".concat(T);j++}}}if(j>20&&b<w-2){return"".concat(P).concat(_,"\n").concat(o,"\n").concat(c,"...").concat(s).concat(n,"\n")+"".concat(c,"...").concat(s)}}return"".concat(P).concat(y?_:"","\n").concat(o).concat(n).concat(a).concat(h)}var y=function(e){_inherits(AssertionError,e);function AssertionError(e){var t;_classCallCheck(this,AssertionError);if(_typeof(e)!=="object"||e===null){throw new a("options","Object",e)}var r=e.message,n=e.operator,o=e.stackStartFn;var i=e.actual,p=e.expected;var y=Error.stackTraceLimit;Error.stackTraceLimit=0;if(r!=null){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,String(r)))}else{if(process.stderr&&process.stderr.isTTY){if(process.stderr&&process.stderr.getColorDepth&&process.stderr.getColorDepth()!==1){c="";u="";s="";f=""}else{c="";u="";s="";f=""}}if(_typeof(i)==="object"&&i!==null&&_typeof(p)==="object"&&p!==null&&"stack"in i&&i instanceof Error&&"stack"in p&&p instanceof Error){i=copyError(i);p=copyError(p)}if(n==="deepStrictEqual"||n==="strictEqual"){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,createErrDiff(i,p,n)))}else if(n==="notDeepStrictEqual"||n==="notStrictEqual"){var g=l[n];var v=inspectValue(i).split("\n");if(n==="notStrictEqual"&&_typeof(i)==="object"&&i!==null){g=l.notStrictEqualObject}if(v.length>30){v[26]="".concat(c,"...").concat(s);while(v.length>27){v.pop()}}if(v.length===1){t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(g," ").concat(v[0])))}else{t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(g,"\n\n").concat(v.join("\n"),"\n")))}}else{var d=inspectValue(i);var b="";var h=l[n];if(n==="notDeepEqual"||n==="notEqual"){d="".concat(l[n],"\n\n").concat(d);if(d.length>1024){d="".concat(d.slice(0,1021),"...")}}else{b="".concat(inspectValue(p));if(d.length>512){d="".concat(d.slice(0,509),"...")}if(b.length>512){b="".concat(b.slice(0,509),"...")}if(n==="deepEqual"||n==="equal"){d="".concat(h,"\n\n").concat(d,"\n\nshould equal\n\n")}else{b=" ".concat(n," ").concat(b)}}t=_possibleConstructorReturn(this,_getPrototypeOf(AssertionError).call(this,"".concat(d).concat(b)))}}Error.stackTraceLimit=y;t.generatedMessage=!r;Object.defineProperty(_assertThisInitialized(t),"name",{value:"AssertionError [ERR_ASSERTION]",enumerable:false,writable:true,configurable:true});t.code="ERR_ASSERTION";t.actual=i;t.expected=p;t.operator=n;if(Error.captureStackTrace){Error.captureStackTrace(_assertThisInitialized(t),o)}t.stack;t.name="AssertionError";return _possibleConstructorReturn(t)}_createClass(AssertionError,[{key:"toString",value:function toString(){return"".concat(this.name," [").concat(this.code,"]: ").concat(this.message)}},{key:o.custom,value:function value(e,t){return o(this,_objectSpread({},t,{customInspect:false,depth:0}))}}]);return AssertionError}(_wrapNativeSuper(Error));e.exports=y},23:function(e,t,r){"use strict";function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}function _classCallCheck(e,t){if(!(e instanceof t)){throw new TypeError("Cannot call a class as a function")}}function _possibleConstructorReturn(e,t){if(t&&(_typeof(t)==="object"||typeof t==="function")){return t}return _assertThisInitialized(e)}function _assertThisInitialized(e){if(e===void 0){throw new ReferenceError("this hasn't been initialised - super() hasn't been called")}return e}function _getPrototypeOf(e){_getPrototypeOf=Object.setPrototypeOf?Object.getPrototypeOf:function _getPrototypeOf(e){return e.__proto__||Object.getPrototypeOf(e)};return _getPrototypeOf(e)}function _inherits(e,t){if(typeof t!=="function"&&t!==null){throw new TypeError("Super expression must either be null or a function")}e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:true,configurable:true}});if(t)_setPrototypeOf(e,t)}function _setPrototypeOf(e,t){_setPrototypeOf=Object.setPrototypeOf||function _setPrototypeOf(e,t){e.__proto__=t;return e};return _setPrototypeOf(e,t)}var n={};var o;var i;function createErrorType(e,t,r){if(!r){r=Error}function getMessage(e,r,n){if(typeof t==="string"){return t}else{return t(e,r,n)}}var o=function(t){_inherits(NodeError,t);function NodeError(t,r,n){var o;_classCallCheck(this,NodeError);o=_possibleConstructorReturn(this,_getPrototypeOf(NodeError).call(this,getMessage(t,r,n)));o.code=e;return o}return NodeError}(r);n[e]=o}function oneOf(e,t){if(Array.isArray(e)){var r=e.length;e=e.map((function(e){return String(e)}));if(r>2){return"one of ".concat(t," ").concat(e.slice(0,r-1).join(", "),", or ")+e[r-1]}else if(r===2){return"one of ".concat(t," ").concat(e[0]," or ").concat(e[1])}else{return"of ".concat(t," ").concat(e[0])}}else{return"of ".concat(t," ").concat(String(e))}}function startsWith(e,t,r){return e.substr(!r||r<0?0:+r,t.length)===t}function endsWith(e,t,r){if(r===undefined||r>e.length){r=e.length}return e.substring(r-t.length,r)===t}function includes(e,t,r){if(typeof r!=="number"){r=0}if(r+t.length>e.length){return false}else{return e.indexOf(t,r)!==-1}}createErrorType("ERR_AMBIGUOUS_ARGUMENT",'The "%s" argument is ambiguous. %s',TypeError);createErrorType("ERR_INVALID_ARG_TYPE",(function(e,t,n){if(o===undefined)o=r(167);o(typeof e==="string","'name' must be a string");var i;if(typeof t==="string"&&startsWith(t,"not ")){i="must not be";t=t.replace(/^not /,"")}else{i="must be"}var a;if(endsWith(e," argument")){a="The ".concat(e," ").concat(i," ").concat(oneOf(t,"type"))}else{var c=includes(e,".")?"property":"argument";a='The "'.concat(e,'" ').concat(c," ").concat(i," ").concat(oneOf(t,"type"))}a+=". Received type ".concat(_typeof(n));return a}),TypeError);createErrorType("ERR_INVALID_ARG_VALUE",(function(e,t){var n=arguments.length>2&&arguments[2]!==undefined?arguments[2]:"is invalid";if(i===undefined)i=r(177);var o=i.inspect(t);if(o.length>128){o="".concat(o.slice(0,128),"...")}return"The argument '".concat(e,"' ").concat(n,". Received ").concat(o)}),TypeError,RangeError);createErrorType("ERR_INVALID_RETURN_VALUE",(function(e,t,r){var n;if(r&&r.constructor&&r.constructor.name){n="instance of ".concat(r.constructor.name)}else{n="type ".concat(_typeof(r))}return"Expected ".concat(e,' to be returned from the "').concat(t,'"')+" function but got ".concat(n,".")}),TypeError);createErrorType("ERR_MISSING_ARGS",(function(){for(var e=arguments.length,t=new Array(e),n=0;n<e;n++){t[n]=arguments[n]}if(o===undefined)o=r(167);o(t.length>0,"At least one arg needs to be specified");var i="The ";var a=t.length;t=t.map((function(e){return'"'.concat(e,'"')}));switch(a){case 1:i+="".concat(t[0]," argument");break;case 2:i+="".concat(t[0]," and ").concat(t[1]," arguments");break;default:i+=t.slice(0,a-1).join(", ");i+=", and ".concat(t[a-1]," arguments");break}return"".concat(i," must be specified")}),TypeError);e.exports.codes=n},176:function(e,t,r){"use strict";function _slicedToArray(e,t){return _arrayWithHoles(e)||_iterableToArrayLimit(e,t)||_nonIterableRest()}function _nonIterableRest(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}function _iterableToArrayLimit(e,t){var r=[];var n=true;var o=false;var i=undefined;try{for(var a=e[Symbol.iterator](),c;!(n=(c=a.next()).done);n=true){r.push(c.value);if(t&&r.length===t)break}}catch(e){o=true;i=e}finally{try{if(!n&&a["return"]!=null)a["return"]()}finally{if(o)throw i}}return r}function _arrayWithHoles(e){if(Array.isArray(e))return e}function _typeof(e){if(typeof Symbol==="function"&&typeof Symbol.iterator==="symbol"){_typeof=function _typeof(e){return typeof e}}else{_typeof=function _typeof(e){return e&&typeof Symbol==="function"&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e}}return _typeof(e)}var n=/a/g.flags!==undefined;var o=function arrayFromSet(e){var t=[];e.forEach((function(e){return t.push(e)}));return t};var i=function arrayFromMap(e){var t=[];e.forEach((function(e,r){return t.push([r,e])}));return t};var a=Object.is?Object.is:r(208);var c=Object.getOwnPropertySymbols?Object.getOwnPropertySymbols:function(){return[]};var u=Number.isNaN?Number.isNaN:r(718);function uncurryThis(e){return e.call.bind(e)}var f=uncurryThis(Object.prototype.hasOwnProperty);var s=uncurryThis(Object.prototype.propertyIsEnumerable);var l=uncurryThis(Object.prototype.toString);var p=r(177).types,y=p.isAnyArrayBuffer,g=p.isArrayBufferView,v=p.isDate,d=p.isMap,b=p.isRegExp,h=p.isSet,m=p.isNativeError,S=p.isBoxedPrimitive,E=p.isNumberObject,O=p.isStringObject,w=p.isBooleanObject,A=p.isBigIntObject,j=p.isSymbolObject,P=p.isFloat32Array,_=p.isFloat64Array;function isNonIndex(e){if(e.length===0||e.length>10)return true;for(var t=0;t<e.length;t++){var r=e.charCodeAt(t);if(r<48||r>57)return true}return e.length===10&&e>=Math.pow(2,32)}function getOwnNonIndexProperties(e){return Object.keys(e).filter(isNonIndex).concat(c(e).filter(Object.prototype.propertyIsEnumerable.bind(e)))}
 /*!
  * The buffer module from node.js, for the browser.
  *
  * @author   Feross Aboukhadijeh <feross@feross.org> <http://feross.org>
  * @license  MIT
- */function compare(e,t){if(e===t){return 0}var r=e.length;var n=t.length;for(var o=0,i=Math.min(r,n);o<i;++o){if(e[o]!==t[o]){r=e[o];n=t[o];break}}if(r<n){return-1}if(n<r){return 1}return 0}var x=undefined;var k=true;var T=false;var I=0;var N=1;var F=2;var R=3;function areSimilarRegExps(e,t){return n?e.source===t.source&&e.flags===t.flags:RegExp.prototype.toString.call(e)===RegExp.prototype.toString.call(t)}function areSimilarFloatArrays(e,t){if(e.byteLength!==t.byteLength){return false}for(var r=0;r<e.byteLength;r++){if(e[r]!==t[r]){return false}}return true}function areSimilarTypedArrays(e,t){if(e.byteLength!==t.byteLength){return false}return compare(new Uint8Array(e.buffer,e.byteOffset,e.byteLength),new Uint8Array(t.buffer,t.byteOffset,t.byteLength))===0}function areEqualArrayBuffers(e,t){return e.byteLength===t.byteLength&&compare(new Uint8Array(e),new Uint8Array(t))===0}function isEqualBoxedPrimitive(e,t){if(E(e)){return E(t)&&a(Number.prototype.valueOf.call(e),Number.prototype.valueOf.call(t))}if(O(e)){return O(t)&&String.prototype.valueOf.call(e)===String.prototype.valueOf.call(t)}if(A(e)){return A(t)&&Boolean.prototype.valueOf.call(e)===Boolean.prototype.valueOf.call(t)}if(w(e)){return w(t)&&BigInt.prototype.valueOf.call(e)===BigInt.prototype.valueOf.call(t)}return j(t)&&Symbol.prototype.valueOf.call(e)===Symbol.prototype.valueOf.call(t)}function innerDeepEqual(e,t,r,n){if(e===t){if(e!==0)return true;return r?a(e,t):true}if(r){if(_typeof(e)!=="object"){return typeof e==="number"&&u(e)&&u(t)}if(_typeof(t)!=="object"||e===null||t===null){return false}if(Object.getPrototypeOf(e)!==Object.getPrototypeOf(t)){return false}}else{if(e===null||_typeof(e)!=="object"){if(t===null||_typeof(t)!=="object"){return e==t}return false}if(t===null||_typeof(t)!=="object"){return false}}var o=l(e);var i=l(t);if(o!==i){return false}if(Array.isArray(e)){if(e.length!==t.length){return false}var c=getOwnNonIndexProperties(e,x);var f=getOwnNonIndexProperties(t,x);if(c.length!==f.length){return false}return keyCheck(e,t,r,n,N,c)}if(o==="[object Object]"){if(!d(e)&&d(t)||!h(e)&&h(t)){return false}}if(v(e)){if(!v(t)||Date.prototype.getTime.call(e)!==Date.prototype.getTime.call(t)){return false}}else if(b(e)){if(!b(t)||!areSimilarRegExps(e,t)){return false}}else if(m(e)||e instanceof Error){if(e.message!==t.message||e.name!==t.name){return false}}else if(g(e)){if(!r&&(_(e)||P(e))){if(!areSimilarFloatArrays(e,t)){return false}}else if(!areSimilarTypedArrays(e,t)){return false}var s=getOwnNonIndexProperties(e,x);var p=getOwnNonIndexProperties(t,x);if(s.length!==p.length){return false}return keyCheck(e,t,r,n,I,s)}else if(h(e)){if(!h(t)||e.size!==t.size){return false}return keyCheck(e,t,r,n,F)}else if(d(e)){if(!d(t)||e.size!==t.size){return false}return keyCheck(e,t,r,n,R)}else if(y(e)){if(!areEqualArrayBuffers(e,t)){return false}}else if(S(e)&&!isEqualBoxedPrimitive(e,t)){return false}return keyCheck(e,t,r,n,I)}function getEnumerables(e,t){return t.filter((function(t){return s(e,t)}))}function keyCheck(e,t,r,n,o,i){if(arguments.length===5){i=Object.keys(e);var a=Object.keys(t);if(i.length!==a.length){return false}}var u=0;for(;u<i.length;u++){if(!f(t,i[u])){return false}}if(r&&arguments.length===5){var l=c(e);if(l.length!==0){var p=0;for(u=0;u<l.length;u++){var y=l[u];if(s(e,y)){if(!s(t,y)){return false}i.push(y);p++}else if(s(t,y)){return false}}var g=c(t);if(l.length!==g.length&&getEnumerables(t,g).length!==p){return false}}else{var v=c(t);if(v.length!==0&&getEnumerables(t,v).length!==0){return false}}}if(i.length===0&&(o===I||o===N&&e.length===0||e.size===0)){return true}if(n===undefined){n={val1:new Map,val2:new Map,position:0}}else{var d=n.val1.get(e);if(d!==undefined){var b=n.val2.get(t);if(b!==undefined){return d===b}}n.position++}n.val1.set(e,n.position);n.val2.set(t,n.position);var h=objEquiv(e,t,r,i,n,o);n.val1.delete(e);n.val2.delete(t);return h}function setHasEqualElement(e,t,r,n){var i=o(e);for(var a=0;a<i.length;a++){var c=i[a];if(innerDeepEqual(t,c,r,n)){e.delete(c);return true}}return false}function findLooseMatchingPrimitives(e){switch(_typeof(e)){case"undefined":return null;case"object":return undefined;case"symbol":return false;case"string":e=+e;case"number":if(u(e)){return false}}return true}function setMightHaveLoosePrim(e,t,r){var n=findLooseMatchingPrimitives(r);if(n!=null)return n;return t.has(n)&&!e.has(n)}function mapMightHaveLoosePrim(e,t,r,n,o){var i=findLooseMatchingPrimitives(r);if(i!=null){return i}var a=t.get(i);if(a===undefined&&!t.has(i)||!innerDeepEqual(n,a,false,o)){return false}return!e.has(i)&&innerDeepEqual(n,a,false,o)}function setEquiv(e,t,r,n){var i=null;var a=o(e);for(var c=0;c<a.length;c++){var u=a[c];if(_typeof(u)==="object"&&u!==null){if(i===null){i=new Set}i.add(u)}else if(!t.has(u)){if(r)return false;if(!setMightHaveLoosePrim(e,t,u)){return false}if(i===null){i=new Set}i.add(u)}}if(i!==null){var f=o(t);for(var s=0;s<f.length;s++){var l=f[s];if(_typeof(l)==="object"&&l!==null){if(!setHasEqualElement(i,l,r,n))return false}else if(!r&&!e.has(l)&&!setHasEqualElement(i,l,r,n)){return false}}return i.size===0}return true}function mapHasEqualEntry(e,t,r,n,i,a){var c=o(e);for(var u=0;u<c.length;u++){var f=c[u];if(innerDeepEqual(r,f,i,a)&&innerDeepEqual(n,t.get(f),i,a)){e.delete(f);return true}}return false}function mapEquiv(e,t,r,n){var o=null;var a=i(e);for(var c=0;c<a.length;c++){var u=_slicedToArray(a[c],2),f=u[0],s=u[1];if(_typeof(f)==="object"&&f!==null){if(o===null){o=new Set}o.add(f)}else{var l=t.get(f);if(l===undefined&&!t.has(f)||!innerDeepEqual(s,l,r,n)){if(r)return false;if(!mapMightHaveLoosePrim(e,t,f,s,n))return false;if(o===null){o=new Set}o.add(f)}}}if(o!==null){var p=i(t);for(var y=0;y<p.length;y++){var g=_slicedToArray(p[y],2),f=g[0],v=g[1];if(_typeof(f)==="object"&&f!==null){if(!mapHasEqualEntry(o,e,f,v,r,n))return false}else if(!r&&(!e.has(f)||!innerDeepEqual(e.get(f),v,false,n))&&!mapHasEqualEntry(o,e,f,v,false,n)){return false}}return o.size===0}return true}function objEquiv(e,t,r,n,o,i){var a=0;if(i===F){if(!setEquiv(e,t,r,o)){return false}}else if(i===R){if(!mapEquiv(e,t,r,o)){return false}}else if(i===N){for(;a<e.length;a++){if(f(e,a)){if(!f(t,a)||!innerDeepEqual(e[a],t[a],r,o)){return false}}else if(f(t,a)){return false}else{var c=Object.keys(e);for(;a<c.length;a++){var u=c[a];if(!f(t,u)||!innerDeepEqual(e[u],t[u],r,o)){return false}}if(c.length!==Object.keys(t).length){return false}return true}}}for(a=0;a<n.length;a++){var s=n[a];if(!innerDeepEqual(e[s],t[s],r,o)){return false}}return true}function isDeepEqual(e,t){return innerDeepEqual(e,t,T)}function isDeepStrictEqual(e,t){return innerDeepEqual(e,t,k)}e.exports={isDeepEqual:isDeepEqual,isDeepStrictEqual:isDeepStrictEqual}},256:function(e,t,r){"use strict";var n=r(838);var o=r(139);var i=o(n("String.prototype.indexOf"));e.exports=function callBoundIntrinsic(e,t){var r=n(e,!!t);if(typeof r==="function"&&i(e,".prototype.")>-1){return o(r)}return r}},139:function(e,t,r){"use strict";var n=r(174);var o=r(838);var i=o("%Function.prototype.apply%");var a=o("%Function.prototype.call%");var c=o("%Reflect.apply%",true)||n.call(a,i);var u=o("%Object.getOwnPropertyDescriptor%",true);var f=o("%Object.defineProperty%",true);var s=o("%Math.max%");if(f){try{f({},"a",{value:1})}catch(e){f=null}}e.exports=function callBind(e){var t=c(n,a,arguments);if(u&&f){var r=u(t,"length");if(r.configurable){f(t,"length",{value:1+s(0,e.length-(arguments.length-1))})}}return t};var l=function applyBind(){return c(n,i,arguments)};if(f){f(e.exports,"apply",{value:l})}else{e.exports.apply=l}},69:function(e,t,r){"use strict";var n=r(935);var o=typeof Symbol==="function"&&typeof Symbol("foo")==="symbol";var i=Object.prototype.toString;var a=Array.prototype.concat;var c=Object.defineProperty;var isFunction=function(e){return typeof e==="function"&&i.call(e)==="[object Function]"};var arePropertyDescriptorsSupported=function(){var e={};try{c(e,"x",{enumerable:false,value:e});for(var t in e){return false}return e.x===e}catch(e){return false}};var u=c&&arePropertyDescriptorsSupported();var defineProperty=function(e,t,r,n){if(t in e&&(!isFunction(n)||!n())){return}if(u){c(e,t,{configurable:true,enumerable:false,value:r,writable:true})}else{e[t]=r}};var defineProperties=function(e,t){var r=arguments.length>2?arguments[2]:{};var i=n(t);if(o){i=a.call(i,Object.getOwnPropertySymbols(t))}for(var c=0;c<i.length;c+=1){defineProperty(e,i[c],t[i[c]],r[i[c]])}};defineProperties.supportsDescriptors=!!u;e.exports=defineProperties},604:function(e){"use strict";function assign(e,t){if(e===undefined||e===null){throw new TypeError("Cannot convert first argument to object")}var r=Object(e);for(var n=1;n<arguments.length;n++){var o=arguments[n];if(o===undefined||o===null){continue}var i=Object.keys(Object(o));for(var a=0,c=i.length;a<c;a++){var u=i[a];var f=Object.getOwnPropertyDescriptor(o,u);if(f!==undefined&&f.enumerable){r[u]=o[u]}}}return r}function polyfill(){if(!Object.assign){Object.defineProperty(Object,"assign",{enumerable:false,configurable:true,writable:true,value:assign})}}e.exports={assign:assign,polyfill:polyfill}},144:function(e){var t=Object.prototype.hasOwnProperty;var r=Object.prototype.toString;e.exports=function forEach(e,n,o){if(r.call(n)!=="[object Function]"){throw new TypeError("iterator must be a function")}var i=e.length;if(i===+i){for(var a=0;a<i;a++){n.call(o,e[a],a,e)}}else{for(var c in e){if(t.call(e,c)){n.call(o,e[c],c,e)}}}}},426:function(e){"use strict";var t="Function.prototype.bind called on incompatible ";var r=Array.prototype.slice;var n=Object.prototype.toString;var o="[object Function]";e.exports=function bind(e){var i=this;if(typeof i!=="function"||n.call(i)!==o){throw new TypeError(t+i)}var a=r.call(arguments,1);var c;var binder=function(){if(this instanceof c){var t=i.apply(this,a.concat(r.call(arguments)));if(Object(t)===t){return t}return this}else{return i.apply(e,a.concat(r.call(arguments)))}};var u=Math.max(0,i.length-a.length);var f=[];for(var s=0;s<u;s++){f.push("$"+s)}c=Function("binder","return function ("+f.join(",")+"){ return binder.apply(this,arguments); }")(binder);if(i.prototype){var l=function Empty(){};l.prototype=i.prototype;c.prototype=new l;l.prototype=null}return c}},174:function(e,t,r){"use strict";var n=r(426);e.exports=Function.prototype.bind||n},838:function(e,t,r){"use strict";var n;var o=SyntaxError;var i=Function;var a=TypeError;var getEvalledConstructor=function(e){try{return i('"use strict"; return ('+e+").constructor;")()}catch(e){}};var c=Object.getOwnPropertyDescriptor;if(c){try{c({},"")}catch(e){c=null}}var throwTypeError=function(){throw new a};var u=c?function(){try{arguments.callee;return throwTypeError}catch(e){try{return c(arguments,"callee").get}catch(e){return throwTypeError}}}():throwTypeError;var f=r(942)();var s=Object.getPrototypeOf||function(e){return e.__proto__};var l={};var p=typeof Uint8Array==="undefined"?n:s(Uint8Array);var y={"%AggregateError%":typeof AggregateError==="undefined"?n:AggregateError,"%Array%":Array,"%ArrayBuffer%":typeof ArrayBuffer==="undefined"?n:ArrayBuffer,"%ArrayIteratorPrototype%":f?s([][Symbol.iterator]()):n,"%AsyncFromSyncIteratorPrototype%":n,"%AsyncFunction%":l,"%AsyncGenerator%":l,"%AsyncGeneratorFunction%":l,"%AsyncIteratorPrototype%":l,"%Atomics%":typeof Atomics==="undefined"?n:Atomics,"%BigInt%":typeof BigInt==="undefined"?n:BigInt,"%Boolean%":Boolean,"%DataView%":typeof DataView==="undefined"?n:DataView,"%Date%":Date,"%decodeURI%":decodeURI,"%decodeURIComponent%":decodeURIComponent,"%encodeURI%":encodeURI,"%encodeURIComponent%":encodeURIComponent,"%Error%":Error,"%eval%":eval,"%EvalError%":EvalError,"%Float32Array%":typeof Float32Array==="undefined"?n:Float32Array,"%Float64Array%":typeof Float64Array==="undefined"?n:Float64Array,"%FinalizationRegistry%":typeof FinalizationRegistry==="undefined"?n:FinalizationRegistry,"%Function%":i,"%GeneratorFunction%":l,"%Int8Array%":typeof Int8Array==="undefined"?n:Int8Array,"%Int16Array%":typeof Int16Array==="undefined"?n:Int16Array,"%Int32Array%":typeof Int32Array==="undefined"?n:Int32Array,"%isFinite%":isFinite,"%isNaN%":isNaN,"%IteratorPrototype%":f?s(s([][Symbol.iterator]())):n,"%JSON%":typeof JSON==="object"?JSON:n,"%Map%":typeof Map==="undefined"?n:Map,"%MapIteratorPrototype%":typeof Map==="undefined"||!f?n:s((new Map)[Symbol.iterator]()),"%Math%":Math,"%Number%":Number,"%Object%":Object,"%parseFloat%":parseFloat,"%parseInt%":parseInt,"%Promise%":typeof Promise==="undefined"?n:Promise,"%Proxy%":typeof Proxy==="undefined"?n:Proxy,"%RangeError%":RangeError,"%ReferenceError%":ReferenceError,"%Reflect%":typeof Reflect==="undefined"?n:Reflect,"%RegExp%":RegExp,"%Set%":typeof Set==="undefined"?n:Set,"%SetIteratorPrototype%":typeof Set==="undefined"||!f?n:s((new Set)[Symbol.iterator]()),"%SharedArrayBuffer%":typeof SharedArrayBuffer==="undefined"?n:SharedArrayBuffer,"%String%":String,"%StringIteratorPrototype%":f?s(""[Symbol.iterator]()):n,"%Symbol%":f?Symbol:n,"%SyntaxError%":o,"%ThrowTypeError%":u,"%TypedArray%":p,"%TypeError%":a,"%Uint8Array%":typeof Uint8Array==="undefined"?n:Uint8Array,"%Uint8ClampedArray%":typeof Uint8ClampedArray==="undefined"?n:Uint8ClampedArray,"%Uint16Array%":typeof Uint16Array==="undefined"?n:Uint16Array,"%Uint32Array%":typeof Uint32Array==="undefined"?n:Uint32Array,"%URIError%":URIError,"%WeakMap%":typeof WeakMap==="undefined"?n:WeakMap,"%WeakRef%":typeof WeakRef==="undefined"?n:WeakRef,"%WeakSet%":typeof WeakSet==="undefined"?n:WeakSet};var g=function doEval(e){var t;if(e==="%AsyncFunction%"){t=getEvalledConstructor("async function () {}")}else if(e==="%GeneratorFunction%"){t=getEvalledConstructor("function* () {}")}else if(e==="%AsyncGeneratorFunction%"){t=getEvalledConstructor("async function* () {}")}else if(e==="%AsyncGenerator%"){var r=doEval("%AsyncGeneratorFunction%");if(r){t=r.prototype}}else if(e==="%AsyncIteratorPrototype%"){var n=doEval("%AsyncGenerator%");if(n){t=s(n.prototype)}}y[e]=t;return t};var v={"%ArrayBufferPrototype%":["ArrayBuffer","prototype"],"%ArrayPrototype%":["Array","prototype"],"%ArrayProto_entries%":["Array","prototype","entries"],"%ArrayProto_forEach%":["Array","prototype","forEach"],"%ArrayProto_keys%":["Array","prototype","keys"],"%ArrayProto_values%":["Array","prototype","values"],"%AsyncFunctionPrototype%":["AsyncFunction","prototype"],"%AsyncGenerator%":["AsyncGeneratorFunction","prototype"],"%AsyncGeneratorPrototype%":["AsyncGeneratorFunction","prototype","prototype"],"%BooleanPrototype%":["Boolean","prototype"],"%DataViewPrototype%":["DataView","prototype"],"%DatePrototype%":["Date","prototype"],"%ErrorPrototype%":["Error","prototype"],"%EvalErrorPrototype%":["EvalError","prototype"],"%Float32ArrayPrototype%":["Float32Array","prototype"],"%Float64ArrayPrototype%":["Float64Array","prototype"],"%FunctionPrototype%":["Function","prototype"],"%Generator%":["GeneratorFunction","prototype"],"%GeneratorPrototype%":["GeneratorFunction","prototype","prototype"],"%Int8ArrayPrototype%":["Int8Array","prototype"],"%Int16ArrayPrototype%":["Int16Array","prototype"],"%Int32ArrayPrototype%":["Int32Array","prototype"],"%JSONParse%":["JSON","parse"],"%JSONStringify%":["JSON","stringify"],"%MapPrototype%":["Map","prototype"],"%NumberPrototype%":["Number","prototype"],"%ObjectPrototype%":["Object","prototype"],"%ObjProto_toString%":["Object","prototype","toString"],"%ObjProto_valueOf%":["Object","prototype","valueOf"],"%PromisePrototype%":["Promise","prototype"],"%PromiseProto_then%":["Promise","prototype","then"],"%Promise_all%":["Promise","all"],"%Promise_reject%":["Promise","reject"],"%Promise_resolve%":["Promise","resolve"],"%RangeErrorPrototype%":["RangeError","prototype"],"%ReferenceErrorPrototype%":["ReferenceError","prototype"],"%RegExpPrototype%":["RegExp","prototype"],"%SetPrototype%":["Set","prototype"],"%SharedArrayBufferPrototype%":["SharedArrayBuffer","prototype"],"%StringPrototype%":["String","prototype"],"%SymbolPrototype%":["Symbol","prototype"],"%SyntaxErrorPrototype%":["SyntaxError","prototype"],"%TypedArrayPrototype%":["TypedArray","prototype"],"%TypeErrorPrototype%":["TypeError","prototype"],"%Uint8ArrayPrototype%":["Uint8Array","prototype"],"%Uint8ClampedArrayPrototype%":["Uint8ClampedArray","prototype"],"%Uint16ArrayPrototype%":["Uint16Array","prototype"],"%Uint32ArrayPrototype%":["Uint32Array","prototype"],"%URIErrorPrototype%":["URIError","prototype"],"%WeakMapPrototype%":["WeakMap","prototype"],"%WeakSetPrototype%":["WeakSet","prototype"]};var d=r(174);var b=r(101);var h=d.call(Function.call,Array.prototype.concat);var m=d.call(Function.apply,Array.prototype.splice);var S=d.call(Function.call,String.prototype.replace);var E=d.call(Function.call,String.prototype.slice);var O=/[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;var A=/\\(\\)?/g;var w=function stringToPath(e){var t=E(e,0,1);var r=E(e,-1);if(t==="%"&&r!=="%"){throw new o("invalid intrinsic syntax, expected closing `%`")}else if(r==="%"&&t!=="%"){throw new o("invalid intrinsic syntax, expected opening `%`")}var n=[];S(e,O,(function(e,t,r,o){n[n.length]=r?S(o,A,"$1"):t||e}));return n};var j=function getBaseIntrinsic(e,t){var r=e;var n;if(b(v,r)){n=v[r];r="%"+n[0]+"%"}if(b(y,r)){var i=y[r];if(i===l){i=g(r)}if(typeof i==="undefined"&&!t){throw new a("intrinsic "+e+" exists, but is not available. Please file an issue!")}return{alias:n,name:r,value:i}}throw new o("intrinsic "+e+" does not exist!")};e.exports=function GetIntrinsic(e,t){if(typeof e!=="string"||e.length===0){throw new a("intrinsic name must be a non-empty string")}if(arguments.length>1&&typeof t!=="boolean"){throw new a('"allowMissing" argument must be a boolean')}var r=w(e);var i=r.length>0?r[0]:"";var u=j("%"+i+"%",t);var f=u.name;var s=u.value;var l=false;var p=u.alias;if(p){i=p[0];m(r,h([0,1],p))}for(var g=1,v=true;g<r.length;g+=1){var d=r[g];var S=E(d,0,1);var O=E(d,-1);if((S==='"'||S==="'"||S==="`"||(O==='"'||O==="'"||O==="`"))&&S!==O){throw new o("property names with quotes must have matching quotes")}if(d==="constructor"||!v){l=true}i+="."+d;f="%"+i+"%";if(b(y,f)){s=y[f]}else if(s!=null){if(!(d in s)){if(!t){throw new a("base intrinsic for "+e+" exists, but the property is not available.")}return void n}if(c&&g+1>=r.length){var A=c(s,d);v=!!A;if(v&&"get"in A&&!("originalValue"in A.get)){s=A.get}else{s=s[d]}}else{v=b(s,d);s=s[d]}if(v&&!l){y[f]=s}}}return s}},942:function(e,t,r){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=r(773);e.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},773:function(e){"use strict";e.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var e={};var t=Symbol("test");var r=Object(t);if(typeof t==="string"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(r)!=="[object Symbol]"){return false}var n=42;e[t]=n;for(t in e){return false}if(typeof Object.keys==="function"&&Object.keys(e).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(e).length!==0){return false}var o=Object.getOwnPropertySymbols(e);if(o.length!==1||o[0]!==t){return false}if(!Object.prototype.propertyIsEnumerable.call(e,t)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(e,t);if(i.value!==n||i.enumerable!==true){return false}}return true}},101:function(e,t,r){"use strict";var n=r(174);e.exports=n.call(Function.call,Object.prototype.hasOwnProperty)},782:function(e){if(typeof Object.create==="function"){e.exports=function inherits(e,t){if(t){e.super_=t;e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:false,writable:true,configurable:true}})}}}else{e.exports=function inherits(e,t){if(t){e.super_=t;var TempCtor=function(){};TempCtor.prototype=t.prototype;e.prototype=new TempCtor;e.prototype.constructor=e}}}},157:function(e){"use strict";var t=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var r=Object.prototype.toString;var n=function isArguments(e){if(t&&e&&typeof e==="object"&&Symbol.toStringTag in e){return false}return r.call(e)==="[object Arguments]"};var o=function isArguments(e){if(n(e)){return true}return e!==null&&typeof e==="object"&&typeof e.length==="number"&&e.length>=0&&r.call(e)!=="[object Array]"&&r.call(e.callee)==="[object Function]"};var i=function(){return n(arguments)}();n.isLegacyArguments=o;e.exports=i?n:o},391:function(e){"use strict";var t=Object.prototype.toString;var r=Function.prototype.toString;var n=/^\s*(?:function)?\*/;var o=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var i=Object.getPrototypeOf;var getGeneratorFunc=function(){if(!o){return false}try{return Function("return function*() {}")()}catch(e){}};var a=getGeneratorFunc();var c=a?i(a):{};e.exports=function isGeneratorFunction(e){if(typeof e!=="function"){return false}if(n.test(r.call(e))){return true}if(!o){var a=t.call(e);return a==="[object GeneratorFunction]"}return i(e)===c}},460:function(e){"use strict";e.exports=function isNaN(e){return e!==e}},718:function(e,t,r){"use strict";var n=r(139);var o=r(69);var i=r(460);var a=r(625);var c=r(171);var u=n(a(),Number);o(u,{getPolyfill:a,implementation:i,shim:c});e.exports=u},625:function(e,t,r){"use strict";var n=r(460);e.exports=function getPolyfill(){if(Number.isNaN&&Number.isNaN(NaN)&&!Number.isNaN("a")){return Number.isNaN}return n}},171:function(e,t,r){"use strict";var n=r(69);var o=r(625);e.exports=function shimNumberIsNaN(){var e=o();n(Number,{isNaN:e},{isNaN:function testIsNaN(){return Number.isNaN!==e}});return e}},994:function(e,t,r){"use strict";var n=r(144);var o=r(349);var i=r(256);var a=i("Object.prototype.toString");var c=r(942)();var u=c&&typeof Symbol.toStringTag==="symbol";var f=o();var s=i("Array.prototype.indexOf",true)||function indexOf(e,t){for(var r=0;r<e.length;r+=1){if(e[r]===t){return r}}return-1};var l=i("String.prototype.slice");var p={};var y=r(466);var g=Object.getPrototypeOf;if(u&&y&&g){n(f,(function(e){var t=new global[e];if(!(Symbol.toStringTag in t)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+e+" does not have the property! Please report this.")}var r=g(t);var n=y(r,Symbol.toStringTag);if(!n){var o=g(r);n=y(o,Symbol.toStringTag)}p[e]=n.get}))}var v=function tryAllTypedArrays(e){var t=false;n(p,(function(r,n){if(!t){try{t=r.call(e)===n}catch(e){}}}));return t};e.exports=function isTypedArray(e){if(!e||typeof e!=="object"){return false}if(!u){var t=l(a(e),8,-1);return s(f,t)>-1}if(!y){return false}return v(e)}},208:function(e){"use strict";var numberIsNaN=function(e){return e!==e};e.exports=function is(e,t){if(e===0&&t===0){return 1/e===1/t}if(e===t){return true}if(numberIsNaN(e)&&numberIsNaN(t)){return true}return false}},579:function(e,t,r){"use strict";var n;if(!Object.keys){var o=Object.prototype.hasOwnProperty;var i=Object.prototype.toString;var a=r(412);var c=Object.prototype.propertyIsEnumerable;var u=!c.call({toString:null},"toString");var f=c.call((function(){}),"prototype");var s=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"];var equalsConstructorPrototype=function(e){var t=e.constructor;return t&&t.prototype===e};var l={$applicationCache:true,$console:true,$external:true,$frame:true,$frameElement:true,$frames:true,$innerHeight:true,$innerWidth:true,$onmozfullscreenchange:true,$onmozfullscreenerror:true,$outerHeight:true,$outerWidth:true,$pageXOffset:true,$pageYOffset:true,$parent:true,$scrollLeft:true,$scrollTop:true,$scrollX:true,$scrollY:true,$self:true,$webkitIndexedDB:true,$webkitStorageInfo:true,$window:true};var p=function(){if(typeof window==="undefined"){return false}for(var e in window){try{if(!l["$"+e]&&o.call(window,e)&&window[e]!==null&&typeof window[e]==="object"){try{equalsConstructorPrototype(window[e])}catch(e){return true}}}catch(e){return true}}return false}();var equalsConstructorPrototypeIfNotBuggy=function(e){if(typeof window==="undefined"||!p){return equalsConstructorPrototype(e)}try{return equalsConstructorPrototype(e)}catch(e){return false}};n=function keys(e){var t=e!==null&&typeof e==="object";var r=i.call(e)==="[object Function]";var n=a(e);var c=t&&i.call(e)==="[object String]";var l=[];if(!t&&!r&&!n){throw new TypeError("Object.keys called on a non-object")}var p=f&&r;if(c&&e.length>0&&!o.call(e,0)){for(var y=0;y<e.length;++y){l.push(String(y))}}if(n&&e.length>0){for(var g=0;g<e.length;++g){l.push(String(g))}}else{for(var v in e){if(!(p&&v==="prototype")&&o.call(e,v)){l.push(String(v))}}}if(u){var d=equalsConstructorPrototypeIfNotBuggy(e);for(var b=0;b<s.length;++b){if(!(d&&s[b]==="constructor")&&o.call(e,s[b])){l.push(s[b])}}}return l}}e.exports=n},935:function(e,t,r){"use strict";var n=Array.prototype.slice;var o=r(412);var i=Object.keys;var a=i?function keys(e){return i(e)}:r(579);var c=Object.keys;a.shim=function shimObjectKeys(){if(Object.keys){var e=function(){var e=Object.keys(arguments);return e&&e.length===arguments.length}(1,2);if(!e){Object.keys=function keys(e){if(o(e)){return c(n.call(e))}return c(e)}}}else{Object.keys=a}return Object.keys||a};e.exports=a},412:function(e){"use strict";var t=Object.prototype.toString;e.exports=function isArguments(e){var r=t.call(e);var n=r==="[object Arguments]";if(!n){n=r!=="[object Array]"&&e!==null&&typeof e==="object"&&typeof e.length==="number"&&e.length>=0&&t.call(e.callee)==="[object Function]"}return n}},369:function(e){e.exports=function isBuffer(e){return e instanceof Buffer}},584:function(e,t,r){"use strict";var n=r(157);var o=r(391);var i=r(490);var a=r(994);function uncurryThis(e){return e.call.bind(e)}var c=typeof BigInt!=="undefined";var u=typeof Symbol!=="undefined";var f=uncurryThis(Object.prototype.toString);var s=uncurryThis(Number.prototype.valueOf);var l=uncurryThis(String.prototype.valueOf);var p=uncurryThis(Boolean.prototype.valueOf);if(c){var y=uncurryThis(BigInt.prototype.valueOf)}if(u){var g=uncurryThis(Symbol.prototype.valueOf)}function checkBoxedPrimitive(e,t){if(typeof e!=="object"){return false}try{t(e);return true}catch(e){return false}}t.isArgumentsObject=n;t.isGeneratorFunction=o;t.isTypedArray=a;function isPromise(e){return typeof Promise!=="undefined"&&e instanceof Promise||e!==null&&typeof e==="object"&&typeof e.then==="function"&&typeof e.catch==="function"}t.isPromise=isPromise;function isArrayBufferView(e){if(typeof ArrayBuffer!=="undefined"&&ArrayBuffer.isView){return ArrayBuffer.isView(e)}return a(e)||isDataView(e)}t.isArrayBufferView=isArrayBufferView;function isUint8Array(e){return i(e)==="Uint8Array"}t.isUint8Array=isUint8Array;function isUint8ClampedArray(e){return i(e)==="Uint8ClampedArray"}t.isUint8ClampedArray=isUint8ClampedArray;function isUint16Array(e){return i(e)==="Uint16Array"}t.isUint16Array=isUint16Array;function isUint32Array(e){return i(e)==="Uint32Array"}t.isUint32Array=isUint32Array;function isInt8Array(e){return i(e)==="Int8Array"}t.isInt8Array=isInt8Array;function isInt16Array(e){return i(e)==="Int16Array"}t.isInt16Array=isInt16Array;function isInt32Array(e){return i(e)==="Int32Array"}t.isInt32Array=isInt32Array;function isFloat32Array(e){return i(e)==="Float32Array"}t.isFloat32Array=isFloat32Array;function isFloat64Array(e){return i(e)==="Float64Array"}t.isFloat64Array=isFloat64Array;function isBigInt64Array(e){return i(e)==="BigInt64Array"}t.isBigInt64Array=isBigInt64Array;function isBigUint64Array(e){return i(e)==="BigUint64Array"}t.isBigUint64Array=isBigUint64Array;function isMapToString(e){return f(e)==="[object Map]"}isMapToString.working=typeof Map!=="undefined"&&isMapToString(new Map);function isMap(e){if(typeof Map==="undefined"){return false}return isMapToString.working?isMapToString(e):e instanceof Map}t.isMap=isMap;function isSetToString(e){return f(e)==="[object Set]"}isSetToString.working=typeof Set!=="undefined"&&isSetToString(new Set);function isSet(e){if(typeof Set==="undefined"){return false}return isSetToString.working?isSetToString(e):e instanceof Set}t.isSet=isSet;function isWeakMapToString(e){return f(e)==="[object WeakMap]"}isWeakMapToString.working=typeof WeakMap!=="undefined"&&isWeakMapToString(new WeakMap);function isWeakMap(e){if(typeof WeakMap==="undefined"){return false}return isWeakMapToString.working?isWeakMapToString(e):e instanceof WeakMap}t.isWeakMap=isWeakMap;function isWeakSetToString(e){return f(e)==="[object WeakSet]"}isWeakSetToString.working=typeof WeakSet!=="undefined"&&isWeakSetToString(new WeakSet);function isWeakSet(e){return isWeakSetToString(e)}t.isWeakSet=isWeakSet;function isArrayBufferToString(e){return f(e)==="[object ArrayBuffer]"}isArrayBufferToString.working=typeof ArrayBuffer!=="undefined"&&isArrayBufferToString(new ArrayBuffer);function isArrayBuffer(e){if(typeof ArrayBuffer==="undefined"){return false}return isArrayBufferToString.working?isArrayBufferToString(e):e instanceof ArrayBuffer}t.isArrayBuffer=isArrayBuffer;function isDataViewToString(e){return f(e)==="[object DataView]"}isDataViewToString.working=typeof ArrayBuffer!=="undefined"&&typeof DataView!=="undefined"&&isDataViewToString(new DataView(new ArrayBuffer(1),0,1));function isDataView(e){if(typeof DataView==="undefined"){return false}return isDataViewToString.working?isDataViewToString(e):e instanceof DataView}t.isDataView=isDataView;var v=typeof SharedArrayBuffer!=="undefined"?SharedArrayBuffer:undefined;function isSharedArrayBufferToString(e){return f(e)==="[object SharedArrayBuffer]"}function isSharedArrayBuffer(e){if(typeof v==="undefined"){return false}if(typeof isSharedArrayBufferToString.working==="undefined"){isSharedArrayBufferToString.working=isSharedArrayBufferToString(new v)}return isSharedArrayBufferToString.working?isSharedArrayBufferToString(e):e instanceof v}t.isSharedArrayBuffer=isSharedArrayBuffer;function isAsyncFunction(e){return f(e)==="[object AsyncFunction]"}t.isAsyncFunction=isAsyncFunction;function isMapIterator(e){return f(e)==="[object Map Iterator]"}t.isMapIterator=isMapIterator;function isSetIterator(e){return f(e)==="[object Set Iterator]"}t.isSetIterator=isSetIterator;function isGeneratorObject(e){return f(e)==="[object Generator]"}t.isGeneratorObject=isGeneratorObject;function isWebAssemblyCompiledModule(e){return f(e)==="[object WebAssembly.Module]"}t.isWebAssemblyCompiledModule=isWebAssemblyCompiledModule;function isNumberObject(e){return checkBoxedPrimitive(e,s)}t.isNumberObject=isNumberObject;function isStringObject(e){return checkBoxedPrimitive(e,l)}t.isStringObject=isStringObject;function isBooleanObject(e){return checkBoxedPrimitive(e,p)}t.isBooleanObject=isBooleanObject;function isBigIntObject(e){return c&&checkBoxedPrimitive(e,y)}t.isBigIntObject=isBigIntObject;function isSymbolObject(e){return u&&checkBoxedPrimitive(e,g)}t.isSymbolObject=isSymbolObject;function isBoxedPrimitive(e){return isNumberObject(e)||isStringObject(e)||isBooleanObject(e)||isBigIntObject(e)||isSymbolObject(e)}t.isBoxedPrimitive=isBoxedPrimitive;function isAnyArrayBuffer(e){return typeof Uint8Array!=="undefined"&&(isArrayBuffer(e)||isSharedArrayBuffer(e))}t.isAnyArrayBuffer=isAnyArrayBuffer;["isProxy","isExternal","isModuleNamespaceObject"].forEach((function(e){Object.defineProperty(t,e,{enumerable:false,value:function(){throw new Error(e+" is not supported in userland")}})}))},177:function(e,t,r){var n=Object.getOwnPropertyDescriptors||function getOwnPropertyDescriptors(e){var t=Object.keys(e);var r={};for(var n=0;n<t.length;n++){r[t[n]]=Object.getOwnPropertyDescriptor(e,t[n])}return r};var o=/%[sdj%]/g;t.format=function(e){if(!isString(e)){var t=[];for(var r=0;r<arguments.length;r++){t.push(inspect(arguments[r]))}return t.join(" ")}var r=1;var n=arguments;var i=n.length;var a=String(e).replace(o,(function(e){if(e==="%%")return"%";if(r>=i)return e;switch(e){case"%s":return String(n[r++]);case"%d":return Number(n[r++]);case"%j":try{return JSON.stringify(n[r++])}catch(e){return"[Circular]"}default:return e}}));for(var c=n[r];r<i;c=n[++r]){if(isNull(c)||!isObject(c)){a+=" "+c}else{a+=" "+inspect(c)}}return a};t.deprecate=function(e,r){if(typeof process!=="undefined"&&process.noDeprecation===true){return e}if(typeof process==="undefined"){return function(){return t.deprecate(e,r).apply(this,arguments)}}var n=false;function deprecated(){if(!n){if(process.throwDeprecation){throw new Error(r)}else if(process.traceDeprecation){console.trace(r)}else{console.error(r)}n=true}return e.apply(this,arguments)}return deprecated};var i={};var a=/^$/;if(process.env.NODE_DEBUG){var c=process.env.NODE_DEBUG;c=c.replace(/[|\\{}()[\]^$+?.]/g,"\\$&").replace(/\*/g,".*").replace(/,/g,"$|^").toUpperCase();a=new RegExp("^"+c+"$","i")}t.debuglog=function(e){e=e.toUpperCase();if(!i[e]){if(a.test(e)){var r=process.pid;i[e]=function(){var n=t.format.apply(t,arguments);console.error("%s %d: %s",e,r,n)}}else{i[e]=function(){}}}return i[e]};function inspect(e,r){var n={seen:[],stylize:stylizeNoColor};if(arguments.length>=3)n.depth=arguments[2];if(arguments.length>=4)n.colors=arguments[3];if(isBoolean(r)){n.showHidden=r}else if(r){t._extend(n,r)}if(isUndefined(n.showHidden))n.showHidden=false;if(isUndefined(n.depth))n.depth=2;if(isUndefined(n.colors))n.colors=false;if(isUndefined(n.customInspect))n.customInspect=true;if(n.colors)n.stylize=stylizeWithColor;return formatValue(n,e,n.depth)}t.inspect=inspect;inspect.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]};inspect.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"};function stylizeWithColor(e,t){var r=inspect.styles[t];if(r){return"["+inspect.colors[r][0]+"m"+e+"["+inspect.colors[r][1]+"m"}else{return e}}function stylizeNoColor(e,t){return e}function arrayToHash(e){var t={};e.forEach((function(e,r){t[e]=true}));return t}function formatValue(e,r,n){if(e.customInspect&&r&&isFunction(r.inspect)&&r.inspect!==t.inspect&&!(r.constructor&&r.constructor.prototype===r)){var o=r.inspect(n,e);if(!isString(o)){o=formatValue(e,o,n)}return o}var i=formatPrimitive(e,r);if(i){return i}var a=Object.keys(r);var c=arrayToHash(a);if(e.showHidden){a=Object.getOwnPropertyNames(r)}if(isError(r)&&(a.indexOf("message")>=0||a.indexOf("description")>=0)){return formatError(r)}if(a.length===0){if(isFunction(r)){var u=r.name?": "+r.name:"";return e.stylize("[Function"+u+"]","special")}if(isRegExp(r)){return e.stylize(RegExp.prototype.toString.call(r),"regexp")}if(isDate(r)){return e.stylize(Date.prototype.toString.call(r),"date")}if(isError(r)){return formatError(r)}}var f="",s=false,l=["{","}"];if(isArray(r)){s=true;l=["[","]"]}if(isFunction(r)){var p=r.name?": "+r.name:"";f=" [Function"+p+"]"}if(isRegExp(r)){f=" "+RegExp.prototype.toString.call(r)}if(isDate(r)){f=" "+Date.prototype.toUTCString.call(r)}if(isError(r)){f=" "+formatError(r)}if(a.length===0&&(!s||r.length==0)){return l[0]+f+l[1]}if(n<0){if(isRegExp(r)){return e.stylize(RegExp.prototype.toString.call(r),"regexp")}else{return e.stylize("[Object]","special")}}e.seen.push(r);var y;if(s){y=formatArray(e,r,n,c,a)}else{y=a.map((function(t){return formatProperty(e,r,n,c,t,s)}))}e.seen.pop();return reduceToSingleString(y,f,l)}function formatPrimitive(e,t){if(isUndefined(t))return e.stylize("undefined","undefined");if(isString(t)){var r="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(r,"string")}if(isNumber(t))return e.stylize(""+t,"number");if(isBoolean(t))return e.stylize(""+t,"boolean");if(isNull(t))return e.stylize("null","null")}function formatError(e){return"["+Error.prototype.toString.call(e)+"]"}function formatArray(e,t,r,n,o){var i=[];for(var a=0,c=t.length;a<c;++a){if(hasOwnProperty(t,String(a))){i.push(formatProperty(e,t,r,n,String(a),true))}else{i.push("")}}o.forEach((function(o){if(!o.match(/^\d+$/)){i.push(formatProperty(e,t,r,n,o,true))}}));return i}function formatProperty(e,t,r,n,o,i){var a,c,u;u=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]};if(u.get){if(u.set){c=e.stylize("[Getter/Setter]","special")}else{c=e.stylize("[Getter]","special")}}else{if(u.set){c=e.stylize("[Setter]","special")}}if(!hasOwnProperty(n,o)){a="["+o+"]"}if(!c){if(e.seen.indexOf(u.value)<0){if(isNull(r)){c=formatValue(e,u.value,null)}else{c=formatValue(e,u.value,r-1)}if(c.indexOf("\n")>-1){if(i){c=c.split("\n").map((function(e){return"  "+e})).join("\n").substr(2)}else{c="\n"+c.split("\n").map((function(e){return"   "+e})).join("\n")}}}else{c=e.stylize("[Circular]","special")}}if(isUndefined(a)){if(i&&o.match(/^\d+$/)){return c}a=JSON.stringify(""+o);if(a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)){a=a.substr(1,a.length-2);a=e.stylize(a,"name")}else{a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'");a=e.stylize(a,"string")}}return a+": "+c}function reduceToSingleString(e,t,r){var n=0;var o=e.reduce((function(e,t){n++;if(t.indexOf("\n")>=0)n++;return e+t.replace(/\u001b\[\d\d?m/g,"").length+1}),0);if(o>60){return r[0]+(t===""?"":t+"\n ")+" "+e.join(",\n  ")+" "+r[1]}return r[0]+t+" "+e.join(", ")+" "+r[1]}t.types=r(584);function isArray(e){return Array.isArray(e)}t.isArray=isArray;function isBoolean(e){return typeof e==="boolean"}t.isBoolean=isBoolean;function isNull(e){return e===null}t.isNull=isNull;function isNullOrUndefined(e){return e==null}t.isNullOrUndefined=isNullOrUndefined;function isNumber(e){return typeof e==="number"}t.isNumber=isNumber;function isString(e){return typeof e==="string"}t.isString=isString;function isSymbol(e){return typeof e==="symbol"}t.isSymbol=isSymbol;function isUndefined(e){return e===void 0}t.isUndefined=isUndefined;function isRegExp(e){return isObject(e)&&objectToString(e)==="[object RegExp]"}t.isRegExp=isRegExp;t.types.isRegExp=isRegExp;function isObject(e){return typeof e==="object"&&e!==null}t.isObject=isObject;function isDate(e){return isObject(e)&&objectToString(e)==="[object Date]"}t.isDate=isDate;t.types.isDate=isDate;function isError(e){return isObject(e)&&(objectToString(e)==="[object Error]"||e instanceof Error)}t.isError=isError;t.types.isNativeError=isError;function isFunction(e){return typeof e==="function"}t.isFunction=isFunction;function isPrimitive(e){return e===null||typeof e==="boolean"||typeof e==="number"||typeof e==="string"||typeof e==="symbol"||typeof e==="undefined"}t.isPrimitive=isPrimitive;t.isBuffer=r(369);function objectToString(e){return Object.prototype.toString.call(e)}function pad(e){return e<10?"0"+e.toString(10):e.toString(10)}var u=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function timestamp(){var e=new Date;var t=[pad(e.getHours()),pad(e.getMinutes()),pad(e.getSeconds())].join(":");return[e.getDate(),u[e.getMonth()],t].join(" ")}t.log=function(){console.log("%s - %s",timestamp(),t.format.apply(t,arguments))};t.inherits=r(782);t._extend=function(e,t){if(!t||!isObject(t))return e;var r=Object.keys(t);var n=r.length;while(n--){e[r[n]]=t[r[n]]}return e};function hasOwnProperty(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var f=typeof Symbol!=="undefined"?Symbol("util.promisify.custom"):undefined;t.promisify=function promisify(e){if(typeof e!=="function")throw new TypeError('The "original" argument must be of type Function');if(f&&e[f]){var t=e[f];if(typeof t!=="function"){throw new TypeError('The "util.promisify.custom" argument must be of type Function')}Object.defineProperty(t,f,{value:t,enumerable:false,writable:false,configurable:true});return t}function t(){var t,r;var n=new Promise((function(e,n){t=e;r=n}));var o=[];for(var i=0;i<arguments.length;i++){o.push(arguments[i])}o.push((function(e,n){if(e){r(e)}else{t(n)}}));try{e.apply(this,o)}catch(e){r(e)}return n}Object.setPrototypeOf(t,Object.getPrototypeOf(e));if(f)Object.defineProperty(t,f,{value:t,enumerable:false,writable:false,configurable:true});return Object.defineProperties(t,n(e))};t.promisify.custom=f;function callbackifyOnRejected(e,t){if(!e){var r=new Error("Promise was rejected with a falsy value");r.reason=e;e=r}return t(e)}function callbackify(e){if(typeof e!=="function"){throw new TypeError('The "original" argument must be of type Function')}function callbackified(){var t=[];for(var r=0;r<arguments.length;r++){t.push(arguments[r])}var n=t.pop();if(typeof n!=="function"){throw new TypeError("The last argument must be of type Function")}var o=this;var cb=function(){return n.apply(o,arguments)};e.apply(this,t).then((function(e){process.nextTick(cb.bind(null,null,e))}),(function(e){process.nextTick(callbackifyOnRejected.bind(null,e,cb))}))}Object.setPrototypeOf(callbackified,Object.getPrototypeOf(e));Object.defineProperties(callbackified,n(e));return callbackified}t.callbackify=callbackify},490:function(e,t,r){"use strict";var n=r(144);var o=r(349);var i=r(256);var a=i("Object.prototype.toString");var c=r(942)();var u=c&&typeof Symbol.toStringTag==="symbol";var f=o();var s=i("String.prototype.slice");var l={};var p=r(466);var y=Object.getPrototypeOf;if(u&&p&&y){n(f,(function(e){if(typeof global[e]==="function"){var t=new global[e];if(!(Symbol.toStringTag in t)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+e+" does not have the property! Please report this.")}var r=y(t);var n=p(r,Symbol.toStringTag);if(!n){var o=y(r);n=p(o,Symbol.toStringTag)}l[e]=n.get}}))}var g=function tryAllTypedArrays(e){var t=false;n(l,(function(r,n){if(!t){try{var o=r.call(e);if(o===n){t=o}}catch(e){}}}));return t};var v=r(994);e.exports=function whichTypedArray(e){if(!v(e)){return false}if(!u){return s(a(e),8,-1)}return g(e)}},349:function(e,t,r){"use strict";var n=r(992);e.exports=function availableTypedArrays(){return n(["BigInt64Array","BigUint64Array","Float32Array","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Uint8Array","Uint8ClampedArray"],(function(e){return typeof global[e]==="function"}))}},466:function(e,t,r){"use strict";var n=r(838);var o=n("%Object.getOwnPropertyDescriptor%",true);if(o){try{o([],"length")}catch(e){o=null}}e.exports=o}};var t={};function __nccwpck_require__(r){var n=t[r];if(n!==undefined){return n.exports}var o=t[r]={exports:{}};var i=true;try{e[r](o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete t[r]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var r=__nccwpck_require__(167);module.exports=r})();
\ No newline at end of file
+ */function compare(e,t){if(e===t){return 0}var r=e.length;var n=t.length;for(var o=0,i=Math.min(r,n);o<i;++o){if(e[o]!==t[o]){r=e[o];n=t[o];break}}if(r<n){return-1}if(n<r){return 1}return 0}var x=undefined;var k=true;var T=false;var I=0;var N=1;var F=2;var R=3;function areSimilarRegExps(e,t){return n?e.source===t.source&&e.flags===t.flags:RegExp.prototype.toString.call(e)===RegExp.prototype.toString.call(t)}function areSimilarFloatArrays(e,t){if(e.byteLength!==t.byteLength){return false}for(var r=0;r<e.byteLength;r++){if(e[r]!==t[r]){return false}}return true}function areSimilarTypedArrays(e,t){if(e.byteLength!==t.byteLength){return false}return compare(new Uint8Array(e.buffer,e.byteOffset,e.byteLength),new Uint8Array(t.buffer,t.byteOffset,t.byteLength))===0}function areEqualArrayBuffers(e,t){return e.byteLength===t.byteLength&&compare(new Uint8Array(e),new Uint8Array(t))===0}function isEqualBoxedPrimitive(e,t){if(E(e)){return E(t)&&a(Number.prototype.valueOf.call(e),Number.prototype.valueOf.call(t))}if(O(e)){return O(t)&&String.prototype.valueOf.call(e)===String.prototype.valueOf.call(t)}if(w(e)){return w(t)&&Boolean.prototype.valueOf.call(e)===Boolean.prototype.valueOf.call(t)}if(A(e)){return A(t)&&BigInt.prototype.valueOf.call(e)===BigInt.prototype.valueOf.call(t)}return j(t)&&Symbol.prototype.valueOf.call(e)===Symbol.prototype.valueOf.call(t)}function innerDeepEqual(e,t,r,n){if(e===t){if(e!==0)return true;return r?a(e,t):true}if(r){if(_typeof(e)!=="object"){return typeof e==="number"&&u(e)&&u(t)}if(_typeof(t)!=="object"||e===null||t===null){return false}if(Object.getPrototypeOf(e)!==Object.getPrototypeOf(t)){return false}}else{if(e===null||_typeof(e)!=="object"){if(t===null||_typeof(t)!=="object"){return e==t}return false}if(t===null||_typeof(t)!=="object"){return false}}var o=l(e);var i=l(t);if(o!==i){return false}if(Array.isArray(e)){if(e.length!==t.length){return false}var c=getOwnNonIndexProperties(e,x);var f=getOwnNonIndexProperties(t,x);if(c.length!==f.length){return false}return keyCheck(e,t,r,n,N,c)}if(o==="[object Object]"){if(!d(e)&&d(t)||!h(e)&&h(t)){return false}}if(v(e)){if(!v(t)||Date.prototype.getTime.call(e)!==Date.prototype.getTime.call(t)){return false}}else if(b(e)){if(!b(t)||!areSimilarRegExps(e,t)){return false}}else if(m(e)||e instanceof Error){if(e.message!==t.message||e.name!==t.name){return false}}else if(g(e)){if(!r&&(P(e)||_(e))){if(!areSimilarFloatArrays(e,t)){return false}}else if(!areSimilarTypedArrays(e,t)){return false}var s=getOwnNonIndexProperties(e,x);var p=getOwnNonIndexProperties(t,x);if(s.length!==p.length){return false}return keyCheck(e,t,r,n,I,s)}else if(h(e)){if(!h(t)||e.size!==t.size){return false}return keyCheck(e,t,r,n,F)}else if(d(e)){if(!d(t)||e.size!==t.size){return false}return keyCheck(e,t,r,n,R)}else if(y(e)){if(!areEqualArrayBuffers(e,t)){return false}}else if(S(e)&&!isEqualBoxedPrimitive(e,t)){return false}return keyCheck(e,t,r,n,I)}function getEnumerables(e,t){return t.filter((function(t){return s(e,t)}))}function keyCheck(e,t,r,n,o,i){if(arguments.length===5){i=Object.keys(e);var a=Object.keys(t);if(i.length!==a.length){return false}}var u=0;for(;u<i.length;u++){if(!f(t,i[u])){return false}}if(r&&arguments.length===5){var l=c(e);if(l.length!==0){var p=0;for(u=0;u<l.length;u++){var y=l[u];if(s(e,y)){if(!s(t,y)){return false}i.push(y);p++}else if(s(t,y)){return false}}var g=c(t);if(l.length!==g.length&&getEnumerables(t,g).length!==p){return false}}else{var v=c(t);if(v.length!==0&&getEnumerables(t,v).length!==0){return false}}}if(i.length===0&&(o===I||o===N&&e.length===0||e.size===0)){return true}if(n===undefined){n={val1:new Map,val2:new Map,position:0}}else{var d=n.val1.get(e);if(d!==undefined){var b=n.val2.get(t);if(b!==undefined){return d===b}}n.position++}n.val1.set(e,n.position);n.val2.set(t,n.position);var h=objEquiv(e,t,r,i,n,o);n.val1.delete(e);n.val2.delete(t);return h}function setHasEqualElement(e,t,r,n){var i=o(e);for(var a=0;a<i.length;a++){var c=i[a];if(innerDeepEqual(t,c,r,n)){e.delete(c);return true}}return false}function findLooseMatchingPrimitives(e){switch(_typeof(e)){case"undefined":return null;case"object":return undefined;case"symbol":return false;case"string":e=+e;case"number":if(u(e)){return false}}return true}function setMightHaveLoosePrim(e,t,r){var n=findLooseMatchingPrimitives(r);if(n!=null)return n;return t.has(n)&&!e.has(n)}function mapMightHaveLoosePrim(e,t,r,n,o){var i=findLooseMatchingPrimitives(r);if(i!=null){return i}var a=t.get(i);if(a===undefined&&!t.has(i)||!innerDeepEqual(n,a,false,o)){return false}return!e.has(i)&&innerDeepEqual(n,a,false,o)}function setEquiv(e,t,r,n){var i=null;var a=o(e);for(var c=0;c<a.length;c++){var u=a[c];if(_typeof(u)==="object"&&u!==null){if(i===null){i=new Set}i.add(u)}else if(!t.has(u)){if(r)return false;if(!setMightHaveLoosePrim(e,t,u)){return false}if(i===null){i=new Set}i.add(u)}}if(i!==null){var f=o(t);for(var s=0;s<f.length;s++){var l=f[s];if(_typeof(l)==="object"&&l!==null){if(!setHasEqualElement(i,l,r,n))return false}else if(!r&&!e.has(l)&&!setHasEqualElement(i,l,r,n)){return false}}return i.size===0}return true}function mapHasEqualEntry(e,t,r,n,i,a){var c=o(e);for(var u=0;u<c.length;u++){var f=c[u];if(innerDeepEqual(r,f,i,a)&&innerDeepEqual(n,t.get(f),i,a)){e.delete(f);return true}}return false}function mapEquiv(e,t,r,n){var o=null;var a=i(e);for(var c=0;c<a.length;c++){var u=_slicedToArray(a[c],2),f=u[0],s=u[1];if(_typeof(f)==="object"&&f!==null){if(o===null){o=new Set}o.add(f)}else{var l=t.get(f);if(l===undefined&&!t.has(f)||!innerDeepEqual(s,l,r,n)){if(r)return false;if(!mapMightHaveLoosePrim(e,t,f,s,n))return false;if(o===null){o=new Set}o.add(f)}}}if(o!==null){var p=i(t);for(var y=0;y<p.length;y++){var g=_slicedToArray(p[y],2),f=g[0],v=g[1];if(_typeof(f)==="object"&&f!==null){if(!mapHasEqualEntry(o,e,f,v,r,n))return false}else if(!r&&(!e.has(f)||!innerDeepEqual(e.get(f),v,false,n))&&!mapHasEqualEntry(o,e,f,v,false,n)){return false}}return o.size===0}return true}function objEquiv(e,t,r,n,o,i){var a=0;if(i===F){if(!setEquiv(e,t,r,o)){return false}}else if(i===R){if(!mapEquiv(e,t,r,o)){return false}}else if(i===N){for(;a<e.length;a++){if(f(e,a)){if(!f(t,a)||!innerDeepEqual(e[a],t[a],r,o)){return false}}else if(f(t,a)){return false}else{var c=Object.keys(e);for(;a<c.length;a++){var u=c[a];if(!f(t,u)||!innerDeepEqual(e[u],t[u],r,o)){return false}}if(c.length!==Object.keys(t).length){return false}return true}}}for(a=0;a<n.length;a++){var s=n[a];if(!innerDeepEqual(e[s],t[s],r,o)){return false}}return true}function isDeepEqual(e,t){return innerDeepEqual(e,t,T)}function isDeepStrictEqual(e,t){return innerDeepEqual(e,t,k)}e.exports={isDeepEqual:isDeepEqual,isDeepStrictEqual:isDeepStrictEqual}},256:function(e,t,r){"use strict";var n=r(838);var o=r(139);var i=o(n("String.prototype.indexOf"));e.exports=function callBoundIntrinsic(e,t){var r=n(e,!!t);if(typeof r==="function"&&i(e,".prototype.")>-1){return o(r)}return r}},139:function(e,t,r){"use strict";var n=r(174);var o=r(838);var i=o("%Function.prototype.apply%");var a=o("%Function.prototype.call%");var c=o("%Reflect.apply%",true)||n.call(a,i);var u=o("%Object.getOwnPropertyDescriptor%",true);var f=o("%Object.defineProperty%",true);var s=o("%Math.max%");if(f){try{f({},"a",{value:1})}catch(e){f=null}}e.exports=function callBind(e){var t=c(n,a,arguments);if(u&&f){var r=u(t,"length");if(r.configurable){f(t,"length",{value:1+s(0,e.length-(arguments.length-1))})}}return t};var l=function applyBind(){return c(n,i,arguments)};if(f){f(e.exports,"apply",{value:l})}else{e.exports.apply=l}},69:function(e,t,r){"use strict";var n=r(935);var o=typeof Symbol==="function"&&typeof Symbol("foo")==="symbol";var i=Object.prototype.toString;var a=Array.prototype.concat;var c=Object.defineProperty;var isFunction=function(e){return typeof e==="function"&&i.call(e)==="[object Function]"};var arePropertyDescriptorsSupported=function(){var e={};try{c(e,"x",{enumerable:false,value:e});for(var t in e){return false}return e.x===e}catch(e){return false}};var u=c&&arePropertyDescriptorsSupported();var defineProperty=function(e,t,r,n){if(t in e&&(!isFunction(n)||!n())){return}if(u){c(e,t,{configurable:true,enumerable:false,value:r,writable:true})}else{e[t]=r}};var defineProperties=function(e,t){var r=arguments.length>2?arguments[2]:{};var i=n(t);if(o){i=a.call(i,Object.getOwnPropertySymbols(t))}for(var c=0;c<i.length;c+=1){defineProperty(e,i[c],t[i[c]],r[i[c]])}};defineProperties.supportsDescriptors=!!u;e.exports=defineProperties},604:function(e){"use strict";function assign(e,t){if(e===undefined||e===null){throw new TypeError("Cannot convert first argument to object")}var r=Object(e);for(var n=1;n<arguments.length;n++){var o=arguments[n];if(o===undefined||o===null){continue}var i=Object.keys(Object(o));for(var a=0,c=i.length;a<c;a++){var u=i[a];var f=Object.getOwnPropertyDescriptor(o,u);if(f!==undefined&&f.enumerable){r[u]=o[u]}}}return r}function polyfill(){if(!Object.assign){Object.defineProperty(Object,"assign",{enumerable:false,configurable:true,writable:true,value:assign})}}e.exports={assign:assign,polyfill:polyfill}},144:function(e){var t=Object.prototype.hasOwnProperty;var r=Object.prototype.toString;e.exports=function forEach(e,n,o){if(r.call(n)!=="[object Function]"){throw new TypeError("iterator must be a function")}var i=e.length;if(i===+i){for(var a=0;a<i;a++){n.call(o,e[a],a,e)}}else{for(var c in e){if(t.call(e,c)){n.call(o,e[c],c,e)}}}}},426:function(e){"use strict";var t="Function.prototype.bind called on incompatible ";var r=Array.prototype.slice;var n=Object.prototype.toString;var o="[object Function]";e.exports=function bind(e){var i=this;if(typeof i!=="function"||n.call(i)!==o){throw new TypeError(t+i)}var a=r.call(arguments,1);var c;var binder=function(){if(this instanceof c){var t=i.apply(this,a.concat(r.call(arguments)));if(Object(t)===t){return t}return this}else{return i.apply(e,a.concat(r.call(arguments)))}};var u=Math.max(0,i.length-a.length);var f=[];for(var s=0;s<u;s++){f.push("$"+s)}c=Function("binder","return function ("+f.join(",")+"){ return binder.apply(this,arguments); }")(binder);if(i.prototype){var l=function Empty(){};l.prototype=i.prototype;c.prototype=new l;l.prototype=null}return c}},174:function(e,t,r){"use strict";var n=r(426);e.exports=Function.prototype.bind||n},838:function(e,t,r){"use strict";var n;var o=SyntaxError;var i=Function;var a=TypeError;var getEvalledConstructor=function(e){try{return i('"use strict"; return ('+e+").constructor;")()}catch(e){}};var c=Object.getOwnPropertyDescriptor;if(c){try{c({},"")}catch(e){c=null}}var throwTypeError=function(){throw new a};var u=c?function(){try{arguments.callee;return throwTypeError}catch(e){try{return c(arguments,"callee").get}catch(e){return throwTypeError}}}():throwTypeError;var f=r(115)();var s=Object.getPrototypeOf||function(e){return e.__proto__};var l={};var p=typeof Uint8Array==="undefined"?n:s(Uint8Array);var y={"%AggregateError%":typeof AggregateError==="undefined"?n:AggregateError,"%Array%":Array,"%ArrayBuffer%":typeof ArrayBuffer==="undefined"?n:ArrayBuffer,"%ArrayIteratorPrototype%":f?s([][Symbol.iterator]()):n,"%AsyncFromSyncIteratorPrototype%":n,"%AsyncFunction%":l,"%AsyncGenerator%":l,"%AsyncGeneratorFunction%":l,"%AsyncIteratorPrototype%":l,"%Atomics%":typeof Atomics==="undefined"?n:Atomics,"%BigInt%":typeof BigInt==="undefined"?n:BigInt,"%Boolean%":Boolean,"%DataView%":typeof DataView==="undefined"?n:DataView,"%Date%":Date,"%decodeURI%":decodeURI,"%decodeURIComponent%":decodeURIComponent,"%encodeURI%":encodeURI,"%encodeURIComponent%":encodeURIComponent,"%Error%":Error,"%eval%":eval,"%EvalError%":EvalError,"%Float32Array%":typeof Float32Array==="undefined"?n:Float32Array,"%Float64Array%":typeof Float64Array==="undefined"?n:Float64Array,"%FinalizationRegistry%":typeof FinalizationRegistry==="undefined"?n:FinalizationRegistry,"%Function%":i,"%GeneratorFunction%":l,"%Int8Array%":typeof Int8Array==="undefined"?n:Int8Array,"%Int16Array%":typeof Int16Array==="undefined"?n:Int16Array,"%Int32Array%":typeof Int32Array==="undefined"?n:Int32Array,"%isFinite%":isFinite,"%isNaN%":isNaN,"%IteratorPrototype%":f?s(s([][Symbol.iterator]())):n,"%JSON%":typeof JSON==="object"?JSON:n,"%Map%":typeof Map==="undefined"?n:Map,"%MapIteratorPrototype%":typeof Map==="undefined"||!f?n:s((new Map)[Symbol.iterator]()),"%Math%":Math,"%Number%":Number,"%Object%":Object,"%parseFloat%":parseFloat,"%parseInt%":parseInt,"%Promise%":typeof Promise==="undefined"?n:Promise,"%Proxy%":typeof Proxy==="undefined"?n:Proxy,"%RangeError%":RangeError,"%ReferenceError%":ReferenceError,"%Reflect%":typeof Reflect==="undefined"?n:Reflect,"%RegExp%":RegExp,"%Set%":typeof Set==="undefined"?n:Set,"%SetIteratorPrototype%":typeof Set==="undefined"||!f?n:s((new Set)[Symbol.iterator]()),"%SharedArrayBuffer%":typeof SharedArrayBuffer==="undefined"?n:SharedArrayBuffer,"%String%":String,"%StringIteratorPrototype%":f?s(""[Symbol.iterator]()):n,"%Symbol%":f?Symbol:n,"%SyntaxError%":o,"%ThrowTypeError%":u,"%TypedArray%":p,"%TypeError%":a,"%Uint8Array%":typeof Uint8Array==="undefined"?n:Uint8Array,"%Uint8ClampedArray%":typeof Uint8ClampedArray==="undefined"?n:Uint8ClampedArray,"%Uint16Array%":typeof Uint16Array==="undefined"?n:Uint16Array,"%Uint32Array%":typeof Uint32Array==="undefined"?n:Uint32Array,"%URIError%":URIError,"%WeakMap%":typeof WeakMap==="undefined"?n:WeakMap,"%WeakRef%":typeof WeakRef==="undefined"?n:WeakRef,"%WeakSet%":typeof WeakSet==="undefined"?n:WeakSet};var g=function doEval(e){var t;if(e==="%AsyncFunction%"){t=getEvalledConstructor("async function () {}")}else if(e==="%GeneratorFunction%"){t=getEvalledConstructor("function* () {}")}else if(e==="%AsyncGeneratorFunction%"){t=getEvalledConstructor("async function* () {}")}else if(e==="%AsyncGenerator%"){var r=doEval("%AsyncGeneratorFunction%");if(r){t=r.prototype}}else if(e==="%AsyncIteratorPrototype%"){var n=doEval("%AsyncGenerator%");if(n){t=s(n.prototype)}}y[e]=t;return t};var v={"%ArrayBufferPrototype%":["ArrayBuffer","prototype"],"%ArrayPrototype%":["Array","prototype"],"%ArrayProto_entries%":["Array","prototype","entries"],"%ArrayProto_forEach%":["Array","prototype","forEach"],"%ArrayProto_keys%":["Array","prototype","keys"],"%ArrayProto_values%":["Array","prototype","values"],"%AsyncFunctionPrototype%":["AsyncFunction","prototype"],"%AsyncGenerator%":["AsyncGeneratorFunction","prototype"],"%AsyncGeneratorPrototype%":["AsyncGeneratorFunction","prototype","prototype"],"%BooleanPrototype%":["Boolean","prototype"],"%DataViewPrototype%":["DataView","prototype"],"%DatePrototype%":["Date","prototype"],"%ErrorPrototype%":["Error","prototype"],"%EvalErrorPrototype%":["EvalError","prototype"],"%Float32ArrayPrototype%":["Float32Array","prototype"],"%Float64ArrayPrototype%":["Float64Array","prototype"],"%FunctionPrototype%":["Function","prototype"],"%Generator%":["GeneratorFunction","prototype"],"%GeneratorPrototype%":["GeneratorFunction","prototype","prototype"],"%Int8ArrayPrototype%":["Int8Array","prototype"],"%Int16ArrayPrototype%":["Int16Array","prototype"],"%Int32ArrayPrototype%":["Int32Array","prototype"],"%JSONParse%":["JSON","parse"],"%JSONStringify%":["JSON","stringify"],"%MapPrototype%":["Map","prototype"],"%NumberPrototype%":["Number","prototype"],"%ObjectPrototype%":["Object","prototype"],"%ObjProto_toString%":["Object","prototype","toString"],"%ObjProto_valueOf%":["Object","prototype","valueOf"],"%PromisePrototype%":["Promise","prototype"],"%PromiseProto_then%":["Promise","prototype","then"],"%Promise_all%":["Promise","all"],"%Promise_reject%":["Promise","reject"],"%Promise_resolve%":["Promise","resolve"],"%RangeErrorPrototype%":["RangeError","prototype"],"%ReferenceErrorPrototype%":["ReferenceError","prototype"],"%RegExpPrototype%":["RegExp","prototype"],"%SetPrototype%":["Set","prototype"],"%SharedArrayBufferPrototype%":["SharedArrayBuffer","prototype"],"%StringPrototype%":["String","prototype"],"%SymbolPrototype%":["Symbol","prototype"],"%SyntaxErrorPrototype%":["SyntaxError","prototype"],"%TypedArrayPrototype%":["TypedArray","prototype"],"%TypeErrorPrototype%":["TypeError","prototype"],"%Uint8ArrayPrototype%":["Uint8Array","prototype"],"%Uint8ClampedArrayPrototype%":["Uint8ClampedArray","prototype"],"%Uint16ArrayPrototype%":["Uint16Array","prototype"],"%Uint32ArrayPrototype%":["Uint32Array","prototype"],"%URIErrorPrototype%":["URIError","prototype"],"%WeakMapPrototype%":["WeakMap","prototype"],"%WeakSetPrototype%":["WeakSet","prototype"]};var d=r(174);var b=r(101);var h=d.call(Function.call,Array.prototype.concat);var m=d.call(Function.apply,Array.prototype.splice);var S=d.call(Function.call,String.prototype.replace);var E=d.call(Function.call,String.prototype.slice);var O=/[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;var w=/\\(\\)?/g;var A=function stringToPath(e){var t=E(e,0,1);var r=E(e,-1);if(t==="%"&&r!=="%"){throw new o("invalid intrinsic syntax, expected closing `%`")}else if(r==="%"&&t!=="%"){throw new o("invalid intrinsic syntax, expected opening `%`")}var n=[];S(e,O,(function(e,t,r,o){n[n.length]=r?S(o,w,"$1"):t||e}));return n};var j=function getBaseIntrinsic(e,t){var r=e;var n;if(b(v,r)){n=v[r];r="%"+n[0]+"%"}if(b(y,r)){var i=y[r];if(i===l){i=g(r)}if(typeof i==="undefined"&&!t){throw new a("intrinsic "+e+" exists, but is not available. Please file an issue!")}return{alias:n,name:r,value:i}}throw new o("intrinsic "+e+" does not exist!")};e.exports=function GetIntrinsic(e,t){if(typeof e!=="string"||e.length===0){throw new a("intrinsic name must be a non-empty string")}if(arguments.length>1&&typeof t!=="boolean"){throw new a('"allowMissing" argument must be a boolean')}var r=A(e);var i=r.length>0?r[0]:"";var u=j("%"+i+"%",t);var f=u.name;var s=u.value;var l=false;var p=u.alias;if(p){i=p[0];m(r,h([0,1],p))}for(var g=1,v=true;g<r.length;g+=1){var d=r[g];var S=E(d,0,1);var O=E(d,-1);if((S==='"'||S==="'"||S==="`"||(O==='"'||O==="'"||O==="`"))&&S!==O){throw new o("property names with quotes must have matching quotes")}if(d==="constructor"||!v){l=true}i+="."+d;f="%"+i+"%";if(b(y,f)){s=y[f]}else if(s!=null){if(!(d in s)){if(!t){throw new a("base intrinsic for "+e+" exists, but the property is not available.")}return void n}if(c&&g+1>=r.length){var w=c(s,d);v=!!w;if(v&&"get"in w&&!("originalValue"in w.get)){s=w.get}else{s=s[d]}}else{v=b(s,d);s=s[d]}if(v&&!l){y[f]=s}}}return s}},942:function(e,t,r){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=r(773);e.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},773:function(e){"use strict";e.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var e={};var t=Symbol("test");var r=Object(t);if(typeof t==="string"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(r)!=="[object Symbol]"){return false}var n=42;e[t]=n;for(t in e){return false}if(typeof Object.keys==="function"&&Object.keys(e).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(e).length!==0){return false}var o=Object.getOwnPropertySymbols(e);if(o.length!==1||o[0]!==t){return false}if(!Object.prototype.propertyIsEnumerable.call(e,t)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(e,t);if(i.value!==n||i.enumerable!==true){return false}}return true}},115:function(e,t,r){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=r(832);e.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},832:function(e){"use strict";e.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var e={};var t=Symbol("test");var r=Object(t);if(typeof t==="string"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(r)!=="[object Symbol]"){return false}var n=42;e[t]=n;for(t in e){return false}if(typeof Object.keys==="function"&&Object.keys(e).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(e).length!==0){return false}var o=Object.getOwnPropertySymbols(e);if(o.length!==1||o[0]!==t){return false}if(!Object.prototype.propertyIsEnumerable.call(e,t)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(e,t);if(i.value!==n||i.enumerable!==true){return false}}return true}},101:function(e,t,r){"use strict";var n=r(174);e.exports=n.call(Function.call,Object.prototype.hasOwnProperty)},782:function(e){if(typeof Object.create==="function"){e.exports=function inherits(e,t){if(t){e.super_=t;e.prototype=Object.create(t.prototype,{constructor:{value:e,enumerable:false,writable:true,configurable:true}})}}}else{e.exports=function inherits(e,t){if(t){e.super_=t;var TempCtor=function(){};TempCtor.prototype=t.prototype;e.prototype=new TempCtor;e.prototype.constructor=e}}}},157:function(e){"use strict";var t=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var r=Object.prototype.toString;var n=function isArguments(e){if(t&&e&&typeof e==="object"&&Symbol.toStringTag in e){return false}return r.call(e)==="[object Arguments]"};var o=function isArguments(e){if(n(e)){return true}return e!==null&&typeof e==="object"&&typeof e.length==="number"&&e.length>=0&&r.call(e)!=="[object Array]"&&r.call(e.callee)==="[object Function]"};var i=function(){return n(arguments)}();n.isLegacyArguments=o;e.exports=i?n:o},391:function(e){"use strict";var t=Object.prototype.toString;var r=Function.prototype.toString;var n=/^\s*(?:function)?\*/;var o=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var i=Object.getPrototypeOf;var getGeneratorFunc=function(){if(!o){return false}try{return Function("return function*() {}")()}catch(e){}};var a=getGeneratorFunc();var c=a?i(a):{};e.exports=function isGeneratorFunction(e){if(typeof e!=="function"){return false}if(n.test(r.call(e))){return true}if(!o){var a=t.call(e);return a==="[object GeneratorFunction]"}return i(e)===c}},460:function(e){"use strict";e.exports=function isNaN(e){return e!==e}},718:function(e,t,r){"use strict";var n=r(139);var o=r(69);var i=r(460);var a=r(625);var c=r(171);var u=n(a(),Number);o(u,{getPolyfill:a,implementation:i,shim:c});e.exports=u},625:function(e,t,r){"use strict";var n=r(460);e.exports=function getPolyfill(){if(Number.isNaN&&Number.isNaN(NaN)&&!Number.isNaN("a")){return Number.isNaN}return n}},171:function(e,t,r){"use strict";var n=r(69);var o=r(625);e.exports=function shimNumberIsNaN(){var e=o();n(Number,{isNaN:e},{isNaN:function testIsNaN(){return Number.isNaN!==e}});return e}},994:function(e,t,r){"use strict";var n=r(144);var o=r(349);var i=r(256);var a=i("Object.prototype.toString");var c=r(942)();var u=c&&typeof Symbol.toStringTag==="symbol";var f=o();var s=i("Array.prototype.indexOf",true)||function indexOf(e,t){for(var r=0;r<e.length;r+=1){if(e[r]===t){return r}}return-1};var l=i("String.prototype.slice");var p={};var y=r(466);var g=Object.getPrototypeOf;if(u&&y&&g){n(f,(function(e){var t=new global[e];if(!(Symbol.toStringTag in t)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+e+" does not have the property! Please report this.")}var r=g(t);var n=y(r,Symbol.toStringTag);if(!n){var o=g(r);n=y(o,Symbol.toStringTag)}p[e]=n.get}))}var v=function tryAllTypedArrays(e){var t=false;n(p,(function(r,n){if(!t){try{t=r.call(e)===n}catch(e){}}}));return t};e.exports=function isTypedArray(e){if(!e||typeof e!=="object"){return false}if(!u){var t=l(a(e),8,-1);return s(f,t)>-1}if(!y){return false}return v(e)}},208:function(e){"use strict";var numberIsNaN=function(e){return e!==e};e.exports=function is(e,t){if(e===0&&t===0){return 1/e===1/t}if(e===t){return true}if(numberIsNaN(e)&&numberIsNaN(t)){return true}return false}},579:function(e,t,r){"use strict";var n;if(!Object.keys){var o=Object.prototype.hasOwnProperty;var i=Object.prototype.toString;var a=r(412);var c=Object.prototype.propertyIsEnumerable;var u=!c.call({toString:null},"toString");var f=c.call((function(){}),"prototype");var s=["toString","toLocaleString","valueOf","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","constructor"];var equalsConstructorPrototype=function(e){var t=e.constructor;return t&&t.prototype===e};var l={$applicationCache:true,$console:true,$external:true,$frame:true,$frameElement:true,$frames:true,$innerHeight:true,$innerWidth:true,$onmozfullscreenchange:true,$onmozfullscreenerror:true,$outerHeight:true,$outerWidth:true,$pageXOffset:true,$pageYOffset:true,$parent:true,$scrollLeft:true,$scrollTop:true,$scrollX:true,$scrollY:true,$self:true,$webkitIndexedDB:true,$webkitStorageInfo:true,$window:true};var p=function(){if(typeof window==="undefined"){return false}for(var e in window){try{if(!l["$"+e]&&o.call(window,e)&&window[e]!==null&&typeof window[e]==="object"){try{equalsConstructorPrototype(window[e])}catch(e){return true}}}catch(e){return true}}return false}();var equalsConstructorPrototypeIfNotBuggy=function(e){if(typeof window==="undefined"||!p){return equalsConstructorPrototype(e)}try{return equalsConstructorPrototype(e)}catch(e){return false}};n=function keys(e){var t=e!==null&&typeof e==="object";var r=i.call(e)==="[object Function]";var n=a(e);var c=t&&i.call(e)==="[object String]";var l=[];if(!t&&!r&&!n){throw new TypeError("Object.keys called on a non-object")}var p=f&&r;if(c&&e.length>0&&!o.call(e,0)){for(var y=0;y<e.length;++y){l.push(String(y))}}if(n&&e.length>0){for(var g=0;g<e.length;++g){l.push(String(g))}}else{for(var v in e){if(!(p&&v==="prototype")&&o.call(e,v)){l.push(String(v))}}}if(u){var d=equalsConstructorPrototypeIfNotBuggy(e);for(var b=0;b<s.length;++b){if(!(d&&s[b]==="constructor")&&o.call(e,s[b])){l.push(s[b])}}}return l}}e.exports=n},935:function(e,t,r){"use strict";var n=Array.prototype.slice;var o=r(412);var i=Object.keys;var a=i?function keys(e){return i(e)}:r(579);var c=Object.keys;a.shim=function shimObjectKeys(){if(Object.keys){var e=function(){var e=Object.keys(arguments);return e&&e.length===arguments.length}(1,2);if(!e){Object.keys=function keys(e){if(o(e)){return c(n.call(e))}return c(e)}}}else{Object.keys=a}return Object.keys||a};e.exports=a},412:function(e){"use strict";var t=Object.prototype.toString;e.exports=function isArguments(e){var r=t.call(e);var n=r==="[object Arguments]";if(!n){n=r!=="[object Array]"&&e!==null&&typeof e==="object"&&typeof e.length==="number"&&e.length>=0&&t.call(e.callee)==="[object Function]"}return n}},369:function(e){e.exports=function isBuffer(e){return e instanceof Buffer}},584:function(e,t,r){"use strict";var n=r(157);var o=r(391);var i=r(490);var a=r(994);function uncurryThis(e){return e.call.bind(e)}var c=typeof BigInt!=="undefined";var u=typeof Symbol!=="undefined";var f=uncurryThis(Object.prototype.toString);var s=uncurryThis(Number.prototype.valueOf);var l=uncurryThis(String.prototype.valueOf);var p=uncurryThis(Boolean.prototype.valueOf);if(c){var y=uncurryThis(BigInt.prototype.valueOf)}if(u){var g=uncurryThis(Symbol.prototype.valueOf)}function checkBoxedPrimitive(e,t){if(typeof e!=="object"){return false}try{t(e);return true}catch(e){return false}}t.isArgumentsObject=n;t.isGeneratorFunction=o;t.isTypedArray=a;function isPromise(e){return typeof Promise!=="undefined"&&e instanceof Promise||e!==null&&typeof e==="object"&&typeof e.then==="function"&&typeof e.catch==="function"}t.isPromise=isPromise;function isArrayBufferView(e){if(typeof ArrayBuffer!=="undefined"&&ArrayBuffer.isView){return ArrayBuffer.isView(e)}return a(e)||isDataView(e)}t.isArrayBufferView=isArrayBufferView;function isUint8Array(e){return i(e)==="Uint8Array"}t.isUint8Array=isUint8Array;function isUint8ClampedArray(e){return i(e)==="Uint8ClampedArray"}t.isUint8ClampedArray=isUint8ClampedArray;function isUint16Array(e){return i(e)==="Uint16Array"}t.isUint16Array=isUint16Array;function isUint32Array(e){return i(e)==="Uint32Array"}t.isUint32Array=isUint32Array;function isInt8Array(e){return i(e)==="Int8Array"}t.isInt8Array=isInt8Array;function isInt16Array(e){return i(e)==="Int16Array"}t.isInt16Array=isInt16Array;function isInt32Array(e){return i(e)==="Int32Array"}t.isInt32Array=isInt32Array;function isFloat32Array(e){return i(e)==="Float32Array"}t.isFloat32Array=isFloat32Array;function isFloat64Array(e){return i(e)==="Float64Array"}t.isFloat64Array=isFloat64Array;function isBigInt64Array(e){return i(e)==="BigInt64Array"}t.isBigInt64Array=isBigInt64Array;function isBigUint64Array(e){return i(e)==="BigUint64Array"}t.isBigUint64Array=isBigUint64Array;function isMapToString(e){return f(e)==="[object Map]"}isMapToString.working=typeof Map!=="undefined"&&isMapToString(new Map);function isMap(e){if(typeof Map==="undefined"){return false}return isMapToString.working?isMapToString(e):e instanceof Map}t.isMap=isMap;function isSetToString(e){return f(e)==="[object Set]"}isSetToString.working=typeof Set!=="undefined"&&isSetToString(new Set);function isSet(e){if(typeof Set==="undefined"){return false}return isSetToString.working?isSetToString(e):e instanceof Set}t.isSet=isSet;function isWeakMapToString(e){return f(e)==="[object WeakMap]"}isWeakMapToString.working=typeof WeakMap!=="undefined"&&isWeakMapToString(new WeakMap);function isWeakMap(e){if(typeof WeakMap==="undefined"){return false}return isWeakMapToString.working?isWeakMapToString(e):e instanceof WeakMap}t.isWeakMap=isWeakMap;function isWeakSetToString(e){return f(e)==="[object WeakSet]"}isWeakSetToString.working=typeof WeakSet!=="undefined"&&isWeakSetToString(new WeakSet);function isWeakSet(e){return isWeakSetToString(e)}t.isWeakSet=isWeakSet;function isArrayBufferToString(e){return f(e)==="[object ArrayBuffer]"}isArrayBufferToString.working=typeof ArrayBuffer!=="undefined"&&isArrayBufferToString(new ArrayBuffer);function isArrayBuffer(e){if(typeof ArrayBuffer==="undefined"){return false}return isArrayBufferToString.working?isArrayBufferToString(e):e instanceof ArrayBuffer}t.isArrayBuffer=isArrayBuffer;function isDataViewToString(e){return f(e)==="[object DataView]"}isDataViewToString.working=typeof ArrayBuffer!=="undefined"&&typeof DataView!=="undefined"&&isDataViewToString(new DataView(new ArrayBuffer(1),0,1));function isDataView(e){if(typeof DataView==="undefined"){return false}return isDataViewToString.working?isDataViewToString(e):e instanceof DataView}t.isDataView=isDataView;var v=typeof SharedArrayBuffer!=="undefined"?SharedArrayBuffer:undefined;function isSharedArrayBufferToString(e){return f(e)==="[object SharedArrayBuffer]"}function isSharedArrayBuffer(e){if(typeof v==="undefined"){return false}if(typeof isSharedArrayBufferToString.working==="undefined"){isSharedArrayBufferToString.working=isSharedArrayBufferToString(new v)}return isSharedArrayBufferToString.working?isSharedArrayBufferToString(e):e instanceof v}t.isSharedArrayBuffer=isSharedArrayBuffer;function isAsyncFunction(e){return f(e)==="[object AsyncFunction]"}t.isAsyncFunction=isAsyncFunction;function isMapIterator(e){return f(e)==="[object Map Iterator]"}t.isMapIterator=isMapIterator;function isSetIterator(e){return f(e)==="[object Set Iterator]"}t.isSetIterator=isSetIterator;function isGeneratorObject(e){return f(e)==="[object Generator]"}t.isGeneratorObject=isGeneratorObject;function isWebAssemblyCompiledModule(e){return f(e)==="[object WebAssembly.Module]"}t.isWebAssemblyCompiledModule=isWebAssemblyCompiledModule;function isNumberObject(e){return checkBoxedPrimitive(e,s)}t.isNumberObject=isNumberObject;function isStringObject(e){return checkBoxedPrimitive(e,l)}t.isStringObject=isStringObject;function isBooleanObject(e){return checkBoxedPrimitive(e,p)}t.isBooleanObject=isBooleanObject;function isBigIntObject(e){return c&&checkBoxedPrimitive(e,y)}t.isBigIntObject=isBigIntObject;function isSymbolObject(e){return u&&checkBoxedPrimitive(e,g)}t.isSymbolObject=isSymbolObject;function isBoxedPrimitive(e){return isNumberObject(e)||isStringObject(e)||isBooleanObject(e)||isBigIntObject(e)||isSymbolObject(e)}t.isBoxedPrimitive=isBoxedPrimitive;function isAnyArrayBuffer(e){return typeof Uint8Array!=="undefined"&&(isArrayBuffer(e)||isSharedArrayBuffer(e))}t.isAnyArrayBuffer=isAnyArrayBuffer;["isProxy","isExternal","isModuleNamespaceObject"].forEach((function(e){Object.defineProperty(t,e,{enumerable:false,value:function(){throw new Error(e+" is not supported in userland")}})}))},177:function(e,t,r){var n=Object.getOwnPropertyDescriptors||function getOwnPropertyDescriptors(e){var t=Object.keys(e);var r={};for(var n=0;n<t.length;n++){r[t[n]]=Object.getOwnPropertyDescriptor(e,t[n])}return r};var o=/%[sdj%]/g;t.format=function(e){if(!isString(e)){var t=[];for(var r=0;r<arguments.length;r++){t.push(inspect(arguments[r]))}return t.join(" ")}var r=1;var n=arguments;var i=n.length;var a=String(e).replace(o,(function(e){if(e==="%%")return"%";if(r>=i)return e;switch(e){case"%s":return String(n[r++]);case"%d":return Number(n[r++]);case"%j":try{return JSON.stringify(n[r++])}catch(e){return"[Circular]"}default:return e}}));for(var c=n[r];r<i;c=n[++r]){if(isNull(c)||!isObject(c)){a+=" "+c}else{a+=" "+inspect(c)}}return a};t.deprecate=function(e,r){if(typeof process!=="undefined"&&process.noDeprecation===true){return e}if(typeof process==="undefined"){return function(){return t.deprecate(e,r).apply(this,arguments)}}var n=false;function deprecated(){if(!n){if(process.throwDeprecation){throw new Error(r)}else if(process.traceDeprecation){console.trace(r)}else{console.error(r)}n=true}return e.apply(this,arguments)}return deprecated};var i={};var a=/^$/;if(process.env.NODE_DEBUG){var c=process.env.NODE_DEBUG;c=c.replace(/[|\\{}()[\]^$+?.]/g,"\\$&").replace(/\*/g,".*").replace(/,/g,"$|^").toUpperCase();a=new RegExp("^"+c+"$","i")}t.debuglog=function(e){e=e.toUpperCase();if(!i[e]){if(a.test(e)){var r=process.pid;i[e]=function(){var n=t.format.apply(t,arguments);console.error("%s %d: %s",e,r,n)}}else{i[e]=function(){}}}return i[e]};function inspect(e,r){var n={seen:[],stylize:stylizeNoColor};if(arguments.length>=3)n.depth=arguments[2];if(arguments.length>=4)n.colors=arguments[3];if(isBoolean(r)){n.showHidden=r}else if(r){t._extend(n,r)}if(isUndefined(n.showHidden))n.showHidden=false;if(isUndefined(n.depth))n.depth=2;if(isUndefined(n.colors))n.colors=false;if(isUndefined(n.customInspect))n.customInspect=true;if(n.colors)n.stylize=stylizeWithColor;return formatValue(n,e,n.depth)}t.inspect=inspect;inspect.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]};inspect.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"};function stylizeWithColor(e,t){var r=inspect.styles[t];if(r){return"["+inspect.colors[r][0]+"m"+e+"["+inspect.colors[r][1]+"m"}else{return e}}function stylizeNoColor(e,t){return e}function arrayToHash(e){var t={};e.forEach((function(e,r){t[e]=true}));return t}function formatValue(e,r,n){if(e.customInspect&&r&&isFunction(r.inspect)&&r.inspect!==t.inspect&&!(r.constructor&&r.constructor.prototype===r)){var o=r.inspect(n,e);if(!isString(o)){o=formatValue(e,o,n)}return o}var i=formatPrimitive(e,r);if(i){return i}var a=Object.keys(r);var c=arrayToHash(a);if(e.showHidden){a=Object.getOwnPropertyNames(r)}if(isError(r)&&(a.indexOf("message")>=0||a.indexOf("description")>=0)){return formatError(r)}if(a.length===0){if(isFunction(r)){var u=r.name?": "+r.name:"";return e.stylize("[Function"+u+"]","special")}if(isRegExp(r)){return e.stylize(RegExp.prototype.toString.call(r),"regexp")}if(isDate(r)){return e.stylize(Date.prototype.toString.call(r),"date")}if(isError(r)){return formatError(r)}}var f="",s=false,l=["{","}"];if(isArray(r)){s=true;l=["[","]"]}if(isFunction(r)){var p=r.name?": "+r.name:"";f=" [Function"+p+"]"}if(isRegExp(r)){f=" "+RegExp.prototype.toString.call(r)}if(isDate(r)){f=" "+Date.prototype.toUTCString.call(r)}if(isError(r)){f=" "+formatError(r)}if(a.length===0&&(!s||r.length==0)){return l[0]+f+l[1]}if(n<0){if(isRegExp(r)){return e.stylize(RegExp.prototype.toString.call(r),"regexp")}else{return e.stylize("[Object]","special")}}e.seen.push(r);var y;if(s){y=formatArray(e,r,n,c,a)}else{y=a.map((function(t){return formatProperty(e,r,n,c,t,s)}))}e.seen.pop();return reduceToSingleString(y,f,l)}function formatPrimitive(e,t){if(isUndefined(t))return e.stylize("undefined","undefined");if(isString(t)){var r="'"+JSON.stringify(t).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return e.stylize(r,"string")}if(isNumber(t))return e.stylize(""+t,"number");if(isBoolean(t))return e.stylize(""+t,"boolean");if(isNull(t))return e.stylize("null","null")}function formatError(e){return"["+Error.prototype.toString.call(e)+"]"}function formatArray(e,t,r,n,o){var i=[];for(var a=0,c=t.length;a<c;++a){if(hasOwnProperty(t,String(a))){i.push(formatProperty(e,t,r,n,String(a),true))}else{i.push("")}}o.forEach((function(o){if(!o.match(/^\d+$/)){i.push(formatProperty(e,t,r,n,o,true))}}));return i}function formatProperty(e,t,r,n,o,i){var a,c,u;u=Object.getOwnPropertyDescriptor(t,o)||{value:t[o]};if(u.get){if(u.set){c=e.stylize("[Getter/Setter]","special")}else{c=e.stylize("[Getter]","special")}}else{if(u.set){c=e.stylize("[Setter]","special")}}if(!hasOwnProperty(n,o)){a="["+o+"]"}if(!c){if(e.seen.indexOf(u.value)<0){if(isNull(r)){c=formatValue(e,u.value,null)}else{c=formatValue(e,u.value,r-1)}if(c.indexOf("\n")>-1){if(i){c=c.split("\n").map((function(e){return"  "+e})).join("\n").substr(2)}else{c="\n"+c.split("\n").map((function(e){return"   "+e})).join("\n")}}}else{c=e.stylize("[Circular]","special")}}if(isUndefined(a)){if(i&&o.match(/^\d+$/)){return c}a=JSON.stringify(""+o);if(a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)){a=a.substr(1,a.length-2);a=e.stylize(a,"name")}else{a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'");a=e.stylize(a,"string")}}return a+": "+c}function reduceToSingleString(e,t,r){var n=0;var o=e.reduce((function(e,t){n++;if(t.indexOf("\n")>=0)n++;return e+t.replace(/\u001b\[\d\d?m/g,"").length+1}),0);if(o>60){return r[0]+(t===""?"":t+"\n ")+" "+e.join(",\n  ")+" "+r[1]}return r[0]+t+" "+e.join(", ")+" "+r[1]}t.types=r(584);function isArray(e){return Array.isArray(e)}t.isArray=isArray;function isBoolean(e){return typeof e==="boolean"}t.isBoolean=isBoolean;function isNull(e){return e===null}t.isNull=isNull;function isNullOrUndefined(e){return e==null}t.isNullOrUndefined=isNullOrUndefined;function isNumber(e){return typeof e==="number"}t.isNumber=isNumber;function isString(e){return typeof e==="string"}t.isString=isString;function isSymbol(e){return typeof e==="symbol"}t.isSymbol=isSymbol;function isUndefined(e){return e===void 0}t.isUndefined=isUndefined;function isRegExp(e){return isObject(e)&&objectToString(e)==="[object RegExp]"}t.isRegExp=isRegExp;t.types.isRegExp=isRegExp;function isObject(e){return typeof e==="object"&&e!==null}t.isObject=isObject;function isDate(e){return isObject(e)&&objectToString(e)==="[object Date]"}t.isDate=isDate;t.types.isDate=isDate;function isError(e){return isObject(e)&&(objectToString(e)==="[object Error]"||e instanceof Error)}t.isError=isError;t.types.isNativeError=isError;function isFunction(e){return typeof e==="function"}t.isFunction=isFunction;function isPrimitive(e){return e===null||typeof e==="boolean"||typeof e==="number"||typeof e==="string"||typeof e==="symbol"||typeof e==="undefined"}t.isPrimitive=isPrimitive;t.isBuffer=r(369);function objectToString(e){return Object.prototype.toString.call(e)}function pad(e){return e<10?"0"+e.toString(10):e.toString(10)}var u=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function timestamp(){var e=new Date;var t=[pad(e.getHours()),pad(e.getMinutes()),pad(e.getSeconds())].join(":");return[e.getDate(),u[e.getMonth()],t].join(" ")}t.log=function(){console.log("%s - %s",timestamp(),t.format.apply(t,arguments))};t.inherits=r(782);t._extend=function(e,t){if(!t||!isObject(t))return e;var r=Object.keys(t);var n=r.length;while(n--){e[r[n]]=t[r[n]]}return e};function hasOwnProperty(e,t){return Object.prototype.hasOwnProperty.call(e,t)}var f=typeof Symbol!=="undefined"?Symbol("util.promisify.custom"):undefined;t.promisify=function promisify(e){if(typeof e!=="function")throw new TypeError('The "original" argument must be of type Function');if(f&&e[f]){var t=e[f];if(typeof t!=="function"){throw new TypeError('The "util.promisify.custom" argument must be of type Function')}Object.defineProperty(t,f,{value:t,enumerable:false,writable:false,configurable:true});return t}function t(){var t,r;var n=new Promise((function(e,n){t=e;r=n}));var o=[];for(var i=0;i<arguments.length;i++){o.push(arguments[i])}o.push((function(e,n){if(e){r(e)}else{t(n)}}));try{e.apply(this,o)}catch(e){r(e)}return n}Object.setPrototypeOf(t,Object.getPrototypeOf(e));if(f)Object.defineProperty(t,f,{value:t,enumerable:false,writable:false,configurable:true});return Object.defineProperties(t,n(e))};t.promisify.custom=f;function callbackifyOnRejected(e,t){if(!e){var r=new Error("Promise was rejected with a falsy value");r.reason=e;e=r}return t(e)}function callbackify(e){if(typeof e!=="function"){throw new TypeError('The "original" argument must be of type Function')}function callbackified(){var t=[];for(var r=0;r<arguments.length;r++){t.push(arguments[r])}var n=t.pop();if(typeof n!=="function"){throw new TypeError("The last argument must be of type Function")}var o=this;var cb=function(){return n.apply(o,arguments)};e.apply(this,t).then((function(e){process.nextTick(cb.bind(null,null,e))}),(function(e){process.nextTick(callbackifyOnRejected.bind(null,e,cb))}))}Object.setPrototypeOf(callbackified,Object.getPrototypeOf(e));Object.defineProperties(callbackified,n(e));return callbackified}t.callbackify=callbackify},490:function(e,t,r){"use strict";var n=r(144);var o=r(349);var i=r(256);var a=i("Object.prototype.toString");var c=r(942)();var u=c&&typeof Symbol.toStringTag==="symbol";var f=o();var s=i("String.prototype.slice");var l={};var p=r(466);var y=Object.getPrototypeOf;if(u&&p&&y){n(f,(function(e){if(typeof global[e]==="function"){var t=new global[e];if(!(Symbol.toStringTag in t)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+e+" does not have the property! Please report this.")}var r=y(t);var n=p(r,Symbol.toStringTag);if(!n){var o=y(r);n=p(o,Symbol.toStringTag)}l[e]=n.get}}))}var g=function tryAllTypedArrays(e){var t=false;n(l,(function(r,n){if(!t){try{var o=r.call(e);if(o===n){t=o}}catch(e){}}}));return t};var v=r(994);e.exports=function whichTypedArray(e){if(!v(e)){return false}if(!u){return s(a(e),8,-1)}return g(e)}},349:function(e,t,r){"use strict";var n=r(992);e.exports=function availableTypedArrays(){return n(["BigInt64Array","BigUint64Array","Float32Array","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Uint8Array","Uint8ClampedArray"],(function(e){return typeof global[e]==="function"}))}},466:function(e,t,r){"use strict";var n=r(838);var o=n("%Object.getOwnPropertyDescriptor%",true);if(o){try{o([],"length")}catch(e){o=null}}e.exports=o}};var t={};function __nccwpck_require__(r){var n=t[r];if(n!==undefined){return n.exports}var o=t[r]={exports:{}};var i=true;try{e[r](o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete t[r]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var r=__nccwpck_require__(167);module.exports=r})();
\ No newline at end of file
diff --git a/packages/next/compiled/util/util.js b/packages/next/compiled/util/util.js
index 36eb0b9a139e..e91dd255343d 100644
--- a/packages/next/compiled/util/util.js
+++ b/packages/next/compiled/util/util.js
@@ -1 +1 @@
-(function(){var r={992:function(r){r.exports=function(r,t,n){if(r.filter)return r.filter(t,n);if(void 0===r||null===r)throw new TypeError;if("function"!=typeof t)throw new TypeError;var o=[];for(var i=0;i<r.length;i++){if(!e.call(r,i))continue;var a=r[i];if(t.call(n,a,i,r))o.push(a)}return o};var e=Object.prototype.hasOwnProperty},256:function(r,e,t){"use strict";var n=t(838);var o=t(139);var i=o(n("String.prototype.indexOf"));r.exports=function callBoundIntrinsic(r,e){var t=n(r,!!e);if(typeof t==="function"&&i(r,".prototype.")>-1){return o(t)}return t}},139:function(r,e,t){"use strict";var n=t(174);var o=t(838);var i=o("%Function.prototype.apply%");var a=o("%Function.prototype.call%");var f=o("%Reflect.apply%",true)||n.call(a,i);var u=o("%Object.getOwnPropertyDescriptor%",true);var s=o("%Object.defineProperty%",true);var c=o("%Math.max%");if(s){try{s({},"a",{value:1})}catch(r){s=null}}r.exports=function callBind(r){var e=f(n,a,arguments);if(u&&s){var t=u(e,"length");if(t.configurable){s(e,"length",{value:1+c(0,r.length-(arguments.length-1))})}}return e};var y=function applyBind(){return f(n,i,arguments)};if(s){s(r.exports,"apply",{value:y})}else{r.exports.apply=y}},144:function(r){var e=Object.prototype.hasOwnProperty;var t=Object.prototype.toString;r.exports=function forEach(r,n,o){if(t.call(n)!=="[object Function]"){throw new TypeError("iterator must be a function")}var i=r.length;if(i===+i){for(var a=0;a<i;a++){n.call(o,r[a],a,r)}}else{for(var f in r){if(e.call(r,f)){n.call(o,r[f],f,r)}}}}},426:function(r){"use strict";var e="Function.prototype.bind called on incompatible ";var t=Array.prototype.slice;var n=Object.prototype.toString;var o="[object Function]";r.exports=function bind(r){var i=this;if(typeof i!=="function"||n.call(i)!==o){throw new TypeError(e+i)}var a=t.call(arguments,1);var f;var binder=function(){if(this instanceof f){var e=i.apply(this,a.concat(t.call(arguments)));if(Object(e)===e){return e}return this}else{return i.apply(r,a.concat(t.call(arguments)))}};var u=Math.max(0,i.length-a.length);var s=[];for(var c=0;c<u;c++){s.push("$"+c)}f=Function("binder","return function ("+s.join(",")+"){ return binder.apply(this,arguments); }")(binder);if(i.prototype){var y=function Empty(){};y.prototype=i.prototype;f.prototype=new y;y.prototype=null}return f}},174:function(r,e,t){"use strict";var n=t(426);r.exports=Function.prototype.bind||n},838:function(r,e,t){"use strict";var n;var o=SyntaxError;var i=Function;var a=TypeError;var getEvalledConstructor=function(r){try{return i('"use strict"; return ('+r+").constructor;")()}catch(r){}};var f=Object.getOwnPropertyDescriptor;if(f){try{f({},"")}catch(r){f=null}}var throwTypeError=function(){throw new a};var u=f?function(){try{arguments.callee;return throwTypeError}catch(r){try{return f(arguments,"callee").get}catch(r){return throwTypeError}}}():throwTypeError;var s=t(942)();var c=Object.getPrototypeOf||function(r){return r.__proto__};var y={};var p=typeof Uint8Array==="undefined"?n:c(Uint8Array);var l={"%AggregateError%":typeof AggregateError==="undefined"?n:AggregateError,"%Array%":Array,"%ArrayBuffer%":typeof ArrayBuffer==="undefined"?n:ArrayBuffer,"%ArrayIteratorPrototype%":s?c([][Symbol.iterator]()):n,"%AsyncFromSyncIteratorPrototype%":n,"%AsyncFunction%":y,"%AsyncGenerator%":y,"%AsyncGeneratorFunction%":y,"%AsyncIteratorPrototype%":y,"%Atomics%":typeof Atomics==="undefined"?n:Atomics,"%BigInt%":typeof BigInt==="undefined"?n:BigInt,"%Boolean%":Boolean,"%DataView%":typeof DataView==="undefined"?n:DataView,"%Date%":Date,"%decodeURI%":decodeURI,"%decodeURIComponent%":decodeURIComponent,"%encodeURI%":encodeURI,"%encodeURIComponent%":encodeURIComponent,"%Error%":Error,"%eval%":eval,"%EvalError%":EvalError,"%Float32Array%":typeof Float32Array==="undefined"?n:Float32Array,"%Float64Array%":typeof Float64Array==="undefined"?n:Float64Array,"%FinalizationRegistry%":typeof FinalizationRegistry==="undefined"?n:FinalizationRegistry,"%Function%":i,"%GeneratorFunction%":y,"%Int8Array%":typeof Int8Array==="undefined"?n:Int8Array,"%Int16Array%":typeof Int16Array==="undefined"?n:Int16Array,"%Int32Array%":typeof Int32Array==="undefined"?n:Int32Array,"%isFinite%":isFinite,"%isNaN%":isNaN,"%IteratorPrototype%":s?c(c([][Symbol.iterator]())):n,"%JSON%":typeof JSON==="object"?JSON:n,"%Map%":typeof Map==="undefined"?n:Map,"%MapIteratorPrototype%":typeof Map==="undefined"||!s?n:c((new Map)[Symbol.iterator]()),"%Math%":Math,"%Number%":Number,"%Object%":Object,"%parseFloat%":parseFloat,"%parseInt%":parseInt,"%Promise%":typeof Promise==="undefined"?n:Promise,"%Proxy%":typeof Proxy==="undefined"?n:Proxy,"%RangeError%":RangeError,"%ReferenceError%":ReferenceError,"%Reflect%":typeof Reflect==="undefined"?n:Reflect,"%RegExp%":RegExp,"%Set%":typeof Set==="undefined"?n:Set,"%SetIteratorPrototype%":typeof Set==="undefined"||!s?n:c((new Set)[Symbol.iterator]()),"%SharedArrayBuffer%":typeof SharedArrayBuffer==="undefined"?n:SharedArrayBuffer,"%String%":String,"%StringIteratorPrototype%":s?c(""[Symbol.iterator]()):n,"%Symbol%":s?Symbol:n,"%SyntaxError%":o,"%ThrowTypeError%":u,"%TypedArray%":p,"%TypeError%":a,"%Uint8Array%":typeof Uint8Array==="undefined"?n:Uint8Array,"%Uint8ClampedArray%":typeof Uint8ClampedArray==="undefined"?n:Uint8ClampedArray,"%Uint16Array%":typeof Uint16Array==="undefined"?n:Uint16Array,"%Uint32Array%":typeof Uint32Array==="undefined"?n:Uint32Array,"%URIError%":URIError,"%WeakMap%":typeof WeakMap==="undefined"?n:WeakMap,"%WeakRef%":typeof WeakRef==="undefined"?n:WeakRef,"%WeakSet%":typeof WeakSet==="undefined"?n:WeakSet};var g=function doEval(r){var e;if(r==="%AsyncFunction%"){e=getEvalledConstructor("async function () {}")}else if(r==="%GeneratorFunction%"){e=getEvalledConstructor("function* () {}")}else if(r==="%AsyncGeneratorFunction%"){e=getEvalledConstructor("async function* () {}")}else if(r==="%AsyncGenerator%"){var t=doEval("%AsyncGeneratorFunction%");if(t){e=t.prototype}}else if(r==="%AsyncIteratorPrototype%"){var n=doEval("%AsyncGenerator%");if(n){e=c(n.prototype)}}l[r]=e;return e};var d={"%ArrayBufferPrototype%":["ArrayBuffer","prototype"],"%ArrayPrototype%":["Array","prototype"],"%ArrayProto_entries%":["Array","prototype","entries"],"%ArrayProto_forEach%":["Array","prototype","forEach"],"%ArrayProto_keys%":["Array","prototype","keys"],"%ArrayProto_values%":["Array","prototype","values"],"%AsyncFunctionPrototype%":["AsyncFunction","prototype"],"%AsyncGenerator%":["AsyncGeneratorFunction","prototype"],"%AsyncGeneratorPrototype%":["AsyncGeneratorFunction","prototype","prototype"],"%BooleanPrototype%":["Boolean","prototype"],"%DataViewPrototype%":["DataView","prototype"],"%DatePrototype%":["Date","prototype"],"%ErrorPrototype%":["Error","prototype"],"%EvalErrorPrototype%":["EvalError","prototype"],"%Float32ArrayPrototype%":["Float32Array","prototype"],"%Float64ArrayPrototype%":["Float64Array","prototype"],"%FunctionPrototype%":["Function","prototype"],"%Generator%":["GeneratorFunction","prototype"],"%GeneratorPrototype%":["GeneratorFunction","prototype","prototype"],"%Int8ArrayPrototype%":["Int8Array","prototype"],"%Int16ArrayPrototype%":["Int16Array","prototype"],"%Int32ArrayPrototype%":["Int32Array","prototype"],"%JSONParse%":["JSON","parse"],"%JSONStringify%":["JSON","stringify"],"%MapPrototype%":["Map","prototype"],"%NumberPrototype%":["Number","prototype"],"%ObjectPrototype%":["Object","prototype"],"%ObjProto_toString%":["Object","prototype","toString"],"%ObjProto_valueOf%":["Object","prototype","valueOf"],"%PromisePrototype%":["Promise","prototype"],"%PromiseProto_then%":["Promise","prototype","then"],"%Promise_all%":["Promise","all"],"%Promise_reject%":["Promise","reject"],"%Promise_resolve%":["Promise","resolve"],"%RangeErrorPrototype%":["RangeError","prototype"],"%ReferenceErrorPrototype%":["ReferenceError","prototype"],"%RegExpPrototype%":["RegExp","prototype"],"%SetPrototype%":["Set","prototype"],"%SharedArrayBufferPrototype%":["SharedArrayBuffer","prototype"],"%StringPrototype%":["String","prototype"],"%SymbolPrototype%":["Symbol","prototype"],"%SyntaxErrorPrototype%":["SyntaxError","prototype"],"%TypedArrayPrototype%":["TypedArray","prototype"],"%TypeErrorPrototype%":["TypeError","prototype"],"%Uint8ArrayPrototype%":["Uint8Array","prototype"],"%Uint8ClampedArrayPrototype%":["Uint8ClampedArray","prototype"],"%Uint16ArrayPrototype%":["Uint16Array","prototype"],"%Uint32ArrayPrototype%":["Uint32Array","prototype"],"%URIErrorPrototype%":["URIError","prototype"],"%WeakMapPrototype%":["WeakMap","prototype"],"%WeakSetPrototype%":["WeakSet","prototype"]};var v=t(174);var b=t(101);var A=v.call(Function.call,Array.prototype.concat);var m=v.call(Function.apply,Array.prototype.splice);var S=v.call(Function.call,String.prototype.replace);var h=v.call(Function.call,String.prototype.slice);var O=/[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;var w=/\\(\\)?/g;var j=function stringToPath(r){var e=h(r,0,1);var t=h(r,-1);if(e==="%"&&t!=="%"){throw new o("invalid intrinsic syntax, expected closing `%`")}else if(t==="%"&&e!=="%"){throw new o("invalid intrinsic syntax, expected opening `%`")}var n=[];S(r,O,(function(r,e,t,o){n[n.length]=t?S(o,w,"$1"):e||r}));return n};var P=function getBaseIntrinsic(r,e){var t=r;var n;if(b(d,t)){n=d[t];t="%"+n[0]+"%"}if(b(l,t)){var i=l[t];if(i===y){i=g(t)}if(typeof i==="undefined"&&!e){throw new a("intrinsic "+r+" exists, but is not available. Please file an issue!")}return{alias:n,name:t,value:i}}throw new o("intrinsic "+r+" does not exist!")};r.exports=function GetIntrinsic(r,e){if(typeof r!=="string"||r.length===0){throw new a("intrinsic name must be a non-empty string")}if(arguments.length>1&&typeof e!=="boolean"){throw new a('"allowMissing" argument must be a boolean')}var t=j(r);var i=t.length>0?t[0]:"";var u=P("%"+i+"%",e);var s=u.name;var c=u.value;var y=false;var p=u.alias;if(p){i=p[0];m(t,A([0,1],p))}for(var g=1,d=true;g<t.length;g+=1){var v=t[g];var S=h(v,0,1);var O=h(v,-1);if((S==='"'||S==="'"||S==="`"||(O==='"'||O==="'"||O==="`"))&&S!==O){throw new o("property names with quotes must have matching quotes")}if(v==="constructor"||!d){y=true}i+="."+v;s="%"+i+"%";if(b(l,s)){c=l[s]}else if(c!=null){if(!(v in c)){if(!e){throw new a("base intrinsic for "+r+" exists, but the property is not available.")}return void n}if(f&&g+1>=t.length){var w=f(c,v);d=!!w;if(d&&"get"in w&&!("originalValue"in w.get)){c=w.get}else{c=c[v]}}else{d=b(c,v);c=c[v]}if(d&&!y){l[s]=c}}}return c}},942:function(r,e,t){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=t(773);r.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},773:function(r){"use strict";r.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var r={};var e=Symbol("test");var t=Object(e);if(typeof e==="string"){return false}if(Object.prototype.toString.call(e)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}var n=42;r[e]=n;for(e in r){return false}if(typeof Object.keys==="function"&&Object.keys(r).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(r).length!==0){return false}var o=Object.getOwnPropertySymbols(r);if(o.length!==1||o[0]!==e){return false}if(!Object.prototype.propertyIsEnumerable.call(r,e)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(r,e);if(i.value!==n||i.enumerable!==true){return false}}return true}},101:function(r,e,t){"use strict";var n=t(174);r.exports=n.call(Function.call,Object.prototype.hasOwnProperty)},782:function(r){if(typeof Object.create==="function"){r.exports=function inherits(r,e){if(e){r.super_=e;r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:false,writable:true,configurable:true}})}}}else{r.exports=function inherits(r,e){if(e){r.super_=e;var TempCtor=function(){};TempCtor.prototype=e.prototype;r.prototype=new TempCtor;r.prototype.constructor=r}}}},157:function(r){"use strict";var e=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var t=Object.prototype.toString;var n=function isArguments(r){if(e&&r&&typeof r==="object"&&Symbol.toStringTag in r){return false}return t.call(r)==="[object Arguments]"};var o=function isArguments(r){if(n(r)){return true}return r!==null&&typeof r==="object"&&typeof r.length==="number"&&r.length>=0&&t.call(r)!=="[object Array]"&&t.call(r.callee)==="[object Function]"};var i=function(){return n(arguments)}();n.isLegacyArguments=o;r.exports=i?n:o},391:function(r){"use strict";var e=Object.prototype.toString;var t=Function.prototype.toString;var n=/^\s*(?:function)?\*/;var o=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var i=Object.getPrototypeOf;var getGeneratorFunc=function(){if(!o){return false}try{return Function("return function*() {}")()}catch(r){}};var a=getGeneratorFunc();var f=a?i(a):{};r.exports=function isGeneratorFunction(r){if(typeof r!=="function"){return false}if(n.test(t.call(r))){return true}if(!o){var a=e.call(r);return a==="[object GeneratorFunction]"}return i(r)===f}},994:function(r,e,t){"use strict";var n=t(144);var o=t(349);var i=t(256);var a=i("Object.prototype.toString");var f=t(942)();var u=f&&typeof Symbol.toStringTag==="symbol";var s=o();var c=i("Array.prototype.indexOf",true)||function indexOf(r,e){for(var t=0;t<r.length;t+=1){if(r[t]===e){return t}}return-1};var y=i("String.prototype.slice");var p={};var l=t(466);var g=Object.getPrototypeOf;if(u&&l&&g){n(s,(function(r){var e=new global[r];if(!(Symbol.toStringTag in e)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+r+" does not have the property! Please report this.")}var t=g(e);var n=l(t,Symbol.toStringTag);if(!n){var o=g(t);n=l(o,Symbol.toStringTag)}p[r]=n.get}))}var d=function tryAllTypedArrays(r){var e=false;n(p,(function(t,n){if(!e){try{e=t.call(r)===n}catch(r){}}}));return e};r.exports=function isTypedArray(r){if(!r||typeof r!=="object"){return false}if(!u){var e=y(a(r),8,-1);return c(s,e)>-1}if(!l){return false}return d(r)}},369:function(r){r.exports=function isBuffer(r){return r instanceof Buffer}},584:function(r,e,t){"use strict";var n=t(157);var o=t(391);var i=t(490);var a=t(994);function uncurryThis(r){return r.call.bind(r)}var f=typeof BigInt!=="undefined";var u=typeof Symbol!=="undefined";var s=uncurryThis(Object.prototype.toString);var c=uncurryThis(Number.prototype.valueOf);var y=uncurryThis(String.prototype.valueOf);var p=uncurryThis(Boolean.prototype.valueOf);if(f){var l=uncurryThis(BigInt.prototype.valueOf)}if(u){var g=uncurryThis(Symbol.prototype.valueOf)}function checkBoxedPrimitive(r,e){if(typeof r!=="object"){return false}try{e(r);return true}catch(r){return false}}e.isArgumentsObject=n;e.isGeneratorFunction=o;e.isTypedArray=a;function isPromise(r){return typeof Promise!=="undefined"&&r instanceof Promise||r!==null&&typeof r==="object"&&typeof r.then==="function"&&typeof r.catch==="function"}e.isPromise=isPromise;function isArrayBufferView(r){if(typeof ArrayBuffer!=="undefined"&&ArrayBuffer.isView){return ArrayBuffer.isView(r)}return a(r)||isDataView(r)}e.isArrayBufferView=isArrayBufferView;function isUint8Array(r){return i(r)==="Uint8Array"}e.isUint8Array=isUint8Array;function isUint8ClampedArray(r){return i(r)==="Uint8ClampedArray"}e.isUint8ClampedArray=isUint8ClampedArray;function isUint16Array(r){return i(r)==="Uint16Array"}e.isUint16Array=isUint16Array;function isUint32Array(r){return i(r)==="Uint32Array"}e.isUint32Array=isUint32Array;function isInt8Array(r){return i(r)==="Int8Array"}e.isInt8Array=isInt8Array;function isInt16Array(r){return i(r)==="Int16Array"}e.isInt16Array=isInt16Array;function isInt32Array(r){return i(r)==="Int32Array"}e.isInt32Array=isInt32Array;function isFloat32Array(r){return i(r)==="Float32Array"}e.isFloat32Array=isFloat32Array;function isFloat64Array(r){return i(r)==="Float64Array"}e.isFloat64Array=isFloat64Array;function isBigInt64Array(r){return i(r)==="BigInt64Array"}e.isBigInt64Array=isBigInt64Array;function isBigUint64Array(r){return i(r)==="BigUint64Array"}e.isBigUint64Array=isBigUint64Array;function isMapToString(r){return s(r)==="[object Map]"}isMapToString.working=typeof Map!=="undefined"&&isMapToString(new Map);function isMap(r){if(typeof Map==="undefined"){return false}return isMapToString.working?isMapToString(r):r instanceof Map}e.isMap=isMap;function isSetToString(r){return s(r)==="[object Set]"}isSetToString.working=typeof Set!=="undefined"&&isSetToString(new Set);function isSet(r){if(typeof Set==="undefined"){return false}return isSetToString.working?isSetToString(r):r instanceof Set}e.isSet=isSet;function isWeakMapToString(r){return s(r)==="[object WeakMap]"}isWeakMapToString.working=typeof WeakMap!=="undefined"&&isWeakMapToString(new WeakMap);function isWeakMap(r){if(typeof WeakMap==="undefined"){return false}return isWeakMapToString.working?isWeakMapToString(r):r instanceof WeakMap}e.isWeakMap=isWeakMap;function isWeakSetToString(r){return s(r)==="[object WeakSet]"}isWeakSetToString.working=typeof WeakSet!=="undefined"&&isWeakSetToString(new WeakSet);function isWeakSet(r){return isWeakSetToString(r)}e.isWeakSet=isWeakSet;function isArrayBufferToString(r){return s(r)==="[object ArrayBuffer]"}isArrayBufferToString.working=typeof ArrayBuffer!=="undefined"&&isArrayBufferToString(new ArrayBuffer);function isArrayBuffer(r){if(typeof ArrayBuffer==="undefined"){return false}return isArrayBufferToString.working?isArrayBufferToString(r):r instanceof ArrayBuffer}e.isArrayBuffer=isArrayBuffer;function isDataViewToString(r){return s(r)==="[object DataView]"}isDataViewToString.working=typeof ArrayBuffer!=="undefined"&&typeof DataView!=="undefined"&&isDataViewToString(new DataView(new ArrayBuffer(1),0,1));function isDataView(r){if(typeof DataView==="undefined"){return false}return isDataViewToString.working?isDataViewToString(r):r instanceof DataView}e.isDataView=isDataView;var d=typeof SharedArrayBuffer!=="undefined"?SharedArrayBuffer:undefined;function isSharedArrayBufferToString(r){return s(r)==="[object SharedArrayBuffer]"}function isSharedArrayBuffer(r){if(typeof d==="undefined"){return false}if(typeof isSharedArrayBufferToString.working==="undefined"){isSharedArrayBufferToString.working=isSharedArrayBufferToString(new d)}return isSharedArrayBufferToString.working?isSharedArrayBufferToString(r):r instanceof d}e.isSharedArrayBuffer=isSharedArrayBuffer;function isAsyncFunction(r){return s(r)==="[object AsyncFunction]"}e.isAsyncFunction=isAsyncFunction;function isMapIterator(r){return s(r)==="[object Map Iterator]"}e.isMapIterator=isMapIterator;function isSetIterator(r){return s(r)==="[object Set Iterator]"}e.isSetIterator=isSetIterator;function isGeneratorObject(r){return s(r)==="[object Generator]"}e.isGeneratorObject=isGeneratorObject;function isWebAssemblyCompiledModule(r){return s(r)==="[object WebAssembly.Module]"}e.isWebAssemblyCompiledModule=isWebAssemblyCompiledModule;function isNumberObject(r){return checkBoxedPrimitive(r,c)}e.isNumberObject=isNumberObject;function isStringObject(r){return checkBoxedPrimitive(r,y)}e.isStringObject=isStringObject;function isBooleanObject(r){return checkBoxedPrimitive(r,p)}e.isBooleanObject=isBooleanObject;function isBigIntObject(r){return f&&checkBoxedPrimitive(r,l)}e.isBigIntObject=isBigIntObject;function isSymbolObject(r){return u&&checkBoxedPrimitive(r,g)}e.isSymbolObject=isSymbolObject;function isBoxedPrimitive(r){return isNumberObject(r)||isStringObject(r)||isBooleanObject(r)||isBigIntObject(r)||isSymbolObject(r)}e.isBoxedPrimitive=isBoxedPrimitive;function isAnyArrayBuffer(r){return typeof Uint8Array!=="undefined"&&(isArrayBuffer(r)||isSharedArrayBuffer(r))}e.isAnyArrayBuffer=isAnyArrayBuffer;["isProxy","isExternal","isModuleNamespaceObject"].forEach((function(r){Object.defineProperty(e,r,{enumerable:false,value:function(){throw new Error(r+" is not supported in userland")}})}))},177:function(r,e,t){var n=Object.getOwnPropertyDescriptors||function getOwnPropertyDescriptors(r){var e=Object.keys(r);var t={};for(var n=0;n<e.length;n++){t[e[n]]=Object.getOwnPropertyDescriptor(r,e[n])}return t};var o=/%[sdj%]/g;e.format=function(r){if(!isString(r)){var e=[];for(var t=0;t<arguments.length;t++){e.push(inspect(arguments[t]))}return e.join(" ")}var t=1;var n=arguments;var i=n.length;var a=String(r).replace(o,(function(r){if(r==="%%")return"%";if(t>=i)return r;switch(r){case"%s":return String(n[t++]);case"%d":return Number(n[t++]);case"%j":try{return JSON.stringify(n[t++])}catch(r){return"[Circular]"}default:return r}}));for(var f=n[t];t<i;f=n[++t]){if(isNull(f)||!isObject(f)){a+=" "+f}else{a+=" "+inspect(f)}}return a};e.deprecate=function(r,t){if(typeof process!=="undefined"&&process.noDeprecation===true){return r}if(typeof process==="undefined"){return function(){return e.deprecate(r,t).apply(this,arguments)}}var n=false;function deprecated(){if(!n){if(process.throwDeprecation){throw new Error(t)}else if(process.traceDeprecation){console.trace(t)}else{console.error(t)}n=true}return r.apply(this,arguments)}return deprecated};var i={};var a=/^$/;if(process.env.NODE_DEBUG){var f=process.env.NODE_DEBUG;f=f.replace(/[|\\{}()[\]^$+?.]/g,"\\$&").replace(/\*/g,".*").replace(/,/g,"$|^").toUpperCase();a=new RegExp("^"+f+"$","i")}e.debuglog=function(r){r=r.toUpperCase();if(!i[r]){if(a.test(r)){var t=process.pid;i[r]=function(){var n=e.format.apply(e,arguments);console.error("%s %d: %s",r,t,n)}}else{i[r]=function(){}}}return i[r]};function inspect(r,t){var n={seen:[],stylize:stylizeNoColor};if(arguments.length>=3)n.depth=arguments[2];if(arguments.length>=4)n.colors=arguments[3];if(isBoolean(t)){n.showHidden=t}else if(t){e._extend(n,t)}if(isUndefined(n.showHidden))n.showHidden=false;if(isUndefined(n.depth))n.depth=2;if(isUndefined(n.colors))n.colors=false;if(isUndefined(n.customInspect))n.customInspect=true;if(n.colors)n.stylize=stylizeWithColor;return formatValue(n,r,n.depth)}e.inspect=inspect;inspect.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]};inspect.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"};function stylizeWithColor(r,e){var t=inspect.styles[e];if(t){return"["+inspect.colors[t][0]+"m"+r+"["+inspect.colors[t][1]+"m"}else{return r}}function stylizeNoColor(r,e){return r}function arrayToHash(r){var e={};r.forEach((function(r,t){e[r]=true}));return e}function formatValue(r,t,n){if(r.customInspect&&t&&isFunction(t.inspect)&&t.inspect!==e.inspect&&!(t.constructor&&t.constructor.prototype===t)){var o=t.inspect(n,r);if(!isString(o)){o=formatValue(r,o,n)}return o}var i=formatPrimitive(r,t);if(i){return i}var a=Object.keys(t);var f=arrayToHash(a);if(r.showHidden){a=Object.getOwnPropertyNames(t)}if(isError(t)&&(a.indexOf("message")>=0||a.indexOf("description")>=0)){return formatError(t)}if(a.length===0){if(isFunction(t)){var u=t.name?": "+t.name:"";return r.stylize("[Function"+u+"]","special")}if(isRegExp(t)){return r.stylize(RegExp.prototype.toString.call(t),"regexp")}if(isDate(t)){return r.stylize(Date.prototype.toString.call(t),"date")}if(isError(t)){return formatError(t)}}var s="",c=false,y=["{","}"];if(isArray(t)){c=true;y=["[","]"]}if(isFunction(t)){var p=t.name?": "+t.name:"";s=" [Function"+p+"]"}if(isRegExp(t)){s=" "+RegExp.prototype.toString.call(t)}if(isDate(t)){s=" "+Date.prototype.toUTCString.call(t)}if(isError(t)){s=" "+formatError(t)}if(a.length===0&&(!c||t.length==0)){return y[0]+s+y[1]}if(n<0){if(isRegExp(t)){return r.stylize(RegExp.prototype.toString.call(t),"regexp")}else{return r.stylize("[Object]","special")}}r.seen.push(t);var l;if(c){l=formatArray(r,t,n,f,a)}else{l=a.map((function(e){return formatProperty(r,t,n,f,e,c)}))}r.seen.pop();return reduceToSingleString(l,s,y)}function formatPrimitive(r,e){if(isUndefined(e))return r.stylize("undefined","undefined");if(isString(e)){var t="'"+JSON.stringify(e).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return r.stylize(t,"string")}if(isNumber(e))return r.stylize(""+e,"number");if(isBoolean(e))return r.stylize(""+e,"boolean");if(isNull(e))return r.stylize("null","null")}function formatError(r){return"["+Error.prototype.toString.call(r)+"]"}function formatArray(r,e,t,n,o){var i=[];for(var a=0,f=e.length;a<f;++a){if(hasOwnProperty(e,String(a))){i.push(formatProperty(r,e,t,n,String(a),true))}else{i.push("")}}o.forEach((function(o){if(!o.match(/^\d+$/)){i.push(formatProperty(r,e,t,n,o,true))}}));return i}function formatProperty(r,e,t,n,o,i){var a,f,u;u=Object.getOwnPropertyDescriptor(e,o)||{value:e[o]};if(u.get){if(u.set){f=r.stylize("[Getter/Setter]","special")}else{f=r.stylize("[Getter]","special")}}else{if(u.set){f=r.stylize("[Setter]","special")}}if(!hasOwnProperty(n,o)){a="["+o+"]"}if(!f){if(r.seen.indexOf(u.value)<0){if(isNull(t)){f=formatValue(r,u.value,null)}else{f=formatValue(r,u.value,t-1)}if(f.indexOf("\n")>-1){if(i){f=f.split("\n").map((function(r){return"  "+r})).join("\n").substr(2)}else{f="\n"+f.split("\n").map((function(r){return"   "+r})).join("\n")}}}else{f=r.stylize("[Circular]","special")}}if(isUndefined(a)){if(i&&o.match(/^\d+$/)){return f}a=JSON.stringify(""+o);if(a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)){a=a.substr(1,a.length-2);a=r.stylize(a,"name")}else{a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'");a=r.stylize(a,"string")}}return a+": "+f}function reduceToSingleString(r,e,t){var n=0;var o=r.reduce((function(r,e){n++;if(e.indexOf("\n")>=0)n++;return r+e.replace(/\u001b\[\d\d?m/g,"").length+1}),0);if(o>60){return t[0]+(e===""?"":e+"\n ")+" "+r.join(",\n  ")+" "+t[1]}return t[0]+e+" "+r.join(", ")+" "+t[1]}e.types=t(584);function isArray(r){return Array.isArray(r)}e.isArray=isArray;function isBoolean(r){return typeof r==="boolean"}e.isBoolean=isBoolean;function isNull(r){return r===null}e.isNull=isNull;function isNullOrUndefined(r){return r==null}e.isNullOrUndefined=isNullOrUndefined;function isNumber(r){return typeof r==="number"}e.isNumber=isNumber;function isString(r){return typeof r==="string"}e.isString=isString;function isSymbol(r){return typeof r==="symbol"}e.isSymbol=isSymbol;function isUndefined(r){return r===void 0}e.isUndefined=isUndefined;function isRegExp(r){return isObject(r)&&objectToString(r)==="[object RegExp]"}e.isRegExp=isRegExp;e.types.isRegExp=isRegExp;function isObject(r){return typeof r==="object"&&r!==null}e.isObject=isObject;function isDate(r){return isObject(r)&&objectToString(r)==="[object Date]"}e.isDate=isDate;e.types.isDate=isDate;function isError(r){return isObject(r)&&(objectToString(r)==="[object Error]"||r instanceof Error)}e.isError=isError;e.types.isNativeError=isError;function isFunction(r){return typeof r==="function"}e.isFunction=isFunction;function isPrimitive(r){return r===null||typeof r==="boolean"||typeof r==="number"||typeof r==="string"||typeof r==="symbol"||typeof r==="undefined"}e.isPrimitive=isPrimitive;e.isBuffer=t(369);function objectToString(r){return Object.prototype.toString.call(r)}function pad(r){return r<10?"0"+r.toString(10):r.toString(10)}var u=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function timestamp(){var r=new Date;var e=[pad(r.getHours()),pad(r.getMinutes()),pad(r.getSeconds())].join(":");return[r.getDate(),u[r.getMonth()],e].join(" ")}e.log=function(){console.log("%s - %s",timestamp(),e.format.apply(e,arguments))};e.inherits=t(782);e._extend=function(r,e){if(!e||!isObject(e))return r;var t=Object.keys(e);var n=t.length;while(n--){r[t[n]]=e[t[n]]}return r};function hasOwnProperty(r,e){return Object.prototype.hasOwnProperty.call(r,e)}var s=typeof Symbol!=="undefined"?Symbol("util.promisify.custom"):undefined;e.promisify=function promisify(r){if(typeof r!=="function")throw new TypeError('The "original" argument must be of type Function');if(s&&r[s]){var e=r[s];if(typeof e!=="function"){throw new TypeError('The "util.promisify.custom" argument must be of type Function')}Object.defineProperty(e,s,{value:e,enumerable:false,writable:false,configurable:true});return e}function e(){var e,t;var n=new Promise((function(r,n){e=r;t=n}));var o=[];for(var i=0;i<arguments.length;i++){o.push(arguments[i])}o.push((function(r,n){if(r){t(r)}else{e(n)}}));try{r.apply(this,o)}catch(r){t(r)}return n}Object.setPrototypeOf(e,Object.getPrototypeOf(r));if(s)Object.defineProperty(e,s,{value:e,enumerable:false,writable:false,configurable:true});return Object.defineProperties(e,n(r))};e.promisify.custom=s;function callbackifyOnRejected(r,e){if(!r){var t=new Error("Promise was rejected with a falsy value");t.reason=r;r=t}return e(r)}function callbackify(r){if(typeof r!=="function"){throw new TypeError('The "original" argument must be of type Function')}function callbackified(){var e=[];for(var t=0;t<arguments.length;t++){e.push(arguments[t])}var n=e.pop();if(typeof n!=="function"){throw new TypeError("The last argument must be of type Function")}var o=this;var cb=function(){return n.apply(o,arguments)};r.apply(this,e).then((function(r){process.nextTick(cb.bind(null,null,r))}),(function(r){process.nextTick(callbackifyOnRejected.bind(null,r,cb))}))}Object.setPrototypeOf(callbackified,Object.getPrototypeOf(r));Object.defineProperties(callbackified,n(r));return callbackified}e.callbackify=callbackify},490:function(r,e,t){"use strict";var n=t(144);var o=t(349);var i=t(256);var a=i("Object.prototype.toString");var f=t(942)();var u=f&&typeof Symbol.toStringTag==="symbol";var s=o();var c=i("String.prototype.slice");var y={};var p=t(466);var l=Object.getPrototypeOf;if(u&&p&&l){n(s,(function(r){if(typeof global[r]==="function"){var e=new global[r];if(!(Symbol.toStringTag in e)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+r+" does not have the property! Please report this.")}var t=l(e);var n=p(t,Symbol.toStringTag);if(!n){var o=l(t);n=p(o,Symbol.toStringTag)}y[r]=n.get}}))}var g=function tryAllTypedArrays(r){var e=false;n(y,(function(t,n){if(!e){try{var o=t.call(r);if(o===n){e=o}}catch(r){}}}));return e};var d=t(994);r.exports=function whichTypedArray(r){if(!d(r)){return false}if(!u){return c(a(r),8,-1)}return g(r)}},349:function(r,e,t){"use strict";var n=t(992);r.exports=function availableTypedArrays(){return n(["BigInt64Array","BigUint64Array","Float32Array","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Uint8Array","Uint8ClampedArray"],(function(r){return typeof global[r]==="function"}))}},466:function(r,e,t){"use strict";var n=t(838);var o=n("%Object.getOwnPropertyDescriptor%",true);if(o){try{o([],"length")}catch(r){o=null}}r.exports=o}};var e={};function __nccwpck_require__(t){var n=e[t];if(n!==undefined){return n.exports}var o=e[t]={exports:{}};var i=true;try{r[t](o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete e[t]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(177);module.exports=t})();
\ No newline at end of file
+(function(){var r={992:function(r){r.exports=function(r,t,n){if(r.filter)return r.filter(t,n);if(void 0===r||null===r)throw new TypeError;if("function"!=typeof t)throw new TypeError;var o=[];for(var i=0;i<r.length;i++){if(!e.call(r,i))continue;var a=r[i];if(t.call(n,a,i,r))o.push(a)}return o};var e=Object.prototype.hasOwnProperty},256:function(r,e,t){"use strict";var n=t(838);var o=t(139);var i=o(n("String.prototype.indexOf"));r.exports=function callBoundIntrinsic(r,e){var t=n(r,!!e);if(typeof t==="function"&&i(r,".prototype.")>-1){return o(t)}return t}},139:function(r,e,t){"use strict";var n=t(174);var o=t(838);var i=o("%Function.prototype.apply%");var a=o("%Function.prototype.call%");var f=o("%Reflect.apply%",true)||n.call(a,i);var u=o("%Object.getOwnPropertyDescriptor%",true);var s=o("%Object.defineProperty%",true);var y=o("%Math.max%");if(s){try{s({},"a",{value:1})}catch(r){s=null}}r.exports=function callBind(r){var e=f(n,a,arguments);if(u&&s){var t=u(e,"length");if(t.configurable){s(e,"length",{value:1+y(0,r.length-(arguments.length-1))})}}return e};var c=function applyBind(){return f(n,i,arguments)};if(s){s(r.exports,"apply",{value:c})}else{r.exports.apply=c}},144:function(r){var e=Object.prototype.hasOwnProperty;var t=Object.prototype.toString;r.exports=function forEach(r,n,o){if(t.call(n)!=="[object Function]"){throw new TypeError("iterator must be a function")}var i=r.length;if(i===+i){for(var a=0;a<i;a++){n.call(o,r[a],a,r)}}else{for(var f in r){if(e.call(r,f)){n.call(o,r[f],f,r)}}}}},426:function(r){"use strict";var e="Function.prototype.bind called on incompatible ";var t=Array.prototype.slice;var n=Object.prototype.toString;var o="[object Function]";r.exports=function bind(r){var i=this;if(typeof i!=="function"||n.call(i)!==o){throw new TypeError(e+i)}var a=t.call(arguments,1);var f;var binder=function(){if(this instanceof f){var e=i.apply(this,a.concat(t.call(arguments)));if(Object(e)===e){return e}return this}else{return i.apply(r,a.concat(t.call(arguments)))}};var u=Math.max(0,i.length-a.length);var s=[];for(var y=0;y<u;y++){s.push("$"+y)}f=Function("binder","return function ("+s.join(",")+"){ return binder.apply(this,arguments); }")(binder);if(i.prototype){var c=function Empty(){};c.prototype=i.prototype;f.prototype=new c;c.prototype=null}return f}},174:function(r,e,t){"use strict";var n=t(426);r.exports=Function.prototype.bind||n},838:function(r,e,t){"use strict";var n;var o=SyntaxError;var i=Function;var a=TypeError;var getEvalledConstructor=function(r){try{return i('"use strict"; return ('+r+").constructor;")()}catch(r){}};var f=Object.getOwnPropertyDescriptor;if(f){try{f({},"")}catch(r){f=null}}var throwTypeError=function(){throw new a};var u=f?function(){try{arguments.callee;return throwTypeError}catch(r){try{return f(arguments,"callee").get}catch(r){return throwTypeError}}}():throwTypeError;var s=t(115)();var y=Object.getPrototypeOf||function(r){return r.__proto__};var c={};var p=typeof Uint8Array==="undefined"?n:y(Uint8Array);var l={"%AggregateError%":typeof AggregateError==="undefined"?n:AggregateError,"%Array%":Array,"%ArrayBuffer%":typeof ArrayBuffer==="undefined"?n:ArrayBuffer,"%ArrayIteratorPrototype%":s?y([][Symbol.iterator]()):n,"%AsyncFromSyncIteratorPrototype%":n,"%AsyncFunction%":c,"%AsyncGenerator%":c,"%AsyncGeneratorFunction%":c,"%AsyncIteratorPrototype%":c,"%Atomics%":typeof Atomics==="undefined"?n:Atomics,"%BigInt%":typeof BigInt==="undefined"?n:BigInt,"%Boolean%":Boolean,"%DataView%":typeof DataView==="undefined"?n:DataView,"%Date%":Date,"%decodeURI%":decodeURI,"%decodeURIComponent%":decodeURIComponent,"%encodeURI%":encodeURI,"%encodeURIComponent%":encodeURIComponent,"%Error%":Error,"%eval%":eval,"%EvalError%":EvalError,"%Float32Array%":typeof Float32Array==="undefined"?n:Float32Array,"%Float64Array%":typeof Float64Array==="undefined"?n:Float64Array,"%FinalizationRegistry%":typeof FinalizationRegistry==="undefined"?n:FinalizationRegistry,"%Function%":i,"%GeneratorFunction%":c,"%Int8Array%":typeof Int8Array==="undefined"?n:Int8Array,"%Int16Array%":typeof Int16Array==="undefined"?n:Int16Array,"%Int32Array%":typeof Int32Array==="undefined"?n:Int32Array,"%isFinite%":isFinite,"%isNaN%":isNaN,"%IteratorPrototype%":s?y(y([][Symbol.iterator]())):n,"%JSON%":typeof JSON==="object"?JSON:n,"%Map%":typeof Map==="undefined"?n:Map,"%MapIteratorPrototype%":typeof Map==="undefined"||!s?n:y((new Map)[Symbol.iterator]()),"%Math%":Math,"%Number%":Number,"%Object%":Object,"%parseFloat%":parseFloat,"%parseInt%":parseInt,"%Promise%":typeof Promise==="undefined"?n:Promise,"%Proxy%":typeof Proxy==="undefined"?n:Proxy,"%RangeError%":RangeError,"%ReferenceError%":ReferenceError,"%Reflect%":typeof Reflect==="undefined"?n:Reflect,"%RegExp%":RegExp,"%Set%":typeof Set==="undefined"?n:Set,"%SetIteratorPrototype%":typeof Set==="undefined"||!s?n:y((new Set)[Symbol.iterator]()),"%SharedArrayBuffer%":typeof SharedArrayBuffer==="undefined"?n:SharedArrayBuffer,"%String%":String,"%StringIteratorPrototype%":s?y(""[Symbol.iterator]()):n,"%Symbol%":s?Symbol:n,"%SyntaxError%":o,"%ThrowTypeError%":u,"%TypedArray%":p,"%TypeError%":a,"%Uint8Array%":typeof Uint8Array==="undefined"?n:Uint8Array,"%Uint8ClampedArray%":typeof Uint8ClampedArray==="undefined"?n:Uint8ClampedArray,"%Uint16Array%":typeof Uint16Array==="undefined"?n:Uint16Array,"%Uint32Array%":typeof Uint32Array==="undefined"?n:Uint32Array,"%URIError%":URIError,"%WeakMap%":typeof WeakMap==="undefined"?n:WeakMap,"%WeakRef%":typeof WeakRef==="undefined"?n:WeakRef,"%WeakSet%":typeof WeakSet==="undefined"?n:WeakSet};var g=function doEval(r){var e;if(r==="%AsyncFunction%"){e=getEvalledConstructor("async function () {}")}else if(r==="%GeneratorFunction%"){e=getEvalledConstructor("function* () {}")}else if(r==="%AsyncGeneratorFunction%"){e=getEvalledConstructor("async function* () {}")}else if(r==="%AsyncGenerator%"){var t=doEval("%AsyncGeneratorFunction%");if(t){e=t.prototype}}else if(r==="%AsyncIteratorPrototype%"){var n=doEval("%AsyncGenerator%");if(n){e=y(n.prototype)}}l[r]=e;return e};var b={"%ArrayBufferPrototype%":["ArrayBuffer","prototype"],"%ArrayPrototype%":["Array","prototype"],"%ArrayProto_entries%":["Array","prototype","entries"],"%ArrayProto_forEach%":["Array","prototype","forEach"],"%ArrayProto_keys%":["Array","prototype","keys"],"%ArrayProto_values%":["Array","prototype","values"],"%AsyncFunctionPrototype%":["AsyncFunction","prototype"],"%AsyncGenerator%":["AsyncGeneratorFunction","prototype"],"%AsyncGeneratorPrototype%":["AsyncGeneratorFunction","prototype","prototype"],"%BooleanPrototype%":["Boolean","prototype"],"%DataViewPrototype%":["DataView","prototype"],"%DatePrototype%":["Date","prototype"],"%ErrorPrototype%":["Error","prototype"],"%EvalErrorPrototype%":["EvalError","prototype"],"%Float32ArrayPrototype%":["Float32Array","prototype"],"%Float64ArrayPrototype%":["Float64Array","prototype"],"%FunctionPrototype%":["Function","prototype"],"%Generator%":["GeneratorFunction","prototype"],"%GeneratorPrototype%":["GeneratorFunction","prototype","prototype"],"%Int8ArrayPrototype%":["Int8Array","prototype"],"%Int16ArrayPrototype%":["Int16Array","prototype"],"%Int32ArrayPrototype%":["Int32Array","prototype"],"%JSONParse%":["JSON","parse"],"%JSONStringify%":["JSON","stringify"],"%MapPrototype%":["Map","prototype"],"%NumberPrototype%":["Number","prototype"],"%ObjectPrototype%":["Object","prototype"],"%ObjProto_toString%":["Object","prototype","toString"],"%ObjProto_valueOf%":["Object","prototype","valueOf"],"%PromisePrototype%":["Promise","prototype"],"%PromiseProto_then%":["Promise","prototype","then"],"%Promise_all%":["Promise","all"],"%Promise_reject%":["Promise","reject"],"%Promise_resolve%":["Promise","resolve"],"%RangeErrorPrototype%":["RangeError","prototype"],"%ReferenceErrorPrototype%":["ReferenceError","prototype"],"%RegExpPrototype%":["RegExp","prototype"],"%SetPrototype%":["Set","prototype"],"%SharedArrayBufferPrototype%":["SharedArrayBuffer","prototype"],"%StringPrototype%":["String","prototype"],"%SymbolPrototype%":["Symbol","prototype"],"%SyntaxErrorPrototype%":["SyntaxError","prototype"],"%TypedArrayPrototype%":["TypedArray","prototype"],"%TypeErrorPrototype%":["TypeError","prototype"],"%Uint8ArrayPrototype%":["Uint8Array","prototype"],"%Uint8ClampedArrayPrototype%":["Uint8ClampedArray","prototype"],"%Uint16ArrayPrototype%":["Uint16Array","prototype"],"%Uint32ArrayPrototype%":["Uint32Array","prototype"],"%URIErrorPrototype%":["URIError","prototype"],"%WeakMapPrototype%":["WeakMap","prototype"],"%WeakSetPrototype%":["WeakSet","prototype"]};var d=t(174);var v=t(101);var m=d.call(Function.call,Array.prototype.concat);var S=d.call(Function.apply,Array.prototype.splice);var A=d.call(Function.call,String.prototype.replace);var h=d.call(Function.call,String.prototype.slice);var O=/[^%.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|%$))/g;var j=/\\(\\)?/g;var w=function stringToPath(r){var e=h(r,0,1);var t=h(r,-1);if(e==="%"&&t!=="%"){throw new o("invalid intrinsic syntax, expected closing `%`")}else if(t==="%"&&e!=="%"){throw new o("invalid intrinsic syntax, expected opening `%`")}var n=[];A(r,O,(function(r,e,t,o){n[n.length]=t?A(o,j,"$1"):e||r}));return n};var P=function getBaseIntrinsic(r,e){var t=r;var n;if(v(b,t)){n=b[t];t="%"+n[0]+"%"}if(v(l,t)){var i=l[t];if(i===c){i=g(t)}if(typeof i==="undefined"&&!e){throw new a("intrinsic "+r+" exists, but is not available. Please file an issue!")}return{alias:n,name:t,value:i}}throw new o("intrinsic "+r+" does not exist!")};r.exports=function GetIntrinsic(r,e){if(typeof r!=="string"||r.length===0){throw new a("intrinsic name must be a non-empty string")}if(arguments.length>1&&typeof e!=="boolean"){throw new a('"allowMissing" argument must be a boolean')}var t=w(r);var i=t.length>0?t[0]:"";var u=P("%"+i+"%",e);var s=u.name;var y=u.value;var c=false;var p=u.alias;if(p){i=p[0];S(t,m([0,1],p))}for(var g=1,b=true;g<t.length;g+=1){var d=t[g];var A=h(d,0,1);var O=h(d,-1);if((A==='"'||A==="'"||A==="`"||(O==='"'||O==="'"||O==="`"))&&A!==O){throw new o("property names with quotes must have matching quotes")}if(d==="constructor"||!b){c=true}i+="."+d;s="%"+i+"%";if(v(l,s)){y=l[s]}else if(y!=null){if(!(d in y)){if(!e){throw new a("base intrinsic for "+r+" exists, but the property is not available.")}return void n}if(f&&g+1>=t.length){var j=f(y,d);b=!!j;if(b&&"get"in j&&!("originalValue"in j.get)){y=j.get}else{y=y[d]}}else{b=v(y,d);y=y[d]}if(b&&!c){l[s]=y}}}return y}},942:function(r,e,t){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=t(773);r.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},773:function(r){"use strict";r.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var r={};var e=Symbol("test");var t=Object(e);if(typeof e==="string"){return false}if(Object.prototype.toString.call(e)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}var n=42;r[e]=n;for(e in r){return false}if(typeof Object.keys==="function"&&Object.keys(r).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(r).length!==0){return false}var o=Object.getOwnPropertySymbols(r);if(o.length!==1||o[0]!==e){return false}if(!Object.prototype.propertyIsEnumerable.call(r,e)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(r,e);if(i.value!==n||i.enumerable!==true){return false}}return true}},115:function(r,e,t){"use strict";var n=typeof Symbol!=="undefined"&&Symbol;var o=t(832);r.exports=function hasNativeSymbols(){if(typeof n!=="function"){return false}if(typeof Symbol!=="function"){return false}if(typeof n("foo")!=="symbol"){return false}if(typeof Symbol("bar")!=="symbol"){return false}return o()}},832:function(r){"use strict";r.exports=function hasSymbols(){if(typeof Symbol!=="function"||typeof Object.getOwnPropertySymbols!=="function"){return false}if(typeof Symbol.iterator==="symbol"){return true}var r={};var e=Symbol("test");var t=Object(e);if(typeof e==="string"){return false}if(Object.prototype.toString.call(e)!=="[object Symbol]"){return false}if(Object.prototype.toString.call(t)!=="[object Symbol]"){return false}var n=42;r[e]=n;for(e in r){return false}if(typeof Object.keys==="function"&&Object.keys(r).length!==0){return false}if(typeof Object.getOwnPropertyNames==="function"&&Object.getOwnPropertyNames(r).length!==0){return false}var o=Object.getOwnPropertySymbols(r);if(o.length!==1||o[0]!==e){return false}if(!Object.prototype.propertyIsEnumerable.call(r,e)){return false}if(typeof Object.getOwnPropertyDescriptor==="function"){var i=Object.getOwnPropertyDescriptor(r,e);if(i.value!==n||i.enumerable!==true){return false}}return true}},101:function(r,e,t){"use strict";var n=t(174);r.exports=n.call(Function.call,Object.prototype.hasOwnProperty)},782:function(r){if(typeof Object.create==="function"){r.exports=function inherits(r,e){if(e){r.super_=e;r.prototype=Object.create(e.prototype,{constructor:{value:r,enumerable:false,writable:true,configurable:true}})}}}else{r.exports=function inherits(r,e){if(e){r.super_=e;var TempCtor=function(){};TempCtor.prototype=e.prototype;r.prototype=new TempCtor;r.prototype.constructor=r}}}},157:function(r){"use strict";var e=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var t=Object.prototype.toString;var n=function isArguments(r){if(e&&r&&typeof r==="object"&&Symbol.toStringTag in r){return false}return t.call(r)==="[object Arguments]"};var o=function isArguments(r){if(n(r)){return true}return r!==null&&typeof r==="object"&&typeof r.length==="number"&&r.length>=0&&t.call(r)!=="[object Array]"&&t.call(r.callee)==="[object Function]"};var i=function(){return n(arguments)}();n.isLegacyArguments=o;r.exports=i?n:o},391:function(r){"use strict";var e=Object.prototype.toString;var t=Function.prototype.toString;var n=/^\s*(?:function)?\*/;var o=typeof Symbol==="function"&&typeof Symbol.toStringTag==="symbol";var i=Object.getPrototypeOf;var getGeneratorFunc=function(){if(!o){return false}try{return Function("return function*() {}")()}catch(r){}};var a=getGeneratorFunc();var f=a?i(a):{};r.exports=function isGeneratorFunction(r){if(typeof r!=="function"){return false}if(n.test(t.call(r))){return true}if(!o){var a=e.call(r);return a==="[object GeneratorFunction]"}return i(r)===f}},994:function(r,e,t){"use strict";var n=t(144);var o=t(349);var i=t(256);var a=i("Object.prototype.toString");var f=t(942)();var u=f&&typeof Symbol.toStringTag==="symbol";var s=o();var y=i("Array.prototype.indexOf",true)||function indexOf(r,e){for(var t=0;t<r.length;t+=1){if(r[t]===e){return t}}return-1};var c=i("String.prototype.slice");var p={};var l=t(466);var g=Object.getPrototypeOf;if(u&&l&&g){n(s,(function(r){var e=new global[r];if(!(Symbol.toStringTag in e)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+r+" does not have the property! Please report this.")}var t=g(e);var n=l(t,Symbol.toStringTag);if(!n){var o=g(t);n=l(o,Symbol.toStringTag)}p[r]=n.get}))}var b=function tryAllTypedArrays(r){var e=false;n(p,(function(t,n){if(!e){try{e=t.call(r)===n}catch(r){}}}));return e};r.exports=function isTypedArray(r){if(!r||typeof r!=="object"){return false}if(!u){var e=c(a(r),8,-1);return y(s,e)>-1}if(!l){return false}return b(r)}},369:function(r){r.exports=function isBuffer(r){return r instanceof Buffer}},584:function(r,e,t){"use strict";var n=t(157);var o=t(391);var i=t(490);var a=t(994);function uncurryThis(r){return r.call.bind(r)}var f=typeof BigInt!=="undefined";var u=typeof Symbol!=="undefined";var s=uncurryThis(Object.prototype.toString);var y=uncurryThis(Number.prototype.valueOf);var c=uncurryThis(String.prototype.valueOf);var p=uncurryThis(Boolean.prototype.valueOf);if(f){var l=uncurryThis(BigInt.prototype.valueOf)}if(u){var g=uncurryThis(Symbol.prototype.valueOf)}function checkBoxedPrimitive(r,e){if(typeof r!=="object"){return false}try{e(r);return true}catch(r){return false}}e.isArgumentsObject=n;e.isGeneratorFunction=o;e.isTypedArray=a;function isPromise(r){return typeof Promise!=="undefined"&&r instanceof Promise||r!==null&&typeof r==="object"&&typeof r.then==="function"&&typeof r.catch==="function"}e.isPromise=isPromise;function isArrayBufferView(r){if(typeof ArrayBuffer!=="undefined"&&ArrayBuffer.isView){return ArrayBuffer.isView(r)}return a(r)||isDataView(r)}e.isArrayBufferView=isArrayBufferView;function isUint8Array(r){return i(r)==="Uint8Array"}e.isUint8Array=isUint8Array;function isUint8ClampedArray(r){return i(r)==="Uint8ClampedArray"}e.isUint8ClampedArray=isUint8ClampedArray;function isUint16Array(r){return i(r)==="Uint16Array"}e.isUint16Array=isUint16Array;function isUint32Array(r){return i(r)==="Uint32Array"}e.isUint32Array=isUint32Array;function isInt8Array(r){return i(r)==="Int8Array"}e.isInt8Array=isInt8Array;function isInt16Array(r){return i(r)==="Int16Array"}e.isInt16Array=isInt16Array;function isInt32Array(r){return i(r)==="Int32Array"}e.isInt32Array=isInt32Array;function isFloat32Array(r){return i(r)==="Float32Array"}e.isFloat32Array=isFloat32Array;function isFloat64Array(r){return i(r)==="Float64Array"}e.isFloat64Array=isFloat64Array;function isBigInt64Array(r){return i(r)==="BigInt64Array"}e.isBigInt64Array=isBigInt64Array;function isBigUint64Array(r){return i(r)==="BigUint64Array"}e.isBigUint64Array=isBigUint64Array;function isMapToString(r){return s(r)==="[object Map]"}isMapToString.working=typeof Map!=="undefined"&&isMapToString(new Map);function isMap(r){if(typeof Map==="undefined"){return false}return isMapToString.working?isMapToString(r):r instanceof Map}e.isMap=isMap;function isSetToString(r){return s(r)==="[object Set]"}isSetToString.working=typeof Set!=="undefined"&&isSetToString(new Set);function isSet(r){if(typeof Set==="undefined"){return false}return isSetToString.working?isSetToString(r):r instanceof Set}e.isSet=isSet;function isWeakMapToString(r){return s(r)==="[object WeakMap]"}isWeakMapToString.working=typeof WeakMap!=="undefined"&&isWeakMapToString(new WeakMap);function isWeakMap(r){if(typeof WeakMap==="undefined"){return false}return isWeakMapToString.working?isWeakMapToString(r):r instanceof WeakMap}e.isWeakMap=isWeakMap;function isWeakSetToString(r){return s(r)==="[object WeakSet]"}isWeakSetToString.working=typeof WeakSet!=="undefined"&&isWeakSetToString(new WeakSet);function isWeakSet(r){return isWeakSetToString(r)}e.isWeakSet=isWeakSet;function isArrayBufferToString(r){return s(r)==="[object ArrayBuffer]"}isArrayBufferToString.working=typeof ArrayBuffer!=="undefined"&&isArrayBufferToString(new ArrayBuffer);function isArrayBuffer(r){if(typeof ArrayBuffer==="undefined"){return false}return isArrayBufferToString.working?isArrayBufferToString(r):r instanceof ArrayBuffer}e.isArrayBuffer=isArrayBuffer;function isDataViewToString(r){return s(r)==="[object DataView]"}isDataViewToString.working=typeof ArrayBuffer!=="undefined"&&typeof DataView!=="undefined"&&isDataViewToString(new DataView(new ArrayBuffer(1),0,1));function isDataView(r){if(typeof DataView==="undefined"){return false}return isDataViewToString.working?isDataViewToString(r):r instanceof DataView}e.isDataView=isDataView;var b=typeof SharedArrayBuffer!=="undefined"?SharedArrayBuffer:undefined;function isSharedArrayBufferToString(r){return s(r)==="[object SharedArrayBuffer]"}function isSharedArrayBuffer(r){if(typeof b==="undefined"){return false}if(typeof isSharedArrayBufferToString.working==="undefined"){isSharedArrayBufferToString.working=isSharedArrayBufferToString(new b)}return isSharedArrayBufferToString.working?isSharedArrayBufferToString(r):r instanceof b}e.isSharedArrayBuffer=isSharedArrayBuffer;function isAsyncFunction(r){return s(r)==="[object AsyncFunction]"}e.isAsyncFunction=isAsyncFunction;function isMapIterator(r){return s(r)==="[object Map Iterator]"}e.isMapIterator=isMapIterator;function isSetIterator(r){return s(r)==="[object Set Iterator]"}e.isSetIterator=isSetIterator;function isGeneratorObject(r){return s(r)==="[object Generator]"}e.isGeneratorObject=isGeneratorObject;function isWebAssemblyCompiledModule(r){return s(r)==="[object WebAssembly.Module]"}e.isWebAssemblyCompiledModule=isWebAssemblyCompiledModule;function isNumberObject(r){return checkBoxedPrimitive(r,y)}e.isNumberObject=isNumberObject;function isStringObject(r){return checkBoxedPrimitive(r,c)}e.isStringObject=isStringObject;function isBooleanObject(r){return checkBoxedPrimitive(r,p)}e.isBooleanObject=isBooleanObject;function isBigIntObject(r){return f&&checkBoxedPrimitive(r,l)}e.isBigIntObject=isBigIntObject;function isSymbolObject(r){return u&&checkBoxedPrimitive(r,g)}e.isSymbolObject=isSymbolObject;function isBoxedPrimitive(r){return isNumberObject(r)||isStringObject(r)||isBooleanObject(r)||isBigIntObject(r)||isSymbolObject(r)}e.isBoxedPrimitive=isBoxedPrimitive;function isAnyArrayBuffer(r){return typeof Uint8Array!=="undefined"&&(isArrayBuffer(r)||isSharedArrayBuffer(r))}e.isAnyArrayBuffer=isAnyArrayBuffer;["isProxy","isExternal","isModuleNamespaceObject"].forEach((function(r){Object.defineProperty(e,r,{enumerable:false,value:function(){throw new Error(r+" is not supported in userland")}})}))},177:function(r,e,t){var n=Object.getOwnPropertyDescriptors||function getOwnPropertyDescriptors(r){var e=Object.keys(r);var t={};for(var n=0;n<e.length;n++){t[e[n]]=Object.getOwnPropertyDescriptor(r,e[n])}return t};var o=/%[sdj%]/g;e.format=function(r){if(!isString(r)){var e=[];for(var t=0;t<arguments.length;t++){e.push(inspect(arguments[t]))}return e.join(" ")}var t=1;var n=arguments;var i=n.length;var a=String(r).replace(o,(function(r){if(r==="%%")return"%";if(t>=i)return r;switch(r){case"%s":return String(n[t++]);case"%d":return Number(n[t++]);case"%j":try{return JSON.stringify(n[t++])}catch(r){return"[Circular]"}default:return r}}));for(var f=n[t];t<i;f=n[++t]){if(isNull(f)||!isObject(f)){a+=" "+f}else{a+=" "+inspect(f)}}return a};e.deprecate=function(r,t){if(typeof process!=="undefined"&&process.noDeprecation===true){return r}if(typeof process==="undefined"){return function(){return e.deprecate(r,t).apply(this,arguments)}}var n=false;function deprecated(){if(!n){if(process.throwDeprecation){throw new Error(t)}else if(process.traceDeprecation){console.trace(t)}else{console.error(t)}n=true}return r.apply(this,arguments)}return deprecated};var i={};var a=/^$/;if(process.env.NODE_DEBUG){var f=process.env.NODE_DEBUG;f=f.replace(/[|\\{}()[\]^$+?.]/g,"\\$&").replace(/\*/g,".*").replace(/,/g,"$|^").toUpperCase();a=new RegExp("^"+f+"$","i")}e.debuglog=function(r){r=r.toUpperCase();if(!i[r]){if(a.test(r)){var t=process.pid;i[r]=function(){var n=e.format.apply(e,arguments);console.error("%s %d: %s",r,t,n)}}else{i[r]=function(){}}}return i[r]};function inspect(r,t){var n={seen:[],stylize:stylizeNoColor};if(arguments.length>=3)n.depth=arguments[2];if(arguments.length>=4)n.colors=arguments[3];if(isBoolean(t)){n.showHidden=t}else if(t){e._extend(n,t)}if(isUndefined(n.showHidden))n.showHidden=false;if(isUndefined(n.depth))n.depth=2;if(isUndefined(n.colors))n.colors=false;if(isUndefined(n.customInspect))n.customInspect=true;if(n.colors)n.stylize=stylizeWithColor;return formatValue(n,r,n.depth)}e.inspect=inspect;inspect.colors={bold:[1,22],italic:[3,23],underline:[4,24],inverse:[7,27],white:[37,39],grey:[90,39],black:[30,39],blue:[34,39],cyan:[36,39],green:[32,39],magenta:[35,39],red:[31,39],yellow:[33,39]};inspect.styles={special:"cyan",number:"yellow",boolean:"yellow",undefined:"grey",null:"bold",string:"green",date:"magenta",regexp:"red"};function stylizeWithColor(r,e){var t=inspect.styles[e];if(t){return"["+inspect.colors[t][0]+"m"+r+"["+inspect.colors[t][1]+"m"}else{return r}}function stylizeNoColor(r,e){return r}function arrayToHash(r){var e={};r.forEach((function(r,t){e[r]=true}));return e}function formatValue(r,t,n){if(r.customInspect&&t&&isFunction(t.inspect)&&t.inspect!==e.inspect&&!(t.constructor&&t.constructor.prototype===t)){var o=t.inspect(n,r);if(!isString(o)){o=formatValue(r,o,n)}return o}var i=formatPrimitive(r,t);if(i){return i}var a=Object.keys(t);var f=arrayToHash(a);if(r.showHidden){a=Object.getOwnPropertyNames(t)}if(isError(t)&&(a.indexOf("message")>=0||a.indexOf("description")>=0)){return formatError(t)}if(a.length===0){if(isFunction(t)){var u=t.name?": "+t.name:"";return r.stylize("[Function"+u+"]","special")}if(isRegExp(t)){return r.stylize(RegExp.prototype.toString.call(t),"regexp")}if(isDate(t)){return r.stylize(Date.prototype.toString.call(t),"date")}if(isError(t)){return formatError(t)}}var s="",y=false,c=["{","}"];if(isArray(t)){y=true;c=["[","]"]}if(isFunction(t)){var p=t.name?": "+t.name:"";s=" [Function"+p+"]"}if(isRegExp(t)){s=" "+RegExp.prototype.toString.call(t)}if(isDate(t)){s=" "+Date.prototype.toUTCString.call(t)}if(isError(t)){s=" "+formatError(t)}if(a.length===0&&(!y||t.length==0)){return c[0]+s+c[1]}if(n<0){if(isRegExp(t)){return r.stylize(RegExp.prototype.toString.call(t),"regexp")}else{return r.stylize("[Object]","special")}}r.seen.push(t);var l;if(y){l=formatArray(r,t,n,f,a)}else{l=a.map((function(e){return formatProperty(r,t,n,f,e,y)}))}r.seen.pop();return reduceToSingleString(l,s,c)}function formatPrimitive(r,e){if(isUndefined(e))return r.stylize("undefined","undefined");if(isString(e)){var t="'"+JSON.stringify(e).replace(/^"|"$/g,"").replace(/'/g,"\\'").replace(/\\"/g,'"')+"'";return r.stylize(t,"string")}if(isNumber(e))return r.stylize(""+e,"number");if(isBoolean(e))return r.stylize(""+e,"boolean");if(isNull(e))return r.stylize("null","null")}function formatError(r){return"["+Error.prototype.toString.call(r)+"]"}function formatArray(r,e,t,n,o){var i=[];for(var a=0,f=e.length;a<f;++a){if(hasOwnProperty(e,String(a))){i.push(formatProperty(r,e,t,n,String(a),true))}else{i.push("")}}o.forEach((function(o){if(!o.match(/^\d+$/)){i.push(formatProperty(r,e,t,n,o,true))}}));return i}function formatProperty(r,e,t,n,o,i){var a,f,u;u=Object.getOwnPropertyDescriptor(e,o)||{value:e[o]};if(u.get){if(u.set){f=r.stylize("[Getter/Setter]","special")}else{f=r.stylize("[Getter]","special")}}else{if(u.set){f=r.stylize("[Setter]","special")}}if(!hasOwnProperty(n,o)){a="["+o+"]"}if(!f){if(r.seen.indexOf(u.value)<0){if(isNull(t)){f=formatValue(r,u.value,null)}else{f=formatValue(r,u.value,t-1)}if(f.indexOf("\n")>-1){if(i){f=f.split("\n").map((function(r){return"  "+r})).join("\n").substr(2)}else{f="\n"+f.split("\n").map((function(r){return"   "+r})).join("\n")}}}else{f=r.stylize("[Circular]","special")}}if(isUndefined(a)){if(i&&o.match(/^\d+$/)){return f}a=JSON.stringify(""+o);if(a.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)){a=a.substr(1,a.length-2);a=r.stylize(a,"name")}else{a=a.replace(/'/g,"\\'").replace(/\\"/g,'"').replace(/(^"|"$)/g,"'");a=r.stylize(a,"string")}}return a+": "+f}function reduceToSingleString(r,e,t){var n=0;var o=r.reduce((function(r,e){n++;if(e.indexOf("\n")>=0)n++;return r+e.replace(/\u001b\[\d\d?m/g,"").length+1}),0);if(o>60){return t[0]+(e===""?"":e+"\n ")+" "+r.join(",\n  ")+" "+t[1]}return t[0]+e+" "+r.join(", ")+" "+t[1]}e.types=t(584);function isArray(r){return Array.isArray(r)}e.isArray=isArray;function isBoolean(r){return typeof r==="boolean"}e.isBoolean=isBoolean;function isNull(r){return r===null}e.isNull=isNull;function isNullOrUndefined(r){return r==null}e.isNullOrUndefined=isNullOrUndefined;function isNumber(r){return typeof r==="number"}e.isNumber=isNumber;function isString(r){return typeof r==="string"}e.isString=isString;function isSymbol(r){return typeof r==="symbol"}e.isSymbol=isSymbol;function isUndefined(r){return r===void 0}e.isUndefined=isUndefined;function isRegExp(r){return isObject(r)&&objectToString(r)==="[object RegExp]"}e.isRegExp=isRegExp;e.types.isRegExp=isRegExp;function isObject(r){return typeof r==="object"&&r!==null}e.isObject=isObject;function isDate(r){return isObject(r)&&objectToString(r)==="[object Date]"}e.isDate=isDate;e.types.isDate=isDate;function isError(r){return isObject(r)&&(objectToString(r)==="[object Error]"||r instanceof Error)}e.isError=isError;e.types.isNativeError=isError;function isFunction(r){return typeof r==="function"}e.isFunction=isFunction;function isPrimitive(r){return r===null||typeof r==="boolean"||typeof r==="number"||typeof r==="string"||typeof r==="symbol"||typeof r==="undefined"}e.isPrimitive=isPrimitive;e.isBuffer=t(369);function objectToString(r){return Object.prototype.toString.call(r)}function pad(r){return r<10?"0"+r.toString(10):r.toString(10)}var u=["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];function timestamp(){var r=new Date;var e=[pad(r.getHours()),pad(r.getMinutes()),pad(r.getSeconds())].join(":");return[r.getDate(),u[r.getMonth()],e].join(" ")}e.log=function(){console.log("%s - %s",timestamp(),e.format.apply(e,arguments))};e.inherits=t(782);e._extend=function(r,e){if(!e||!isObject(e))return r;var t=Object.keys(e);var n=t.length;while(n--){r[t[n]]=e[t[n]]}return r};function hasOwnProperty(r,e){return Object.prototype.hasOwnProperty.call(r,e)}var s=typeof Symbol!=="undefined"?Symbol("util.promisify.custom"):undefined;e.promisify=function promisify(r){if(typeof r!=="function")throw new TypeError('The "original" argument must be of type Function');if(s&&r[s]){var e=r[s];if(typeof e!=="function"){throw new TypeError('The "util.promisify.custom" argument must be of type Function')}Object.defineProperty(e,s,{value:e,enumerable:false,writable:false,configurable:true});return e}function e(){var e,t;var n=new Promise((function(r,n){e=r;t=n}));var o=[];for(var i=0;i<arguments.length;i++){o.push(arguments[i])}o.push((function(r,n){if(r){t(r)}else{e(n)}}));try{r.apply(this,o)}catch(r){t(r)}return n}Object.setPrototypeOf(e,Object.getPrototypeOf(r));if(s)Object.defineProperty(e,s,{value:e,enumerable:false,writable:false,configurable:true});return Object.defineProperties(e,n(r))};e.promisify.custom=s;function callbackifyOnRejected(r,e){if(!r){var t=new Error("Promise was rejected with a falsy value");t.reason=r;r=t}return e(r)}function callbackify(r){if(typeof r!=="function"){throw new TypeError('The "original" argument must be of type Function')}function callbackified(){var e=[];for(var t=0;t<arguments.length;t++){e.push(arguments[t])}var n=e.pop();if(typeof n!=="function"){throw new TypeError("The last argument must be of type Function")}var o=this;var cb=function(){return n.apply(o,arguments)};r.apply(this,e).then((function(r){process.nextTick(cb.bind(null,null,r))}),(function(r){process.nextTick(callbackifyOnRejected.bind(null,r,cb))}))}Object.setPrototypeOf(callbackified,Object.getPrototypeOf(r));Object.defineProperties(callbackified,n(r));return callbackified}e.callbackify=callbackify},490:function(r,e,t){"use strict";var n=t(144);var o=t(349);var i=t(256);var a=i("Object.prototype.toString");var f=t(942)();var u=f&&typeof Symbol.toStringTag==="symbol";var s=o();var y=i("String.prototype.slice");var c={};var p=t(466);var l=Object.getPrototypeOf;if(u&&p&&l){n(s,(function(r){if(typeof global[r]==="function"){var e=new global[r];if(!(Symbol.toStringTag in e)){throw new EvalError("this engine has support for Symbol.toStringTag, but "+r+" does not have the property! Please report this.")}var t=l(e);var n=p(t,Symbol.toStringTag);if(!n){var o=l(t);n=p(o,Symbol.toStringTag)}c[r]=n.get}}))}var g=function tryAllTypedArrays(r){var e=false;n(c,(function(t,n){if(!e){try{var o=t.call(r);if(o===n){e=o}}catch(r){}}}));return e};var b=t(994);r.exports=function whichTypedArray(r){if(!b(r)){return false}if(!u){return y(a(r),8,-1)}return g(r)}},349:function(r,e,t){"use strict";var n=t(992);r.exports=function availableTypedArrays(){return n(["BigInt64Array","BigUint64Array","Float32Array","Float64Array","Int16Array","Int32Array","Int8Array","Uint16Array","Uint32Array","Uint8Array","Uint8ClampedArray"],(function(r){return typeof global[r]==="function"}))}},466:function(r,e,t){"use strict";var n=t(838);var o=n("%Object.getOwnPropertyDescriptor%",true);if(o){try{o([],"length")}catch(r){o=null}}r.exports=o}};var e={};function __nccwpck_require__(t){var n=e[t];if(n!==undefined){return n.exports}var o=e[t]={exports:{}};var i=true;try{r[t](o,o.exports,__nccwpck_require__);i=false}finally{if(i)delete e[t]}return o.exports}if(typeof __nccwpck_require__!=="undefined")__nccwpck_require__.ab=__dirname+"/";var t=__nccwpck_require__(177);module.exports=t})();
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 857906a80f28..f9da48226515 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -372,7 +372,7 @@ importers:
       eslint-import-resolver-typescript: ^2.7.1
       eslint-plugin-import: ^2.26.0
       eslint-plugin-jsx-a11y: ^6.5.1
-      eslint-plugin-react: ^7.29.4
+      eslint-plugin-react: ^7.31.7
       eslint-plugin-react-hooks: ^4.5.0
     dependencies:
       '@next/eslint-plugin-next': link:../eslint-plugin-next
@@ -382,7 +382,7 @@ importers:
       eslint-import-resolver-typescript: 2.7.1_hpmu7kn6tcn2vnxpfzvv33bxmy
       eslint-plugin-import: 2.26.0_asoxhzjlkaozogjqriaz4fv5ly
       eslint-plugin-jsx-a11y: 6.5.1_eslint@7.32.0
-      eslint-plugin-react: 7.29.4_eslint@7.32.0
+      eslint-plugin-react: 7.31.8_eslint@7.32.0
       eslint-plugin-react-hooks: 4.5.0_eslint@7.32.0
 
   packages/eslint-plugin-next:
@@ -8741,8 +8741,21 @@ packages:
     engines: { node: '>= 0.4' }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.1
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
+      get-intrinsic: 1.1.1
+      is-string: 1.0.7
+
+  /array-includes/3.1.5:
+    resolution:
+      {
+        integrity: sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
       get-intrinsic: 1.1.1
       is-string: 1.0.7
 
@@ -8815,8 +8828,8 @@ packages:
     engines: { node: '>= 0.4' }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.1
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
 
   /array.prototype.flatmap/1.2.5:
     resolution:
@@ -8828,6 +8841,20 @@ packages:
       call-bind: 1.0.2
       define-properties: 1.1.3
       es-abstract: 1.19.1
+    dev: true
+
+  /array.prototype.flatmap/1.3.0:
+    resolution:
+      {
+        integrity: sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
+      es-shim-unscopables: 1.0.0
+    dev: false
 
   /arrify/1.0.1:
     resolution:
@@ -10956,7 +10983,10 @@ packages:
     dev: true
 
   /concat-map/0.0.1:
-    resolution: { integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= }
+    resolution:
+      {
+        integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==,
+      }
 
   /concat-stream/1.6.2:
     resolution:
@@ -12356,6 +12386,16 @@ packages:
     dependencies:
       object-keys: 1.1.1
 
+  /define-properties/1.1.4:
+    resolution:
+      {
+        integrity: sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      has-property-descriptors: 1.0.0
+      object-keys: 1.1.1
+
   /define-property/0.2.5:
     resolution:
       {
@@ -13132,7 +13172,7 @@ packages:
       get-intrinsic: 1.1.1
       get-symbol-description: 1.0.0
       has: 1.0.3
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
       internal-slot: 1.0.3
       is-callable: 1.2.4
       is-negative-zero: 2.0.1
@@ -13147,6 +13187,37 @@ packages:
       string.prototype.trimstart: 1.0.4
       unbox-primitive: 1.0.1
 
+  /es-abstract/1.20.2:
+    resolution:
+      {
+        integrity: sha512-XxXQuVNrySBNlEkTYJoDNFe5+s2yIOpzq80sUHEdPdQr0S5nTLz4ZPPPswNIpKseDDUS5yghX1gfLIHQZ1iNuQ==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      es-to-primitive: 1.2.1
+      function-bind: 1.1.1
+      function.prototype.name: 1.1.5
+      get-intrinsic: 1.1.2
+      get-symbol-description: 1.0.0
+      has: 1.0.3
+      has-property-descriptors: 1.0.0
+      has-symbols: 1.0.3
+      internal-slot: 1.0.3
+      is-callable: 1.2.4
+      is-negative-zero: 2.0.2
+      is-regex: 1.1.4
+      is-shared-array-buffer: 1.0.2
+      is-string: 1.0.7
+      is-weakref: 1.0.2
+      object-inspect: 1.12.2
+      object-keys: 1.1.1
+      object.assign: 4.1.4
+      regexp.prototype.flags: 1.4.3
+      string.prototype.trimend: 1.0.5
+      string.prototype.trimstart: 1.0.5
+      unbox-primitive: 1.0.2
+
   /es-module-lexer/0.9.0:
     resolution:
       {
@@ -13154,6 +13225,15 @@ packages:
       }
     dev: true
 
+  /es-shim-unscopables/1.0.0:
+    resolution:
+      {
+        integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==,
+      }
+    dependencies:
+      has: 1.0.3
+    dev: false
+
   /es-to-primitive/1.2.1:
     resolution:
       {
@@ -13545,17 +13625,17 @@ packages:
       string.prototype.matchall: 4.0.6
     dev: true
 
-  /eslint-plugin-react/7.29.4_eslint@7.32.0:
+  /eslint-plugin-react/7.31.8_eslint@7.32.0:
     resolution:
       {
-        integrity: sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ==,
+        integrity: sha512-5lBTZmgQmARLLSYiwI71tiGVTLUuqXantZM6vlSY39OaDSV0M7+32K5DnLkmFrwTe+Ksz0ffuLUC91RUviVZfw==,
       }
     engines: { node: '>=4' }
     peerDependencies:
       eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
     dependencies:
-      array-includes: 3.1.4
-      array.prototype.flatmap: 1.2.5
+      array-includes: 3.1.5
+      array.prototype.flatmap: 1.3.0
       doctrine: 2.1.0
       eslint: 7.32.0
       estraverse: 5.3.0
@@ -13563,12 +13643,12 @@ packages:
       minimatch: 3.1.2
       object.entries: 1.1.5
       object.fromentries: 2.0.5
-      object.hasown: 1.1.0
+      object.hasown: 1.1.1
       object.values: 1.1.5
       prop-types: 15.8.1
       resolve: 2.0.0-next.3
       semver: 6.3.0
-      string.prototype.matchall: 4.0.6
+      string.prototype.matchall: 4.0.7
     dev: false
 
   /eslint-scope/5.1.1:
@@ -14881,12 +14961,30 @@ packages:
         integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==,
       }
 
+  /function.prototype.name/1.1.5:
+    resolution:
+      {
+        integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
+      functions-have-names: 1.2.3
+
   /functional-red-black-tree/1.0.1:
     resolution:
       {
         integrity: sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==,
       }
 
+  /functions-have-names/1.2.3:
+    resolution:
+      {
+        integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==,
+      }
+
   /gauge/2.7.4:
     resolution:
       {
@@ -14935,7 +15033,17 @@ packages:
     dependencies:
       function-bind: 1.1.1
       has: 1.0.3
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
+
+  /get-intrinsic/1.1.2:
+    resolution:
+      {
+        integrity: sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==,
+      }
+    dependencies:
+      function-bind: 1.1.1
+      has: 1.0.3
+      has-symbols: 1.0.3
 
   /get-orientation/1.1.2:
     resolution:
@@ -15025,7 +15133,7 @@ packages:
     engines: { node: '>= 0.4' }
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.1
+      get-intrinsic: 1.1.2
 
   /get-value/2.0.6:
     resolution:
@@ -15641,6 +15749,12 @@ packages:
         integrity: sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==,
       }
 
+  /has-bigints/1.0.2:
+    resolution:
+      {
+        integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==,
+      }
+
   /has-flag/1.0.0:
     resolution:
       {
@@ -15671,6 +15785,14 @@ packages:
     engines: { node: '>=8' }
     dev: true
 
+  /has-property-descriptors/1.0.0:
+    resolution:
+      {
+        integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==,
+      }
+    dependencies:
+      get-intrinsic: 1.1.1
+
   /has-symbol-support-x/1.4.2:
     resolution:
       {
@@ -15684,6 +15806,14 @@ packages:
         integrity: sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==,
       }
     engines: { node: '>= 0.4' }
+    dev: true
+
+  /has-symbols/1.0.3:
+    resolution:
+      {
+        integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==,
+      }
+    engines: { node: '>= 0.4' }
 
   /has-to-string-tag-x/1.4.1:
     resolution:
@@ -15701,7 +15831,7 @@ packages:
       }
     engines: { node: '>= 0.4' }
     dependencies:
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
 
   /has-unicode/2.0.1:
     resolution:
@@ -17127,6 +17257,13 @@ packages:
       }
     engines: { node: '>= 0.4' }
 
+  /is-negative-zero/2.0.2:
+    resolution:
+      {
+        integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==,
+      }
+    engines: { node: '>= 0.4' }
+
   /is-npm/4.0.0:
     resolution:
       {
@@ -17333,6 +17470,14 @@ packages:
         integrity: sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==,
       }
 
+  /is-shared-array-buffer/1.0.2:
+    resolution:
+      {
+        integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+
   /is-ssh/1.3.1:
     resolution:
       {
@@ -17379,7 +17524,7 @@ packages:
       }
     engines: { node: '>= 0.4' }
     dependencies:
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
 
   /is-text-path/1.0.1:
     resolution: { integrity: sha1-Thqg+1G/vLPpJogAE5cgLBd1tm4= }
@@ -17456,6 +17601,14 @@ packages:
     dependencies:
       call-bind: 1.0.2
 
+  /is-weakref/1.0.2:
+    resolution:
+      {
+        integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+
   /is-whitespace-character/1.0.3:
     resolution:
       {
@@ -18693,7 +18846,7 @@ packages:
       }
     engines: { node: '>=4.0' }
     dependencies:
-      array-includes: 3.1.4
+      array-includes: 3.1.5
       object.assign: 4.1.2
 
   /jszip/3.7.1:
@@ -21282,6 +21435,12 @@ packages:
         integrity: sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==,
       }
 
+  /object-inspect/1.12.2:
+    resolution:
+      {
+        integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==,
+      }
+
   /object-is/1.0.2:
     resolution:
       {
@@ -21322,8 +21481,20 @@ packages:
     engines: { node: '>= 0.4' }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      has-symbols: 1.0.2
+      define-properties: 1.1.4
+      has-symbols: 1.0.3
+      object-keys: 1.1.1
+
+  /object.assign/4.1.4:
+    resolution:
+      {
+        integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      has-symbols: 1.0.3
       object-keys: 1.1.1
 
   /object.defaults/1.1.0:
@@ -21344,8 +21515,8 @@ packages:
     engines: { node: '>= 0.4' }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
-      es-abstract: 1.19.1
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
 
   /object.fromentries/2.0.5:
     resolution:
@@ -21369,14 +21540,14 @@ packages:
       es-abstract: 1.19.1
     dev: true
 
-  /object.hasown/1.1.0:
+  /object.hasown/1.1.1:
     resolution:
       {
-        integrity: sha512-MhjYRfj3GBlhSkDHo6QmvgjRLXQ2zndabdf3nX0yTyZK9rPfxb6uRpAac8HXNLy1GpqWtZ81Qh4v3uOls2sRAg==,
+        integrity: sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A==,
       }
     dependencies:
-      define-properties: 1.1.3
-      es-abstract: 1.19.1
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
     dev: false
 
   /object.map/1.0.1:
@@ -24738,6 +24909,18 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.3
+    dev: true
+
+  /regexp.prototype.flags/1.4.3:
+    resolution:
+      {
+        integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==,
+      }
+    engines: { node: '>= 0.4' }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      functions-have-names: 1.2.3
 
   /regexpp/3.1.0:
     resolution:
@@ -26617,6 +26800,23 @@ packages:
       internal-slot: 1.0.3
       regexp.prototype.flags: 1.3.1
       side-channel: 1.0.4
+    dev: true
+
+  /string.prototype.matchall/4.0.7:
+    resolution:
+      {
+        integrity: sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.3
+      es-abstract: 1.19.1
+      get-intrinsic: 1.1.1
+      has-symbols: 1.0.3
+      internal-slot: 1.0.3
+      regexp.prototype.flags: 1.4.3
+      side-channel: 1.0.4
+    dev: false
 
   /string.prototype.padend/3.1.0:
     resolution:
@@ -26636,7 +26836,17 @@ packages:
       }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
+
+  /string.prototype.trimend/1.0.5:
+    resolution:
+      {
+        integrity: sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
 
   /string.prototype.trimstart/1.0.4:
     resolution:
@@ -26645,7 +26855,17 @@ packages:
       }
     dependencies:
       call-bind: 1.0.2
-      define-properties: 1.1.3
+      define-properties: 1.1.4
+
+  /string.prototype.trimstart/1.0.5:
+    resolution:
+      {
+        integrity: sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+      define-properties: 1.1.4
+      es-abstract: 1.20.2
 
   /string_decoder/0.10.31:
     resolution:
@@ -28138,7 +28358,18 @@ packages:
     dependencies:
       function-bind: 1.1.1
       has-bigints: 1.0.1
-      has-symbols: 1.0.2
+      has-symbols: 1.0.3
+      which-boxed-primitive: 1.0.2
+
+  /unbox-primitive/1.0.2:
+    resolution:
+      {
+        integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==,
+      }
+    dependencies:
+      call-bind: 1.0.2
+      has-bigints: 1.0.2
+      has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
 
   /unc-path-regex/0.1.2:

From baf6046bf3c479e347af4b5fc123c840bf4240e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Tue, 13 Sep 2022 12:56:53 +0200
Subject: [PATCH 60/69] chore: use `link:` instead of `file:` in
 CONTRIBUTING.md (#40510)

Closes #40497

Ref: https://pnpm.io/cli/link, https://stackoverflow.com/a/70266777

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 contributing.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributing.md b/contributing.md
index b3ec843cf2e7..e5403bdef11b 100644
--- a/contributing.md
+++ b/contributing.md
@@ -147,7 +147,7 @@ There are two options to develop with your local version of the codebase:
    with:
 
    ```json
-   "next": "file:/path/to/next.js/packages/next",
+   "next": "link:/path/to/next.js/packages/next",
    ```
 
 2. In your app's root directory, make sure to remove `next` from `node_modules` with:

From c11310b0f152c1aef20016c6dc0e2833c35badcf Mon Sep 17 00:00:00 2001
From: Jan Klimo <jan.klimo@gmail.com>
Date: Tue, 13 Sep 2022 13:22:25 +0200
Subject: [PATCH 61/69] Fix a typo in docs (#40501)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)

Co-authored-by: Balázs Orbán <info@balazsorban.com>
---
 errors/invalid-page-config.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/errors/invalid-page-config.md b/errors/invalid-page-config.md
index c9feeb38dbaa..a535a29056c7 100644
--- a/errors/invalid-page-config.md
+++ b/errors/invalid-page-config.md
@@ -7,7 +7,7 @@ In one of your pages or API Routes you did `export const config` with an invalid
 #### Possible Ways to Fix It
 
 The page's config must be an object initialized directly when being exported and not modified dynamically.
-The config object must only contains static constant literals without expressions.
+The config object must only contain static constant literals without expressions.
 
 <table>
 <thead>

From e6ed8ef56e93e8ff516b8c750a6f227a43137e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Tue, 13 Sep 2022 13:23:03 +0200
Subject: [PATCH 62/69] =?UTF-8?q?add=20Bal=C3=A1zs=20as=20codeowner=20to?=
 =?UTF-8?q?=20`/errors/`=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ref: #40501
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index b601a1f32f53..eacdc887f86c 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -4,6 +4,7 @@
 *          @timneutkens @ijjk @shuding @huozhi
 /.github/  @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @balazsorban44
 /docs/     @timneutkens @ijjk @shuding @styfle @huozhi @padmaia @leerob @balazsorban44
+/errors/   @balazsorban44
 /examples/ @timneutkens @ijjk @shuding @leerob @steven-tey @balazsorban44
 
 # SWC Build & Telemetry (@padmaia)

From 629c7f584ebbb8d651441e111c1a5919d4248e73 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Tue, 13 Sep 2022 13:47:20 +0200
Subject: [PATCH 63/69] Clean up startTransition in Link (#40505)

- Use React.startTransition instead of useTransition
- Upgrade to latest React experimental
- Split router cache invalidate into separate function

Some minor cleanup while verifying behaviors.
---
 package.json                               |  4 +-
 packages/next/client/components/reducer.ts | 44 +++++++++++++++-------
 packages/next/client/link.tsx              | 19 +++-------
 pnpm-lock.yaml                             | 24 ++++++------
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/package.json b/package.json
index bfab57a860fc..a0c2544af4b4 100644
--- a/package.json
+++ b/package.json
@@ -178,8 +178,8 @@
     "react-17": "npm:react@17.0.2",
     "react-dom": "18.2.0",
     "react-dom-17": "npm:react-dom@17.0.2",
-    "react-dom-exp": "npm:react-dom@0.0.0-experimental-7028ce745-20220907",
-    "react-exp": "npm:react@0.0.0-experimental-7028ce745-20220907",
+    "react-dom-exp": "npm:react-dom@0.0.0-experimental-c739cef2f-20220912",
+    "react-exp": "npm:react@0.0.0-experimental-c739cef2f-20220912",
     "react-ssr-prepass": "1.0.8",
     "react-virtualized": "9.22.3",
     "relay-compiler": "13.0.2",
diff --git a/packages/next/client/components/reducer.ts b/packages/next/client/components/reducer.ts
index 90c081d2f059..f4b013528ceb 100644
--- a/packages/next/client/components/reducer.ts
+++ b/packages/next/client/components/reducer.ts
@@ -9,6 +9,31 @@ import type {
 import { matchSegment } from './match-segments'
 import { fetchServerResponse } from './app-router.client'
 
+/**
+ * Invalidate cache one level down from the router state.
+ */
+// TODO-APP: Verify if this needs to be recursive.
+function invalidateCacheByRouterState(
+  newCache: CacheNode,
+  existingCache: CacheNode,
+  routerState: FlightRouterState
+) {
+  // Remove segment that we got data for so that it is filled in during rendering of subTreeData.
+  for (const key in routerState[1]) {
+    const segmentForParallelRoute = routerState[1][key][0]
+    const cacheKey = Array.isArray(segmentForParallelRoute)
+      ? segmentForParallelRoute[1]
+      : segmentForParallelRoute
+    const existingParallelRoutesCacheNode =
+      existingCache.parallelRoutes.get(key)
+    if (existingParallelRoutesCacheNode) {
+      let parallelRouteCacheNode = new Map(existingParallelRoutesCacheNode)
+      parallelRouteCacheNode.delete(cacheKey)
+      newCache.parallelRoutes.set(key, parallelRouteCacheNode)
+    }
+  }
+}
+
 /**
  * Fill cache with subTreeData based on flightDataPath
  */
@@ -56,19 +81,12 @@ function fillCacheWithNewSubTreeData(
           : new Map(),
       }
 
-      // Remove segment that we got data for so that it is filled in during rendering of subTreeData.
-      for (const key in flightDataPath[2][1]) {
-        const segmentForParallelRoute = flightDataPath[2][1][key][0]
-        const cacheKey = Array.isArray(segmentForParallelRoute)
-          ? segmentForParallelRoute[1]
-          : segmentForParallelRoute
-        const existingParallelRoutesCacheNode =
-          existingChildCacheNode?.parallelRoutes.get(key)
-        if (existingParallelRoutesCacheNode) {
-          let parallelRouteCacheNode = new Map(existingParallelRoutesCacheNode)
-          parallelRouteCacheNode.delete(cacheKey)
-          childCacheNode.parallelRoutes.set(key, parallelRouteCacheNode)
-        }
+      if (existingChildCacheNode) {
+        invalidateCacheByRouterState(
+          childCacheNode,
+          existingChildCacheNode,
+          flightDataPath[2]
+        )
       }
 
       childSegmentMap.set(segmentForCache, childCacheNode)
diff --git a/packages/next/client/link.tsx b/packages/next/client/link.tsx
index 26ed48d1404c..805dd857bdab 100644
--- a/packages/next/client/link.tsx
+++ b/packages/next/client/link.tsx
@@ -16,9 +16,6 @@ import { useIntersection } from './use-intersection'
 import { getDomainLocale } from './get-domain-locale'
 import { addBasePath } from './add-base-path'
 
-// @ts-ignore useTransition exist
-const hasUseTransition = typeof React.useTransition !== 'undefined'
-
 type Url = string | UrlObject
 type RequiredKeys<T> = {
   [K in keyof T]-?: {} extends Pick<T, K> ? never : K
@@ -110,7 +107,7 @@ function linkClicked(
   shallow?: boolean,
   scroll?: boolean,
   locale?: string | false,
-  startTransition?: (cb: any) => void,
+  isAppRouter?: boolean,
   prefetchEnabled?: boolean
 ): void {
   const { nodeName } = e.currentTarget
@@ -141,8 +138,9 @@ function linkClicked(
     }
   }
 
-  if (startTransition) {
-    startTransition(navigate)
+  if (isAppRouter) {
+    // @ts-expect-error startTransition exists.
+    React.startTransition(navigate)
   } else {
     navigate()
   }
@@ -305,13 +303,6 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
     }
 
     const p = prefetchProp !== false
-    const [, /* isPending */ startTransition] = hasUseTransition
-      ? // Rules of hooks is disabled here because the useTransition will always exist with React 18.
-        // There is no difference between renders in this case, only between using React 18 vs 17.
-        // @ts-ignore useTransition exists
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        React.useTransition()
-      : []
     let router = React.useContext(RouterContext)
 
     // TODO-APP: type error. Remove `as any`
@@ -442,7 +433,7 @@ const Link = React.forwardRef<HTMLAnchorElement, LinkPropsReal>(
             shallow,
             scroll,
             locale,
-            appRouter ? startTransition : undefined,
+            Boolean(appRouter),
             p
           )
         }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f9da48226515..8bb382bf1ae0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,8 +140,8 @@ importers:
       react-17: npm:react@17.0.2
       react-dom: 18.2.0
       react-dom-17: npm:react-dom@17.0.2
-      react-dom-exp: npm:react-dom@0.0.0-experimental-7028ce745-20220907
-      react-exp: npm:react@0.0.0-experimental-7028ce745-20220907
+      react-dom-exp: npm:react-dom@0.0.0-experimental-c739cef2f-20220912
+      react-exp: npm:react@0.0.0-experimental-c739cef2f-20220912
       react-ssr-prepass: 1.0.8
       react-virtualized: 9.22.3
       relay-compiler: 13.0.2
@@ -295,8 +295,8 @@ importers:
       react-17: /react/17.0.2
       react-dom: 18.2.0_react@18.2.0
       react-dom-17: /react-dom/17.0.2_react@18.2.0
-      react-dom-exp: /react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0
-      react-exp: /react/0.0.0-experimental-7028ce745-20220907
+      react-dom-exp: /react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0
+      react-exp: /react/0.0.0-experimental-c739cef2f-20220912
       react-ssr-prepass: 1.0.8_qncsgtzehe3fgiqp6tr7lwq6fm
       react-virtualized: 9.22.3_biqbaboplfbrettd7655fr4n2y
       relay-compiler: 13.0.2
@@ -24369,17 +24369,17 @@ packages:
       strip-json-comments: 2.0.1
     dev: true
 
-  /react-dom/0.0.0-experimental-7028ce745-20220907_react@18.2.0:
+  /react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0:
     resolution:
       {
-        integrity: sha512-vNt0UKStPB47hPjpk6I1JEnxjl3vb0VItCtpZolzcNtYlMyfDmZFInh6IGiMtfBpm6Fp1LCztfopAnuiYoEb3Q==,
+        integrity: sha512-RbKxCHjX+H/n9yRvB2LFVhHUsFxWOiOlnhSGQ/JO45odUVreNVw0W7hez3biBF1r32f+0dp8RDVfvvKcF1sQyg==,
       }
     peerDependencies:
-      react: 0.0.0-experimental-7028ce745-20220907
+      react: 0.0.0-experimental-c739cef2f-20220912
     dependencies:
       loose-envify: 1.4.0
       react: 18.2.0
-      scheduler: 0.0.0-experimental-7028ce745-20220907
+      scheduler: 0.0.0-experimental-c739cef2f-20220912
     dev: true
 
   /react-dom/17.0.2_react@18.2.0:
@@ -24493,10 +24493,10 @@ packages:
       react-lifecycles-compat: 3.0.4
     dev: true
 
-  /react/0.0.0-experimental-7028ce745-20220907:
+  /react/0.0.0-experimental-c739cef2f-20220912:
     resolution:
       {
-        integrity: sha512-GJkc7NNWnUV7imij/n8YxJTQEY+OsE8qSmHB4esfFV/Gdi5zFOtzXr9LEB8CItAIoIpZ0eK1LXcOAO3cenDzLQ==,
+        integrity: sha512-K3T+R0lw7LzA3HSPHtI4CIYXw6tXKV5ewvuvuY7vfom/0rDvgoUkWHpdkykFUiEaShMKrQyeK6+faq41LeucKA==,
       }
     engines: { node: '>=0.10.0' }
     dependencies:
@@ -25838,10 +25838,10 @@ packages:
       xmlchars: 2.2.0
     dev: true
 
-  /scheduler/0.0.0-experimental-7028ce745-20220907:
+  /scheduler/0.0.0-experimental-c739cef2f-20220912:
     resolution:
       {
-        integrity: sha512-vmk4QI8sXQYFk7rtB9omwlsyNOhdsai4BKvud+XE+CfZuI5iTV+Nzj2EQq19PcfS7cmf1UOQ83wgv4yGgsefUQ==,
+        integrity: sha512-6HcdQoIp5PENl8IWJfCkIHcMx9Z+PVYxiTzFURS58bdkYhF8vsl65w/z6dpq6Ii/05miYi16VzrLc9T61EmexQ==,
       }
     dependencies:
       loose-envify: 1.4.0

From 814144af7f3a6e760634896924692a29b8bc3ee4 Mon Sep 17 00:00:00 2001
From: hiro <hiroyuki.kikuchi@zozo.com>
Date: Tue, 13 Sep 2022 20:53:55 +0900
Subject: [PATCH 64/69] update(examples): Emotion modules (#40242)

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [x] Make sure the linting passes by running `pnpm lint`
- [x] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 examples/with-emotion-swc/package.json     | 4 ++--
 examples/with-emotion-vanilla/package.json | 6 +++---
 examples/with-emotion/package.json         | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/with-emotion-swc/package.json b/examples/with-emotion-swc/package.json
index 89f0df6f3f3a..cd16c715d0b1 100644
--- a/examples/with-emotion-swc/package.json
+++ b/examples/with-emotion-swc/package.json
@@ -6,8 +6,8 @@
     "start": "next start"
   },
   "dependencies": {
-    "@emotion/react": "11.9.3",
-    "@emotion/styled": "11.9.3",
+    "@emotion/react": "11.10.4",
+    "@emotion/styled": "11.10.4",
     "next": "latest",
     "react": "18.2.0",
     "react-dom": "18.2.0"
diff --git a/examples/with-emotion-vanilla/package.json b/examples/with-emotion-vanilla/package.json
index 3a0c6ed052b4..904d9083f852 100644
--- a/examples/with-emotion-vanilla/package.json
+++ b/examples/with-emotion-vanilla/package.json
@@ -6,11 +6,11 @@
     "start": "next start"
   },
   "devDependencies": {
-    "@emotion/babel-plugin": "11.0.0"
+    "@emotion/babel-plugin": "11.10.2"
   },
   "dependencies": {
-    "@emotion/css": "11.0.0",
-    "@emotion/server": "11.0.0",
+    "@emotion/css": "11.10.0",
+    "@emotion/server": "11.10.0",
     "next": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/examples/with-emotion/package.json b/examples/with-emotion/package.json
index 2cad72a46681..b9445b646b19 100644
--- a/examples/with-emotion/package.json
+++ b/examples/with-emotion/package.json
@@ -6,11 +6,11 @@
     "start": "next start"
   },
   "devDependencies": {
-    "@emotion/babel-plugin": "11.0.0"
+    "@emotion/babel-plugin": "11.10.2"
   },
   "dependencies": {
-    "@emotion/react": "11.1.1",
-    "@emotion/styled": "11.0.0",
+    "@emotion/react": "11.10.4",
+    "@emotion/styled": "11.10.4",
     "next": "latest",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"

From 260ea550e07a753310c2ec998ad367d2461595b6 Mon Sep 17 00:00:00 2001
From: Steven Tey <stevensteel97@gmail.com>
Date: Tue, 13 Sep 2022 05:21:05 -0700
Subject: [PATCH 65/69] Added comments to middleware-matcher example (#40273)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)


Co-authored-by: Balázs Orbán <18369201+balazsorban44@users.noreply.github.com>
---
 examples/middleware-matcher/middleware.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/middleware-matcher/middleware.js b/examples/middleware-matcher/middleware.js
index 2d555ddfa773..a14196a4ccf3 100644
--- a/examples/middleware-matcher/middleware.js
+++ b/examples/middleware-matcher/middleware.js
@@ -11,5 +11,8 @@ export default function middleware(req) {
 }
 
 export const config = {
-  matcher: ['/public/disclaimer', '/((?!public|static).*)'],
+  matcher: [
+    '/disclaimer', // match a single, specific page
+    '/((?!public|static).*)', // match all paths not starting with 'public' or 'static'
+  ],
 }

From 3cf7a30df92d8885daaec215c16fc2f22e8efc29 Mon Sep 17 00:00:00 2001
From: Sukka <isukkaw@gmail.com>
Date: Tue, 13 Sep 2022 22:39:52 +0800
Subject: [PATCH 66/69] docs(README): next.js logo with dark mode (#40223)

This PR follows #40181, adding the dark mode support for the brand new
Next.js logo (BTW, the new logo is awesome!). The dark version of the
logo is also served from `assets.vercel.com` (I just change the original
logo URL, replace the `light` with `dark`, and surprisingly find out
that doesn't result in 404).

cc @Nutlope @steven-tey

Ref: [Specify theme context for images in Markdown (Beta) - GitHub
Blog](https://github.blog/changelog/2022-05-19-specify-theme-context-for-images-in-markdown-beta/)

Currently, the Next.js README in dark mode:

<img width="917" alt="image"
src="https://user-images.githubusercontent.com/40715044/188449078-864f6b71-7741-44f4-aee6-02a281b0a263.png">

After the PR:

<img width="914" alt="image"
src="https://user-images.githubusercontent.com/40715044/188449265-a3556565-d866-4e0e-9b97-be62fba6c6fe.png">

Preview link:
https://github.com/SukkaW/next.js/tree/readme-logo-darkmode
---
 packages/next/README.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/next/README.md b/packages/next/README.md
index 824aab204216..a156ba206dca 100644
--- a/packages/next/README.md
+++ b/packages/next/README.md
@@ -1,6 +1,9 @@
 <p align="center">
   <a href="https://nextjs.org">
-    <img src="https://assets.vercel.com/image/upload/v1662130559/nextjs/Icon_light_background.png" height="128">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://assets.vercel.com/image/upload/v1662130559/nextjs/Icon_dark_background.png">
+      <img src="https://assets.vercel.com/image/upload/v1662130559/nextjs/Icon_light_background.png" height="128">
+    </picture>
     <h1 align="center">Next.js</h1>
   </a>
 </p>

From a4ff04124290081939452167d84ada0d69cce0a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bal=C3=A1zs=20Orb=C3=A1n?= <info@balazsorban.com>
Date: Tue, 13 Sep 2022 22:51:44 +0200
Subject: [PATCH 67/69] fix(cli): tune filter for extracting example `.tar`
 (#40513)

As pointed out in
https://github.com/vercel/next.js/issues/40389#issuecomment-1243039792,
the `filter` matched more files than necessary and merged different
example directories together. This change makes the filter match the
example directory name precisely.

Fixes #40389

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 packages/create-next-app/helpers/examples.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/create-next-app/helpers/examples.ts b/packages/create-next-app/helpers/examples.ts
index 961199628d3e..06fef57d27b1 100644
--- a/packages/create-next-app/helpers/examples.ts
+++ b/packages/create-next-app/helpers/examples.ts
@@ -122,7 +122,7 @@ export async function downloadAndExtractExample(root: string, name: string) {
     file: tempFile,
     cwd: root,
     strip: 3,
-    filter: (p) => p.includes(`next.js-canary/examples/${name}`),
+    filter: (p) => p.includes(`next.js-canary/examples/${name}/`),
   })
 
   await fs.unlink(tempFile)

From 69d0e6082caa5b3130c9b0b28de9efd2ec7e5773 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Tue, 13 Sep 2022 23:42:09 +0200
Subject: [PATCH 68/69] Passing down original sourcemap for flight client
 loader (#40508)

Consume the original sourcemap in flight client loader if there's any, to avoid source map is generated based on the module proxy which make debugging hard

Testing with adding `debugger` in layout router, screenshot:

<img width="400" alt="image" src="https://user-images.githubusercontent.com/4800338/189866388-adb1aba5-496b-4b8d-8098-ec04d6f1914a.png">
---
 .../webpack/loaders/next-flight-client-loader/index.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/next/build/webpack/loaders/next-flight-client-loader/index.ts b/packages/next/build/webpack/loaders/next-flight-client-loader/index.ts
index 6c27a5a49f2d..f36ed00d6dfb 100644
--- a/packages/next/build/webpack/loaders/next-flight-client-loader/index.ts
+++ b/packages/next/build/webpack/loaders/next-flight-client-loader/index.ts
@@ -16,12 +16,14 @@ function containsPath(parent: string, child: string) {
 
 export default async function transformSource(
   this: any,
-  source: string
-): Promise<string> {
+  source: string,
+  map: any
+) {
   if (typeof source !== 'string') {
     throw new Error('Expected source to have been transformed to a string.')
   }
 
+  const callback = this.async()
   const appDir = path.join(this.rootContext, 'app')
   const isUnderAppDir = containsPath(appDir, this.resourcePath)
   const filename = path.basename(this.resourcePath)
@@ -50,5 +52,7 @@ export default async function transformSource(
 const { createProxy } = require("next/dist/build/webpack/loaders/next-flight-client-loader/module-proxy")\n
 module.exports = createProxy(${JSON.stringify(this.resourcePath)})
 `
-  return output
+  // Pass empty sourcemap
+  callback(null, output, map)
+  return
 }

From eadaca780b57a561e13200078d5b0626e69af633 Mon Sep 17 00:00:00 2001
From: Tim Neutkens <tim@timneutkens.nl>
Date: Wed, 14 Sep 2022 01:01:43 +0200
Subject: [PATCH 69/69] Add additional tests for prefetch and trailingSlash
 (#40517)

Adds some of the tests we didn't have yet for app.
<!--
Thanks for opening a PR! Your contribution is much appreciated.
In order to make sure your PR is handled as smoothly as possible we
request that you follow the checklist sections below.
Choose the right checklist for the change that you're making:
-->

## Bug

- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Errors have helpful link attached, see `contributing.md`

## Feature

- [ ] Implements an existing feature request or RFC. Make sure the
feature request has been accepted for implementation before opening a
PR.
- [ ] Related issues linked using `fixes #number`
- [ ] Integration tests added
- [ ] Documentation added
- [ ] Telemetry added. In case of a feature if it's used or not.
- [ ] Errors have helpful link attached, see `contributing.md`

## Documentation / Examples

- [ ] Make sure the linting passes by running `pnpm lint`
- [ ] The examples guidelines are followed from [our contributing
doc](https://github.com/vercel/next.js/blob/canary/contributing.md#adding-examples)
---
 .../app/dashboard/layout.server.js            |  4 +-
 .../app-prefetch/app/dashboard/page.server.js |  2 +-
 .../app-dir/app-prefetch/app/page.server.js   |  4 +-
 test/e2e/app-dir/index.test.ts                | 10 +--
 test/e2e/app-dir/prefetching.test.ts          | 57 ++++++++++++++++
 test/e2e/app-dir/rendering.test.ts            |  7 +-
 test/e2e/app-dir/rsc-basic.test.ts            |  9 +--
 test/e2e/app-dir/trailingslash.test.ts        | 66 +++++++++++++++++++
 .../trailingslash/app/a/page.server.js        |  9 +++
 .../trailingslash/app/layout.server.js        | 10 +++
 .../app-dir/trailingslash/app/page.server.js  | 12 ++++
 test/e2e/app-dir/trailingslash/next.config.js |  9 +++
 12 files changed, 172 insertions(+), 27 deletions(-)
 create mode 100644 test/e2e/app-dir/prefetching.test.ts
 create mode 100644 test/e2e/app-dir/trailingslash.test.ts
 create mode 100644 test/e2e/app-dir/trailingslash/app/a/page.server.js
 create mode 100644 test/e2e/app-dir/trailingslash/app/layout.server.js
 create mode 100644 test/e2e/app-dir/trailingslash/app/page.server.js
 create mode 100644 test/e2e/app-dir/trailingslash/next.config.js

diff --git a/test/e2e/app-dir/app-prefetch/app/dashboard/layout.server.js b/test/e2e/app-dir/app-prefetch/app/dashboard/layout.server.js
index 84ebbb490d40..8c83d8e7a216 100644
--- a/test/e2e/app-dir/app-prefetch/app/dashboard/layout.server.js
+++ b/test/e2e/app-dir/app-prefetch/app/dashboard/layout.server.js
@@ -1,5 +1,5 @@
 export async function getServerSideProps() {
-  await new Promise((resolve) => setTimeout(resolve, 2000))
+  await new Promise((resolve) => setTimeout(resolve, 400))
   return {
     props: {
       message: 'Hello World',
@@ -9,7 +9,7 @@ export async function getServerSideProps() {
 export default function DashboardLayout({ children, message }) {
   return (
     <>
-      <h1>Dashboard {message}</h1>
+      <h1 id="dashboard-layout">Dashboard {message}</h1>
       {children}
     </>
   )
diff --git a/test/e2e/app-dir/app-prefetch/app/dashboard/page.server.js b/test/e2e/app-dir/app-prefetch/app/dashboard/page.server.js
index d22dfdf51e84..5171e25e542d 100644
--- a/test/e2e/app-dir/app-prefetch/app/dashboard/page.server.js
+++ b/test/e2e/app-dir/app-prefetch/app/dashboard/page.server.js
@@ -9,7 +9,7 @@ export async function getServerSideProps() {
 export default function DashboardPage({ message }) {
   return (
     <>
-      <p>{message}</p>
+      <p id="dashboard-page">{message}</p>
     </>
   )
 }
diff --git a/test/e2e/app-dir/app-prefetch/app/page.server.js b/test/e2e/app-dir/app-prefetch/app/page.server.js
index 5cb37da2ad8a..be3690c6321b 100644
--- a/test/e2e/app-dir/app-prefetch/app/page.server.js
+++ b/test/e2e/app-dir/app-prefetch/app/page.server.js
@@ -2,7 +2,9 @@ import Link from 'next/link'
 export default function HomePage() {
   return (
     <>
-      <Link href="/dashboard">To Dashboard</Link>
+      <Link href="/dashboard">
+        <a id="to-dashboard">To Dashboard</a>
+      </Link>
     </>
   )
 }
diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts
index 6af635e765ed..0bf456d2dbdc 100644
--- a/test/e2e/app-dir/index.test.ts
+++ b/test/e2e/app-dir/index.test.ts
@@ -23,15 +23,7 @@ describe('app dir', () => {
   function runTests({ assetPrefix }: { assetPrefix?: boolean }) {
     beforeAll(async () => {
       next = await createNext({
-        files: {
-          public: new FileRef(path.join(__dirname, 'app/public')),
-          styles: new FileRef(path.join(__dirname, 'app/styles')),
-          pages: new FileRef(path.join(__dirname, 'app/pages')),
-          app: new FileRef(path.join(__dirname, 'app/app')),
-          'next.config.js': new FileRef(
-            path.join(__dirname, 'app/next.config.js')
-          ),
-        },
+        files: new FileRef(path.join(__dirname, 'app')),
         dependencies: {
           react: 'experimental',
           'react-dom': 'experimental',
diff --git a/test/e2e/app-dir/prefetching.test.ts b/test/e2e/app-dir/prefetching.test.ts
new file mode 100644
index 000000000000..5f9f6bdb5474
--- /dev/null
+++ b/test/e2e/app-dir/prefetching.test.ts
@@ -0,0 +1,57 @@
+import { createNext, FileRef } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
+import { waitFor } from 'next-test-utils'
+import path from 'path'
+import webdriver from 'next-webdriver'
+
+describe('app dir prefetching', () => {
+  if ((global as any).isNextDeploy) {
+    it('should skip next deploy for now', () => {})
+    return
+  }
+
+  if (process.env.NEXT_TEST_REACT_VERSION === '^17') {
+    it('should skip for react v17', () => {})
+    return
+  }
+  let next: NextInstance
+
+  beforeAll(async () => {
+    next = await createNext({
+      files: new FileRef(path.join(__dirname, 'app-prefetch')),
+      dependencies: {
+        react: 'experimental',
+        'react-dom': 'experimental',
+      },
+      skipStart: true,
+    })
+    await next.start()
+  })
+  afterAll(() => next.destroy())
+
+  it('should show layout eagerly when prefetched with loading one level down', async () => {
+    const browser = await webdriver(next.url, '/')
+    // Ensure the page is prefetched
+    await waitFor(1000)
+
+    const before = Date.now()
+    await browser
+      .elementByCss('#to-dashboard')
+      .click()
+      .waitForElementByCss('#dashboard-layout')
+    const after = Date.now()
+    const timeToComplete = after - before
+
+    expect(timeToComplete < 1000).toBe(true)
+
+    expect(await browser.elementByCss('#dashboard-layout').text()).toBe(
+      'Dashboard Hello World'
+    )
+
+    await browser.waitForElementByCss('#dashboard-page')
+
+    expect(await browser.waitForElementByCss('#dashboard-page').text()).toBe(
+      'Welcome to the dashboard'
+    )
+  })
+})
diff --git a/test/e2e/app-dir/rendering.test.ts b/test/e2e/app-dir/rendering.test.ts
index 69f1f0dd3859..d7168bcd275d 100644
--- a/test/e2e/app-dir/rendering.test.ts
+++ b/test/e2e/app-dir/rendering.test.ts
@@ -20,12 +20,7 @@ describe('app dir rendering', () => {
 
   beforeAll(async () => {
     next = await createNext({
-      files: {
-        app: new FileRef(path.join(__dirname, 'app-rendering/app')),
-        'next.config.js': new FileRef(
-          path.join(__dirname, 'app-rendering/next.config.js')
-        ),
-      },
+      files: new FileRef(path.join(__dirname, 'app-rendering')),
       dependencies: {
         react: 'experimental',
         'react-dom': 'experimental',
diff --git a/test/e2e/app-dir/rsc-basic.test.ts b/test/e2e/app-dir/rsc-basic.test.ts
index 0debb6818399..e548c458445f 100644
--- a/test/e2e/app-dir/rsc-basic.test.ts
+++ b/test/e2e/app-dir/rsc-basic.test.ts
@@ -35,15 +35,8 @@ describe('app dir - react server components', () => {
   }
 
   beforeAll(async () => {
-    const appDir = path.join(__dirname, './rsc-basic')
     next = await createNext({
-      files: {
-        node_modules_bak: new FileRef(path.join(appDir, 'node_modules_bak')),
-        public: new FileRef(path.join(appDir, 'public')),
-        components: new FileRef(path.join(appDir, 'components')),
-        app: new FileRef(path.join(appDir, 'app')),
-        'next.config.js': new FileRef(path.join(appDir, 'next.config.js')),
-      },
+      files: new FileRef(path.join(__dirname, './rsc-basic')),
       dependencies: {
         'styled-components': '6.0.0-alpha.5',
         react: 'experimental',
diff --git a/test/e2e/app-dir/trailingslash.test.ts b/test/e2e/app-dir/trailingslash.test.ts
new file mode 100644
index 000000000000..0b8ca82f7553
--- /dev/null
+++ b/test/e2e/app-dir/trailingslash.test.ts
@@ -0,0 +1,66 @@
+import { createNext, FileRef } from 'e2e-utils'
+import { NextInstance } from 'test/lib/next-modes/base'
+import { fetchViaHTTP, renderViaHTTP } from 'next-test-utils'
+import path from 'path'
+import cheerio from 'cheerio'
+import webdriver from 'next-webdriver'
+
+describe('app-dir trailingSlash handling', () => {
+  if ((global as any).isNextDeploy) {
+    it('should skip next deploy for now', () => {})
+    return
+  }
+
+  if (process.env.NEXT_TEST_REACT_VERSION === '^17') {
+    it('should skip for react v17', () => {})
+    return
+  }
+  let next: NextInstance
+
+  beforeAll(async () => {
+    next = await createNext({
+      files: new FileRef(path.join(__dirname, 'trailingslash')),
+      dependencies: {
+        react: 'experimental',
+        'react-dom': 'experimental',
+      },
+      skipStart: true,
+    })
+
+    await next.start()
+  })
+  afterAll(() => next.destroy())
+
+  it('should redirect route when requesting it directly', async () => {
+    const res = await fetchViaHTTP(
+      next.url,
+      '/a',
+      {},
+      {
+        redirect: 'manual',
+      }
+    )
+    expect(res.status).toBe(308)
+    expect(res.headers.get('location')).toBe(next.url + '/a/')
+  })
+
+  it('should render link with trailing slash', async () => {
+    const html = await renderViaHTTP(next.url, '/')
+    const $ = cheerio.load(html)
+    expect($('#to-a-trailing-slash').attr('href')).toBe('/a/')
+  })
+
+  it('should redirect route when requesting it directly by browser', async () => {
+    const browser = await webdriver(next.url, '/a')
+    expect(await browser.waitForElementByCss('#a-page').text()).toBe('A page')
+  })
+
+  it('should redirect route when clicking link', async () => {
+    const browser = await webdriver(next.url, '/')
+    await browser
+      .elementByCss('#to-a-trailing-slash')
+      .click()
+      .waitForElementByCss('#a-page')
+    expect(await browser.waitForElementByCss('#a-page').text()).toBe('A page')
+  })
+})
diff --git a/test/e2e/app-dir/trailingslash/app/a/page.server.js b/test/e2e/app-dir/trailingslash/app/a/page.server.js
new file mode 100644
index 000000000000..d61256ee9f3d
--- /dev/null
+++ b/test/e2e/app-dir/trailingslash/app/a/page.server.js
@@ -0,0 +1,9 @@
+import Link from 'next/link'
+export default function HomePage() {
+  return (
+    <>
+      <h1 id="a-page">A page</h1>
+      <Link href="/">To home</Link>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/trailingslash/app/layout.server.js b/test/e2e/app-dir/trailingslash/app/layout.server.js
new file mode 100644
index 000000000000..05b841b280b3
--- /dev/null
+++ b/test/e2e/app-dir/trailingslash/app/layout.server.js
@@ -0,0 +1,10 @@
+export default function Root({ children }) {
+  return (
+    <html>
+      <head>
+        <title>Hello</title>
+      </head>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/e2e/app-dir/trailingslash/app/page.server.js b/test/e2e/app-dir/trailingslash/app/page.server.js
new file mode 100644
index 000000000000..f02fd1b341b1
--- /dev/null
+++ b/test/e2e/app-dir/trailingslash/app/page.server.js
@@ -0,0 +1,12 @@
+import Link from 'next/link'
+export default function HomePage() {
+  return (
+    <>
+      <p>
+        <Link href="/a/">
+          <a id="to-a-trailing-slash">To a with trailing slash</a>
+        </Link>
+      </p>
+    </>
+  )
+}
diff --git a/test/e2e/app-dir/trailingslash/next.config.js b/test/e2e/app-dir/trailingslash/next.config.js
new file mode 100644
index 000000000000..a4194e110b51
--- /dev/null
+++ b/test/e2e/app-dir/trailingslash/next.config.js
@@ -0,0 +1,9 @@
+module.exports = {
+  experimental: {
+    appDir: true,
+    serverComponents: true,
+    legacyBrowsers: false,
+    browsersListForSwc: true,
+  },
+  trailingSlash: true,
+}