@angular-devkit/build-angular 14.2.0-rc.0 → 14.2.2

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "14.2.0-rc.0",
+  "version": "14.2.2",
   "description": "Angular Webpack Build Facade",
   "main": "src/index.js",
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
     "@ampproject/remapping": "2.2.0",
-    "@angular-devkit/architect": "0.1402.0-rc.0",
-    "@angular-devkit/build-webpack": "0.1402.0-rc.0",
-    "@angular-devkit/core": "14.2.0-rc.0",
+    "@angular-devkit/architect": "0.1402.2",
+    "@angular-devkit/build-webpack": "0.1402.2",
+    "@angular-devkit/core": "14.2.2",
     "@babel/core": "7.18.10",
     "@babel/generator": "7.18.12",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.18.9",
     "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "14.2.0-rc.0",
+    "@ngtools/webpack": "14.2.2",
     "ansi-colors": "4.1.3",
     "babel-loader": "8.2.5",
     "babel-plugin-istanbul": "6.1.1",
@@ -46,7 +46,7 @@
     "parse5-html-rewriting-stream": "6.0.1",
     "piscina": "3.2.0",
     "postcss": "8.4.16",
-    "postcss-import": "14.1.0",
+    "postcss-import": "15.0.0",
     "postcss-loader": "7.0.1",
     "postcss-preset-env": "7.8.0",
     "regenerator-runtime": "0.13.9",
@@ -65,7 +65,7 @@
     "tslib": "2.4.0",
     "webpack": "5.74.0",
     "webpack-dev-middleware": "5.3.3",
-    "webpack-dev-server": "4.10.0",
+    "webpack-dev-server": "4.11.0",
     "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "5.1.0"
   },
