Merge pull request #22 from korziee/master

adambullmer · web-flow · commit 805852c7dc20 · 2018-09-19T13:36:36.000-05:00
content_security_policy is not overwritten by default anymore.
diff --git a/index.js b/index.js
@@ -83,7 +83,7 @@ module.exports = (api, options) => {
             return resolve(JSON.stringify(jsonContent, null, 2))
           }
 
-          jsonContent.content_security_policy = "script-src 'self' 'unsafe-eval'; object-src 'self'"
+          jsonContent.content_security_policy = jsonContent.content_security_policy || "script-src 'self' 'unsafe-eval'; object-src 'self'"
 
           try {
             fs.statSync(keyFile)

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ module.exports = (api, options) => {`
`83`	`83`	`return resolve(JSON.stringify(jsonContent, null, 2))`
`84`	`84`	`}`
`85`	`85`
`86`		`- jsonContent.content_security_policy = "script-src 'self' 'unsafe-eval'; object-src 'self'"`
	`86`	`+ jsonContent.content_security_policy = jsonContent.content_security_policy \|\| "script-src 'self' 'unsafe-eval'; object-src 'self'"`
`87`	`87`
`88`	`88`	`try {`
`89`	`89`	`fs.statSync(keyFile)`