Merge branch 'canary' into shu/6e85

vercel · Feb 8, 2022 · a56bd75 · a56bd75
2 parents 1145889 + 451dfa1
commit a56bd75
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 37 deletions.
diff --git a/packages/next/build/webpack-config.ts b/packages/next/build/webpack-config.ts
@@ -38,7 +38,6 @@ import BuildManifestPlugin from './webpack/plugins/build-manifest-plugin'
 import { JsConfigPathsPlugin } from './webpack/plugins/jsconfig-paths-plugin'
 import { DropClientPage } from './webpack/plugins/next-drop-client-page-plugin'
 import { TraceEntryPointsPlugin } from './webpack/plugins/next-trace-entrypoints-plugin'
-import NextJsSsrImportPlugin from './webpack/plugins/nextjs-ssr-import'
 import PagesManifestPlugin from './webpack/plugins/pages-manifest-plugin'
 import { ProfilingPlugin } from './webpack/plugins/profiling-plugin'
 import { ReactLoadablePlugin } from './webpack/plugins/react-loadable-plugin'
@@ -1475,7 +1474,6 @@ export default async function getBaseWebpackConfig(
           isEdgeRuntime,
           pageExtensions: config.pageExtensions,
         }),
-      isServer && new NextJsSsrImportPlugin(),
       !isServer &&
         new BuildManifestPlugin({
           buildId,

diff --git a/packages/next/build/webpack/plugins/nextjs-ssr-import.ts b/packages/next/build/webpack/plugins/nextjs-ssr-import.ts