Merge branch 'canary' into hotfix/build-id

vercel · Jan 9, 2020 · 156d426 · 156d426
2 parents 14f0fad + 345efa3
commit 156d426
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/packages/next/build/utils.ts b/packages/next/build/utils.ts
@@ -172,7 +172,7 @@ export async function printTreeView(
         // Re-add `static/` for root files
         .replace(/^<buildId>/, 'static')
         // Remove file hash
-        .replace(/[.-][0-9a-z]{20}(?=\.)/, '')
+        .replace(/[.-]([0-9a-z]{6})[0-9a-z]{14}(?=\.)/, '.$1')
 
       messages.push([
         `  ${innerSymbol} ${cleanName}`,

diff --git a/packages/next/taskfile-babel.js b/packages/next/taskfile-babel.js
@@ -10,7 +10,6 @@ module.exports = function(task) {
     const options = {
       ...babelOpts,
       compact: true,
-      comments: false,
       babelrc: false,
       configFile: false,
       filename: file.base,
@@ -31,7 +30,7 @@ module.exports = function(task) {
     // Workaround for noop.js loading
     if (file.base === 'next-dev.js') {
       output.code = output.code.replace(
-        '__REPLACE_NOOP_IMPORT__',
+        /__REPLACE_NOOP_IMPORT__/g,
         `import('./dev/noop');`
       )
     }

diff --git a/test/integration/build-output/test/index.test.js b/test/integration/build-output/test/index.test.js
@@ -24,8 +24,8 @@ describe('Build Output', () => {
 
       expect(stdout).toMatch(/\/ [ ]* \d{1,} B/)
       expect(stdout).toMatch(/\+ shared by all [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ runtime\/main\.js [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ chunks\/framework\.js [ 0-9. ]* kB/)
+      expect(stdout).toMatch(/ runtime\/main\.[0-9a-z]{6}\.js [ 0-9.]* kB/)
+      expect(stdout).toMatch(/ chunks\/framework\.[0-9a-z]{6}\.js [ 0-9. ]* kB/)
 
       expect(stdout).not.toContain(' /_document')
       expect(stdout).not.toContain(' /_app')
@@ -51,8 +51,8 @@ describe('Build Output', () => {
       expect(stdout).toMatch(/\/ [ ]* \d{1,} B/)
       expect(stdout).toMatch(/\/_app [ ]* \d{1,} B/)
       expect(stdout).toMatch(/\+ shared by all [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ runtime\/main\.js [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ chunks\/framework\.js [ 0-9. ]* kB/)
+      expect(stdout).toMatch(/ runtime\/main\.[0-9a-z]{6}\.js [ 0-9.]* kB/)
+      expect(stdout).toMatch(/ chunks\/framework\.[0-9a-z]{6}\.js [ 0-9. ]* kB/)
 
       expect(stdout).not.toContain(' /_document')
       expect(stdout).not.toContain(' /_error')
@@ -79,8 +79,8 @@ describe('Build Output', () => {
       expect(stdout).toMatch(/\/amp .* AMP/)
       expect(stdout).toMatch(/\/hybrid [ 0-9.]* B/)
       expect(stdout).toMatch(/\+ shared by all [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ runtime\/main\.js [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ chunks\/framework\.js [ 0-9. ]* kB/)
+      expect(stdout).toMatch(/ runtime\/main\.[0-9a-z]{6}\.js [ 0-9.]* kB/)
+      expect(stdout).toMatch(/ chunks\/framework\.[0-9a-z]{6}\.js [ 0-9. ]* kB/)
 
       expect(stdout).not.toContain(' /_document')
       expect(stdout).not.toContain(' /_error')
@@ -105,8 +105,8 @@ describe('Build Output', () => {
       expect(stdout).toMatch(/\/ [ ]* \d{1,} B/)
       expect(stdout).toMatch(/λ \/_error [ ]* \d{1,} B/)
       expect(stdout).toMatch(/\+ shared by all [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ runtime\/main\.js [ 0-9.]* kB/)
-      expect(stdout).toMatch(/ chunks\/framework\.js [ 0-9. ]* kB/)
+      expect(stdout).toMatch(/ runtime\/main\.[0-9a-z]{6}\.js [ 0-9.]* kB/)
+      expect(stdout).toMatch(/ chunks\/framework\.[0-9a-z]{6}\.js [ 0-9. ]* kB/)
 
       expect(stdout).not.toContain(' /_document')
       expect(stdout).not.toContain(' /_app')