@angular-devkit/build-angular 15.0.3 → 15.0.4

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "15.0.3",
+  "version": "15.0.4",
   "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.1500.3",
-    "@angular-devkit/build-webpack": "0.1500.3",
-    "@angular-devkit/core": "15.0.3",
+    "@angular-devkit/architect": "0.1500.4",
+    "@angular-devkit/build-webpack": "0.1500.4",
+    "@angular-devkit/core": "15.0.4",
     "@babel/core": "7.20.2",
     "@babel/generator": "7.20.4",
     "@babel/helper-annotate-as-pure": "7.18.6",
@@ -20,7 +20,7 @@
     "@babel/runtime": "7.20.1",
     "@babel/template": "7.18.10",
     "@discoveryjs/json-ext": "0.5.7",
-    "@ngtools/webpack": "15.0.3",
+    "@ngtools/webpack": "15.0.4",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.13",
     "babel-loader": "9.1.0",
@@ -30,7 +30,7 @@
     "chokidar": "3.5.3",
     "copy-webpack-plugin": "11.0.0",
     "critters": "0.0.16",
-    "css-loader": "6.7.1",
+    "css-loader": "6.7.3",
     "esbuild-wasm": "0.15.13",
     "glob": "8.0.3",
     "https-proxy-agent": "5.0.1",

package/src/babel/presets/application.js

@@ -139,7 +139,7 @@ function default_1(api, options) {
         // downlevel class properties by ensuring the class properties Babel plugin
         // is always included- regardless of the preset-env targets.
         if (options.supportedBrowsers.some((b) => safariClassFieldScopeBugBrowsers.has(b))) {
-            includePlugins.push('@babel/plugin-proposal-class-properties');
+            includePlugins.push('@babel/plugin-proposal-class-properties', '@babel/plugin-proposal-private-methods');
         }
         presets.push([
             require('@babel/preset-env').default,

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

@@ -155,6 +155,10 @@ function createCompilerPlugin(pluginOptions, styleOptions) {
                     // Skip keys that have been manually provided
                     continue;
                 }
+                if (key === 'ngDevMode') {
+                    // ngDevMode is already set based on the builder's script optimization option
+                    continue;
+                }
                 // esbuild requires values to be a string (actual strings need to be quoted).
                 // In this case, all provided values are booleans.
                 build.initialOptions.define[key] = value.toString();

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

@@ -232,7 +232,11 @@ function createCodeBundleOptions(options, target, sourceFileCache) {
             }),
         ],
         define: {
+            // Only set to false when script optimizations are enabled. It should not be set to true because
+            // Angular turns `ngDevMode` into an object for development debugging purposes when not defined
+            // which a constant true value would break.
             ...(optimizationOptions.scripts ? { 'ngDevMode': 'false' } : undefined),
+            // Only AOT mode is supported currently
             'ngJitMode': 'false',
         },
     };

package/src/builders/browser-esbuild/worker-angular-compilation.js

@@ -0,0 +1,59 @@
+"use strict";
+// /**
+//  * @license
+//  * Copyright Google LLC 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 type ng from '@angular/compiler-cli';
+// import { Worker } from 'node:worker_threads';
+// import { AngularHostOptions } from './angular-host';
+// interface Message {
+//   id: number;
+// }
+// interface InitializeRequest extends Message {
+//   tsconfig: string;
+//   tsCallbackId: number;
+//   tcoCallbackId?: number;
+// }
+// // eslint-disable-next-line @typescript-eslint/no-explicit-any
+// type ResponseCallback = (...args: any[]) => void;
+// let callbackIds = 0;
+// export class WorkerAngularCompilation {
+//   #worker: Worker;
+//   #callbacks = new Map<number, ResponseCallback>();
+//   constructor() {
+//     this.#worker = new Worker(require.resolve('./compilation-worker'));
+//   }
+//   async initialize(
+//     tsconfig: string,
+//     hostOptions: AngularHostOptions,
+//     transformCompilerOptions?: (compilerOptions: ng.CompilerOptions) => ng.CompilerOptions,
+//   ): Promise<{ compilerOptions: ng.CompilerOptions }> {
+//     const request: InitializeRequest = {
+//       id: ++callbackIds,
+//       tsconfig,
+//       tsCallbackId: ++callbackIds,
+//     };
+//     this.#callbacks.set(request.tsCallbackId, () => {
+//       hostOptions.transformStylesheet();
+//     });
+//     if (transformCompilerOptions) {
+//       request.tcoCallbackId = ++callbackIds;
+//       this.#callbacks.set(request.tcoCallbackId, (id: number, compilerOptions) => {
+//         try {
+//             transformCompilerOptions(compilerOptions);
+//         } catch (e) {
+//         }
+//       });
+//     }
+//     const result = new Promise<{ compilerOptions: ng.CompilerOptions }>((resolve, reject) => {
+//         this.#callbacks.set(request.id, () => {
+//             resolve({});
+//         });
+//     });
+//     this.#worker.postMessage(request);
+//     return result;
+//   }
+// }

