Commit 72a0c557 authored by Tim Neutkens's avatar Tim Neutkens Committed by Joe Haddad

Remove async from void functions in page-loader (#9948)

* Remove async from void functions in page-loader

* Fix void return

* Update page-loader.js

* Update index.test.js
parent 1fd57d22
...@@ -18,6 +18,16 @@ const relPrefetch = ...@@ -18,6 +18,16 @@ const relPrefetch =
const hasNoModule = 'noModule' in document.createElement('script') const hasNoModule = 'noModule' in document.createElement('script')
function normalizeRoute(route) {
if (route[0] !== '/') {
throw new Error(`Route name should start with a "/", got "${route}"`)
}
route = route.replace(/\/index$/, '/')
if (route === '/') return route
return route.replace(/\/$/, '')
}
function appendLink(href, rel, as) { function appendLink(href, rel, as) {
return new Promise((res, rej, link) => { return new Promise((res, rej, link) => {
link = document.createElement('link') link = document.createElement('link')
...@@ -63,22 +73,12 @@ export default class PageLoader { ...@@ -63,22 +73,12 @@ export default class PageLoader {
) )
} }
normalizeRoute(route) {
if (route[0] !== '/') {
throw new Error(`Route name should start with a "/", got "${route}"`)
}
route = route.replace(/\/index$/, '/')
if (route === '/') return route
return route.replace(/\/$/, '')
}
loadPage(route) { loadPage(route) {
return this.loadPageScript(route).then(v => v.page) return this.loadPageScript(route).then(v => v.page)
} }
loadPageScript(route) { loadPageScript(route) {
route = this.normalizeRoute(route) route = normalizeRoute(route)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const fire = ({ error, page, mod }) => { const fire = ({ error, page, mod }) => {
...@@ -139,8 +139,8 @@ export default class PageLoader { ...@@ -139,8 +139,8 @@ export default class PageLoader {
}) })
} }
async loadRoute(route) { loadRoute(route) {
route = this.normalizeRoute(route) route = normalizeRoute(route)
let scriptRoute = route === '/' ? '/index.js' : `${route}.js` let scriptRoute = route === '/' ? '/index.js' : `${route}.js`
const url = `${this.assetPrefix}/_next/static/${encodeURIComponent( const url = `${this.assetPrefix}/_next/static/${encodeURIComponent(
...@@ -203,20 +203,20 @@ export default class PageLoader { ...@@ -203,20 +203,20 @@ export default class PageLoader {
register() register()
} }
async prefetch(route, isDependency) { prefetch(route, isDependency) {
// https://github.com/GoogleChromeLabs/quicklink/blob/453a661fa1fa940e2d2e044452398e38c67a98fb/src/index.mjs#L115-L118 // https://github.com/GoogleChromeLabs/quicklink/blob/453a661fa1fa940e2d2e044452398e38c67a98fb/src/index.mjs#L115-L118
// License: Apache 2.0 // License: Apache 2.0
let cn let cn
if ((cn = navigator.connection)) { if ((cn = navigator.connection)) {
// Don't prefetch if using 2G or if Save-Data is enabled. // Don't prefetch if using 2G or if Save-Data is enabled.
if (cn.saveData || /2g/.test(cn.effectiveType)) return if (cn.saveData || /2g/.test(cn.effectiveType)) return Promise.resolve()
} }
let url = this.assetPrefix let url = this.assetPrefix
if (isDependency) { if (isDependency) {
url += route url += route
} else { } else {
route = this.normalizeRoute(route) route = normalizeRoute(route)
this.prefetched[route] = true this.prefetched[route] = true
let scriptRoute = `${route === '/' ? '/index' : route}.js` let scriptRoute = `${route === '/' ? '/index' : route}.js`
...@@ -229,22 +229,24 @@ export default class PageLoader { ...@@ -229,22 +229,24 @@ export default class PageLoader {
)}/pages${encodeURI(scriptRoute)}` )}/pages${encodeURI(scriptRoute)}`
} }
if ( return Promise.all(
document.querySelector( document.querySelector(
`link[rel="${relPrefetch}"][href^="${url}"], script[data-next-page="${route}"]` `link[rel="${relPrefetch}"][href^="${url}"], script[data-next-page="${route}"]`
) )
) { ? []
return : [
} appendLink(
url,
return Promise.all([ relPrefetch,
appendLink(url, relPrefetch, url.match(/\.css$/) ? 'style' : 'script'), url.match(/\.css$/) ? 'style' : 'script'
process.env.__NEXT_GRANULAR_CHUNKS && ),
!isDependency && process.env.__NEXT_GRANULAR_CHUNKS &&
this.getDependencies(route).then(urls => !isDependency &&
Promise.all(urls.map(url => this.prefetch(url, true))) this.getDependencies(route).then(urls =>
), Promise.all(urls.map(url => this.prefetch(url, true)))
]).then( ),
]
).then(
// do not return any data // do not return any data
() => {}, () => {},
// swallow prefetch errors // swallow prefetch errors
......
...@@ -101,7 +101,7 @@ describe('Production response size', () => { ...@@ -101,7 +101,7 @@ describe('Production response size', () => {
) )
// These numbers are without gzip compression! // These numbers are without gzip compression!
const delta = responseSizeKilobytes - 199 const delta = responseSizeKilobytes - 198
expect(delta).toBeLessThanOrEqual(0) // don't increase size expect(delta).toBeLessThanOrEqual(0) // don't increase size
expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target expect(delta).toBeGreaterThanOrEqual(-1) // don't decrease size without updating target
}) })
......
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