Unverified Commit 9d30e411 authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

Fallback to <script> loading behavior when preload is not supported (#5744)

Based on https://github.com/zeit/next.js/pull/5737#discussion_r236059295

This will cause a warning in chrome/safari after 3s
parent c178e98a
...@@ -2,18 +2,18 @@ ...@@ -2,18 +2,18 @@
import EventEmitter from 'next-server/dist/lib/EventEmitter' import EventEmitter from 'next-server/dist/lib/EventEmitter'
// smaller version of https://gist.github.com/igrigorik/a02f2359f3bc50ca7a9c // smaller version of https://gist.github.com/igrigorik/a02f2359f3bc50ca7a9c
function listSupports (list, token) { function supportsPreload (list) {
if (!list || !list.supports) { if (!list || !list.supports) {
return false return false
} }
try { try {
return list.supports(token) return list.supports('preload')
} catch (e) { } catch (e) {
return false return false
} }
} }
const supportsPrefetch = listSupports(document.createElement('link').relList, 'prefetch') const hasPreload = supportsPreload(document.createElement('link').relList)
const webpackModule = module const webpackModule = module
export default class PageLoader { export default class PageLoader {
...@@ -131,22 +131,33 @@ export default class PageLoader { ...@@ -131,22 +131,33 @@ export default class PageLoader {
} }
this.prefetchCache.add(scriptRoute) this.prefetchCache.add(scriptRoute)
const link = document.createElement('link') // Feature detection is used to see if preload is supported
// Feature detection is used to see if prefetch is supported, else fall back to preload // If not fall back to loading script tags before the page is loaded
// Mainly this is for Safari
// https://caniuse.com/#feat=link-rel-prefetch
// https://caniuse.com/#feat=link-rel-preload // https://caniuse.com/#feat=link-rel-preload
link.rel = supportsPrefetch ? 'prefetch' : 'preload' if (hasPreload) {
link.href = `${this.assetPrefix}/_next/static/${encodeURIComponent(this.buildId)}/pages${scriptRoute}` const link = document.createElement('link')
link.as = 'script' link.rel = 'preload'
document.head.appendChild(link) link.href = `${this.assetPrefix}/_next/static/${encodeURIComponent(this.buildId)}/pages${scriptRoute}`
link.as = 'script'
document.head.appendChild(link)
return
}
if (document.readyState === 'complete') {
await this.loadPage(route)
} else {
return new Promise((resolve, reject) => {
window.addEventListener('load', () => {
this.loadPage(route).then(() => resolve(), reject)
})
})
}
} }
clearCache (route) { clearCache (route) {
route = this.normalizeRoute(route) route = this.normalizeRoute(route)
delete this.pageCache[route] delete this.pageCache[route]
delete this.loadingRoutes[route] delete this.loadingRoutes[route]
delete this.loadingRoutes[route]
const script = document.getElementById(`__NEXT_PAGE__${route}`) const script = document.getElementById(`__NEXT_PAGE__${route}`)
if (script) { if (script) {
......
...@@ -210,15 +210,15 @@ describe('Production Usage', () => { ...@@ -210,15 +210,15 @@ describe('Production Usage', () => {
browser.close() browser.close()
}) })
it('should add prefetch tags when Link prefetch prop is used', async () => { it('should add preload tags when Link prefetch prop is used', async () => {
const browser = await webdriver(appPort, '/prefetch') const browser = await webdriver(appPort, '/prefetch')
const elements = await browser.elementsByCss('link[rel=prefetch]') const elements = await browser.elementsByCss('link[rel=preload]')
expect(elements.length).toBe(4) expect(elements.length).toBe(10)
await Promise.all( await Promise.all(
elements.map(async (element) => { elements.map(async (element) => {
const rel = await element.getAttribute('rel') const rel = await element.getAttribute('rel')
const as = await element.getAttribute('as') const as = await element.getAttribute('as')
expect(rel).toBe('prefetch') expect(rel).toBe('preload')
expect(as).toBe('script') expect(as).toBe('script')
}) })
) )
......
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