@angular-devkit/build-angular 15.0.4 → 15.0.5

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@angular-devkit/build-angular",
-  "version": "15.0.4",
+  "version": "15.0.5",
   "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.4",
-    "@angular-devkit/build-webpack": "0.1500.4",
-    "@angular-devkit/core": "15.0.4",
+    "@angular-devkit/architect": "0.1500.5",
+    "@angular-devkit/build-webpack": "0.1500.5",
+    "@angular-devkit/core": "15.0.5",
     "@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.4",
+    "@ngtools/webpack": "15.0.5",
     "ansi-colors": "4.1.3",
     "autoprefixer": "10.4.13",
     "babel-loader": "9.1.0",

package/src/webpack/plugins/javascript-optimizer-plugin.js

@@ -130,7 +130,13 @@ class JavaScriptOptimizerPlugin {
                             },
                             options: optimizeOptions,
                         })
-                            .then(({ code, name, map }) => {
+                            .then(async ({ code, name, map, errors }) => {
+                            if (errors === null || errors === void 0 ? void 0 : errors.length) {
+                                for (const error of errors) {
+                                    (0, webpack_diagnostics_1.addError)(compilation, `Optimization error [${name}]: ${error}`);
+                                }
+                                return;
+                            }
                             const optimizedAsset = map
                                 ? new SourceMapSource(code, name, map)
                                 : new OriginalSource(code, name);

package/src/webpack/plugins/javascript-optimizer-worker.d.ts

@@ -81,8 +81,14 @@ interface OptimizeRequest {
  * Handles optimization requests sent from the main thread via the `JavaScriptOptimizerPlugin`.
  */
 export default function ({ asset, options }: OptimizeRequest): Promise<{
+    name: string;
+    errors: string[];
+    code?: undefined;
+    map?: undefined;
+} | {
     name: string;
     code: string;
     map: import("@ampproject/remapping/dist/types/source-map").default | undefined;
+    errors?: undefined;
 }>;
 export {};

package/src/webpack/plugins/javascript-optimizer-worker.js

@@ -25,6 +25,13 @@ let esbuild;
 async function default_1({ asset, options }) {
     // esbuild is used as a first pass
     const esbuildResult = await optimizeWithEsbuild(asset.code, asset.name, options);
+    if (isEsBuildFailure(esbuildResult)) {
+        return {
+            name: asset.name,
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            errors: await esbuild.formatMessages(esbuildResult.errors, { kind: 'error' }),
+        };
+    }
     // terser is used as a second pass
     const terserResult = await optimizeWithTerser(asset.name, esbuildResult.code, options.sourcemap, options.advanced);
     // Merge intermediate sourcemaps with input sourcemap if enabled
@@ -57,23 +64,31 @@ async function optimizeWithEsbuild(content, name, options) {
     if (!esbuild) {
         esbuild = new esbuild_executor_1.EsbuildExecutor(options.alwaysUseWasm);
     }
-    return esbuild.transform(content, {
-        minifyIdentifiers: !options.keepIdentifierNames,
-        minifySyntax: true,
-        // NOTE: Disabling whitespace ensures unused pure annotations are kept
-        minifyWhitespace: false,
-        pure: ['forwardRef'],
-        legalComments: options.removeLicenses ? 'none' : 'inline',
-        sourcefile: name,
-        sourcemap: options.sourcemap && 'external',
-        define: options.define,
-        // This option should always be disabled for browser builds as we don't rely on `.name`
-        // and causes deadcode to be retained which makes `NG_BUILD_MANGLE` unusable to investigate tree-shaking issues.
-        // We enable `keepNames` only for server builds as Domino relies on `.name`.
-        // Once we no longer rely on Domino for SSR we should be able to remove this.
-        keepNames: options.keepNames,
-        target: options.target,
-    });
+    try {
+        return await esbuild.transform(content, {
+            minifyIdentifiers: !options.keepIdentifierNames,
+            minifySyntax: true,
+            // NOTE: Disabling whitespace ensures unused pure annotations are kept
+            minifyWhitespace: false,
+            pure: ['forwardRef'],
+            legalComments: options.removeLicenses ? 'none' : 'inline',
+            sourcefile: name,
+            sourcemap: options.sourcemap && 'external',
+            define: options.define,
+            // This option should always be disabled for browser builds as we don't rely on `.name`
+            // and causes deadcode to be retained which makes `NG_BUILD_MANGLE` unusable to investigate tree-shaking issues.
+            // We enable `keepNames` only for server builds as Domino relies on `.name`.
+            // Once we no longer rely on Domino for SSR we should be able to remove this.
+            keepNames: options.keepNames,
+            target: options.target,
+        });
+    }
+    catch (error) {
+        if (isEsBuildFailure(error)) {
+            return error;
+        }
+        throw error;
+    }
 }
 /**
  * Optimizes a JavaScript asset using terser.
@@ -114,3 +129,11 @@ async function optimizeWithTerser(name, code, sourcemaps, advanced) {
     }
     return { code: result.code, map: result.map };
 }
+/**
+ * Determines if an unknown value is an esbuild BuildFailure error object thrown by esbuild.
+ * @param value A potential esbuild BuildFailure error object.
+ * @returns `true` if the object is determined to be a BuildFailure object; otherwise, `false`.
+ */
+function isEsBuildFailure(value) {
+    return !!value && typeof value === 'object' && 'errors' in value && 'warnings' in value;
+}

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

@@ -1,59 +0,0 @@
-"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;
-//   }
-// }