Unverified Commit 444be1cb authored by Joe Haddad's avatar Joe Haddad Committed by GitHub

Fix nesting level of client page scripts (#6925)

parent a9648c44
...@@ -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
......
...@@ -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]
} }
......
...@@ -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
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment