@angular/cli 18.1.0-rc.1 → 18.2.0-next.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "18.1.0-rc.1",
+  "version": "18.2.0-next.0",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,18 +25,18 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1801.0-rc.1",
-    "@angular-devkit/core": "18.1.0-rc.1",
-    "@angular-devkit/schematics": "18.1.0-rc.1",
-    "@inquirer/prompts": "5.0.7",
+    "@angular-devkit/architect": "0.1802.0-next.0",
+    "@angular-devkit/core": "18.2.0-next.0",
+    "@angular-devkit/schematics": "18.2.0-next.0",
+    "@inquirer/prompts": "5.1.2",
     "@listr2/prompt-adapter-inquirer": "2.0.13",
-    "@schematics/angular": "18.1.0-rc.1",
+    "@schematics/angular": "18.2.0-next.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ini": "4.1.3",
     "jsonc-parser": "3.3.1",
     "listr2": "8.2.3",
     "npm-package-arg": "11.0.2",
-    "npm-pick-manifest": "9.0.1",
+    "npm-pick-manifest": "9.1.0",
     "pacote": "18.0.6",
     "resolve": "1.22.8",
     "semver": "7.6.2",
@@ -46,14 +46,14 @@
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "18.1.0-rc.1",
-      "@angular/build": "18.1.0-rc.1",
-      "@angular/ssr": "18.1.0-rc.1",
-      "@angular-devkit/architect": "0.1801.0-rc.1",
-      "@angular-devkit/build-angular": "18.1.0-rc.1",
-      "@angular-devkit/build-webpack": "0.1801.0-rc.1",
-      "@angular-devkit/core": "18.1.0-rc.1",
-      "@angular-devkit/schematics": "18.1.0-rc.1"
+      "@angular/cli": "18.2.0-next.0",
+      "@angular/build": "18.2.0-next.0",
+      "@angular/ssr": "18.2.0-next.0",
+      "@angular-devkit/architect": "0.1802.0-next.0",
+      "@angular-devkit/build-angular": "18.2.0-next.0",
+      "@angular-devkit/build-webpack": "0.1802.0-next.0",
+      "@angular-devkit/core": "18.2.0-next.0",
+      "@angular-devkit/schematics": "18.2.0-next.0"
     }
   },
   "packageManager": "yarn@4.3.0",

package/src/command-builder/architect-command-module.d.ts

@@ -5,6 +5,8 @@
  * 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 { Target } from '@angular-devkit/architect';
+import { workspaces } from '@angular-devkit/core';
 import { Argv } from 'yargs';
 import { ArchitectBaseCommandModule } from './architect-base-command-module';
 import { CommandModuleImplementation, Options, OtherOptions } from './command-module';
@@ -14,6 +16,7 @@ export interface ArchitectCommandArgs {
 }
 export declare abstract class ArchitectCommandModule extends ArchitectBaseCommandModule<ArchitectCommandArgs> implements CommandModuleImplementation<ArchitectCommandArgs> {
     abstract readonly multiTarget: boolean;
+    findDefaultBuilderName?(project: workspaces.ProjectDefinition, target: Target): Promise<string | undefined>;
     builder(argv: Argv): Promise<Argv<ArchitectCommandArgs>>;
     run(options: Options<ArchitectCommandArgs> & OtherOptions): Promise<number | void>;
     private getArchitectProject;

package/src/command-builder/architect-command-module.js

@@ -58,6 +58,24 @@ let ArchitectCommandModule = (() => {
             if (_metadata) Object.defineProperty(this, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         }
         async builder(argv) {
+            const target = this.getArchitectTarget();
+            // Add default builder if target is not in project and a command default is provided
+            if (this.findDefaultBuilderName && this.context.workspace) {
+                for (const [project, projectDefinition] of this.context.workspace.projects) {
+                    if (projectDefinition.targets.has(target)) {
+                        continue;
+                    }
+                    const defaultBuilder = await this.findDefaultBuilderName(projectDefinition, {
+                        project,
+                        target,
+                    });
+                    if (defaultBuilder) {
+                        projectDefinition.targets.set(target, {
+                            builder: defaultBuilder,
+                        });
+                    }
+                }
+            }
             const project = this.getArchitectProject();
             const { jsonHelp, getYargsCompletions, help } = this.context.args.options;
             const localYargs = argv
@@ -84,7 +102,6 @@ let ArchitectCommandModule = (() => {
             if (!project) {
                 return localYargs;
             }
-            const target = this.getArchitectTarget();
             const schemaOptions = await this.getArchitectTargetOptions({
                 project,
                 target,

package/src/command-builder/utilities/schematic-engine-host.js

@@ -14,7 +14,6 @@ const fs_1 = require("fs");
 const jsonc_parser_1 = require("jsonc-parser");
 const module_1 = require("module");
 const path_1 = require("path");
-const util_1 = require("util");
 const vm_1 = require("vm");
 const error_1 = require("../../utilities/error");
 /**
@@ -165,34 +164,16 @@ function wrap(schematicFile, schematicDirectory, moduleCache, exportName) {
     };
     // Setup a wrapper function to capture the module's exports
     const schematicCode = (0, fs_1.readFileSync)(schematicFile, 'utf8');
-    // `module` is required due to @angular/localize ng-add being in UMD format
-    const headerCode = '(function() {\nvar exports = {};\nvar module = { exports };\n';
-    const footerCode = exportName
-        ? `\nreturn module.exports['${exportName}'];});`
-        : '\nreturn module.exports;});';
-    const script = new vm_1.Script(headerCode + schematicCode + footerCode, {
+    const script = new vm_1.Script(module_1.Module.wrap(schematicCode), {
         filename: schematicFile,
-        lineOffset: 3,
+        lineOffset: 1,
     });
-    const context = {
-        __dirname: schematicDirectory,
-        __filename: schematicFile,
-        Buffer,
-        // TextEncoder is used by the compiler to generate i18n message IDs. See:
-        // https://github.com/angular/angular/blob/main/packages/compiler/src/i18n/digest.ts#L17
-        // It is referenced globally, because it may be run either on the browser or the server.
-        // Usually Node exposes it globally, but in order for it to work, our custom context
-        // has to expose it too. Issue context: https://github.com/angular/angular/issues/48940.
-        TextEncoder: util_1.TextEncoder,
-        console,
-        process,
-        get global() {
-            return this;
-        },
-        require: customRequire,
+    const schematicModule = new module_1.Module(schematicFile);
+    const moduleFactory = script.runInThisContext();
+    return () => {
+        moduleFactory(schematicModule.exports, customRequire, schematicModule, schematicFile, schematicDirectory);
+        return exportName ? schematicModule.exports[exportName] : schematicModule.exports;
     };
-    const exportsFactory = script.runInNewContext(context);
-    return exportsFactory;
 }
 function loadBuiltinModule(id) {
     return undefined;

package/src/commands/extract-i18n/cli.d.ts

@@ -5,6 +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 { workspaces } from '@angular-devkit/core';
 import { ArchitectCommandModule } from '../../command-builder/architect-command-module';
 import { CommandModuleImplementation } from '../../command-builder/command-module';
 export default class ExtractI18nCommandModule extends ArchitectCommandModule implements CommandModuleImplementation {
@@ -12,4 +13,5 @@ export default class ExtractI18nCommandModule extends ArchitectCommandModule imp
     command: string;
     describe: string;
     longDescriptionPath?: string | undefined;
+    findDefaultBuilderName(project: workspaces.ProjectDefinition): Promise<string | undefined>;
 }

package/src/commands/extract-i18n/cli.js

@@ -7,11 +7,41 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+const node_module_1 = require("node:module");
+const node_path_1 = require("node:path");
 const architect_command_module_1 = require("../../command-builder/architect-command-module");
 class ExtractI18nCommandModule extends architect_command_module_1.ArchitectCommandModule {
     multiTarget = false;
     command = 'extract-i18n [project]';
     describe = 'Extracts i18n messages from source code.';
     longDescriptionPath;
+    async findDefaultBuilderName(project) {
+        // Only application type projects have a default i18n extraction target
+        if (project.extensions['projectType'] !== 'application') {
+            return;
+        }
+        const buildTarget = project.targets.get('build');
+        if (!buildTarget) {
+            // No default if there is no build target
+            return;
+        }
+        // Provide a default based on the defined builder for the 'build' target
+        switch (buildTarget.builder) {
+            case '@angular-devkit/build-angular:application':
+            case '@angular-devkit/build-angular:browser-esbuild':
+            case '@angular-devkit/build-angular:browser':
+                return '@angular-devkit/build-angular:extract-i18n';
+            case '@angular/build:application':
+                return '@angular/build:extract-i18n';
+        }
+        // For other builders, check for `@angular-devkit/build-angular` and use if found.
+        // This package is safer to use since it supports both application builder types.
+        try {
+            const projectRequire = (0, node_module_1.createRequire)((0, node_path_1.join)(this.context.root, project.root) + '/');
+            projectRequire.resolve('@angular-devkit/build-angular');
+            return '@angular-devkit/build-angular:extract-i18n';
+        }
+        catch { }
+    }
 }
 exports.default = ExtractI18nCommandModule;

package/src/utilities/version.js

@@ -25,5 +25,5 @@ class Version {
     }
 }
 // TODO(bazel): Convert this to use build-time version stamping after flipping the build script to use bazel
-// export const VERSION = new Version('18.1.0-rc.1');
+// export const VERSION = new Version('18.2.0-next.0');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);