@angular/cli 18.1.1 → 18.2.0-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@angular/cli",
-  "version": "18.1.1",
+  "version": "18.2.0-next.1",
   "description": "CLI tool for Angular",
   "main": "lib/cli/index.js",
   "bin": {
@@ -25,35 +25,35 @@
   },
   "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.1801.1",
-    "@angular-devkit/core": "18.1.1",
-    "@angular-devkit/schematics": "18.1.1",
-    "@inquirer/prompts": "5.0.7",
+    "@angular-devkit/architect": "0.1802.0-next.1",
+    "@angular-devkit/core": "18.2.0-next.1",
+    "@angular-devkit/schematics": "18.2.0-next.1",
+    "@inquirer/prompts": "5.1.3",
     "@listr2/prompt-adapter-inquirer": "2.0.13",
-    "@schematics/angular": "18.1.1",
+    "@schematics/angular": "18.2.0-next.1",
     "@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",
+    "semver": "7.6.3",
     "symbol-observable": "4.0.0",
     "yargs": "17.7.2"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "18.1.1",
-      "@angular/build": "18.1.1",
-      "@angular/ssr": "18.1.1",
-      "@angular-devkit/architect": "0.1801.1",
-      "@angular-devkit/build-angular": "18.1.1",
-      "@angular-devkit/build-webpack": "0.1801.1",
-      "@angular-devkit/core": "18.1.1",
-      "@angular-devkit/schematics": "18.1.1"
+      "@angular/cli": "18.2.0-next.1",
+      "@angular/build": "18.2.0-next.1",
+      "@angular/ssr": "18.2.0-next.1",
+      "@angular-devkit/architect": "0.1802.0-next.1",
+      "@angular-devkit/build-angular": "18.2.0-next.1",
+      "@angular-devkit/build-webpack": "0.1802.0-next.1",
+      "@angular-devkit/core": "18.2.0-next.1",
+      "@angular-devkit/schematics": "18.2.0-next.1"
     }
   },
   "packageManager": "yarn@4.3.0",

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

@@ -206,8 +206,10 @@ let SchematicsCommandModule = (() => {
                                 if (!definition.items?.length) {
                                     continue;
                                 }
-                                const choices = definition.items?.map((item) => {
-                                    return typeof item == 'string'
+                                answers[definition.id] = await (definition.multiselect ? prompts.checkbox : prompts.select)({
+                                    message: definition.message,
+                                    default: definition.default,
+                                    choices: definition.items?.map((item) => typeof item == 'string'
                                         ? {
                                             name: item,
                                             value: item,
@@ -215,15 +217,10 @@ let SchematicsCommandModule = (() => {
                                         : {
                                             name: item.label,
                                             value: item.value,
-                                        };
-                                });
-                                answers[definition.id] = await (definition.multiselect ? prompts.checkbox : prompts.select)({
-                                    message: definition.message,
-                                    default: definition.default,
-                                    choices,
+                                        }),
                                 });
                                 break;
-                            case 'input':
+                            case 'input': {
                                 let finalValue;
                                 answers[definition.id] = await prompts.input({
                                     message: definition.message,
@@ -263,6 +260,7 @@ let SchematicsCommandModule = (() => {
                                     answers[definition.id] = finalValue;
                                 }
                                 break;
+                            }
                         }
                     }
                     return answers;

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/command-builder/utilities/schematic-workflow.js

@@ -9,18 +9,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToWorkflow = subscribeToWorkflow;
 const color_1 = require("../../utilities/color");
+function removeLeadingSlash(value) {
+    return value[0] === '/' ? value.slice(1) : value;
+}
 function subscribeToWorkflow(workflow, logger) {
     const files = new Set();
     let error = false;
     let logs = [];
     const reporterSubscription = workflow.reporter.subscribe((event) => {
         // Strip leading slash to prevent confusion.
-        const eventPath = event.path.charAt(0) === '/' ? event.path.substring(1) : event.path;
+        const eventPath = removeLeadingSlash(event.path);
         switch (event.kind) {
             case 'error':
                 error = true;
-                const desc = event.description == 'alreadyExist' ? 'already exists' : 'does not exist';
-                logger.error(`ERROR! ${eventPath} ${desc}.`);
+                logger.error(`ERROR! ${eventPath} ${event.description == 'alreadyExist' ? 'already exists' : 'does not exist'}.`);
                 break;
             case 'update':
                 logs.push(`${color_1.colors.cyan('UPDATE')} ${eventPath} (${event.content.length} bytes)`);
@@ -35,8 +37,7 @@ function subscribeToWorkflow(workflow, logger) {
                 files.add(eventPath);
                 break;
             case 'rename':
-                const eventToPath = event.to.charAt(0) === '/' ? event.to.substring(1) : event.to;
-                logs.push(`${color_1.colors.blue('RENAME')} ${eventPath} => ${eventToPath}`);
+                logs.push(`${color_1.colors.blue('RENAME')} ${eventPath} => ${removeLeadingSlash(event.to)}`);
                 files.add(eventPath);
                 break;
         }

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.1');
+// export const VERSION = new Version('18.2.0-next.1');
 exports.VERSION = new Version(JSON.parse((0, fs_1.readFileSync)((0, path_1.resolve)(__dirname, '../../package.json'), 'utf-8')).version);