dnrops
/
tauri
mirror of https://github.com/tauri-apps/tauri
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat(js-cli) inject CSP from tauri.config.js (#167)

This commit is contained in:
Lucas Fernandes Nogueira 2019-12-17 22:00:49 -03:00 committed by nothingismagick
parent 153e77d631
commit 0f12f5f6df
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cli/tauri.js/runner.js
View File

@ -43,7 +43,7 @@ class Runner {
let inlinedAssets = []
if (!runningDevServer) {
inlinedAssets = await this.__parseHtml(path.resolve(appDir, devPath))
inlinedAssets = await this.__parseHtml(cfg, path.resolve(appDir, devPath))
}
generator.generate({
@ -95,7 +95,7 @@ class Runner {
this.__whitelistApi(cfg, toml)
})
const inlinedAssets = await this.__parseHtml(cfg.build.distDir)
const inlinedAssets = await this.__parseHtml(cfg, cfg.build.distDir)
generator.generate({
inlinedAssets,
@ -127,7 +127,7 @@ class Runner {
}
}
__parseHtml (indexDir) {
__parseHtml (cfg, indexDir) {
const Inliner = require('@tauri-apps/tauri-inliner')
const jsdom = require('jsdom')
const { JSDOM } = jsdom
@ -148,7 +148,15 @@ class Runner {
const tauriScript = document.createElement('script')
tauriScript.text = readFileSync(path.join(tauriDir, 'tauri.js'))
document.body.insertBefore(tauriScript, document.body.firstChild)
const csp = cfg.tauri.security.csp
if (csp) {
const cspTag = document.createElement('meta')
cspTag.setAttribute('http-equiv', 'Content-Security-Policy')
cspTag.setAttribute('content', csp)
document.head.appendChild(cspTag)
}
writeFileSync(path.join(indexDir, 'index.tauri.html'), dom.serialize())
resolve(inlinedAssets)
}