Remove dead code elimination for when iSSG isn't used (#9267)

* Don't rely on page-config plugin to detect iSSG usage * Make sure to only update sprStatus if page file * Remove dead-code elimination for iSSG code * Revert next-page-config.ts * Update index.js * Update index.test.js
vercel · Oct 31, 2019 · aafbd53 · aafbd53
1 parent 81066a3
commit aafbd53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 17 deletions.
diff --git a/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js b/packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
@@ -6,7 +6,6 @@ import { SourceMapConsumer } from 'source-map'
 import { SourceMapSource, RawSource } from 'webpack-sources'
 import { RequestShortener } from 'webpack'
 import TaskRunner from './TaskRunner'
-import { sprStatus } from '../../../../babel/plugins/next-page-config'
 
 const warningRegex = /\[.+:([0-9]+),([0-9]+)\]/
 
@@ -177,15 +176,6 @@ export class TerserPlugin {
               inputSourceMap = null
             }
 
-            // force dead-code elimination for SPR related code if not used
-            const { compress } = this.options.terserOptions
-            if (compress) {
-              if (!compress.global_defs) {
-                compress.global_defs = {}
-              }
-              compress.global_defs['self.__HAS_SPR'] = !!sprStatus.used
-            }
-
             const task = {
               file,
               input,

diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
@@ -625,11 +625,7 @@ export default class Router implements BaseRouter {
     const { Component: App } = this.components['/_app']
     let props
 
-    if (
-      // @ts-ignore workaround for dead-code elimination
-      (self.__HAS_SPR || process.env.NODE_ENV !== 'production') &&
-      (Component as any).__NEXT_SPR
-    ) {
+    if ((Component as any).__NEXT_SPR) {
       let status: any
       // pathname should have leading slash
       let { pathname } = parse(ctx.asPath || ctx.pathname)

diff --git a/test/integration/size-limit/test/index.test.js b/test/integration/size-limit/test/index.test.js
@@ -81,7 +81,7 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    expect(responseSizeKilobytes).toBeLessThanOrEqual(221) // Kilobytes
+    expect(responseSizeKilobytes).toBeLessThanOrEqual(222) // Kilobytes
   })
 
   it('should not increase the overall response size of modern build', async () => {
@@ -99,6 +99,6 @@ describe('Production response size', () => {
     )
 
     // These numbers are without gzip compression!
-    expect(responseSizeKilobytes).toBeLessThanOrEqual(199) // Kilobytes
+    expect(responseSizeKilobytes).toBeLessThanOrEqual(200) // Kilobytes
   })
 })