feat: Upgrade Next.js to Webpack 5

Enabling module federation & suspense SSR
module-federation · Mar 28, 2020 · 6ec9246 · 6ec9246
1 parent be2c65b
commit 6ec9246
Show file tree

Hide file tree

Showing 70 changed files with 9 additions and 1,581 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -508,7 +508,6 @@ export default async function build(dir: string, conf = null): Promise<void> {
       pagesManifest[page] = bundleRelative.replace(/\\/g, '/')
 
       const nonReservedPage = !page.match(/^\/(_app|_error|_document|api)/)
-
       if (nonReservedPage && customAppGetInitialProps === undefined) {
         customAppGetInitialProps = hasCustomGetInitialProps(
           isLikeServerless
@@ -633,6 +632,7 @@ export default async function build(dir: string, conf = null): Promise<void> {
       'utf8'
     )
   }
+
   // Since custom _app.js can wrap the 404 page we have to opt-out of static optimization if it has getInitialProps
   // Only export the static 404 when there is no /_error present
   const useStatic404 =
@@ -669,8 +669,11 @@ export default async function build(dir: string, conf = null): Promise<void> {
   const tbdPrerenderRoutes: string[] = []
 
   if (staticPages.size > 0 || ssgPages.size > 0 || useStatic404) {
+    console.log({ staticPages, ssgPages })
+    // const combinedPages = [...staticPages, ...ssgPages]
     const combinedPages = [...staticPages, ...ssgPages]
     const exportApp = require('../export').default
+
     const exportOptions = {
       silent: true,
       buildExport: true,

diff --git a/packages/next/export/index.ts b/packages/next/export/index.ts
@@ -200,7 +200,6 @@ export default async function(
     }),
     'utf8'
   )
-
   // Copy static directory
   if (!options.buildExport && existsSync(join(dir, 'static'))) {
     log('  copying "static" directory')

diff --git a/packages/next/export/worker.js b/packages/next/export/worker.js
@@ -55,7 +55,6 @@ export default async function({
         )
       }
     }
-
     // Check if the page is a specified dynamic route
     if (isDynamicRoute(page) && page !== path) {
       params = getRouteMatcher(getRouteRegex(page))(path)
@@ -117,7 +116,7 @@ export default async function({
     let html
     let curRenderOpts = {}
     let renderMethod = renderToHTML
-
+    console.log(path)
     const renderedDuringBuild = getStaticProps => {
       return !buildExport && getStaticProps && !isDynamicRoute(path)
     }

diff --git a/packages/next/next-server/server/require.ts b/packages/next/next-server/server/require.ts
@@ -15,7 +15,10 @@ export function pageNotFoundError(page: string): Error {
   err.code = 'ENOENT'
   return err
 }
-
+function requireUncached(module) {
+  delete require.cache[require.resolve(module)]
+  return require(module)
+}
 export function getPagePath(
   page: string,
   distDir: string,

diff --git a/test/integration/404-page/pages/404.js.bak b/test/integration/404-page/pages/404.js.bak
diff --git a/test/integration/api-support/next.config.js b/test/integration/api-support/next.config.js
diff --git a/test/integration/api-support/pages/api/child-process.js b/test/integration/api-support/pages/api/child-process.js
diff --git a/test/integration/bigint/next.config.js b/test/integration/bigint/next.config.js
diff --git a/test/integration/conformance/components/one.js b/test/integration/conformance/components/one.js
diff --git a/test/integration/conformance/next.config.js b/test/integration/conformance/next.config.js
diff --git a/test/integration/conformance/pages/index.js b/test/integration/conformance/pages/index.js
diff --git a/test/integration/conformance/pages/page1.js b/test/integration/conformance/pages/page1.js
diff --git a/test/integration/conformance/pages/page2.js b/test/integration/conformance/pages/page2.js
diff --git a/test/integration/conformance/pages/page3.js b/test/integration/conformance/pages/page3.js
diff --git a/test/integration/conformance/test/index.test.js b/test/integration/conformance/test/index.test.js
diff --git a/test/integration/custom-error/next.config.js b/test/integration/custom-error/next.config.js
diff --git a/test/integration/custom-routes/pages/api/dynamic/[slug].js b/test/integration/custom-routes/pages/api/dynamic/[slug].js
diff --git a/test/integration/custom-routes/server.js b/test/integration/custom-routes/server.js
diff --git a/test/integration/dist-dir/next.config.js b/test/integration/dist-dir/next.config.js
diff --git a/test/integration/dist-dir/pages/index.js b/test/integration/dist-dir/pages/index.js
diff --git a/test/integration/dist-dir/test/index.test.js b/test/integration/dist-dir/test/index.test.js
diff --git a/test/integration/dynamic-route-rename/pages/[pid].js b/test/integration/dynamic-route-rename/pages/[pid].js
diff --git a/test/integration/dynamic-route-rename/test/index.test.js b/test/integration/dynamic-route-rename/test/index.test.js
diff --git a/test/integration/dynamic-routing/pages/p1/p2/nested-all-ssg/[...rest]/index.js b/test/integration/dynamic-routing/pages/p1/p2/nested-all-ssg/[...rest]/index.js
diff --git a/test/integration/dynamic-routing/pages/p1/p2/nested-all-ssg/[...rest]/styles.module.css b/test/integration/dynamic-routing/pages/p1/p2/nested-all-ssg/[...rest]/styles.module.css
diff --git a/test/integration/error-load-fail/pages/broken.js b/test/integration/error-load-fail/pages/broken.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -200,7 +200,6 @@ export default async function( @@
         }),
         'utf8'
       )
       // Copy static directory
       if (!options.buildExport && existsSync(join(dir, 'static'))) {
         log('  copying "static" directory')
@@ Expand Down @@