Issue #386 [Enhancement][WIP] Handle this.url.root as "/" or "" cases

t2ym · Oct 14, 2020 · 60f7f5c · 60f7f5c
1 parent 353185f
commit 60f7f5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/plugins/entry-page/configurator.js b/plugins/entry-page/configurator.js
@@ -47,7 +47,7 @@ const configurator = function (targetConfig) {
         let html = String(file.contents);
         let whitelist = {...(this['integrityService'].additionalWhitelist || {})};
         let blacklist = {...(this['integrityService'].additionalBlacklist || {})};
-        const entryPageURL = new URL(this.url.root + '/', 'https://localhost');
+        const entryPageURL = new URL((this.url.root + '/').replace(/\/\/$/, '/'), 'https://localhost');
         whitelist[entryPageURL.pathname] = true;
         blacklist[new URL(this.path.encodedIndexHtml, entryPageURL).pathname] = true;
         let stream = new htmlparser.WritableStream({

diff --git a/plugins/frontend-components/configurator.js b/plugins/frontend-components/configurator.js
@@ -32,7 +32,7 @@ const configurator = function (targetConfig) {
 
     return this.gulp.src(require(path.resolve(configPath, 'targets.js')).targets.call(this, this, blocked))
       .pipe(through.obj((file, enc, callback) => {
-        file.path = path.resolve(this.path.base, this.path.frontend, this.mapper(this.url.mappings, file.path).substring(1));
+        file.path = path.resolve(this.path.base, this.path.frontend, this.mapper(this.url.mappings, file.path).replace(/^\//, ''));
         file.base = path.resolve(this.path.base, this.path.frontend);
         callback(null, file);
       }))