diff --git a/rollup.config.js b/rollup.config.js index 95d4b7102e922f273e064843a61ad93578aa20ed..a10a14ba2095348be9a3880b129341adf2814638 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -14,8 +14,7 @@ import del from 'rollup-plugin-delete'; import emitEJS from 'rollup-plugin-emit-ejs' import {getBabelOutputPlugin} from '@rollup/plugin-babel'; import appConfig from './app.config.js'; -import {getPackagePath, getBuildInfo} from './vendor/toolkit/rollup.utils.js'; -import {generateTLSConfig} from './rollup.utils.js'; +import {getPackagePath, getBuildInfo, generateTLSConfig} from './vendor/toolkit/rollup.utils.js'; const pkg = require('./package.json'); const appEnv = (typeof process.env.APP_ENV !== 'undefined') ? process.env.APP_ENV : 'local'; @@ -220,7 +219,7 @@ Dependencies: host: '127.0.0.1', port: 8001, historyApiFallback: config.basePath + pkg.name + '.html', - https: useHTTPS ? generateTLSConfig() : false, + https: useHTTPS ? await generateTLSConfig() : false, headers: { 'Content-Security-Policy': config.CSP }, diff --git a/rollup.utils.js b/rollup.utils.js deleted file mode 100644 index 46b774a4fd096988e735e792e8d34f4679ffb139..0000000000000000000000000000000000000000 --- a/rollup.utils.js +++ /dev/null @@ -1,21 +0,0 @@ -import fs from 'fs'; -import selfsigned from 'selfsigned'; - -/** - * Creates a server certificate and caches it in the .cert directory - */ -export function generateTLSConfig() { - fs.mkdirSync('.cert', {recursive: true}); - - if (!fs.existsSync('.cert/server.key') || !fs.existsSync('.cert/server.cert')) { - const attrs = [{name: 'commonName', value: 'dbp-dev.localhost'}]; - const pems = selfsigned.generate(attrs, {algorithm: 'sha256', days: 9999}); - fs.writeFileSync('.cert/server.key', pems.private); - fs.writeFileSync('.cert/server.cert', pems.cert); - } - - return { - key: fs.readFileSync('.cert/server.key'), - cert: fs.readFileSync('.cert/server.cert') - } - } \ No newline at end of file diff --git a/vendor/toolkit b/vendor/toolkit index be243cdd860d8762be4f60ae5a494054ca99b2b3..43c558436c6a0f66e6bd162cd6f6ce8af1f2fa7c 160000 --- a/vendor/toolkit +++ b/vendor/toolkit @@ -1 +1 @@ -Subproject commit be243cdd860d8762be4f60ae5a494054ca99b2b3 +Subproject commit 43c558436c6a0f66e6bd162cd6f6ce8af1f2fa7c