Ensure modern AMP client page bundles are removed (#12138)

vercel · Apr 23, 2020 · 5d13e55 · 5d13e55
1 parent 0a3b64d
commit 5d13e55
Show file tree

Hide file tree

Showing 3 changed files with 296 additions and 188 deletions.
diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -551,15 +551,18 @@ export default async function build(dir: string, conf = null): Promise<void> {
           if (result.isAmpOnly) {
             // ensure all AMP only bundles got removed
             try {
-              await fsUnlink(
-                path.join(
-                  distDir,
-                  'static',
-                  buildId,
-                  'pages',
-                  actualPage + '.js'
-                )
+              const clientBundle = path.join(
+                distDir,
+                'static',
+                buildId,
+                'pages',
+                actualPage + '.js'
               )
+              await fsUnlink(clientBundle)
+
+              if (config.experimental.modern) {
+                await fsUnlink(clientBundle.replace(/\.js$/, '.module.js'))
+              }
             } catch (err) {
               if (err.code !== 'ENOENT') {
                 throw err

diff --git a/test/integration/amphtml/next.config.js b/test/integration/amphtml/next.config.js
@@ -6,4 +6,5 @@ module.exports = {
   amp: {
     canonicalBase: 'http://localhost:1234',
   },
+  // edit here
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,4 +6,5 @@ module.exports = { @@
       amp: {
         canonicalBase: 'http://localhost:1234',
       },
+      // edit here
     }