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

Encode URL paths in HTML and CSR #8435

Merged
merged 12 commits into from
Aug 29, 2019
Merged

Encode URL paths in HTML and CSR #8435

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b5c95b4
added filename encoder for testing
eshikerya Aug 20, 2019
2996aa0
Merge branch 'canary' into filename-encoder
eshikerya Aug 20, 2019
ff2691a
fixes in page-loader
eshikerya Aug 20, 2019
16b8191
Merge branch 'filename-encoder' of https://github.com/eshikerya/next.…
eshikerya Aug 20, 2019
ab5d396
fix possibly undefined
eshikerya Aug 22, 2019
28072d2
conflict resolution
eshikerya Aug 22, 2019
3999687
Merge branch 'canary' into filename-encoder
eshikerya Aug 22, 2019
623f49d
Merge branch 'canary' into filename-encoder
eshikerya Aug 23, 2019
dac1208
Update packages/next/pages/_document.tsx
eshikerya Aug 23, 2019
71d0180
move encoding into individual tags as Joe suggested
eshikerya Aug 23, 2019
067a2fc
Merge branch 'canary' into filename-encoder
Timer Aug 29, 2019
53c068d
Merge branch 'canary' into filename-encoder
Timer Aug 29, 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
4 changes: 2 additions & 2 deletions packages/next/client/page-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ function preloadScript (url) {
const link = document.createElement('link')
link.rel = 'preload'
link.crossOrigin = process.crossOrigin
link.href = url
link.href = encodeURI(url)
link.as = 'script'
document.head.appendChild(link)
}
Expand Down Expand Up @@ -166,7 +166,7 @@ export default class PageLoader {
if (isPage) url = url.replace(/\.js$/, '.module.js')
}
script.crossOrigin = process.crossOrigin
script.src = url
script.src = encodeURI(url)
script.onerror = () => {
const error = new Error(`Error loading script ${url}`)
error.code = 'PAGE_LOAD_ERROR'
Expand Down
31 changes: 18 additions & 13 deletions packages/next/pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export class Head extends Component<
key={file}
nonce={this.props.nonce}
rel="stylesheet"
href={`${assetPrefix}/_next/${file}`}
href={`${assetPrefix}/_next/${encodeURI(file)}`}
crossOrigin={this.props.crossOrigin || process.crossOrigin}
/>
)
Expand All @@ -178,9 +178,9 @@ export class Head extends Component<
<link
rel="preload"
key={bundle.file}
href={`${assetPrefix}/_next/${
href={`${assetPrefix}/_next/${encodeURI(
bundle.file
}${_devOnlyInvalidateCacheQueryString}`}
)}${_devOnlyInvalidateCacheQueryString}`}
as="script"
nonce={this.props.nonce}
crossOrigin={this.props.crossOrigin || process.crossOrigin}
Expand Down Expand Up @@ -214,7 +214,9 @@ export class Head extends Component<
key={file}
nonce={this.props.nonce}
rel="preload"
href={`${assetPrefix}/_next/${file}${_devOnlyInvalidateCacheQueryString}`}
href={`${assetPrefix}/_next/${encodeURI(
file
)}${_devOnlyInvalidateCacheQueryString}`}
as="script"
crossOrigin={this.props.crossOrigin || process.crossOrigin}
/>
Expand Down Expand Up @@ -490,9 +492,9 @@ export class NextScript extends Component<OriginProps> {
<script
async
key={bundle.file}
src={`${assetPrefix}/_next/${
src={`${assetPrefix}/_next/${encodeURI(
bundle.file
}${_devOnlyInvalidateCacheQueryString}`}
)}${_devOnlyInvalidateCacheQueryString}`}
nonce={this.props.nonce}
crossOrigin={this.props.crossOrigin || process.crossOrigin}
{...modernProps}
Expand Down Expand Up @@ -524,7 +526,9 @@ export class NextScript extends Component<OriginProps> {
return (
<script
key={file}
src={`${assetPrefix}/_next/${file}${_devOnlyInvalidateCacheQueryString}`}
src={`${assetPrefix}/_next/${encodeURI(
file
)}${_devOnlyInvalidateCacheQueryString}`}
nonce={this.props.nonce}
async
crossOrigin={this.props.crossOrigin || process.crossOrigin}
Expand Down Expand Up @@ -617,11 +621,10 @@ export class NextScript extends Component<OriginProps> {
data-next-page={page}
key={page}
src={
assetPrefix +
(dynamicBuildId
assetPrefix + dynamicBuildId
eshikerya marked this conversation as resolved.
Show resolved Hide resolved
? `/_next/static/client/pages${getPageFile(page, buildId)}`
: `/_next/static/${buildId}/pages${getPageFile(page)}`) +
_devOnlyInvalidateCacheQueryString
: `/_next/static/${buildId}/pages${getPageFile(page)}` +
_devOnlyInvalidateCacheQueryString
}
nonce={this.props.nonce}
crossOrigin={this.props.crossOrigin || process.crossOrigin}
Expand Down Expand Up @@ -691,7 +694,9 @@ export class NextScript extends Component<OriginProps> {
!file.match(/\.js\.map/) && (
<script
key={file}
src={`${assetPrefix}/_next/${file}${_devOnlyInvalidateCacheQueryString}`}
src={`${assetPrefix}/_next/${encodeURI(
file
)}${_devOnlyInvalidateCacheQueryString}`}
nonce={this.props.nonce}
crossOrigin={this.props.crossOrigin || process.crossOrigin}
/>
Expand Down Expand Up @@ -739,5 +744,5 @@ function getPageFile(page: string, buildId?: string) {
return buildId ? `/index.${buildId}.js` : '/index.js'
}

return buildId ? `${page}.${buildId}.js` : `${page}.js`
return encodeURI(buildId ? `${page}.${buildId}.js` : `${page}.js`)
Timer marked this conversation as resolved.
Show resolved Hide resolved
}