Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
bbc62a07
Unverified
Commit
bbc62a07
authored
Dec 07, 2019
by
Joe Haddad
Committed by
GitHub
Dec 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only Remove Server-Side Imports (#9653)
* Only Remove Server-Side Imports * Cleanup imports
parent
b4db0421
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
68 additions
and
59 deletions
+68
-59
dangerously-remove-unused-imports.ts
.../build/babel/plugins/dangerously-remove-unused-imports.ts
+0
-36
next-ssg-transform.ts
packages/next/build/babel/plugins/next-ssg-transform.ts
+40
-0
next-babel-loader.js
packages/next/build/webpack/loaders/next-babel-loader.js
+2
-12
babel-plugin-next-ssg-transform.test.js
test/unit/babel-plugin-next-ssg-transform.test.js
+18
-5
next-babel-loader.test.js
test/unit/next-babel-loader.test.js
+8
-6
No files found.
packages/next/build/babel/plugins/dangerously-remove-unused-imports.ts
deleted
100644 → 0
View file @
b4db0421
import
{
NodePath
,
PluginObj
}
from
'@babel/core'
import
*
as
BabelTypes
from
'@babel/types'
export
default
function
():
PluginObj
<
any
>
{
return
{
name
:
'dangerously-remove-unused-imports'
,
visitor
:
{
Program
:
{
exit
(
path
:
NodePath
<
BabelTypes
.
Program
>
)
{
Object
.
entries
(
path
.
scope
.
bindings
).
forEach
(([
k
,
v
])
=>
{
if
(
v
.
referenced
||
v
.
kind
!==
'module'
)
return
if
(
!
(
v
.
path
.
type
===
'ImportDefaultSpecifier'
||
v
.
path
.
type
===
'ImportSpecifier'
||
v
.
path
.
type
===
'ImportNamespaceSpecifier'
)
||
!
(
v
.
path
.
parent
.
type
===
'ImportDeclaration'
)
)
{
throw
new
Error
(
`invariant: unknown import binding:
${
v
.
path
.
type
}
/ parent:
${
v
.
path
.
parent
.
type
}
`
)
}
if
(
v
.
path
.
parent
.
specifiers
.
length
===
1
)
{
v
.
path
.
parentPath
.
remove
()
}
else
{
v
.
path
.
remove
()
}
})
},
},
},
}
}
packages/next/build/babel/plugins/next-ssg-transform.ts
View file @
bbc62a07
...
...
@@ -110,6 +110,20 @@ export default function nextTransformSsg({
}
}
function
markImport
(
path
:
NodePath
<
|
BabelTypes
.
ImportSpecifier
|
BabelTypes
.
ImportDefaultSpecifier
|
BabelTypes
.
ImportNamespaceSpecifier
>
,
state
:
PluginState
)
{
const
local
=
path
.
get
(
'local'
)
if
(
isIdentifierReferenced
(
local
))
{
state
.
refs
.
add
(
local
.
node
.
name
)
}
}
return
{
visitor
:
{
Program
:
{
...
...
@@ -149,6 +163,26 @@ export default function nextTransformSsg({
}
}
function
sweepImport
(
path
:
NodePath
<
|
BabelTypes
.
ImportSpecifier
|
BabelTypes
.
ImportDefaultSpecifier
|
BabelTypes
.
ImportNamespaceSpecifier
>
)
{
const
local
=
path
.
get
(
'local'
)
if
(
refs
.
has
(
local
.
node
.
name
)
&&
!
isIdentifierReferenced
(
local
))
{
++
count
path
.
remove
()
if
(
(
path
.
parent
as
BabelTypes
.
ImportDeclaration
).
specifiers
.
length
===
0
)
{
path
.
parentPath
.
remove
()
}
}
}
do
{
;(
path
.
scope
as
any
).
crawl
()
count
=
0
...
...
@@ -172,6 +206,9 @@ export default function nextTransformSsg({
FunctionDeclaration
:
sweepFunction
,
FunctionExpression
:
sweepFunction
,
ArrowFunctionExpression
:
sweepFunction
,
ImportSpecifier
:
sweepImport
,
ImportDefaultSpecifier
:
sweepImport
,
ImportNamespaceSpecifier
:
sweepImport
,
})
}
while
(
count
)
...
...
@@ -193,6 +230,9 @@ export default function nextTransformSsg({
FunctionDeclaration
:
markFunction
,
FunctionExpression
:
markFunction
,
ArrowFunctionExpression
:
markFunction
,
ImportSpecifier
:
markImport
,
ImportDefaultSpecifier
:
markImport
,
ImportNamespaceSpecifier
:
markImport
,
ExportNamedDeclaration
(
path
,
state
)
{
const
specifiers
=
path
.
get
(
'specifiers'
)
if
(
specifiers
.
length
)
{
...
...
packages/next/build/webpack/loaders/next-babel-loader.js
View file @
bbc62a07
import
hash
from
'string-hash'
import
{
join
,
basename
}
from
'path'
import
babelLoader
from
'babel-loader'
import
{
EXPORT_NAME_GET_STATIC_PROPS
}
from
'../../babel/plugins/next-ssg-transform'
import
{
basename
,
join
}
from
'path'
import
hash
from
'string-hash'
// increment 'e' to invalidate cache
// eslint-disable-next-line no-useless-concat
...
...
@@ -195,15 +194,6 @@ module.exports = babelLoader.custom(babel => {
{},
])
}
if
(
source
.
includes
(
EXPORT_NAME_GET_STATIC_PROPS
))
{
options
.
plugins
.
push
([
require
.
resolve
(
'../../babel/plugins/dangerously-remove-unused-imports'
),
{},
])
}
}
// As next-server/lib has stateful modules we have to transpile commonjs
...
...
test/unit/babel-plugin-next-ssg-transform.test.js
View file @
bbc62a07
...
...
@@ -262,22 +262,35 @@ describe('babel plugin (next-ssg-transform)', () => {
)
})
it
(
`should remove re-exported function declarations' dependents (variables, functions)`
,
()
=>
{
it
(
`should remove re-exported function declarations' dependents (variables, functions
, imports
)`
,
()
=>
{
const
output
=
babel
(
trim
`
import keep_me from 'hello'
import {keep_me2} from 'hello2'
import * as keep_me3 from 'hello3'
import drop_me from 'bla'
import { drop_me2 } from 'foo'
import { drop_me3, but_not_me } from 'bar'
import * as remove_mua from 'hehe'
var leave_me_alone = 1;
function dont_bug_me_either() {}
const inceptionVar = 'hahaa';
var var1 = 1;
let var2 = 2;
const var3 = inceptionVar;
const var3 = inceptionVar
+ remove_mua
;
function inception1() {var2;}
function inception1() {var2;
drop_me2;
}
function abc() {}
const b = function() {var3;};
const b = function() {var3;
drop_me3;
};
const b2 = function apples() {};
const bla = () => {inception1};
function unstable_getStaticProps() {
abc();
drop_me;
b;
b2;
bla();
...
...
@@ -292,7 +305,7 @@ describe('babel plugin (next-ssg-transform)', () => {
`
)
expect
(
output
).
toMatchInlineSnapshot
(
`"const __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
`"
import keep_me from'hello';import{keep_me2}from'hello2';import*as keep_me3 from'hello3';import{but_not_me}from'bar';var leave_me_alone=1;function dont_bug_me_either(){}
const __NEXT_COMP=function Test(){return __jsx(\\"div\\",null);};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
)
})
})
...
...
test/unit/next-babel-loader.test.js
View file @
bbc62a07
...
...
@@ -254,10 +254,12 @@ describe('next-babel-loader', () => {
`import{c,d}from"e";`
+
`import{e as ee,f as ff}from"f";`
+
``
+
`export function unstable_getStaticProps() { return { props: {} } }`
,
`export function unstable_getStaticProps() {
foo;bar;baz;cats;baz2;ff;
return { props: {} } }`
,
{
resourcePath
:
pageFile
}
)
expect
(
code
).
toMatchInlineSnapshot
(
`"import\\"core-js\\";"`
)
expect
(
code
).
toMatchInlineSnapshot
(
`"import\\"core-js\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3 from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f\\";"`
)
})
it
(
'should keep used exports in a modern-apis page (server)'
,
async
()
=>
{
...
...
@@ -278,7 +280,7 @@ describe('next-babel-loader', () => {
{
resourcePath
:
pageFile
,
isServer
:
true
}
)
expect
(
code
).
toMatchInlineSnapshot
(
`"import\\"core-js\\";import{foo,bar}from\\"a\\";import
ooo from\\"ooo\\";import baz2 from\\"c\\";import{
f as ff}from\\"f\\";export function unstable_getStaticProps(){foo();baz2();ff();ooo();return{props:{}};}export default function(){return bar();}"`
`"import\\"core-js\\";import{foo,bar}from\\"a\\";import
baz from\\"b\\";import ooo from\\"ooo\\";import*as React from\\"react\\";import baz2,{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee,
f as ff}from\\"f\\";export function unstable_getStaticProps(){foo();baz2();ff();ooo();return{props:{}};}export default function(){return bar();}"`
)
})
...
...
@@ -295,12 +297,12 @@ describe('next-babel-loader', () => {
`import{c,d}from"e";`
+
`import{e as ee,f as ff}from"f";`
+
``
+
`export function unstable_getStaticProps() {foo();baz2();ff();ooo(); return { props: {} }}`
+
`export function unstable_getStaticProps() {foo();baz2();ff();ooo();
cats;
return { props: {} }}`
+
`export default function () { return cats + bar(); }`
,
{
resourcePath
:
pageFile
,
isServer
:
false
}
)
expect
(
code
).
toMatchInlineSnapshot
(
`"import\\"core-js\\";import{bar}from\\"a\\";import
{cats}from\\"d
\\";const __NEXT_COMP=function(){return cats+bar();};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
`"import\\"core-js\\";import{bar}from\\"a\\";import
baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f
\\";const __NEXT_COMP=function(){return cats+bar();};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
)
})
...
...
@@ -322,7 +324,7 @@ describe('next-babel-loader', () => {
{
resourcePath
:
pageFile
,
isServer
:
false
}
)
expect
(
code
).
toMatchInlineSnapshot
(
`"
import React from\\"react\\";var __jsx=React.createElement;import\\"core-js\\";import{bar}from\\"a\\";import{cats}from\\"d
\\";const __NEXT_COMP=function(){return __jsx(\\"div\\",null,cats+bar());};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
`"
var __jsx=React.createElement;import\\"core-js\\";import{bar}from\\"a\\";import baz from\\"b\\";import*as React from\\"react\\";import{yeet}from\\"c\\";import baz3,{cats}from\\"d\\";import{c,d}from\\"e\\";import{e as ee}from\\"f
\\";const __NEXT_COMP=function(){return __jsx(\\"div\\",null,cats+bar());};__NEXT_COMP.__NEXT_SPR=true export default __NEXT_COMP;"`
)
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment