4e6570520 fix(@angular-devkit/build-angular): baseHref with protocol and localize option

Author: Angular Builds

package.json

@@ -1,20 +1,20 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.901.0-next.0+7.764b977",
+  "version": "0.901.0-next.0+8.4e65705",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#764b977de",
-    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#764b977de",
-    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#764b977de",
-    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#764b977de",
+    "@angular-devkit/architect": "github:angular/angular-devkit-architect-builds#4e6570520",
+    "@angular-devkit/build-optimizer": "github:angular/angular-devkit-build-optimizer-builds#4e6570520",
+    "@angular-devkit/build-webpack": "github:angular/angular-devkit-build-webpack-builds#4e6570520",
+    "@angular-devkit/core": "github:angular/angular-devkit-core-builds#4e6570520",
     "@babel/core": "7.8.4",
     "@babel/preset-env": "7.8.4",
     "@babel/template": "7.8.3",
-    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#764b977de",
+    "@ngtools/webpack": "github:angular/ngtools-webpack-builds#4e6570520",
     "ajv": "6.12.0",
     "autoprefixer": "9.7.4",
     "babel-loader": "8.0.6",

src/browser/index.js

@@ -136,6 +136,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
         }).pipe(
         // tslint:disable-next-line: no-big-function
         operators_1.concatMap(async (buildEvent) => {
+            var _a, _b;
             const { webpackStats: webpackRawStats, success, emittedFiles = [] } = buildEvent;
             if (!webpackRawStats) {
                 throw new Error('Webpack stats build result is required.');
@@ -245,7 +246,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                     fs.unlinkSync(filename + '.map');
                                 }
                             }
-                            catch (_a) { }
+                            catch (_c) { }
                         }
                         if (es5Polyfills) {
                             fs.unlinkSync(filename);
@@ -467,9 +468,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     for (const [locale, outputPath] of outputPaths.entries()) {
                         let localeBaseHref;
                         if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-                            localeBaseHref = path.posix.join(options.baseHref || '', i18n.locales[locale].baseHref === undefined
-                                ? `/${locale}/`
-                                : i18n.locales[locale].baseHref);
+                            localeBaseHref = utils_1.urlJoin(options.baseHref || '', (_a = i18n.locales[locale].baseHref, (_a !== null && _a !== void 0 ? _a : `/${locale}/`)));
                         }
                         try {
                             await generateIndex(outputPath, options, root, files, noModuleFiles, moduleFiles, transforms.indexHtml, 
@@ -485,9 +484,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     for (const [locale, outputPath] of outputPaths.entries()) {
                         let localeBaseHref;
                         if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {
-                            localeBaseHref = path.posix.join(options.baseHref || '', i18n.locales[locale].baseHref === undefined
-                                ? `/${locale}/`
-                                : i18n.locales[locale].baseHref);
+                            localeBaseHref = utils_1.urlJoin(options.baseHref || '', (_b = i18n.locales[locale].baseHref, (_b !== null && _b !== void 0 ? _b : `/${locale}/`)));
                         }
                         try {
                             await service_worker_1.augmentAppWithServiceWorker(host, root, core_1.normalize(projectRoot), core_1.normalize(outputPath), localeBaseHref || options.baseHref || '/', options.ngswConfigPath);

src/utils/index.d.ts

@@ -14,3 +14,4 @@ export * from './normalize-asset-patterns';
 export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
+export * from './url';

src/utils/index.js

@@ -19,3 +19,4 @@ __export(require("./normalize-asset-patterns"));
 __export(require("./normalize-source-maps"));
 __export(require("./normalize-optimization"));
 __export(require("./normalize-builder-schema"));
+__export(require("./url"));

src/utils/url.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+export declare function urlJoin(...parts: string[]): string;

src/utils/url.js

@@ -0,0 +1,17 @@
+"use strict";
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+function urlJoin(...parts) {
+    const [p, ...rest] = parts;
+    // Remove trailing slash from first part
+    // Join all parts with `/`
+    // Dedupe double slashes from path names
+    return p.replace(/\/$/, '') + ('/' + rest.join('/')).replace(/\/\/+/g, '/');
+}
+exports.urlJoin = urlJoin;

uniqueId

@@ -1 +1 @@
-Mon Feb 24 2020 21:20:11 GMT+0000 (Coordinated Universal Time)
+Mon Feb 24 2020 21:27:48 GMT+0000 (Coordinated Universal Time)