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
444be1cb
Unverified
Commit
444be1cb
authored
Apr 07, 2019
by
Joe Haddad
Committed by
GitHub
Apr 07, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix nesting level of client page scripts (#6925)
parent
a9648c44
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
chunk-graph-plugin.ts
packages/next/build/webpack/plugins/chunk-graph-plugin.ts
+1
-1
serverless-plugin.ts
packages/next/build/webpack/plugins/serverless-plugin.ts
+1
-1
_document.js
packages/next/pages/_document.js
+4
-4
No files found.
packages/next/build/webpack/plugins/chunk-graph-plugin.ts
View file @
444be1cb
...
@@ -163,7 +163,7 @@ export class ChunkGraphPlugin implements Plugin {
...
@@ -163,7 +163,7 @@ export class ChunkGraphPlugin implements Plugin {
const
getLambdaChunk
=
(
name
:
string
)
=>
const
getLambdaChunk
=
(
name
:
string
)
=>
name
.
includes
(
this
.
buildId
)
name
.
includes
(
this
.
buildId
)
?
name
?
name
.
replace
(
new
RegExp
(
`
${
this
.
buildId
}
[\\/\\\\]`
),
''
)
.
replace
(
new
RegExp
(
`
${
this
.
buildId
}
[\\/\\\\]`
),
'
client/
'
)
.
replace
(
/
[
.
]
js$/
,
`.
${
this
.
buildId
}
.js`
)
.
replace
(
/
[
.
]
js$/
,
`.
${
this
.
buildId
}
.js`
)
:
name
:
name
...
...
packages/next/build/webpack/plugins/serverless-plugin.ts
View file @
444be1cb
...
@@ -94,7 +94,7 @@ export class ServerlessPlugin {
...
@@ -94,7 +94,7 @@ export class ServerlessPlugin {
for
(
const
name
of
assetNames
)
{
for
(
const
name
of
assetNames
)
{
compilation
.
assets
[
compilation
.
assets
[
name
name
.
replace
(
new
RegExp
(
`
${
this
.
buildId
}
[\\/\\\\]`
),
''
)
.
replace
(
new
RegExp
(
`
${
this
.
buildId
}
[\\/\\\\]`
),
'
client/
'
)
.
replace
(
/
[
.
]
js$/
,
`.
${
this
.
buildId
}
.js`
)
.
replace
(
/
[
.
]
js$/
,
`.
${
this
.
buildId
}
.js`
)
]
=
compilation
.
assets
[
name
]
]
=
compilation
.
assets
[
name
]
}
}
...
...
packages/next/pages/_document.js
View file @
444be1cb
...
@@ -258,7 +258,7 @@ export class Head extends Component {
...
@@ -258,7 +258,7 @@ export class Head extends Component {
href
=
{
href
=
{
assetPrefix
+
assetPrefix
+
(
dynamicBuildId
(
dynamicBuildId
?
`/_next/static/pages
${
getPageFile
(
page
,
buildId
)}
`
?
`/_next/static/
client/
pages
${
getPageFile
(
page
,
buildId
)}
`
:
`/_next/static/
${
buildId
}
/pages
${
getPageFile
(
page
)}
`
)
+
:
`/_next/static/
${
buildId
}
/pages
${
getPageFile
(
page
)}
`
)
+
_devOnlyInvalidateCacheQueryString
_devOnlyInvalidateCacheQueryString
}
}
...
@@ -272,7 +272,7 @@ export class Head extends Component {
...
@@ -272,7 +272,7 @@ export class Head extends Component {
href
=
{
href
=
{
assetPrefix
+
assetPrefix
+
(
dynamicBuildId
(
dynamicBuildId
?
`/_next/static/pages/_app.
${
buildId
}
.js`
?
`/_next/static/
client/
pages/_app.
${
buildId
}
.js`
:
`/_next/static/
${
buildId
}
/pages/_app.js`
)
+
:
`/_next/static/
${
buildId
}
/pages/_app.js`
)
+
_devOnlyInvalidateCacheQueryString
_devOnlyInvalidateCacheQueryString
}
}
...
@@ -467,7 +467,7 @@ export class NextScript extends Component {
...
@@ -467,7 +467,7 @@ export class NextScript extends Component {
src
=
{
src
=
{
assetPrefix
+
assetPrefix
+
(
dynamicBuildId
(
dynamicBuildId
?
`/_next/static/pages
${
getPageFile
(
page
,
buildId
)}
`
?
`/_next/static/
client/
pages
${
getPageFile
(
page
,
buildId
)}
`
:
`/_next/static/
${
buildId
}
/pages
${
getPageFile
(
page
)}
`
)
+
:
`/_next/static/
${
buildId
}
/pages
${
getPageFile
(
page
)}
`
)
+
_devOnlyInvalidateCacheQueryString
_devOnlyInvalidateCacheQueryString
}
}
...
@@ -481,7 +481,7 @@ export class NextScript extends Component {
...
@@ -481,7 +481,7 @@ export class NextScript extends Component {
src
=
{
src
=
{
assetPrefix
+
assetPrefix
+
(
dynamicBuildId
(
dynamicBuildId
?
`/_next/static/pages/_app.
${
buildId
}
.js`
?
`/_next/static/
client/
pages/_app.
${
buildId
}
.js`
:
`/_next/static/
${
buildId
}
/pages/_app.js`
)
+
:
`/_next/static/
${
buildId
}
/pages/_app.js`
)
+
_devOnlyInvalidateCacheQueryString
_devOnlyInvalidateCacheQueryString
}
}
...
...
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