Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Oct 31, 2019
Merged

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

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
666ed62
Don't rely on page-config plugin to detect iSSG usage
ijjk Oct 31, 2019
b0d868b
Make sure to only update sprStatus if page file
ijjk Oct 31, 2019
974fe58
Merge remote-tracking branch 'upstream/canary' into fix/terser-spr-check
ijjk Oct 31, 2019
03b31cc
Remove dead-code elimination for iSSG code
ijjk Oct 31, 2019
e892804
Revert next-page-config.ts
Timer Oct 31, 2019
5e27a30
Update index.js
Timer Oct 31, 2019
38eb288
Merge branch 'canary' into fix/terser-spr-check
Timer Oct 31, 2019
0ac212e
Update index.test.js
Timer Oct 31, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions packages/next/build/webpack/plugins/terser-webpack-plugin/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]+)\]/

Expand Down Expand Up @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions packages/next/next-server/lib/router/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down