fix(@angular/cli): support empty index base href attribute

angular · Feb 15, 2018 · 214be80 · 214be80
1 parent eed5794
commit 214be80
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.ts b/packages/@angular/cli/lib/base-href-webpack/base-href-webpack-plugin.ts
@@ -26,7 +26,7 @@ export class BaseHrefWebpackPlugin {
           } else {
             // Replace only href attribute if exists
             const modifiedBaseTag = baseTagMatches[0].replace(
-              /href="\S+"/i, `href="${this.options.baseHref}"`
+              /href="\S*?"/i, `href="${this.options.baseHref}"`
             );
             htmlPluginData.html = htmlPluginData.html.replace(baseTagRegex, modifiedBaseTag);
           }

diff --git a/tests/e2e/tests/build/base-href.ts b/tests/e2e/tests/build/base-href.ts
@@ -1,6 +1,6 @@
-import {ng} from '../../utils/process';
-import {expectFileToMatch} from '../../utils/fs';
-import {updateJsonFile} from '../../utils/project';
+import { ng } from '../../utils/process';
+import { expectFileToMatch, replaceInFile } from '../../utils/fs';
+import { updateJsonFile } from '../../utils/project';
 
 
 export default function() {
@@ -12,4 +12,7 @@ export default function() {
     }))
     .then(() => ng('build'))
     .then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/))
+    .then(() => replaceInFile('src/index.html', 'href="/"', 'href=""'))
+    .then(() => ng('build'))
+    .then(() => expectFileToMatch('dist/index.html', /<base href="\/myUrl">/));
 }