@angular-devkit/build-angular 0.1101.4 → 0.1102.0

package/package.json

@@ -1,33 +1,34 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "0.1101.4",
+  "version": "0.1102.0",
   "description": "Angular Webpack Build Facade",
   "experimental": true,
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
-    "@angular-devkit/architect": "0.1101.4",
-    "@angular-devkit/build-optimizer": "0.1101.4",
-    "@angular-devkit/build-webpack": "0.1101.4",
-    "@angular-devkit/core": "11.1.4",
+    "@angular-devkit/architect": "0.1102.0",
+    "@angular-devkit/build-optimizer": "0.1102.0",
+    "@angular-devkit/build-webpack": "0.1102.0",
+    "@angular-devkit/core": "11.2.0",
     "@babel/core": "7.12.10",
     "@babel/generator": "7.12.11",
+    "@babel/plugin-transform-async-to-generator": "7.12.1",
     "@babel/plugin-transform-runtime": "7.12.10",
     "@babel/preset-env": "7.12.11",
     "@babel/runtime": "7.12.5",
     "@babel/template": "7.12.7",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@ngtools/webpack": "11.1.4",
+    "@ngtools/webpack": "11.2.0",
     "ansi-colors": "4.1.1",
-    "autoprefixer": "10.2.1",
+    "autoprefixer": "10.2.4",
     "babel-loader": "8.2.2",
     "browserslist": "^4.9.1",
     "cacache": "15.0.5",
     "caniuse-lite": "^1.0.30001032",
     "circular-dependency-plugin": "5.2.2",
     "copy-webpack-plugin": "6.3.2",
-    "core-js": "3.8.2",
+    "core-js": "3.8.3",
     "critters": "0.0.6",
     "css-loader": "5.0.1",
     "cssnano": "4.1.10",
@@ -38,14 +39,14 @@
     "inquirer": "7.3.3",
     "jest-worker": "26.6.2",
     "karma-source-map-support": "1.4.0",
-    "less": "4.1.0",
+    "less": "4.1.1",
     "less-loader": "7.3.0",
     "license-webpack-plugin": "2.3.11",
     "loader-utils": "2.0.0",
-    "mini-css-extract-plugin": "1.3.3",
+    "mini-css-extract-plugin": "1.3.5",
     "minimatch": "3.0.4",
-    "open": "7.3.1",
-    "ora": "5.2.0",
+    "open": "7.4.0",
+    "ora": "5.3.0",
     "parse5-html-rewriting-stream": "6.0.1",
     "pnp-webpack-plugin": "1.6.4",
     "postcss": "8.2.4",
@@ -55,36 +56,38 @@
     "regenerator-runtime": "0.13.7",
     "resolve-url-loader": "3.1.2",
     "rimraf": "3.0.2",
-    "rollup": "2.36.1",
+    "rollup": "2.38.4",
     "rxjs": "6.6.3",
-    "sass": "1.32.4",
+    "sass": "1.32.6",
     "sass-loader": "10.1.1",
     "semver": "7.3.4",
     "source-map": "0.7.3",
     "source-map-loader": "1.1.3",
     "source-map-support": "0.5.19",
-    "speed-measure-webpack-plugin": "1.3.3",
+    "speed-measure-webpack-plugin": "1.4.2",
     "style-loader": "2.0.0",
     "stylus": "0.54.8",
-    "stylus-loader": "4.3.2",
+    "stylus-loader": "4.3.3",
     "terser": "5.5.1",
     "terser-webpack-plugin": "4.2.3",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
     "webpack": "4.44.2",
     "webpack-dev-middleware": "3.7.2",
-    "webpack-dev-server": "3.11.1",
+    "webpack-dev-server": "3.11.2",
     "webpack-merge": "5.7.3",
     "webpack-sources": "2.2.0",
     "webpack-subresource-integrity": "1.5.2",
     "worker-plugin": "5.0.0"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^11.0.0",
-    "@angular/localize": "^11.0.0",
-    "karma": "^5.2.0",
-    "ng-packagr": "^11.0.0",
+    "@angular/compiler-cli": "^11.0.0 || ^11.2.0-next",
+    "@angular/localize": "^11.0.0 || ^11.2.0-next",
+    "@angular/service-worker": "^11.0.0 || ^11.2.0-next",
+    "karma": "^5.2.0 || ^6.0.0",
+    "ng-packagr": "^11.0.0 || ^11.2.0-next",
     "protractor": "^7.0.0",
+    "tailwindcss": "^2.0.0",
     "tslint": "^6.1.0",
     "typescript": "~4.0.0 || ~4.1.0"
   },
@@ -92,6 +95,9 @@
     "@angular/localize": {
       "optional": true
     },
+    "@angular/service-worker": {
+      "optional": true
+    },
     "karma": {
       "optional": true
     },
@@ -101,6 +107,9 @@
     "protractor": {
       "optional": true
     },
+    "tailwindcss": {
+      "optional": true
+    },
     "tslint": {
       "optional": true
     }

package/plugins/karma.js

@@ -6,4 +6,4 @@
  * 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
  */
-module.exports = require('../src/webpack/plugins/karma');
+module.exports = require('../src/webpack/plugins/karma/karma');

package/src/app-shell/index.js

@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const architect_1 = require("@angular-devkit/architect");
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const fs = require("fs");
 const path = require("path");
 const utils_1 = require("../utils");
@@ -27,7 +26,6 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
     const root = context.workspaceRoot;
     const zonePackage = require.resolve('zone.js', { paths: [root] });
     await Promise.resolve().then(() => require(zonePackage));
-    const host = new node_1.NodeJsSyncHost();
     const projectName = context.target && context.target.project;
     if (!projectName) {
         throw new Error('The builder requires a target.');
@@ -82,7 +80,7 @@ async function _renderUniversal(options, context, browserResult, serverResult, s
         }
         await fs_1.writeFile(outputIndexPath, html);
         if (browserOptions.serviceWorker) {
-            await service_worker_1.augmentAppWithServiceWorker(host, core_1.normalize(root), projectRoot, core_1.normalize(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
+            await service_worker_1.augmentAppWithServiceWorker(core_1.normalize(root), projectRoot, core_1.normalize(outputPath), browserOptions.baseHref || '/', browserOptions.ngswConfigPath);
         }
     }
     return browserResult;

package/src/babel/presets/application.js

@@ -111,7 +111,6 @@ function default_1(api, options) {
     }
     if (options.forceAsyncTransformation) {
         // Always transform async/await to support Zone.js
-        // tslint:disable-next-line: no-implicit-dependencies
         plugins.push(require('@babel/plugin-transform-async-to-generator').default);
         needRuntimeTransform = true;
     }

package/src/babel/webpack-loader.js

@@ -19,7 +19,8 @@ const typescript_1 = require("typescript");
 let needsLinking;
 async function checkLinking(path, source) {
     // @angular/core and @angular/compiler will cause false positives
-    if (/[\\\/]@angular[\\\/](?:compiler|core)/.test(path)) {
+    // Also, TypeScript files do not require linking
+    if (/[\\\/]@angular[\\\/](?:compiler|core)|\.tsx?$/.test(path)) {
         return { requiresLinking: false };
     }
     if (needsLinking !== null) {
@@ -66,22 +67,35 @@ exports.default = babel_loader_1.custom(() => {
             shouldProcess || (shouldProcess = shouldLink);
             // Analyze for ES target processing
             let forceES5 = false;
+            let forceAsyncTransformation = false;
             const esTarget = scriptTarget;
             if (esTarget < typescript_1.ScriptTarget.ES2015) {
-                forceES5 = true;
+                // TypeScript files will have already been downlevelled
+                forceES5 = !/\.tsx?$/.test(this.resourcePath);
             }
-            shouldProcess || (shouldProcess = forceES5);
+            else if (esTarget >= typescript_1.ScriptTarget.ES2017) {
+                forceAsyncTransformation = source.includes('async');
+            }
+            shouldProcess || (shouldProcess = forceAsyncTransformation || forceES5);
             // Add provided loader options to default base options
             const options = {
                 ...baseOptions,
                 ...loaderOptions,
+                cacheIdentifier: JSON.stringify({
+                    buildAngular: require('../../package.json').version,
+                    forceAsyncTransformation,
+                    forceES5,
+                    shouldLink,
+                    baseOptions,
+                    loaderOptions,
+                }),
             };
             // Skip babel processing if no actions are needed
             if (!shouldProcess) {
                 // Force the current file to be ignored
                 options.ignore = [() => true];
             }
-            return { custom: { forceES5, shouldLink }, loader: options };
+            return { custom: { forceAsyncTransformation, forceES5, shouldLink }, loader: options };
         },
         config(configuration, { customOptions }) {
             return {
@@ -93,6 +107,7 @@ exports.default = babel_loader_1.custom(() => {
                         {
                             angularLinker: customOptions.shouldLink,
                             forceES5: customOptions.forceES5,
+                            forceAsyncTransformation: customOptions.forceAsyncTransformation,
                             diagnosticReporter: (type, message) => {
                                 switch (type) {
                                     case 'error':

package/src/browser/index.js

@@ -11,7 +11,6 @@ exports.buildWebpackBrowser = exports.getCompilerConfig = exports.getAnalyticsCo
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const fs = require("fs");
 const path = require("path");
 const rxjs_1 = require("rxjs");
@@ -37,6 +36,7 @@ const webpack_browser_config_1 = require("../utils/webpack-browser-config");
 const configs_1 = require("../webpack/configs");
 const analytics_1 = require("../webpack/plugins/analytics");
 const async_chunks_1 = require("../webpack/utils/async-chunks");
+const helpers_1 = require("../webpack/utils/helpers");
 const stats_1 = require("../webpack/utils/stats");
 const cacheDownlevelPath = environment_options_1.cachingDisabled ? undefined : cache_path_1.findCachePath('angular-build-dl');
 function getAnalyticsConfig(wco, context) {
@@ -63,7 +63,7 @@ function getCompilerConfig(wco) {
     return {};
 }
 exports.getCompilerConfig = getCompilerConfig;
-async function initialize(options, context, host, differentialLoadingNeeded, webpackConfigurationTransform) {
+async function initialize(options, context, differentialLoadingNeeded, webpackConfigurationTransform) {
     var _a, _b;
     const originalOutputPath = options.outputPath;
     // Assets are processed directly by the builder except when watching
@@ -76,10 +76,10 @@ async function initialize(options, context, host, differentialLoadingNeeded, web
         getAnalyticsConfig(wco, context),
         getCompilerConfig(wco),
         wco.buildOptions.webWorkerTsConfig ? configs_1.getWorkerConfig(wco) : {},
-    ], host, { differentialLoadingNeeded });
+    ], { differentialLoadingNeeded });
     // Validate asset option values if processed directly
     if (((_a = options.assets) === null || _a === void 0 ? void 0 : _a.length) && !((_b = adjustedOptions.assets) === null || _b === void 0 ? void 0 : _b.length)) {
-        utils_1.normalizeAssetPatterns(options.assets, new core_1.virtualFs.SyncDelegateHost(host), core_1.normalize(context.workspaceRoot), core_1.normalize(projectRoot), projectSourceRoot === undefined ? undefined : core_1.normalize(projectSourceRoot)).forEach(({ output }) => {
+        utils_1.normalizeAssetPatterns(options.assets, core_1.normalize(context.workspaceRoot), core_1.normalize(projectRoot), projectSourceRoot === undefined ? undefined : core_1.normalize(projectSourceRoot)).forEach(({ output }) => {
             if (output.startsWith('..')) {
                 throw new Error('An asset cannot be written to a location outside of the output path.');
             }
@@ -97,7 +97,6 @@ async function initialize(options, context, host, differentialLoadingNeeded, web
 // tslint:disable-next-line: no-big-function
 function buildWebpackBrowser(options, context, transforms = {}) {
     var _a;
-    const host = new node_1.NodeJsSyncHost();
     const root = core_1.normalize(context.workspaceRoot);
     const projectName = (_a = context.target) === null || _a === void 0 ? void 0 : _a.project;
     if (!projectName) {
@@ -132,7 +131,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                 '\nFor additional information: https://v10.angular.io/guide/deprecations#ie-9-10-and-mobile');
         }
         return {
-            ...(await initialize(options, context, host, isDifferentialLoadingNeeded, transforms.webpackConfiguration)),
+            ...(await initialize(options, context, isDifferentialLoadingNeeded, transforms.webpackConfiguration)),
             buildBrowserFeatures,
             isDifferentialLoadingNeeded,
             target,
@@ -160,8 +159,8 @@ function buildWebpackBrowser(options, context, transforms = {}) {
             }
             // Fix incorrectly set `initial` value on chunks.
             const extraEntryPoints = [
-                ...configs_1.normalizeExtraEntryPoints(options.styles || [], 'styles'),
-                ...configs_1.normalizeExtraEntryPoints(options.scripts || [], 'scripts'),
+                ...helpers_1.normalizeExtraEntryPoints(options.styles || [], 'styles'),
+                ...helpers_1.normalizeExtraEntryPoints(options.scripts || [], 'scripts'),
             ];
             const webpackStats = {
                 ...webpackRawStats,
@@ -179,12 +178,13 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                 return { success };
             }
             else {
+                const processResults = [];
                 const bundleInfoStats = [];
                 outputPaths = output_paths_1.ensureOutputPaths(baseOutputPath, i18n);
                 let noModuleFiles;
                 let moduleFiles;
                 let files;
-                const scriptsEntryPointName = configs_1.normalizeExtraEntryPoints(options.scripts || [], 'scripts').map(x => x.bundleName);
+                const scriptsEntryPointName = helpers_1.normalizeExtraEntryPoints(options.scripts || [], 'scripts').map(x => x.bundleName);
                 if (isDifferentialLoadingNeeded && options.watch) {
                     moduleFiles = emittedFiles;
                     files = moduleFiles.filter(x => x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)));
@@ -299,7 +299,6 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                     const processActions = [];
                     let processRuntimeAction;
-                    const processResults = [];
                     for (const action of actions) {
                         // If SRI is enabled always process the runtime bundle
                         // Lazy route integrity values are stored in the runtime bundle
@@ -429,8 +428,22 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         const asset = (_c = webpackStats.assets) === null || _c === void 0 ? void 0 : _c.find(a => a.name === chunk.files[0]);
                         bundleInfoStats.push(stats_1.generateBundleStats({ ...chunk, size: asset === null || asset === void 0 ? void 0 : asset.size }));
                     }
-                    // Check for budget errors and display them to the user.
-                    const budgets = options.budgets || [];
+                }
+                else {
+                    files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
+                    noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
+                    if (i18n.shouldInline) {
+                        const success = await i18n_inlining_1.i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, Array.from(outputPaths.values()), scriptsEntryPointName, 
+                        // tslint:disable-next-line: no-non-null-assertion
+                        webpackStats.outputPath, target <= typescript_1.ScriptTarget.ES5, options.i18nMissingTranslation);
+                        if (!success) {
+                            return { success: false };
+                        }
+                    }
+                }
+                // Check for budget errors and display them to the user.
+                const budgets = options.budgets;
+                if (budgets === null || budgets === void 0 ? void 0 : budgets.length) {
                     const budgetFailures = bundle_calculator_1.checkBudgets(budgets, webpackStats, processResults);
                     for (const { severity, message } of budgetFailures) {
                         switch (severity) {
@@ -445,31 +458,20 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         }
                     }
                 }
-                else {
-                    files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
-                    noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
-                    if (i18n.shouldInline) {
-                        const success = await i18n_inlining_1.i18nInlineEmittedFiles(context, emittedFiles, i18n, baseOutputPath, Array.from(outputPaths.values()), scriptsEntryPointName, 
-                        // tslint:disable-next-line: no-non-null-assertion
-                        webpackStats.outputPath, target <= typescript_1.ScriptTarget.ES5, options.i18nMissingTranslation);
-                        if (!success) {
-                            return { success: false };
+                const buildSuccess = success && !stats_1.statsHasErrors(webpackStats);
+                if (buildSuccess) {
+                    // Copy assets
+                    if (!options.watch && ((_d = options.assets) === null || _d === void 0 ? void 0 : _d.length)) {
+                        spinner.start('Copying assets...');
+                        try {
+                            await copy_assets_1.copyAssets(utils_1.normalizeAssetPatterns(options.assets, root, core_1.normalize(projectRoot), projectSourceRoot === undefined ? undefined : core_1.normalize(projectSourceRoot)), Array.from(outputPaths.values()), context.workspaceRoot);
+                            spinner.succeed('Copying assets complete.');
+                        }
+                        catch (err) {
+                            spinner.fail(color_1.colors.redBright('Copying of assets failed.'));
+                            return { success: false, error: 'Unable to copy assets: ' + err.message };
                         }
                     }
-                }
-                // Copy assets
-                if (!options.watch && ((_d = options.assets) === null || _d === void 0 ? void 0 : _d.length)) {
-                    spinner.start('Copying assets...');
-                    try {
-                        await copy_assets_1.copyAssets(utils_1.normalizeAssetPatterns(options.assets, new core_1.virtualFs.SyncDelegateHost(host), root, core_1.normalize(projectRoot), projectSourceRoot === undefined ? undefined : core_1.normalize(projectSourceRoot)), Array.from(outputPaths.values()), context.workspaceRoot);
-                        spinner.succeed('Copying assets complete.');
-                    }
-                    catch (err) {
-                        spinner.fail(color_1.colors.redBright('Copying of assets failed.'));
-                        return { success: false, error: 'Unable to copy assets: ' + err.message };
-                    }
-                }
-                if (success) {
                     if (options.index) {
                         spinner.start('Generating index html...');
                         const WOFFSupportNeeded = !buildBrowserFeatures.isFeatureSupported('woff2');
@@ -519,7 +521,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                         spinner.start('Generating service worker...');
                         for (const [locale, outputPath] of outputPaths.entries()) {
                             try {
-                                await service_worker_1.augmentAppWithServiceWorker(host, root, core_1.normalize(projectRoot), core_1.normalize(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
+                                await service_worker_1.augmentAppWithServiceWorker(root, core_1.normalize(projectRoot), core_1.normalize(outputPath), getLocaleBaseHref(i18n, locale) || options.baseHref || '/', options.ngswConfigPath);
                             }
                             catch (error) {
                                 spinner.fail('Service worker generation failed.');
@@ -530,7 +532,7 @@ function buildWebpackBrowser(options, context, transforms = {}) {
                     }
                 }
                 stats_1.webpackStatsLogger(context.logger, webpackStats, config, bundleInfoStats);
-                return { success: !stats_1.statsHasErrors(webpackStats) };
+                return { success: buildSuccess };
             }
         }), operators_1.map(event => ({
             ...event,

package/src/dev-server/index.js

@@ -11,7 +11,6 @@ exports.serveWebpackBrowser = void 0;
 const architect_1 = require("@angular-devkit/architect");
 const build_webpack_1 = require("@angular-devkit/build-webpack");
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const path = require("path");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
@@ -30,7 +29,6 @@ const version_1 = require("../utils/version");
 const webpack_browser_config_1 = require("../utils/webpack-browser-config");
 const webpack_diagnostics_1 = require("../utils/webpack-diagnostics");
 const configs_1 = require("../webpack/configs");
-const dev_server_1 = require("../webpack/configs/dev-server");
 const index_html_webpack_plugin_1 = require("../webpack/plugins/index-html-webpack-plugin");
 const stats_1 = require("../webpack/utils/stats");
 const devServerBuildOverriddenKeys = [
@@ -59,7 +57,6 @@ function serveWebpackBrowser(options, context, transforms = {}) {
     const { logger, workspaceRoot } = context;
     version_1.assertCompatibleAngularVersion(workspaceRoot, logger);
     const browserTarget = architect_1.targetFromTargetString(options.browserTarget);
-    const host = new node_1.NodeJsSyncHost();
     async function setup() {
         var _a;
         // Get the browser configuration from the target name.
@@ -89,7 +86,7 @@ function serveWebpackBrowser(options, context, transforms = {}) {
         const browserName = await context.getBuilderNameForTarget(browserTarget);
         const browserOptions = await context.validateOptions({ ...rawBrowserOptions, ...overrides }, browserName);
         const { config, projectRoot, i18n } = await webpack_browser_config_1.generateI18nBrowserWebpackConfigFromContext(browserOptions, context, wco => [
-            dev_server_1.getDevServerConfig(wco),
+            configs_1.getDevServerConfig(wco),
             configs_1.getCommonConfig(wco),
             configs_1.getBrowserConfig(wco),
             configs_1.getStylesConfig(wco),
@@ -97,7 +94,7 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             browser_1.getAnalyticsConfig(wco, context),
             browser_1.getCompilerConfig(wco),
             browserOptions.webWorkerTsConfig ? configs_1.getWorkerConfig(wco) : {},
-        ], host, devServerOptions);
+        ], devServerOptions);
         if (!config.devServer) {
             throw new Error('Webpack Dev Server configuration was not set.');
         }
@@ -226,7 +223,7 @@ function serveWebpackBrowser(options, context, transforms = {}) {
             logging: transforms.logging || stats_1.createWebpackLoggingCallback(!!options.verbose, logger),
             webpackFactory: require('webpack'),
             webpackDevServerFactory: require('webpack-dev-server'),
-        }).pipe(operators_1.concatMap((buildEvent, index) => {
+        }).pipe(operators_1.concatMap(async (buildEvent, index) => {
             var _a;
             // Resolve serve address.
             const serverAddress = url.format({
@@ -243,14 +240,14 @@ function serveWebpackBrowser(options, context, transforms = {}) {
               **
             ` + '\n');
                 if (options.open) {
-                    const open = require('open');
-                    open(serverAddress);
+                    const open = await Promise.resolve().then(() => require('open'));
+                    await open(serverAddress);
                 }
             }
             if (buildEvent.success) {
                 logger.info(`\n${color_1.colors.greenBright(color_1.colors.symbols.check)} Compiled successfully.`);
             }
-            return rxjs_1.of({ ...buildEvent, baseUrl: serverAddress });
+            return { ...buildEvent, baseUrl: serverAddress };
         }));
     }));
 }

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/find-up.d.ts

@@ -1,2 +1 @@
-export declare function findUp(names: string | string[], from: string, stopOnNodeModules?: boolean): string | null;
 export declare function findAllNodeModules(from: string, root?: string): string[];

package/src/utils/find-up.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAllNodeModules = exports.findUp = void 0;
+exports.findAllNodeModules = void 0;
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -11,30 +11,6 @@ exports.findAllNodeModules = exports.findUp = void 0;
 const fs_1 = require("fs");
 const path = require("path");
 const is_directory_1 = require("./is-directory");
-function findUp(names, from, stopOnNodeModules = false) {
-    if (!Array.isArray(names)) {
-        names = [names];
-    }
-    const root = path.parse(from).root;
-    let currentDir = from;
-    while (currentDir && currentDir !== root) {
-        for (const name of names) {
-            const p = path.join(currentDir, name);
-            if (fs_1.existsSync(p)) {
-                return p;
-            }
-        }
-        if (stopOnNodeModules) {
-            const nodeModuleP = path.join(currentDir, 'node_modules');
-            if (fs_1.existsSync(nodeModuleP)) {
-                return null;
-            }
-        }
-        currentDir = path.dirname(currentDir);
-    }
-    return null;
-}
-exports.findUp = findUp;
 function findAllNodeModules(from, root) {
     const nodeModules = [];
     let current = from;

package/src/utils/normalize-asset-patterns.d.ts

@@ -5,9 +5,9 @@
  * 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
  */
-import { BaseException, Path, virtualFs } from '@angular-devkit/core';
+import { BaseException, Path } from '@angular-devkit/core';
 import { AssetPattern, AssetPatternClass } from '../browser/schema';
 export declare class MissingAssetSourceRootException extends BaseException {
     constructor(path: String);
 }
-export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], host: virtualFs.SyncDelegateHost, root: Path, projectRoot: Path, maybeSourceRoot: Path | undefined): AssetPatternClass[];
+export declare function normalizeAssetPatterns(assetPatterns: AssetPattern[], root: Path, projectRoot: Path, maybeSourceRoot: Path | undefined): AssetPatternClass[];

package/src/utils/normalize-asset-patterns.js

@@ -9,13 +9,14 @@ exports.normalizeAssetPatterns = exports.MissingAssetSourceRootException = void
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
+const fs_1 = require("fs");
 class MissingAssetSourceRootException extends core_1.BaseException {
     constructor(path) {
         super(`The ${path} asset path must start with the project source root.`);
     }
 }
 exports.MissingAssetSourceRootException = MissingAssetSourceRootException;
-function normalizeAssetPatterns(assetPatterns, host, root, projectRoot, maybeSourceRoot) {
+function normalizeAssetPatterns(assetPatterns, root, projectRoot, maybeSourceRoot) {
     // When sourceRoot is not available, we default to ${projectRoot}/src.
     const sourceRoot = maybeSourceRoot || core_1.join(projectRoot, 'src');
     const resolvedSourceRoot = core_1.resolve(root, sourceRoot);
@@ -35,7 +36,7 @@ function normalizeAssetPatterns(assetPatterns, host, root, projectRoot, maybeSou
             let glob, input, output;
             let isDirectory = false;
             try {
-                isDirectory = host.isDirectory(resolvedAssetPath);
+                isDirectory = fs_1.statSync(core_1.getSystemPath(resolvedAssetPath)).isDirectory();
             }
             catch (_a) {
                 isDirectory = true;

package/src/utils/normalize-builder-schema.d.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import { Path, virtualFs } from '@angular-devkit/core';
+import { Path } from '@angular-devkit/core';
 import { AssetPatternClass, Schema as BrowserBuilderSchema, SourceMapClass } from '../browser/schema';
 import { BuildOptions } from './build-options';
 import { NormalizedFileReplacement } from './normalize-file-replacements';
@@ -19,4 +19,4 @@ export declare type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & Buil
     fileReplacements: NormalizedFileReplacement[];
     optimization: NormalizedOptimizationOptions;
 };
-export declare function normalizeBrowserSchema(host: virtualFs.Host<{}>, root: Path, projectRoot: Path, sourceRoot: Path | undefined, options: BrowserBuilderSchema): NormalizedBrowserBuilderSchema;
+export declare function normalizeBrowserSchema(root: Path, projectRoot: Path, sourceRoot: Path | undefined, options: BrowserBuilderSchema): NormalizedBrowserBuilderSchema;

package/src/utils/normalize-builder-schema.js

@@ -8,18 +8,16 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeBrowserSchema = void 0;
-const core_1 = require("@angular-devkit/core");
 const normalize_asset_patterns_1 = require("./normalize-asset-patterns");
 const normalize_file_replacements_1 = require("./normalize-file-replacements");
 const normalize_optimization_1 = require("./normalize-optimization");
 const normalize_source_maps_1 = require("./normalize-source-maps");
-function normalizeBrowserSchema(host, root, projectRoot, sourceRoot, options) {
-    const syncHost = new core_1.virtualFs.SyncDelegateHost(host);
+function normalizeBrowserSchema(root, projectRoot, sourceRoot, options) {
     const normalizedSourceMapOptions = normalize_source_maps_1.normalizeSourceMaps(options.sourceMap || false);
     return {
         ...options,
-        assets: normalize_asset_patterns_1.normalizeAssetPatterns(options.assets || [], syncHost, root, projectRoot, sourceRoot),
-        fileReplacements: normalize_file_replacements_1.normalizeFileReplacements(options.fileReplacements || [], syncHost, root),
+        assets: normalize_asset_patterns_1.normalizeAssetPatterns(options.assets || [], root, projectRoot, sourceRoot),
+        fileReplacements: normalize_file_replacements_1.normalizeFileReplacements(options.fileReplacements || [], root),
         optimization: normalize_optimization_1.normalizeOptimization(options.optimization),
         sourceMap: normalizedSourceMapOptions,
         preserveSymlinks: options.preserveSymlinks === undefined ? process.execArgv.includes('--preserve-symlinks') : options.preserveSymlinks,

package/src/utils/normalize-file-replacements.d.ts

@@ -5,7 +5,7 @@
  * 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
  */
-import { BaseException, Path, virtualFs } from '@angular-devkit/core';
+import { BaseException, Path } from '@angular-devkit/core';
 import { FileReplacement } from '../browser/schema';
 export declare class MissingFileReplacementException extends BaseException {
     constructor(path: String);
@@ -14,4 +14,4 @@ export interface NormalizedFileReplacement {
     replace: Path;
     with: Path;
 }
-export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], host: virtualFs.SyncDelegateHost, root: Path): NormalizedFileReplacement[];
+export declare function normalizeFileReplacements(fileReplacements: FileReplacement[], root: Path): NormalizedFileReplacement[];

package/src/utils/normalize-file-replacements.js

@@ -9,23 +9,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeFileReplacements = exports.MissingFileReplacementException = void 0;
 const core_1 = require("@angular-devkit/core");
+const fs_1 = require("fs");
 class MissingFileReplacementException extends core_1.BaseException {
     constructor(path) {
         super(`The ${path} path in file replacements does not exist.`);
     }
 }
 exports.MissingFileReplacementException = MissingFileReplacementException;
-function normalizeFileReplacements(fileReplacements, host, root) {
+function normalizeFileReplacements(fileReplacements, root) {
     if (fileReplacements.length === 0) {
         return [];
     }
     const normalizedReplacement = fileReplacements
         .map(replacement => normalizeFileReplacement(replacement, root));
     for (const { replace, with: replacementWith } of normalizedReplacement) {
-        if (!host.exists(replacementWith)) {
+        if (!fs_1.existsSync(core_1.getSystemPath(replacementWith))) {
             throw new MissingFileReplacementException(core_1.getSystemPath(replacementWith));
         }
-        if (!host.exists(replace)) {
+        if (!fs_1.existsSync(core_1.getSystemPath(replace))) {
             throw new MissingFileReplacementException(core_1.getSystemPath(replace));
         }
     }

package/src/utils/package-chunk-sort.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEntryPoints = void 0;
-const configs_1 = require("../webpack/configs");
+const helpers_1 = require("../webpack/utils/helpers");
 function generateEntryPoints(appConfig) {
     // Add all styles/scripts, except lazy-loaded ones.
     const extraEntryPoints = (extraEntryPoints, defaultBundleName) => {
-        const entryPoints = configs_1.normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
+        const entryPoints = helpers_1.normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
             .filter(entry => entry.inject)
             .map(entry => entry.bundleName);
         // remove duplicates

package/src/utils/service-worker.d.ts

@@ -5,5 +5,5 @@
  * 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
  */
-import { Path, virtualFs } from '@angular-devkit/core';
-export declare function augmentAppWithServiceWorker(host: virtualFs.Host, projectRoot: Path, appRoot: Path, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;
+import { Path } from '@angular-devkit/core';
+export declare function augmentAppWithServiceWorker(projectRoot: Path, appRoot: Path, outputPath: Path, baseHref: string, ngswConfigPath?: string): Promise<void>;

package/src/utils/service-worker.js

@@ -9,6 +9,7 @@ exports.augmentAppWithServiceWorker = void 0;
  * found in the LICENSE file at https://angular.io/license
  */
 const core_1 = require("@angular-devkit/core");
+const node_1 = require("@angular-devkit/core/node");
 const crypto = require("crypto");
 class CliFilesystem {
     constructor(_host, base) {
@@ -50,7 +51,8 @@ class CliFilesystem {
         return items;
     }
 }
-async function augmentAppWithServiceWorker(host, projectRoot, appRoot, outputPath, baseHref, ngswConfigPath) {
+async function augmentAppWithServiceWorker(projectRoot, appRoot, outputPath, baseHref, ngswConfigPath) {
+    const host = new node_1.NodeJsSyncHost();
     const distPath = core_1.normalize(outputPath);
     const systemProjectRoot = core_1.getSystemPath(projectRoot);
     // Find the service worker package

package/src/utils/webpack-browser-config.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * @license
  * Copyright Google Inc. All Rights Reserved.
@@ -7,8 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import { BuilderContext } from '@angular-devkit/architect';
-import { logging, virtualFs } from '@angular-devkit/core';
-import * as fs from 'fs';
+import { logging } from '@angular-devkit/core';
 import * as webpack from 'webpack';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { NormalizedBrowserBuilderSchema } from '../utils';
@@ -16,13 +14,13 @@ import { WebpackConfigOptions } from '../utils/build-options';
 import { I18nOptions } from './i18n-options';
 export declare type BrowserWebpackConfigOptions = WebpackConfigOptions<NormalizedBrowserBuilderSchema>;
 export declare function generateWebpackConfig(workspaceRoot: string, projectRoot: string, sourceRoot: string | undefined, options: NormalizedBrowserBuilderSchema, webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[], logger: logging.LoggerApi, extraBuildOptions: Partial<NormalizedBrowserBuilderSchema>): Promise<webpack.Configuration>;
-export declare function generateI18nBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[], host?: virtualFs.Host<fs.Stats>, extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
+export declare function generateI18nBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[], extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
     config: webpack.Configuration;
     projectRoot: string;
     projectSourceRoot?: string;
     i18n: I18nOptions;
 }>;
-export declare function generateBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[], host?: virtualFs.Host<fs.Stats>, extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
+export declare function generateBrowserWebpackConfigFromContext(options: BrowserBuilderSchema, context: BuilderContext, webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[], extraBuildOptions?: Partial<NormalizedBrowserBuilderSchema>): Promise<{
     config: webpack.Configuration;
     projectRoot: string;
     projectSourceRoot?: string;

package/src/utils/webpack-browser-config.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getIndexInputFile = exports.getIndexOutputFile = exports.generateBrowserWebpackConfigFromContext = exports.generateI18nBrowserWebpackConfigFromContext = exports.generateWebpackConfig = void 0;
 const core_1 = require("@angular-devkit/core");
-const node_1 = require("@angular-devkit/core/node");
 const path = require("path");
 const webpack_merge_1 = require("webpack-merge");
 const utils_1 = require("../utils");
@@ -28,7 +27,6 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, opt
     }
     const tsConfigPath = path.resolve(workspaceRoot, options.tsConfig);
     const tsConfig = read_tsconfig_1.readTsconfig(tsConfigPath);
-    // tslint:disable-next-line:no-implicit-dependencies
     const ts = await Promise.resolve().then(() => require('typescript'));
     const scriptTarget = tsConfig.options.target || ts.ScriptTarget.ES5;
     const supportES2015 = scriptTarget !== ts.ScriptTarget.JSON && scriptTarget > ts.ScriptTarget.ES5;
@@ -74,9 +72,9 @@ async function generateWebpackConfig(workspaceRoot, projectRoot, sourceRoot, opt
     return webpackConfig;
 }
 exports.generateWebpackConfig = generateWebpackConfig;
-async function generateI18nBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, host = new node_1.NodeJsSyncHost(), extraBuildOptions = {}) {
+async function generateI18nBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, extraBuildOptions = {}) {
     const { buildOptions, i18n } = await i18n_options_1.configureI18nBuild(context, options);
-    const result = await generateBrowserWebpackConfigFromContext(buildOptions, context, webpackPartialGenerator, host, extraBuildOptions);
+    const result = await generateBrowserWebpackConfigFromContext(buildOptions, context, webpackPartialGenerator, extraBuildOptions);
     const config = result.config;
     if (i18n.shouldInline) {
         // Remove localize "polyfill" if in AOT mode
@@ -122,7 +120,7 @@ async function generateI18nBrowserWebpackConfigFromContext(options, context, web
     return { ...result, i18n };
 }
 exports.generateI18nBrowserWebpackConfigFromContext = generateI18nBrowserWebpackConfigFromContext;
-async function generateBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, host = new node_1.NodeJsSyncHost(), extraBuildOptions = {}) {
+async function generateBrowserWebpackConfigFromContext(options, context, webpackPartialGenerator, extraBuildOptions = {}) {
     const projectName = context.target && context.target.project;
     if (!projectName) {
         throw new Error('The builder requires a target.');
@@ -134,7 +132,7 @@ async function generateBrowserWebpackConfigFromContext(options, context, webpack
     const sourceRoot = projectSourceRoot
         ? core_1.resolve(workspaceRoot, core_1.normalize(projectSourceRoot))
         : undefined;
-    const normalizedOptions = utils_1.normalizeBrowserSchema(host, workspaceRoot, projectRoot, sourceRoot, options);
+    const normalizedOptions = utils_1.normalizeBrowserSchema(workspaceRoot, projectRoot, sourceRoot, options);
     const config = await generateWebpackConfig(core_1.getSystemPath(workspaceRoot), core_1.getSystemPath(projectRoot), sourceRoot && core_1.getSystemPath(sourceRoot), normalizedOptions, webpackPartialGenerator, context.logger, extraBuildOptions);
     // If builder watch support is present in the context, add watch plugin
     // This is internal only and currently only used for testing

package/src/webpack/configs/common.js

@@ -269,15 +269,6 @@ function getCommonConfig(wco) {
         // Provide full names for lazy routes that use the deprecated string format
         extraPlugins.push(new webpack_1.ContextReplacementPlugin(/\@angular[\\\/]core[\\\/]/, (data) => (data.chunkName = '[request]')));
     }
-    if (buildOptions.budgets.length && !differentialLoadingMode) {
-        // Budgets are computed after differential builds, not via a plugin.
-        // https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_angular/src/browser/index.ts
-        const extraEntryPoints = [
-            ...helpers_1.normalizeExtraEntryPoints(buildOptions.styles || [], 'styles'),
-            ...helpers_1.normalizeExtraEntryPoints(buildOptions.scripts || [], 'scripts'),
-        ];
-        extraPlugins.push(new plugins_1.BundleBudgetPlugin({ budgets: buildOptions.budgets, extraEntryPoints }));
-    }
     if ((scriptsSourceMap || stylesSourceMap)) {
         extraRules.push({
             test: /\.m?js$/,
@@ -443,16 +434,13 @@ function getCommonConfig(wco) {
                     sideEffects: true,
                 },
                 {
-                    test: /\.[cm]?js$/,
+                    test: /\.[cm]?js$|\.tsx?$/,
                     exclude: [/[\/\\](?:core-js|\@babel|tslib|web-animations-js)[\/\\]/, /(ngfactory|ngstyle)\.js$/],
                     use: [
                         {
                             loader: require.resolve('../../babel/webpack-loader'),
                             options: {
                                 cacheDirectory: cache_path_1.findCachePath('babel-webpack'),
-                                cacheIdentifier: JSON.stringify({
-                                    buildAngular: require('../../../package.json').version,
-                                }),
                                 scriptTarget: wco.scriptTarget,
                             },
                         },

package/src/webpack/configs/index.d.ts

@@ -7,10 +7,10 @@
  */
 export * from './browser';
 export * from './common';
+export * from './dev-server';
 export * from './server';
 export * from './styles';
 export * from './test';
 export * from './typescript';
-export * from '../utils/helpers';
 export * from './stats';
 export * from './worker';

package/src/webpack/configs/index.js

@@ -19,10 +19,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 __exportStar(require("./browser"), exports);
 __exportStar(require("./common"), exports);
+__exportStar(require("./dev-server"), exports);
 __exportStar(require("./server"), exports);
 __exportStar(require("./styles"), exports);
 __exportStar(require("./test"), exports);
 __exportStar(require("./typescript"), exports);
-__exportStar(require("../utils/helpers"), exports);
 __exportStar(require("./stats"), exports);
 __exportStar(require("./worker"), exports);

package/src/webpack/configs/styles.js

@@ -137,6 +137,36 @@ function getStylesConfig(wco) {
         },
     ];
     const assetNameTemplate = helpers_1.assetNameTemplateFactory(hashFormat);
+    const extraPostcssPlugins = [];
+    // Attempt to setup Tailwind CSS
+    // A configuration file can exist in the project or workspace root
+    const tailwindConfigFile = 'tailwind.config.js';
+    let tailwindConfigPath;
+    for (const basePath of [wco.projectRoot, wco.root]) {
+        const fullPath = path.join(basePath, tailwindConfigFile);
+        if (fs.existsSync(fullPath)) {
+            tailwindConfigPath = fullPath;
+            break;
+        }
+    }
+    // Only load Tailwind CSS plugin if configuration file was found.
+    // This acts as a guard to ensure the project actually wants to use Tailwind CSS.
+    // The package may be unknowningly present due to a third-party transitive package dependency.
+    if (tailwindConfigPath) {
+        let tailwindPackagePath;
+        try {
+            tailwindPackagePath = require.resolve('tailwindcss', { paths: [wco.root] });
+        }
+        catch (_e) {
+            const relativeTailwindConfigPath = path.relative(wco.root, tailwindConfigPath);
+            wco.logger.warn(`Tailwind CSS configuration file found (${relativeTailwindConfigPath})` +
+                ` but the 'tailwindcss' package is not installed.` +
+                ` To enable Tailwind CSS, please install the 'tailwindcss' package.`);
+        }
+        if (tailwindPackagePath) {
+            extraPostcssPlugins.push(require(tailwindPackagePath)({ config: tailwindConfigPath }));
+        }
+    }
     const postcssOptionsCreator = (sourceMap, extracted) => {
         return (loader) => ({
             map: sourceMap && {
@@ -168,6 +198,7 @@ function getStylesConfig(wco) {
                     emitFile: buildOptions.platform !== 'server',
                     extracted,
                 }),
+                ...extraPostcssPlugins,
                 autoprefixer(),
             ],
         });

package/src/webpack/configs/typescript.js

@@ -47,6 +47,7 @@ function createIvyPlugin(wco, aot, tsconfig) {
         fileReplacements,
         jitMode: !aot,
         emitNgModuleScope: !optimize,
+        suppressZoneJsIncompatibilityWarning: true,
     });
 }
 function _pluginOptionsOverrides(buildOptions, pluginOptions) {
@@ -107,6 +108,7 @@ function _createAotPlugin(wco, options, i18nExtract = false) {
         directTemplateLoading: true,
         ...options,
         compilerOptions,
+        suppressZoneJsIncompatibilityWarning: true,
     };
     pluginOptions = _pluginOptionsOverrides(buildOptions, pluginOptions);
     return new webpack_1.AngularCompilerPlugin(pluginOptions);

package/src/webpack/plugins/index.d.ts

@@ -7,7 +7,6 @@
  */
 export { AnyComponentStyleBudgetChecker } from './any-component-style-budget-checker';
 export { OptimizeCssWebpackPlugin, OptimizeCssWebpackPluginOptions } from './optimize-css-webpack-plugin';
-export { BundleBudgetPlugin, BundleBudgetPluginOptions } from './bundle-budget';
 export { ScriptsWebpackPlugin, ScriptsWebpackPluginOptions } from './scripts-webpack-plugin';
 export { SuppressExtractedTextChunksWebpackPlugin } from './suppress-entry-chunks-webpack-plugin';
 export { RemoveHashPlugin, RemoveHashPluginOptions } from './remove-hash-plugin';

package/src/webpack/plugins/index.js

@@ -7,14 +7,12 @@
  * found in the LICENSE file at https://angular.io/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebpackRollupLoader = exports.PostcssCliResources = exports.CommonJsUsageWarnPlugin = exports.DedupeModuleResolvePlugin = exports.NamedLazyChunksPlugin = exports.RemoveHashPlugin = exports.SuppressExtractedTextChunksWebpackPlugin = exports.ScriptsWebpackPlugin = exports.BundleBudgetPlugin = exports.OptimizeCssWebpackPlugin = exports.AnyComponentStyleBudgetChecker = void 0;
+exports.WebpackRollupLoader = exports.PostcssCliResources = exports.CommonJsUsageWarnPlugin = exports.DedupeModuleResolvePlugin = exports.NamedLazyChunksPlugin = exports.RemoveHashPlugin = exports.SuppressExtractedTextChunksWebpackPlugin = exports.ScriptsWebpackPlugin = exports.OptimizeCssWebpackPlugin = exports.AnyComponentStyleBudgetChecker = void 0;
 // Exports the webpack plugins we use internally.
 var any_component_style_budget_checker_1 = require("./any-component-style-budget-checker");
 Object.defineProperty(exports, "AnyComponentStyleBudgetChecker", { enumerable: true, get: function () { return any_component_style_budget_checker_1.AnyComponentStyleBudgetChecker; } });
 var optimize_css_webpack_plugin_1 = require("./optimize-css-webpack-plugin");
 Object.defineProperty(exports, "OptimizeCssWebpackPlugin", { enumerable: true, get: function () { return optimize_css_webpack_plugin_1.OptimizeCssWebpackPlugin; } });
-var bundle_budget_1 = require("./bundle-budget");
-Object.defineProperty(exports, "BundleBudgetPlugin", { enumerable: true, get: function () { return bundle_budget_1.BundleBudgetPlugin; } });
 var scripts_webpack_plugin_1 = require("./scripts-webpack-plugin");
 Object.defineProperty(exports, "ScriptsWebpackPlugin", { enumerable: true, get: function () { return scripts_webpack_plugin_1.ScriptsWebpackPlugin; } });
 var suppress_entry_chunks_webpack_plugin_1 = require("./suppress-entry-chunks-webpack-plugin");

package/src/webpack/plugins/{karma.js → karma/karma.js}

@@ -5,10 +5,10 @@ const glob = require("glob");
 const webpack = require("webpack");
 const webpackDevMiddleware = require('webpack-dev-middleware');
 const karma_webpack_failure_cb_1 = require("./karma-webpack-failure-cb");
-const stats_1 = require("../utils/stats");
-const stats_2 = require("../configs/stats");
+const stats_1 = require("../../utils/stats");
+const stats_2 = require("../../configs/stats");
 const node_1 = require("@angular-devkit/core/node");
-const index_1 = require("../../utils/index");
+const index_1 = require("../../../utils/index");
 /**
  * Enumerate needed (but not require/imported) dependencies from this file
  *  to let the dependency validator know they are used.
@@ -43,7 +43,7 @@ function addKarmaFiles(files, newFiles, prepend = false) {
         files.push(...processedFiles);
     }
 }
-const init = (config, emitter, customFileHandlers) => {
+const init = (config, emitter) => {
     if (!config.buildWebpack) {
         throw new Error(`The '@angular-devkit/build-angular/plugins/karma' karma plugin is meant to` +
             ` be used from within Angular CLI and will not work correctly outside of it.`);
@@ -180,38 +180,12 @@ const init = (config, emitter, customFileHandlers) => {
         unblock();
     });
     webpackMiddleware = new webpackDevMiddleware(compiler, webpackMiddlewareConfig);
-    // Forward requests to webpack server.
-    customFileHandlers.push({
-        urlRegex: new RegExp(`\\/${KARMA_APPLICATION_PATH}\\/.*`),
-        handler: function handler(req, res) {
-            webpackMiddleware(req, res, function () {
-                // Ensure script and style bundles are served.
-                // They are mentioned in the custom karma context page and we don't want them to 404.
-                const alwaysServe = [
-                    `/${KARMA_APPLICATION_PATH}/runtime.js`,
-                    `/${KARMA_APPLICATION_PATH}/polyfills.js`,
-                    `/${KARMA_APPLICATION_PATH}/polyfills-es5.js`,
-                    `/${KARMA_APPLICATION_PATH}/scripts.js`,
-                    `/${KARMA_APPLICATION_PATH}/styles.js`,
-                    `/${KARMA_APPLICATION_PATH}/vendor.js`,
-                ];
-                if (alwaysServe.indexOf(req.url) != -1) {
-                    res.statusCode = 200;
-                    res.end();
-                }
-                else {
-                    res.statusCode = 404;
-                    res.end('Not found');
-                }
-            });
-        }
-    });
     emitter.on('exit', (done) => {
         webpackMiddleware.close();
         done();
     });
 };
-init.$inject = ['config', 'emitter', 'customFileHandlers'];
+init.$inject = ['config', 'emitter'];
 // Block requests until the Webpack compilation is done.
 function requestBlocker() {
     return function (_request, _response, next) {
@@ -274,8 +248,26 @@ sourceMapReporter.$inject = ['baseReporterDecorator', 'config'];
 function fallbackMiddleware() {
     return function (request, response, next) {
         if (webpackMiddleware) {
-            request.url = '/' + KARMA_APPLICATION_PATH + request.url;
-            webpackMiddleware(request, response, next);
+            if (request.url && !new RegExp(`\\/${KARMA_APPLICATION_PATH}\\/.*`).test(request.url)) {
+                request.url = '/' + KARMA_APPLICATION_PATH + request.url;
+            }
+            webpackMiddleware(request, response, () => {
+                const alwaysServe = [
+                    `/${KARMA_APPLICATION_PATH}/runtime.js`,
+                    `/${KARMA_APPLICATION_PATH}/polyfills.js`,
+                    `/${KARMA_APPLICATION_PATH}/polyfills-es5.js`,
+                    `/${KARMA_APPLICATION_PATH}/scripts.js`,
+                    `/${KARMA_APPLICATION_PATH}/styles.js`,
+                    `/${KARMA_APPLICATION_PATH}/vendor.js`,
+                ];
+                if (request.url && alwaysServe.includes(request.url)) {
+                    response.statusCode = 200;
+                    response.end();
+                }
+                else {
+                    next();
+                }
+            });
         }
         else {
             next();
@@ -292,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;
     };

package/src/webpack/plugins/bundle-budget.d.ts

@@ -1,19 +0,0 @@
-/**
- * @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
- */
-import { Compiler } from 'webpack';
-import { Budget } from '../../browser/schema';
-import { NormalizedEntryPoint } from '../utils/helpers';
-export interface BundleBudgetPluginOptions {
-    budgets: Budget[];
-    extraEntryPoints: NormalizedEntryPoint[];
-}
-export declare class BundleBudgetPlugin {
-    private options;
-    constructor(options: BundleBudgetPluginOptions);
-    apply(compiler: Compiler): void;
-}

package/src/webpack/plugins/bundle-budget.js

@@ -1,36 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BundleBudgetPlugin = void 0;
-const bundle_calculator_1 = require("../../utils/bundle-calculator");
-const webpack_diagnostics_1 = require("../../utils/webpack-diagnostics");
-const async_chunks_1 = require("../utils/async-chunks");
-class BundleBudgetPlugin {
-    constructor(options) {
-        this.options = options;
-    }
-    apply(compiler) {
-        const { budgets } = this.options;
-        if (!budgets || budgets.length === 0) {
-            return;
-        }
-        compiler.hooks.afterEmit.tap('BundleBudgetPlugin', (compilation) => {
-            // No process bundle results because this plugin is only used when differential
-            // builds are disabled.
-            const processResults = [];
-            // Fix incorrectly set `initial` value on chunks.
-            const stats = compilation.getStats().toJson();
-            stats.chunks = async_chunks_1.markAsyncChunksNonInitial(stats, this.options.extraEntryPoints);
-            for (const { severity, message } of bundle_calculator_1.checkBudgets(budgets, stats, processResults)) {
-                switch (severity) {
-                    case bundle_calculator_1.ThresholdSeverity.Warning:
-                        webpack_diagnostics_1.addWarning(compilation, `budgets: ${message}`);
-                        break;
-                    case bundle_calculator_1.ThresholdSeverity.Error:
-                        webpack_diagnostics_1.addError(compilation, `budgets: ${message}`);
-                        break;
-                }
-            }
-        });
-    }
-}
-exports.BundleBudgetPlugin = BundleBudgetPlugin;