@angular-devkit/build-angular 0.1000.4 → 0.1000.8

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1000.4",
+  "version": "0.1000.8",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.1000.4",
-    "@angular-devkit/build-optimizer": "0.1000.4",
-    "@angular-devkit/build-webpack": "0.1000.4",
-    "@angular-devkit/core": "10.0.4",
+    "@angular-devkit/architect": "0.1000.8",
+    "@angular-devkit/build-optimizer": "0.1000.8",
+    "@angular-devkit/build-webpack": "0.1000.8",
+    "@angular-devkit/core": "10.0.8",
     "@babel/core": "7.9.6",
     "@babel/generator": "7.9.6",
     "@babel/plugin-transform-runtime": "7.9.6",
@@ -18,7 +18,7 @@
     "@babel/runtime": "7.9.6",
     "@babel/template": "7.8.6",
     "@jsdevtools/coverage-istanbul-loader": "3.0.3",
-    "@ngtools/webpack": "10.0.4",
+    "@ngtools/webpack": "10.0.8",
     "ajv": "6.12.3",
     "autoprefixer": "9.8.0",
     "babel-loader": "8.1.0",

package/src/angular-cli-files/models/webpack-configs/server.js

@@ -48,7 +48,7 @@ function getServerConfig(wco) {
             ...externalDependencies,
             (context, request, callback) => {
                 // Absolute & Relative paths are not externals
-                if (request.startsWith('./') || path_1.isAbsolute(request)) {
+                if (request.startsWith('.') || path_1.isAbsolute(request)) {
                     callback();
                     return;
                 }

package/src/angular-cli-files/plugins/common-js-usage-warn-plugin.js

@@ -43,12 +43,12 @@ class CommonJsUsageWarnPlugin {
                          */
                         continue;
                     }
-                    if (this.hasCommonJsDependencies(dependencies, true)) {
+                    if (this.hasCommonJsDependencies(dependencies)) {
                         // Dependency is CommonsJS or AMD.
                         // Check if it's parent issuer is also a CommonJS dependency.
                         // In case it is skip as an warning will be show for the parent CommonJS dependency.
                         const parentDependencies = (_a = issuer === null || issuer === void 0 ? void 0 : issuer.issuer) === null || _a === void 0 ? void 0 : _a.dependencies;
-                        if (parentDependencies && this.hasCommonJsDependencies(parentDependencies)) {
+                        if (parentDependencies && this.hasCommonJsDependencies(parentDependencies, true)) {
                             continue;
                         }
                         // Find the main issuer (entry-point).
@@ -74,10 +74,10 @@ class CommonJsUsageWarnPlugin {
             });
         });
     }
-    hasCommonJsDependencies(dependencies, checkForStylesAndTemplatesCJS = false) {
+    hasCommonJsDependencies(dependencies, checkParentModules = false) {
         for (const dep of dependencies) {
             if (dep instanceof CommonJsRequireDependency) {
-                if (checkForStylesAndTemplatesCJS && STYLES_TEMPLATE_URL_REGEXP.test(dep.request)) {
+                if (STYLES_TEMPLATE_URL_REGEXP.test(dep.request)) {
                     // Skip in case it's a template or stylesheet
                     continue;
                 }
@@ -86,6 +86,9 @@ class CommonJsUsageWarnPlugin {
             if (dep instanceof AMDDefineDependency) {
                 return true;
             }
+            if (checkParentModules && dep.module && this.hasCommonJsDependencies(dep.module.dependencies)) {
+                return true;
+            }
         }
         return false;
     }

package/src/angular-cli-files/utilities/stats.js

@@ -70,9 +70,9 @@ function statsToString(json, statsConfig) {
 }
 exports.statsToString = statsToString;
 // TODO(#16193): Don't emit this warning in the first place rather than just suppressing it.
-const ERRONEOUS_WARNINGS = [
+const ERRONEOUS_WARNINGS_FILTER = (warning) => ![
     /multiple assets emit different content.*3rdpartylicenses\.txt/i,
-];
+].some(msg => msg.test(warning));
 function statsWarningsToString(json, statsConfig) {
     const colors = statsConfig.colors;
     const rs = (x) => colors ? reset(x) : x;
@@ -85,7 +85,7 @@ function statsWarningsToString(json, statsConfig) {
     }
     return rs('\n' + warnings
         .map((warning) => `${warning}`)
-        .filter((warning) => !ERRONEOUS_WARNINGS.some((erroneous) => erroneous.test(warning)))
+        .filter(ERRONEOUS_WARNINGS_FILTER)
         .map((warning) => y(`WARNING in ${warning}`))
         .join('\n\n'));
 }
@@ -107,11 +107,12 @@ function statsErrorsToString(json, statsConfig) {
 exports.statsErrorsToString = statsErrorsToString;
 function statsHasErrors(json) {
     var _a;
-    return json.errors.length > 0 || !!((_a = json.children) === null || _a === void 0 ? void 0 : _a.some((c) => c.errors.length));
+    return json.errors.length || !!((_a = json.children) === null || _a === void 0 ? void 0 : _a.some((c) => c.errors.length));
 }
 exports.statsHasErrors = statsHasErrors;
 function statsHasWarnings(json) {
     var _a;
-    return json.warnings.length > 0 || !!((_a = json.children) === null || _a === void 0 ? void 0 : _a.some((c) => c.warnings.length));
+    return json.warnings.filter(ERRONEOUS_WARNINGS_FILTER).length ||
+        !!((_a = json.children) === null || _a === void 0 ? void 0 : _a.some((c) => c.warnings.filter(ERRONEOUS_WARNINGS_FILTER).length));
 }
 exports.statsHasWarnings = statsHasWarnings;

package/src/browser/index.js

@@ -45,10 +45,10 @@ function createBrowserLoggingCallback(verbose, logger) {
         else {
             logger.info(stats_1.statsToString(json, config.stats));
         }
-        if (stats.hasWarnings()) {
+        if (stats_1.statsHasWarnings(json)) {
             logger.warn(stats_1.statsWarningsToString(json, config.stats));
         }
-        if (stats.hasErrors()) {
+        if (stats_1.statsHasErrors(json)) {
             logger.error(stats_1.statsErrorsToString(json, config.stats));
         }
     };
@@ -497,7 +497,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         }
                     }
                 }
-                if (!options.watch && options.serviceWorker) {
+                if (options.serviceWorker) {
                     for (const [locale, outputPath] of outputPaths.entries()) {
                         let localeBaseHref;
                         if (i18n.locales[locale] && i18n.locales[locale].baseHref !== '') {

package/src/extract-i18n/index.js

@@ -96,10 +96,10 @@ async function execute(options, context) {
     ]);
     const logging = (stats, config) => {
         const json = stats.toJson({ errors: true, warnings: true });
-        if (stats.hasWarnings()) {
+        if (stats_1.statsHasWarnings(json)) {
             context.logger.warn(stats_1.statsWarningsToString(json, config.stats));
         }
-        if (stats.hasErrors()) {
+        if (stats_1.statsHasErrors(json)) {
             context.logger.error(stats_1.statsErrorsToString(json, config.stats));
         }
     };