@angular/build 21.0.0-next.4 → 21.0.0-next.6

package/src/tools/angular/transformers/jit-resource-transformer.js

@@ -141,7 +141,7 @@ function visitComponentMetadata(nodeFactory, node, styleReplacements, resourceIm
 function createResourceImport(nodeFactory, url, resourceImportDeclarations) {
     const urlLiteral = nodeFactory.createStringLiteral(url);
     const importName = nodeFactory.createIdentifier(`__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`);
-    resourceImportDeclarations.push(nodeFactory.createImportDeclaration(undefined, nodeFactory.createImportClause(false, importName, undefined), urlLiteral));
+    resourceImportDeclarations.push(nodeFactory.createImportDeclaration(undefined, nodeFactory.createImportClause(undefined, importName, undefined), urlLiteral));
     return importName;
 }
 function getDecoratorOrigin(decorator, typeChecker) {

package/src/tools/babel/plugins/pure-toplevel-functions.d.ts

@@ -8,7 +8,6 @@
 import type { PluginObj } from '@babel/core';
 /**
  * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
- *
  * @returns A babel plugin object instance.
  */
 export default function (): PluginObj;

package/src/tools/babel/plugins/pure-toplevel-functions.js

@@ -47,7 +47,11 @@ exports.default = default_1;
 const helper_annotate_as_pure_1 = __importDefault(require("@babel/helper-annotate-as-pure"));
 const tslib = __importStar(require("tslib"));
 /**
- * A cached set of TypeScript helper function names used by the helper name matcher utility function.
+ * A set of constructor names that are considered to be side-effect free.
+ */
+const sideEffectFreeConstructors = new Set(['InjectionToken']);
+/**
+ * A set of TypeScript helper function names used by the helper name matcher utility function.
  */
 const tslibHelpers = new Set(Object.keys(tslib).filter((h) => h.startsWith('__')));
 /**
@@ -76,13 +80,16 @@ function isBabelHelperName(name) {
 }
 /**
  * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
- *
  * @returns A babel plugin object instance.
  */
 function default_1() {
     return {
         visitor: {
-            CallExpression(path) {
+            CallExpression(path, state) {
+                const { topLevelSafeMode = false } = state.opts;
+                if (topLevelSafeMode) {
+                    return;
+                }
                 // If the expression has a function parent, it is not top-level
                 if (path.getFunctionParent()) {
                     return;
@@ -100,9 +107,18 @@ function default_1() {
                 }
                 (0, helper_annotate_as_pure_1.default)(path);
             },
-            NewExpression(path) {
+            NewExpression(path, state) {
                 // If the expression has a function parent, it is not top-level
-                if (!path.getFunctionParent()) {
+                if (path.getFunctionParent()) {
+                    return;
+                }
+                const { topLevelSafeMode = false } = state.opts;
+                if (!topLevelSafeMode) {
+                    (0, helper_annotate_as_pure_1.default)(path);
+                    return;
+                }
+                const callee = path.get('callee');
+                if (callee.isIdentifier() && sideEffectFreeConstructors.has(callee.node.name)) {
                     (0, helper_annotate_as_pure_1.default)(path);
                 }
             },

package/src/tools/esbuild/angular/compiler-plugin.js

@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompilerPlugin = createCompilerPlugin;
 const node_assert_1 = __importDefault(require("node:assert"));
 const node_crypto_1 = require("node:crypto");
+const promises_1 = require("node:fs/promises");
 const path = __importStar(require("node:path"));
 const environment_options_1 = require("../../../utils/environment-options");
 const compilation_1 = require("../../angular/compilation");
@@ -344,11 +345,21 @@ function createCompilerPlugin(pluginOptions, compilationOrFactory, stylesheetBun
                     if (!shouldTsIgnoreJs && isJS) {
                         return undefined;
                     }
+                    const diangosticRoot = build.initialOptions.absWorkingDir ?? '';
+                    // Evaluate whether the file requires the Angular compiler transpilation.
+                    // If not, issue a warning but allow bundler to process the file (no type-checking).
+                    const directContents = await (0, promises_1.readFile)(request, 'utf-8');
+                    if (!requiresAngularCompiler(directContents)) {
+                        return {
+                            warnings: [createMissingFileDiagnostic(request, args.path, diangosticRoot, false)],
+                            contents,
+                            loader: 'ts',
+                            resolveDir: path.dirname(request),
+                        };
+                    }
                     // Otherwise return an error
                     return {
-                        errors: [
-                            createMissingFileError(request, args.path, build.initialOptions.absWorkingDir ?? ''),
-                        ],
+                        errors: [createMissingFileDiagnostic(request, args.path, diangosticRoot, true)],
                     };
                 }
                 else if (typeof contents === 'string' && (useTypeScriptTranspilation || isJS)) {
@@ -585,21 +596,34 @@ function bundleWebWorker(build, pluginOptions, workerFile) {
         throw error;
     }
 }
-function createMissingFileError(request, original, root) {
+function createMissingFileDiagnostic(request, original, root, angular) {
     const relativeRequest = path.relative(root, request);
-    const error = {
-        text: `File '${relativeRequest}' is missing from the TypeScript compilation.`,
-        notes: [
-            {
-                text: `Ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
-            },
-        ],
-    };
+    const notes = [];
+    if (angular) {
+        notes.push({
+            text: `Files containing Angular metadata ('@Component'/'@Directive'/etc.) must be part of the TypeScript compilation.` +
+                ` You can ensure the file is part of the TypeScript program via the 'files' or 'include' property.`,
+        });
+    }
+    else {
+        notes.push({
+            text: `The file will be bundled and included in the output but will not be type-checked at build time.` +
+                ` To remove this message you can add the file to the TypeScript program via the 'files' or 'include' property.`,
+        });
+    }
     const relativeOriginal = path.relative(root, original);
     if (relativeRequest !== relativeOriginal) {
-        error.notes.push({
+        notes.push({
             text: `File is requested from a file replacement of '${relativeOriginal}'.`,
         });
     }
-    return error;
+    const diagnostic = {
+        text: `File '${relativeRequest}' not found in TypeScript compilation.`,
+        notes,
+    };
+    return diagnostic;
+}
+const POTENTIAL_METADATA_REGEX = /@angular\/core|@Component|@Directive|@Injectable|@Pipe|@NgModule/;
+function requiresAngularCompiler(contents) {
+    return POTENTIAL_METADATA_REGEX.test(contents);
 }

package/src/tools/esbuild/javascript-transformer-worker.js

@@ -84,16 +84,10 @@ async function transformWithBabel(filename, data, options) {
         plugins.push(linkerPlugin);
     }
     if (options.advancedOptimizations) {
+        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure } = await Promise.resolve().then(() => __importStar(require('../babel/plugins')));
         const sideEffectFree = options.sideEffects === false;
         const safeAngularPackage = sideEffectFree && /[\\/]node_modules[\\/]@angular[\\/]/.test(filename);
-        const { adjustStaticMembers, adjustTypeScriptEnums, elideAngularMetadata, markTopLevelPure } = await Promise.resolve().then(() => __importStar(require('../babel/plugins')));
-        if (safeAngularPackage) {
-            plugins.push(markTopLevelPure);
-        }
-        plugins.push(elideAngularMetadata, adjustTypeScriptEnums, [
-            adjustStaticMembers,
-            { wrapDecorators: sideEffectFree },
-        ]);
+        plugins.push([markTopLevelPure, { topLevelSafeMode: !safeAngularPackage }], elideAngularMetadata, adjustTypeScriptEnums, [adjustStaticMembers, { wrapDecorators: sideEffectFree }]);
     }
     // If no additional transformations are needed, return the data directly
     if (plugins.length === 0) {

package/src/tools/esbuild/stylesheets/less-language.js

@@ -55,11 +55,10 @@ exports.LessStylesheetLanguage = Object.freeze({
     componentFilter: /^less;/,
     fileFilter: /\.less$/,
     process(data, file, _, options, build) {
-        return compileString(data, file, options, build.resolve.bind(build), 
-        /* unsafeInlineJavaScript */ false);
+        return compileString(data, file, options, build.resolve.bind(build));
     },
 });
-async function compileString(data, filename, options, resolver, unsafeInlineJavaScript) {
+async function compileString(data, filename, options, resolver) {
     try {
         lessPreprocessor ??= (await Promise.resolve().then(() => __importStar(require('less')))).default;
     }
@@ -120,7 +119,6 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
             paths: options.includePaths,
             plugins: [resolverPlugin],
             rewriteUrls: 'all',
-            javascriptEnabled: unsafeInlineJavaScript,
             sourceMap: options.sourcemap
                 ? {
                     sourceMapFileInline: true,
@@ -137,28 +135,6 @@ async function compileString(data, filename, options, resolver, unsafeInlineJava
     catch (error) {
         if (isLessException(error)) {
             const location = convertExceptionLocation(error);
-            // Retry with a warning for less files requiring the deprecated inline JavaScript option
-            if (error.message.includes('Inline JavaScript is not enabled.')) {
-                const withJsResult = await compileString(data, filename, options, resolver, 
-                /* unsafeInlineJavaScript */ true);
-                withJsResult.warnings = [
-                    {
-                        text: 'Deprecated inline execution of JavaScript has been enabled ("javascriptEnabled")',
-                        location,
-                        notes: [
-                            {
-                                location: null,
-                                text: 'JavaScript found within less stylesheets may be executed at build time. [https://lesscss.org/usage/#less-options]',
-                            },
-                            {
-                                location: null,
-                                text: 'Support for "javascriptEnabled" may be removed from the Angular CLI starting with Angular v19.',
-                            },
-                        ],
-                    },
-                ];
-                return withJsResult;
-            }
             return {
                 errors: [
                     {

package/src/tools/esbuild/stylesheets/stylesheet-plugin-factory.js

@@ -152,7 +152,8 @@ class StylesheetPluginFactory {
                 postcssProcessor = postcss();
                 const postCssPluginRequire = (0, node_module_1.createRequire)((0, node_path_1.dirname)(configPath) + '/');
                 for (const [pluginName, pluginOptions] of config.plugins) {
-                    const plugin = postCssPluginRequire(pluginName);
+                    const pluginMod = postCssPluginRequire(pluginName);
+                    const plugin = pluginMod.__esModule ? pluginMod['default'] : pluginMod;
                     if (typeof plugin !== 'function' || plugin.postcss !== true) {
                         throw new Error(`Attempted to load invalid Postcss plugin: "${pluginName}"`);
                     }

package/src/utils/normalize-cache.js

@@ -10,7 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeCacheOptions = normalizeCacheOptions;
 const node_path_1 = require("node:path");
 /** Version placeholder is replaced during the build process with actual package version */
-const VERSION = '21.0.0-next.4';
+const VERSION = '21.0.0-next.6';
 function hasCacheMetadata(value) {
     return (!!value &&
         typeof value === 'object' &&

package/src/utils/server-rendering/utils.d.ts

@@ -6,6 +6,6 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import type { createRequestHandler } from '@angular/ssr';
-import type { createNodeRequestHandler } from '@angular/ssr/node';
+import type { createNodeRequestHandler } from '@angular/ssr/node' with { 'resolution-mode': 'import' };
 export declare function isSsrNodeRequestHandler(value: unknown): value is ReturnType<typeof createNodeRequestHandler>;
 export declare function isSsrRequestHandler(value: unknown): value is ReturnType<typeof createRequestHandler>;

package/src/utils/service-worker.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.dev/license
  */
-import type { Config, Filesystem } from '@angular/service-worker/config';
+import type { Config, Filesystem } from '@angular/service-worker/config' with { 'resolution-mode': 'import' };
 import { promises as fsPromises } from 'node:fs';
 import { BuildOutputFile } from '../tools/esbuild/bundler-context';
 import { BuildOutputAsset } from '../tools/esbuild/bundler-execution-result';