copyleftie
/
pinafore
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix: fix broken CSP in dev mode (#992) 

It seems #988 occasionally breaks dev mode due to missing SW script. This fixes that.
This commit is contained in:
Nolan Lawson 2019-02-14 21:26:41 -08:00 committed by GitHub
parent 1b9d3b1cd0
commit 75db2c0dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/sapperInlineScriptChecksums.js
View File

@ -4,17 +4,19 @@
import crypto from 'crypto' import crypto from 'crypto'
let scripts = [ const baseScripts = [
`__SAPPER__={baseUrl:"",preloaded:[{},{}]};`, `__SAPPER__={baseUrl:"",preloaded:[{},{}]};`,
`__SAPPER__={baseUrl:"",preloaded:[{}]};`, `__SAPPER__={baseUrl:"",preloaded:[{}]};`,
`__SAPPER__={baseUrl:"",preloaded:[{},null,null,{}]};`, `__SAPPER__={baseUrl:"",preloaded:[{},null,null,{}]};`,
`__SAPPER__={baseUrl:"",preloaded:[{},null,{}]};` `__SAPPER__={baseUrl:"",preloaded:[{},null,{}]};`
] ]
if (process.env.NODE_ENV === 'production') { const scriptsWithSW = baseScripts.map(script => (
// sapper adds service worker only in production `${script}if('serviceWorker' in navigator)navigator.serviceWorker.register('/service-worker.js');`)
scripts = scripts.map(script => `${script}if('serviceWorker' in navigator)navigator.serviceWorker.register('/service-worker.js');`) )
}
// sapper adds service worker usually, but it seems inconsistent in dev mode especially
const scripts = [].concat(baseScripts).concat(scriptsWithSW)
export const sapperInlineScriptChecksums = scripts.map(script => { export const sapperInlineScriptChecksums = scripts.map(script => {
return crypto.createHash('sha256').update(script).digest('base64') return crypto.createHash('sha256').update(script).digest('base64')