@angular-devkit/build-angular 0.1000.2 → 0.1000.3

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1000.2",
+  "version": "0.1000.3",
   "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.2",
-    "@angular-devkit/build-optimizer": "0.1000.2",
-    "@angular-devkit/build-webpack": "0.1000.2",
-    "@angular-devkit/core": "10.0.2",
+    "@angular-devkit/architect": "0.1000.3",
+    "@angular-devkit/build-optimizer": "0.1000.3",
+    "@angular-devkit/build-webpack": "0.1000.3",
+    "@angular-devkit/core": "10.0.3",
     "@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.2",
+    "@ngtools/webpack": "10.0.3",
     "ajv": "6.12.2",
     "autoprefixer": "9.8.0",
     "babel-loader": "8.1.0",

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

@@ -12,6 +12,7 @@ const path_1 = require("path");
 // Webpack doesn't export these so the deep imports can potentially break.
 const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
 const AMDDefineDependency = require('webpack/lib/dependencies/AMDDefineDependency');
+const STYLES_TEMPLATE_URL_REGEXP = /\.(html|svg|css|sass|less|styl|scss)$/;
 class CommonJsUsageWarnPlugin {
     constructor(options = {}) {
         var _a;
@@ -42,7 +43,7 @@ class CommonJsUsageWarnPlugin {
                          */
                         continue;
                     }
-                    if (this.hasCommonJsDependencies(dependencies)) {
+                    if (this.hasCommonJsDependencies(dependencies, true)) {
                         // 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.
@@ -73,8 +74,20 @@ class CommonJsUsageWarnPlugin {
             });
         });
     }
-    hasCommonJsDependencies(dependencies) {
-        return dependencies.some(d => d instanceof CommonJsRequireDependency || d instanceof AMDDefineDependency);
+    hasCommonJsDependencies(dependencies, checkForStylesAndTemplatesCJS = false) {
+        for (const dep of dependencies) {
+            if (dep instanceof CommonJsRequireDependency) {
+                if (checkForStylesAndTemplatesCJS && STYLES_TEMPLATE_URL_REGEXP.test(dep.request)) {
+                    // Skip in case it's a template or stylesheet
+                    continue;
+                }
+                return true;
+            }
+            if (dep instanceof AMDDefineDependency) {
+                return true;
+            }
+        }
+        return false;
     }
     rawRequestToPackageName(rawRequest) {
         return rawRequest.startsWith('@')

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

@@ -82,6 +82,7 @@ function statsWarningsToString(json, statsConfig) {
         warnings.push(...json.children.map((c) => c.warnings));
     }
     return rs('\n' + warnings
+        .filter(m => !!m)
         .map((warning) => `${warning}`)
         .filter((warning) => !ERRONEOUS_WARNINGS.some((erroneous) => erroneous.test(warning)))
         .map((warning) => y(`WARNING in ${warning}`))
@@ -96,7 +97,10 @@ function statsErrorsToString(json, statsConfig) {
     if (json.children) {
         errors.push(...json.children.map((c) => c.errors));
     }
-    return rs('\n' + errors.map((error) => r(`ERROR in ${error}`)).join('\n'));
+    return rs('\n' + errors
+        .filter(m => !!m)
+        .map((error) => r(`ERROR in ${error}`))
+        .join('\n\n'));
 }
 exports.statsErrorsToString = statsErrorsToString;
 function statsHasErrors(json) {

package/src/utils/process-bundle.js

@@ -91,7 +91,10 @@ async function process(options) {
                         exclude: ['transform-typeof-symbol'],
                     },
                 ]],
-            plugins: options.replacements ? [createReplacePlugin(options.replacements)] : [],
+            plugins: [
+                createIifeWrapperPlugin(),
+                ...(options.replacements ? [createReplacePlugin(options.replacements)] : []),
+            ],
             minified: environment_options_1.allowMinify && !!options.optimize,
             compact: !environment_options_1.shouldBeautify && !!options.optimize,
             sourceMaps: !!sourceMap,
@@ -335,6 +338,25 @@ function createReplacePlugin(replacements) {
         },
     };
 }
+function createIifeWrapperPlugin() {
+    return {
+        visitor: {
+            Program: {
+                exit(path) {
+                    // Save existing body and directives
+                    const { body, directives } = path.node;
+                    // Clear out body and directives for wrapper
+                    path.node.body = [];
+                    path.node.directives = [];
+                    // Create the wrapper - "(function() { ... })();"
+                    const wrapper = core_1.types.expressionStatement(core_1.types.callExpression(core_1.types.parenthesizedExpression(core_1.types.functionExpression(undefined, [], core_1.types.blockStatement(body, directives))), []));
+                    // Insert the wrapper
+                    path.pushContainer('body', wrapper);
+                },
+            },
+        },
+    };
+}
 const USE_LOCALIZE_PLUGINS = false;
 async function createI18nPlugins(locale, translation, missingTranslation, localeDataContent) {
     const plugins = [];