@@ -73,14 +73,14 @@
     "esbuild": "0.15.5"
   },
   "peerDependencies": {
-    "@angular/compiler-cli": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
-    "@angular/localize": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
-    "@angular/service-worker": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
+    "@angular/compiler-cli": "^14.0.0",
+    "@angular/localize": "^14.0.0",
+    "@angular/service-worker": "^14.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^14.0.0 || ^14.0.0-next || ^14.1.0-next",
+    "ng-packagr": "^14.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0 || ^3.0.0",
-    "typescript": ">=4.6.2 <4.8"
+    "typescript": ">=4.6.2 <4.9"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {

package/src/builders/browser/index.js

@@ -105,12 +105,26 @@ function buildWebpackBrowser(options, context, transforms = {}) {
     // Check Angular version.
     (0, version_1.assertCompatibleAngularVersion)(context.workspaceRoot);
     return (0, rxjs_1.from)(context.getProjectMetadata(projectName)).pipe((0, operators_1.switchMap)(async (projectMetadata) => {
+        var _a;
+        var _b;
         // Purge old build disk cache.
         await (0, purge_cache_1.purgeStaleBuildCache)(context);
         // Initialize builder
         const initialization = await initialize(options, context, transforms.webpackConfiguration);
         // Check and warn about IE browser support
         checkInternetExplorerSupport(initialization.projectRoot, context.logger);
+        // Add index file to watched files.
+        if (options.watch) {
+            const indexInputFile = path.join(context.workspaceRoot, (0, webpack_browser_config_1.getIndexInputFile)(options.index));
+            (_a = (_b = initialization.config).plugins) !== null && _a !== void 0 ? _a : (_b.plugins = []);
+            initialization.config.plugins.push({
+                apply: (compiler) => {
+                    compiler.hooks.thisCompilation.tap('build-angular', (compilation) => {
+                        compilation.fileDependencies.add(indexInputFile);
+                    });
+                },
+            });
+        }
         return {
             ...initialization,
             cacheOptions: (0, normalize_cache_1.normalizeCacheOptions)(projectMetadata, context.workspaceRoot),

package/src/builders/browser-esbuild/compiler-plugin.js

@@ -176,8 +176,8 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                 // Once the AOT compiler allows only a transformResource hook, this can be reevaluated.
                 host.readResource = async function (fileName) {
                     var _a, _b, _c;
-                    // Template resources (.html) files are not bundled or transformed
-                    if (fileName.endsWith('.html')) {
+                    // Template resources (.html/.svg) files are not bundled or transformed
+                    if (fileName.endsWith('.html') || fileName.endsWith('.svg')) {
                         return (_a = this.readFile(fileName)) !== null && _a !== void 0 ? _a : '';
                     }
                     const { contents, resourceFiles, errors, warnings } = await (0, stylesheets_1.bundleStylesheetFile)(fileName, styleOptions);

package/src/builders/browser-esbuild/index.js

@@ -57,7 +57,7 @@ const stylesheets_1 = require("./stylesheets");
  */
 // eslint-disable-next-line max-lines-per-function
 async function buildEsbuildBrowser(options, context) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     const startTime = Date.now();
     // Only AOT is currently supported
     if (options.aot !== true) {
@@ -86,21 +86,28 @@ async function buildEsbuildBrowser(options, context) {
     }
     // Create reverse lookup used during index HTML generation
     const entryPointNameLookup = new Map(Object.entries(entryPoints).map(([name, filePath]) => [path.relative(workspaceRoot, filePath), name]));
-    // Execute esbuild
-    const result = await bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig);
+    const [codeResults, styleResults] = await Promise.all([
+        // Execute esbuild to bundle the application code
+        bundleCode(workspaceRoot, entryPoints, outputNames, options, optimizationOptions, sourcemapOptions, tsconfig),
+        // Execute esbuild to bundle the global stylesheets
+        bundleGlobalStylesheets(workspaceRoot, outputNames, options, optimizationOptions, sourcemapOptions),
+    ]);
     // Log all warnings and errors generated during bundling
-    await (0, esbuild_1.logMessages)(context, result);
+    await (0, esbuild_1.logMessages)(context, {
+        errors: [...codeResults.errors, ...styleResults.errors],
+        warnings: [...codeResults.warnings, ...styleResults.warnings],
+    });
     // Return if the bundling failed to generate output files or there are errors
-    if (!result.outputFiles || result.errors.length) {
+    if (!codeResults.outputFiles || codeResults.errors.length) {
         return { success: false };
     }
-    // Structure the bundling output files
+    // Structure the code bundling output files
     const initialFiles = [];
     const outputFiles = [];
-    for (const outputFile of result.outputFiles) {
+    for (const outputFile of codeResults.outputFiles) {
         // Entries in the metafile are relative to the `absWorkingDir` option which is set to the workspaceRoot
         const relativeFilePath = path.relative(workspaceRoot, outputFile.path);
-        const entryPoint = (_c = (_b = result.metafile) === null || _b === void 0 ? void 0 : _b.outputs[relativeFilePath]) === null || _c === void 0 ? void 0 : _c.entryPoint;
+        const entryPoint = (_c = (_b = codeResults.metafile) === null || _b === void 0 ? void 0 : _b.outputs[relativeFilePath]) === null || _c === void 0 ? void 0 : _c.entryPoint;
         outputFile.path = relativeFilePath;
         if (entryPoint) {
             // An entryPoint value indicates an initial file
@@ -112,6 +119,13 @@ async function buildEsbuildBrowser(options, context) {
         }
         outputFiles.push(outputFile);
     }
+    // Add global stylesheets output files
+    outputFiles.push(...styleResults.outputFiles);
+    initialFiles.push(...styleResults.initialFiles);
+    // Return if the global stylesheet bundling has errors
+    if (styleResults.errors.length) {
+        return { success: false };
+    }
     // Create output directory if needed
     try {
         await fs_1.promises.mkdir(outputPath, { recursive: true });
@@ -121,56 +135,11 @@ async function buildEsbuildBrowser(options, context) {
         context.logger.error('Unable to create output directory: ' + e.message);
         return { success: false };
     }
-    // Process global stylesheets
-    if (options.styles) {
-        // resolveGlobalStyles is temporarily reused from the Webpack builder code
-        const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles, workspaceRoot, 
-        // preserveSymlinks is always true here to allow the bundler to handle the option
-        true, 
-        // skipResolution to leverage the bundler's more comprehensive resolution
-        true);
-        for (const [name, files] of Object.entries(stylesheetEntrypoints)) {
-            const virtualEntryData = files
-                .map((file) => `@import '${file.replace(/\\/g, '/')}';`)
-                .join('\n');
-            const sheetResult = await (0, stylesheets_1.bundleStylesheetText)(virtualEntryData, { virtualName: `angular:style/global;${name}`, resolvePath: workspaceRoot }, {
-                workspaceRoot,
-                optimization: !!optimizationOptions.styles.minify,
-                sourcemap: !!sourcemapOptions.styles && (sourcemapOptions.hidden ? 'external' : true),
-                outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
-                includePaths: (_e = options.stylePreprocessorOptions) === null || _e === void 0 ? void 0 : _e.includePaths,
-                preserveSymlinks: options.preserveSymlinks,
-                externalDependencies: options.externalDependencies,
-            });
-            await (0, esbuild_1.logMessages)(context, sheetResult);
-            if (!sheetResult.path) {
-                // Failed to process the stylesheet
-                assert.ok(sheetResult.errors.length, `Global stylesheet processing for '${name}' failed with no errors.`);
-                return { success: false };
-            }
-            // The virtual stylesheets will be named `stdin` by esbuild. This must be replaced
-            // with the actual name of the global style and the leading directory separator must
-            // also be removed to make the path relative.
-            const sheetPath = sheetResult.path.replace('stdin', name);
-            outputFiles.push(createOutputFileFromText(sheetPath, sheetResult.contents));
-            if (sheetResult.map) {
-                outputFiles.push(createOutputFileFromText(sheetPath + '.map', sheetResult.map));
-            }
-            if (!noInjectNames.includes(name)) {
-                initialFiles.push({
-                    file: sheetPath,
-                    name,
-                    extension: '.css',
-                });
-            }
-            outputFiles.push(...sheetResult.resourceFiles);
-        }
-    }
     // Generate index HTML file
     if (options.index) {
         const entrypoints = (0, package_chunk_sort_1.generateEntryPoints)({
-            scripts: (_f = options.scripts) !== null && _f !== void 0 ? _f : [],
-            styles: (_g = options.styles) !== null && _g !== void 0 ? _g : [],
+            scripts: (_e = options.scripts) !== null && _e !== void 0 ? _e : [],
+            styles: (_f = options.styles) !== null && _f !== void 0 ? _f : [],
         });
         // Create an index HTML generator that reads from the in-memory output files
         const indexHtmlGenerator = new index_html_generator_1.IndexHtmlGenerator({
@@ -301,4 +270,57 @@ async function bundleCode(workspaceRoot, entryPoints, outputNames, options, opti
         },
     });
 }
+async function bundleGlobalStylesheets(workspaceRoot, outputNames, options, optimizationOptions, sourcemapOptions) {
+    var _a;
+    const outputFiles = [];
+    const initialFiles = [];
+    const errors = [];
+    const warnings = [];
+    // resolveGlobalStyles is temporarily reused from the Webpack builder code
+    const { entryPoints: stylesheetEntrypoints, noInjectNames } = (0, configs_1.resolveGlobalStyles)(options.styles || [], workspaceRoot, 
+    // preserveSymlinks is always true here to allow the bundler to handle the option
+    true, 
+    // skipResolution to leverage the bundler's more comprehensive resolution
+    true);
+    for (const [name, files] of Object.entries(stylesheetEntrypoints)) {
+        const virtualEntryData = files
+            .map((file) => `@import '${file.replace(/\\/g, '/')}';`)
+            .join('\n');
+        const sheetResult = await (0, stylesheets_1.bundleStylesheetText)(virtualEntryData, { virtualName: `angular:style/global;${name}`, resolvePath: workspaceRoot }, {
+            workspaceRoot,
+            optimization: !!optimizationOptions.styles.minify,
+            sourcemap: !!sourcemapOptions.styles && (sourcemapOptions.hidden ? 'external' : true),
+            outputNames: noInjectNames.includes(name) ? { media: outputNames.media } : outputNames,
+            includePaths: (_a = options.stylePreprocessorOptions) === null || _a === void 0 ? void 0 : _a.includePaths,
+            preserveSymlinks: options.preserveSymlinks,
+            externalDependencies: options.externalDependencies,
+        });
+        errors.push(...sheetResult.errors);
+        warnings.push(...sheetResult.warnings);
+        if (!sheetResult.path) {
+            // Failed to process the stylesheet
+            assert.ok(sheetResult.errors.length, `Global stylesheet processing for '${name}' failed with no errors.`);
+            continue;
+        }
+        // The virtual stylesheets will be named `stdin` by esbuild. This must be replaced
+        // with the actual name of the global style and the leading directory separator must
+        // also be removed to make the path relative.
+        const sheetPath = sheetResult.path.replace('stdin', name);
+        let sheetContents = sheetResult.contents;
+        if (sheetResult.map) {
+            outputFiles.push(createOutputFileFromText(sheetPath + '.map', sheetResult.map));
+            sheetContents = sheetContents.replace('sourceMappingURL=stdin.css.map', `sourceMappingURL=${name}.css.map`);
+        }
+        outputFiles.push(createOutputFileFromText(sheetPath, sheetContents));
+        if (!noInjectNames.includes(name)) {
+            initialFiles.push({
+                file: sheetPath,
+                name,
+                extension: '.css',
+            });
+        }
+        outputFiles.push(...sheetResult.resourceFiles);
+    }
+    return { outputFiles, initialFiles, errors, warnings };
+}
 exports.default = (0, architect_1.createBuilder)(buildEsbuildBrowser);

package/src/builders/browser-esbuild/sass-plugin.js

@@ -37,11 +37,9 @@ function createSassPlugin(options) {
         name: 'angular-sass',
         setup(build) {
             let sass;
-            build.onStart(async () => {
-                // Lazily load Sass
-                sass = await Promise.resolve().then(() => __importStar(require('sass')));
-            });
-            build.onLoad({ filter: /\.s[ac]ss$/ }, (args) => {
+            build.onLoad({ filter: /\.s[ac]ss$/ }, async (args) => {
+                // Lazily load Sass when a Sass file is found
+                sass !== null && sass !== void 0 ? sass : (sass = await Promise.resolve().then(() => __importStar(require('sass'))));
                 try {
                     const warnings = [];
                     // Use sync version as async version is slower.
@@ -61,7 +59,7 @@ function createSassPlugin(options) {
                     });
                     return {
                         loader: 'css',
-                        contents: `${css}\n${sourceMapToUrlComment(sourceMap)}`,
+                        contents: sourceMap ? `${css}\n${sourceMapToUrlComment(sourceMap)}` : css,
                         watchFiles: loadedUrls.map((url) => (0, url_1.fileURLToPath)(url)),
                         warnings,
                     };
@@ -87,9 +85,6 @@ function createSassPlugin(options) {
 }
 exports.createSassPlugin = createSassPlugin;
 function sourceMapToUrlComment(sourceMap) {
-    if (!sourceMap) {
-        return '';
-    }
     const urlSourceMap = Buffer.from(JSON.stringify(sourceMap), 'utf-8').toString('base64');
     return `/*# sourceMappingURL=data:application/json;charset=utf-8;base64,${urlSourceMap} */`;
 }

package/src/builders/dev-server/index.js

@@ -191,7 +191,6 @@ function serveWebpackBrowser(options, context, transforms = {}) {
                 baseHref: browserOptions.baseHref,
                 root: context.workspaceRoot,
                 projectRoot,
-                outputPath: path.join(context.workspaceRoot, browserOptions.outputPath),
                 ngswConfigPath: browserOptions.ngswConfigPath,
             }));
         }

package/src/webpack/configs/styles.js

@@ -37,6 +37,7 @@ exports.getStylesConfig = exports.resolveGlobalStyles = void 0;
 const fs = __importStar(require("fs"));
 const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const path = __importStar(require("path"));
+const webpack_1 = require("webpack");
 const sass_service_1 = require("../../sass/sass-service");
 const plugins_1 = require("../plugins");
 const css_optimizer_plugin_1 = require("../plugins/css-optimizer-plugin");
@@ -103,11 +104,18 @@ function getStylesConfig(wco) {
             'To opt-out of the deprecated behaviour, please migrate to another stylesheet language.');
     }
     const sassImplementation = new sass_service_1.SassWorkerImplementation();
+    const sassTildeUsageMessage = new Set();
     extraPlugins.push({
         apply(compiler) {
             compiler.hooks.shutdown.tap('sass-worker', () => {
                 sassImplementation.close();
             });
+            compiler.hooks.afterCompile.tap('sass-worker', (compilation) => {
+                for (const message of sassTildeUsageMessage) {
+                    compilation.warnings.push(new webpack_1.WebpackError(message));
+                }
+                sassTildeUsageMessage.clear();
+            });
         },
     });
     const assetNameTemplate = (0, helpers_1.assetNameTemplateFactory)(hashFormat);
@@ -245,6 +253,12 @@ function getStylesConfig(wco) {
                         implementation: sassImplementation,
                         sourceMap: true,
                         sassOptions: {
+                            importer: (url, from) => {
+                                if (url.charAt(0) === '~') {
+                                    sassTildeUsageMessage.add(`'${from}' imports '${url}' with a tilde. Usage of '~' in imports is deprecated.`);
+                                }
+                                return null;
+                            },
                             // Prevent use of `fibers` package as it no longer works in newer Node.js versions
                             fiber: false,
                             // bootstrap-sass requires a minimum precision of 8
@@ -277,6 +291,12 @@ function getStylesConfig(wco) {
                         implementation: sassImplementation,
                         sourceMap: true,
                         sassOptions: {
+                            importer: (url, from) => {
+                                if (url.charAt(0) === '~') {
+                                    sassTildeUsageMessage.add(`'${from}' imports '${url}' with a tilde. Usage of '~' in imports is deprecated.`);
+                                }
+                                return null;
+                            },
                             // Prevent use of `fibers` package as it no longer works in newer Node.js versions
                             fiber: false,
                             indentedSyntax: true,

package/src/webpack/plugins/postcss-cli-resources.js

@@ -131,7 +131,7 @@ function default_1(options) {
                 return;
             }
             const value = decl.value;
-            const urlRegex = /url(?:\(\s*['"]?)(.*?)(?:['"]?\s*\))/g;
+            const urlRegex = /url(?:\(\s*(['"]?))(.*?)(?:\1\s*\))/g;
             const segments = [];
             let match;
             let lastIndex = 0;
@@ -139,9 +139,8 @@ function default_1(options) {
             // We want to load it relative to the file that imports
             const inputFile = decl.source && decl.source.input.file;
             const context = (inputFile && path.dirname(inputFile)) || loader.context;
-            // eslint-disable-next-line no-cond-assign
             while ((match = urlRegex.exec(value))) {
-                const originalUrl = match[1];
+                const originalUrl = match[2];
                 let processedUrl;
                 try {
                     processedUrl = await process(originalUrl, context, resourceCache);

package/src/webpack/plugins/service-worker-plugin.d.ts

@@ -9,7 +9,6 @@ import type { Compiler } from 'webpack';
 export interface ServiceWorkerPluginOptions {
     projectRoot: string;
     root: string;
-    outputPath: string;
     baseHref?: string;
     ngswConfigPath?: string;
 }

package/src/webpack/plugins/service-worker-plugin.js

@@ -14,13 +14,31 @@ class ServiceWorkerPlugin {
         this.options = options;
     }
     apply(compiler) {
-        compiler.hooks.done.tapPromise('angular-service-worker', async (_compilation) => {
-            const { projectRoot, root, baseHref = '', ngswConfigPath, outputPath } = this.options;
-            await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, ngswConfigPath, 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            compiler.inputFileSystem.promises, 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            compiler.outputFileSystem.promises);
+        compiler.hooks.done.tapPromise('angular-service-worker', async (stats) => {
+            if (stats.hasErrors()) {
+                // Don't generate a service worker if the compilation has errors.
+                // When there are errors some files will not be emitted which would cause other errors down the line such as readdir failures.
+                return;
+            }
+            const { projectRoot, root, baseHref = '', ngswConfigPath } = this.options;
+            const { compilation } = stats;
+            // We use the output path from the compilation instead of build options since during
+            // localization the output path is modified to a temp directory.
+            // See: https://github.com/angular/angular-cli/blob/7e64b1537d54fadb650559214fbb12707324cd75/packages/angular_devkit/build_angular/src/utils/i18n-options.ts#L251-L252
+            const outputPath = compilation.outputOptions.path;
+            if (!outputPath) {
+                throw new Error('Compilation output path cannot be empty.');
+            }
+            try {
+                await (0, service_worker_1.augmentAppWithServiceWorker)(projectRoot, root, outputPath, baseHref, ngswConfigPath, 
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                compiler.inputFileSystem.promises, 
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                compiler.outputFileSystem.promises);
+            }
+            catch (error) {
+                compilation.errors.push(new compilation.compiler.webpack.WebpackError(`Failed to generate service worker - ${error instanceof Error ? error.message : error}`));
+            }
         });
     }
 }