Merge branch 'fix/isolate-edge-workers' of github.com:ijjk/next.js in…

…to fix/isolate-edge-workers
vercel · Oct 14, 2022 · f31a7b4 · f31a7b4
2 parents 35a7339 + 6b8cbc0
commit f31a7b4
Show file tree

Hide file tree

Showing 314 changed files with 1,226 additions and 1,121 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -1067,7 +1067,7 @@ export default async function getBaseWebpackConfig(
       }
 
       const notExternalModules =
-        /^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|future\/image|constants|dynamic|script|navigation|headers)$)|string-hash|private-next-rsc-mod-ref-proxy$)/
+        /^(?:private-next-pages\/|next\/(?:dist\/pages\/|(?:app|document|link|image|legacy\/image|constants|dynamic|script|navigation|headers)$)|string-hash|private-next-rsc-mod-ref-proxy$)/
       if (notExternalModules.test(request)) {
         return
       }

diff --git a/packages/next/build/webpack/plugins/telemetry-plugin.ts b/packages/next/build/webpack/plugins/telemetry-plugin.ts
@@ -21,6 +21,7 @@ export type SWC_TARGET_TRIPLE =
 export type Feature =
   | 'next/image'
   | 'next/future/image'
+  | 'next/legacy/image'
   | 'next/script'
   | 'next/dynamic'
   | 'swcLoader'
@@ -58,6 +59,7 @@ interface Connection {
 const FEATURE_MODULE_MAP: ReadonlyMap<Feature, string> = new Map([
   ['next/image', '/next/image.js'],
   ['next/future/image', '/next/future/image.js'],
+  ['next/legacy/image', '/next/legacy/image.js'],
   ['next/script', '/next/script.js'],
   ['next/dynamic', '/next/dynamic.js'],
 ])