@angular-devkit/build-angular 0.1102.0-rc.0 → 0.1102.2

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1102.0-rc.0",
+  "version": "0.1102.2",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.1102.0-rc.0",
-    "@angular-devkit/build-optimizer": "0.1102.0-rc.0",
-    "@angular-devkit/build-webpack": "0.1102.0-rc.0",
-    "@angular-devkit/core": "11.2.0-rc.0",
+    "@angular-devkit/architect": "0.1102.2",
+    "@angular-devkit/build-optimizer": "0.1102.2",
+    "@angular-devkit/build-webpack": "0.1102.2",
+    "@angular-devkit/core": "11.2.2",
     "@babel/core": "7.12.10",
     "@babel/generator": "7.12.11",
     "@babel/plugin-transform-async-to-generator": "7.12.1",
@@ -19,7 +19,7 @@
     "@babel/runtime": "7.12.5",
     "@babel/template": "7.12.7",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "11.2.0-rc.0",
+    "@ngtools/webpack": "11.2.2",
     "ansi-colors": "4.1.1",
     "autoprefixer": "10.2.4",
     "babel-loader": "8.2.2",
@@ -29,7 +29,7 @@
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "6.3.2",
     "core-js": "3.8.3",
-    "critters": "0.0.6",
+    "critters": "0.0.7",
     "css-loader": "5.0.1",
     "cssnano": "4.1.10",
     "file-loader": "6.2.0",
@@ -127,7 +127,7 @@
   },
   "engines": {
     "node": ">= 10.13.0",
-    "npm": "^6.11.0",
+    "npm": "^6.11.0 || ^7.5.6",
     "yarn": ">= 1.13.0"
   },
   "author": "Angular Authors",

package/src/browser/index.js

@@ -514,8 +514,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                 spinner.fail('Index html generation failed.');
                                 return { success: false, error: mapErrorToMessage(error) };
                             }
-                            spinner.succeed('Index html generation complete.');
                         }
+                        spinner.succeed('Index html generation complete.');
                     }
                     if (options.serviceWorker) {
                         spinner.start('Generating service worker...');
@@ -527,8 +527,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                                 spinner.fail('Service worker generation failed.');
                                 return { success: false, error: mapErrorToMessage(error) };
                             }
-                            spinner.succeed('Service worker generation complete.');
                         }
+                        spinner.succeed('Service worker generation complete.');
                     }
                 }
                 stats_1.webpackStatsLogger(context.logger, webpackStats, config, bundleInfoStats);

package/src/extract-i18n/index.js

@@ -144,6 +144,8 @@ async function execute(options, context, transforms) {
         scripts: [],
         styles: [],
         deleteOutputPath: false,
+        extractLicenses: false,
+        subresourceIntegrity: false,
     }, context, (wco) => {
         var _a;
         const isIvyApplication = wco.tsConfig.options.enableIvy !== false;
@@ -163,6 +165,7 @@ async function execute(options, context, transforms) {
         const partials = [
             { plugins: [new NoEmitPlugin()] },
             configs_1.getCommonConfig(wco),
+            configs_1.getBrowserConfig(wco),
             // Only use VE extraction if not using Ivy
             configs_1.getAotConfig(wco, !usingIvy),
             configs_1.getStatsConfig(wco),

package/src/tslint/index.js

@@ -15,7 +15,7 @@ const path = require("path");
 const strip_bom_1 = require("../utils/strip-bom");
 async function _run(options, context) {
     context.logger.warn(`TSLint's support is discontinued and we're deprecating its support in Angular CLI.\n` +
-        'To opt-in using the community driven ESLint builder, see: https://github.com/angular-eslint/angular-eslint#migrating-from-codelyzer-and-tslint.');
+        'To opt-in using the community driven ESLint builder, see: https://github.com/angular-eslint/angular-eslint#migrating-an-angular-cli-project-from-codelyzer-and-tslint.');
     const systemRoot = context.workspaceRoot;
     process.chdir(context.currentDirectory);
     const projectName = (context.target && context.target.project) || '<???>';

package/src/utils/version.js

@@ -46,9 +46,9 @@ function assertCompatibleAngularVersion(projectRoot, logger) {
         // In this case we don't provide as many version checks.
         return;
     }
-    if (angularCliPkgJson['version'] === '0.0.0' || angularPkgJson['version'] === '0.0.0-PLACEHOLDER') {
+    if (angularCliPkgJson['version'] === '0.0.0' || angularPkgJson['version'] === '0.0.0') {
         // Internal CLI testing version or integration testing in the angular/angular
-        // repository with the generated development @angular/core npm package which is versioned "0.0.0-PLACEHOLDER".
+        // repository with the generated development @angular/core npm package which is versioned "0.0.0".
         return;
     }
     const angularVersion = new semver_1.SemVer(angularPkgJson['version']);

package/src/webpack/configs/styles.js

@@ -112,6 +112,7 @@ function getStylesConfig(wco) {
                         implementation: require('less'),
                         sourceMap: cssSourceMap,
                         lessOptions: {
+                            math: 'always',
                             javascriptEnabled: true,
                             paths: includePaths,
                         },
@@ -146,6 +147,7 @@ function getStylesConfig(wco) {
         const fullPath = path.join(basePath, tailwindConfigFile);
         if (fs.existsSync(fullPath)) {
             tailwindConfigPath = fullPath;
+            break;
         }
     }
     // Only load Tailwind CSS plugin if configuration file was found.

package/src/webpack/configs/typescript.js

@@ -31,6 +31,8 @@ function createIvyPlugin(wco, aot, tsconfig) {
     const optimize = buildOptions.optimization.scripts;
     const compilerOptions = {
         sourceMap: buildOptions.sourceMap.scripts,
+        declaration: false,
+        declarationMap: false,
     };
     if (buildOptions.preserveSymlinks !== undefined) {
         compilerOptions.preserveSymlinks = buildOptions.preserveSymlinks;

package/src/webpack/plugins/karma/karma.js

@@ -284,7 +284,18 @@ function fallbackMiddleware() {
 function isPlugin(moduleId, pluginName) {
     return (plugin) => {
         if (typeof plugin === 'string') {
-            return plugin === moduleId;
+            if (!plugin.includes('*')) {
+                return plugin === moduleId;
+            }
+            const regexp = new RegExp(`^${plugin.replace('*', '.*')}`);
+            if (regexp.test(moduleId)) {
+                try {
+                    require.resolve(moduleId);
+                    return true;
+                }
+                catch (_a) { }
+            }
+            return false;
         }
         return pluginName in plugin;
     };