package/src/utils/i18n-inlining.js

@@ -52,7 +52,7 @@ function emittedFilesToInlineOptions(emittedFiles, scriptsEntryPointName, emitte
             code: fs.readFileSync(originalPath, 'utf8'),
             outputPath,
             missingTranslation,
-            setLocale: emittedFile.name === 'main' || emittedFile.name === 'vendor',
+            setLocale: emittedFile.name === 'main',
         };
         originalFiles.push(originalPath);
         try {

package/src/utils/process-bundle.js

@@ -211,7 +211,7 @@ async function inlineLocalesDirect(ast, options) {
         }
         let outputSource = content;
         if (options.setLocale) {
-            const setLocaleText = `var $localize=Object.assign(void 0===$localize?{}:$localize,{locale:"${locale}"});\n`;
+            const setLocaleText = `globalThis.$localize=Object.assign(globalThis.$localize || {},{locale:"${locale}"});\n`;
             // If locale data is provided, load it and prepend to file
             let localeDataSource;
             const localeDataPath = i18n.locales[locale] && i18n.locales[locale].dataPath;

package/src/webpack/configs/styles.js

@@ -320,6 +320,7 @@ function getSassLoaderOptions(root, implementation, includePaths, indentedSyntax
                 quietDeps: !verbose,
                 verbose,
                 syntax: indentedSyntax ? 'indented' : 'scss',
+                sourceMapIncludeSources: true,
             }),
         }
         : {

package/src/webpack/plugins/styles-webpack-plugin.js

@@ -24,8 +24,6 @@ class StylesWebpackPlugin {
     }
     apply(compiler) {
         const { entryPoints, preserveSymlinks, root } = this.options;
-        const webpackOptions = compiler.options;
-        const entry = typeof webpackOptions.entry === 'function' ? webpackOptions.entry() : webpackOptions.entry;
         const resolver = compiler.resolverFactory.get('global-styles', {
             conditionNames: ['sass', 'less', 'style'],
             mainFields: ['sass', 'less', 'style', 'main', '...'],
@@ -36,33 +34,37 @@ class StylesWebpackPlugin {
             symlinks: !preserveSymlinks,
             fileSystem: compiler.inputFileSystem,
         });
-        webpackOptions.entry = async () => {
-            var _a, _b;
-            var _c;
-            const entrypoints = await entry;
-            for (const [bundleName, paths] of Object.entries(entryPoints)) {
-                (_a = entrypoints[bundleName]) !== null && _a !== void 0 ? _a : (entrypoints[bundleName] = {});
-                const entryImport = ((_b = (_c = entrypoints[bundleName]).import) !== null && _b !== void 0 ? _b : (_c.import = []));
-                for (const path of paths) {
-                    try {
-                        const resolvedPath = resolver.resolveSync({}, root, path);
-                        if (resolvedPath) {
-                            entryImport.push(`${resolvedPath}?ngGlobalStyle`);
+        const webpackOptions = compiler.options;
+        compiler.hooks.environment.tap(PLUGIN_NAME, () => {
+            const entry = typeof webpackOptions.entry === 'function' ? webpackOptions.entry() : webpackOptions.entry;
+            webpackOptions.entry = async () => {
+                var _a, _b;
+                var _c;
+                const entrypoints = await entry;
+                for (const [bundleName, paths] of Object.entries(entryPoints)) {
+                    (_a = entrypoints[bundleName]) !== null && _a !== void 0 ? _a : (entrypoints[bundleName] = {});
+                    const entryImport = ((_b = (_c = entrypoints[bundleName]).import) !== null && _b !== void 0 ? _b : (_c.import = []));
+                    for (const path of paths) {
+                        try {
+                            const resolvedPath = resolver.resolveSync({}, root, path);
+                            if (resolvedPath) {
+                                entryImport.push(`${resolvedPath}?ngGlobalStyle`);
+                            }
+                            else {
+                                (0, assert_1.default)(this.compilation, 'Compilation cannot be undefined.');
+                                (0, webpack_diagnostics_1.addError)(this.compilation, `Cannot resolve '${path}'.`);
+                            }
                         }
-                        else {
+                        catch (error) {
                             (0, assert_1.default)(this.compilation, 'Compilation cannot be undefined.');
-                            (0, webpack_diagnostics_1.addError)(this.compilation, `Cannot resolve '${path}'.`);
+                            (0, error_1.assertIsError)(error);
+                            (0, webpack_diagnostics_1.addError)(this.compilation, error.message);
                         }
                     }
-                    catch (error) {
-                        (0, assert_1.default)(this.compilation, 'Compilation cannot be undefined.');
-                        (0, error_1.assertIsError)(error);
-                        (0, webpack_diagnostics_1.addError)(this.compilation, error.message);
-                    }
                 }
-            }
-            return entrypoints;
-        };
+                return entrypoints;
+            };
+        });
         compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
             this.compilation = compilation;
         });