From e7c9303c3aca095afd5e8999208df886f6745ae1 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle <patrizio@bekerle.com> Date: Thu, 8 Apr 2021 08:57:50 +0200 Subject: [PATCH] Set internalName in package.json and use it in build process --- package.json | 1 + rollup.config.js | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index d972010..43f240c 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "@dbp-apps/signature", + "internalName": "dbp-signature", "version": "1.0.0", "main": "src/dbp-signature.js", "license": "LGPL-2.1-or-later", diff --git a/rollup.config.js b/rollup.config.js index 77895ef..0d2d9d2 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -78,10 +78,10 @@ function replaceAll(string, search, replace) { } export default (async () => { - let privatePath = await getDistPath(pkg.name) + let privatePath = await getDistPath(pkg.internalName) return { input: (appEnv != 'test') ? [ - 'src/' + pkg.name + '.js', + 'src/' + pkg.internalName + '.js', 'src/dbp-official-signature-pdf-upload.js', 'src/dbp-qualified-signature-pdf-upload.js', 'src/dbp-signature-verification.js', @@ -128,7 +128,7 @@ export default (async () => { isVisible: (name) => { return !config.hiddenActivities.includes(name); }, - name: pkg.name, + name: pkg.internalName, entryPointURL: config.entryPointURL, nextcloudWebAppPasswordURL: config.nextcloudWebAppPasswordURL, nextcloudWebDavURL: config.nextcloudWebDavURL, @@ -180,26 +180,26 @@ Dependencies: }), copy({ targets: [ - {src: 'assets/*-placeholder.png', dest: 'dist/' + await getDistPath(pkg.name)}, - {src: 'assets/*.css', dest: 'dist/' + await getDistPath(pkg.name)}, - {src: 'assets/*.ico', dest: 'dist/' + await getDistPath(pkg.name)}, + {src: 'assets/*-placeholder.png', dest: 'dist/' + await getDistPath(pkg.internalName)}, + {src: 'assets/*.css', dest: 'dist/' + await getDistPath(pkg.internalName)}, + {src: 'assets/*.ico', dest: 'dist/' + await getDistPath(pkg.internalName)}, {src: 'src/*.metadata.json', dest: 'dist'}, - {src: 'assets/*.svg', dest: 'dist/' + await getDistPath(pkg.name)}, + {src: 'assets/*.svg', dest: 'dist/' + await getDistPath(pkg.internalName)}, {src: 'assets/htaccess-shared', dest: 'dist/shared/', rename: '.htaccess'}, - {src: 'assets/icon-*.png', dest: 'dist/' + await getDistPath(pkg.name)}, - {src: 'assets/manifest.json', dest: 'dist', rename: pkg.name + '.manifest.json'}, + {src: 'assets/icon-*.png', dest: 'dist/' + await getDistPath(pkg.internalName)}, + {src: 'assets/manifest.json', dest: 'dist', rename: pkg.internalName + '.manifest.json'}, {src: 'assets/silent-check-sso.html', dest:'dist'}, {src: 'assets/dbp-signature-maintenance.html', dest:'dist'}, { src: await getPackagePath('pdfjs-dist', 'es5/build/pdf.worker.js'), - dest: 'dist/' + await getDistPath(pkg.name, 'pdfjs'), + dest: 'dist/' + await getDistPath(pkg.internalName, 'pdfjs'), // enable signatures in pdf preview transform: (contents) => replaceAll(contents.toString(), '"Sig"', '"Sig-patched-show-anyway"') }, - {src: await getPackagePath('pdfjs-dist', 'cmaps/*'), dest: 'dist/' + await getDistPath(pkg.name, 'pdfjs')}, // do we want all map files? - {src: await getPackagePath('@dbp-toolkit/font-source-sans-pro', 'files/*'), dest: 'dist/' + await getDistPath(pkg.name, 'fonts/source-sans-pro')}, - {src: await getPackagePath('@dbp-toolkit/common', 'src/spinner.js'), dest: 'dist/' + await getDistPath(pkg.name)}, - {src: await getPackagePath('@dbp-toolkit/common', 'misc/browser-check.js'), dest: 'dist/' + await getDistPath(pkg.name)}, + {src: await getPackagePath('pdfjs-dist', 'cmaps/*'), dest: 'dist/' + await getDistPath(pkg.internalName, 'pdfjs')}, // do we want all map files? + {src: await getPackagePath('@dbp-toolkit/font-source-sans-pro', 'files/*'), dest: 'dist/' + await getDistPath(pkg.internalName, 'fonts/source-sans-pro')}, + {src: await getPackagePath('@dbp-toolkit/common', 'src/spinner.js'), dest: 'dist/' + await getDistPath(pkg.internalName)}, + {src: await getPackagePath('@dbp-toolkit/common', 'misc/browser-check.js'), dest: 'dist/' + await getDistPath(pkg.internalName)}, {src: await getPackagePath('@dbp-toolkit/common', 'assets/icons/*.svg'), dest: 'dist/' + await getDistPath('@dbp-toolkit/common', 'icons')}, {src: await getPackagePath('tabulator-tables', 'dist/css'), dest: 'dist/' + await getDistPath('@dbp-toolkit/file-handling', 'tabulator-tables')}, ], @@ -223,7 +223,7 @@ Dependencies: contentBase: '.', host: '127.0.0.1', port: 8001, - historyApiFallback: config.basePath + pkg.name + '.html', + historyApiFallback: config.basePath + pkg.internalName + '.html', https: useHTTPS ? await generateTLSConfig() : false, headers: { 'Content-Security-Policy': config.CSP -- GitLab