@depup/angular__cli 21.2.6-depup.1 → 22.0.7-depup.0

package/lib/config/workspace-schema.js

@@ -79,7 +79,7 @@ var ViewEncapsulation;
  */
 var ChangeDetection;
 (function (ChangeDetection) {
-    ChangeDetection["Default"] = "Default";
+    ChangeDetection["Eager"] = "Eager";
     ChangeDetection["OnPush"] = "OnPush";
 })(ChangeDetection || (exports.ChangeDetection = ChangeDetection = {}));
 /**

package/lib/config/workspace-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-schema.js","sourceRoot":"","sources":["workspace-schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AA4DpF;;GAEG;AACH,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,8BAAe,CAAA;AACnB,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAED;;;;GAIG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,+BAAa,CAAA;IACb,+BAAa,CAAA;AACjB,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAqID;;;;;GAKG;AACH,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC1B,sCAAgB,CAAA;IAChB,sCAAgB,CAAA;AACpB,CAAC,EAHW,kBAAkB,kCAAlB,kBAAkB,QAG7B;AAED;;;;GAIG;AACH,IAAY,iCAMX;AAND,WAAY,iCAAiC;IACzC,gDAAW,CAAA;IACX,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,0DAAqB,CAAA;AACzB,CAAC,EANW,iCAAiC,iDAAjC,iCAAiC,QAM5C;AAED;;GAEG;AACH,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,6BAAe,CAAA;IACf,+BAAiB,CAAA;AACrB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAED;;;;;;;;;;;GAWG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;IACb,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,iCAAjB,iBAAiB,QAI5B;AAsJD;;GAEG;AACH,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,sCAAmB,CAAA;IACnB,oCAAiB,CAAA;AACrB,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED;;;GAGG;AACH,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACvC,8CAAW,CAAA;IACX,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;AACjB,CAAC,EANW,+BAA+B,+CAA/B,+BAA+B,QAM1C;AAwJD,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,wCAA2B,CAAA;IAC3B,kDAAqC,CAAA;IACrC,4CAA+B,CAAA;IAC/B,kCAAqB,CAAA;AACzB,CAAC,EALW,SAAS,yBAAT,SAAS,QAKpB;AAED;;;;;;;;;;;;GAYG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACrB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACvB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAuQD,IAAY,QASX;AATD,WAAY,QAAQ;IAChB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,+BAAmB,CAAA;IACnB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;IACvB,yBAAa,CAAA;IACb,iCAAqB,CAAA;AACzB,CAAC,EATW,QAAQ,wBAAR,QAAQ,QASnB"}
+{"version":3,"file":"workspace-schema.js","sourceRoot":"","sources":["workspace-schema.ts"],"names":[],"mappings":";AACA,mFAAmF;AACnF,oFAAoF;;;AA4DpF;;GAEG;AACH,IAAY,WAIX;AAJD,WAAY,WAAW;IACnB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,8BAAe,CAAA;AACnB,CAAC,EAJW,WAAW,2BAAX,WAAW,QAItB;AAED;;;;GAIG;AACH,IAAY,cAKX;AALD,WAAY,cAAc;IACtB,6BAAW,CAAA;IACX,6BAAW,CAAA;IACX,+BAAa,CAAA;IACb,+BAAa,CAAA;AACjB,CAAC,EALW,cAAc,8BAAd,cAAc,QAKzB;AAqID;;;;;GAKG;AACH,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC1B,sCAAgB,CAAA;IAChB,sCAAgB,CAAA;AACpB,CAAC,EAHW,kBAAkB,kCAAlB,kBAAkB,QAG7B;AAED;;;;GAIG;AACH,IAAY,iCAMX;AAND,WAAY,iCAAiC;IACzC,gDAAW,CAAA;IACX,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,kDAAa,CAAA;IACb,0DAAqB,CAAA;AACzB,CAAC,EANW,iCAAiC,iDAAjC,iCAAiC,QAM5C;AAED;;GAEG;AACH,IAAY,UAGX;AAHD,WAAY,UAAU;IAClB,6BAAe,CAAA;IACf,+BAAiB,CAAA;AACrB,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAED;;;;;;;;;;;GAWG;AACH,IAAY,iBAIX;AAJD,WAAY,iBAAiB;IACzB,0CAAqB,CAAA;IACrB,kCAAa,CAAA;IACb,4CAAuB,CAAA;AAC3B,CAAC,EAJW,iBAAiB,iCAAjB,iBAAiB,QAI5B;AAsJD;;GAEG;AACH,IAAY,eAGX;AAHD,WAAY,eAAe;IACvB,kCAAe,CAAA;IACf,oCAAiB,CAAA;AACrB,CAAC,EAHW,eAAe,+BAAf,eAAe,QAG1B;AAED;;;GAGG;AACH,IAAY,+BAMX;AAND,WAAY,+BAA+B;IACvC,8CAAW,CAAA;IACX,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;IACb,gDAAa,CAAA;AACjB,CAAC,EANW,+BAA+B,+CAA/B,+BAA+B,QAM1C;AAwJD,IAAY,SAKX;AALD,WAAY,SAAS;IACjB,wCAA2B,CAAA;IAC3B,kDAAqC,CAAA;IACrC,4CAA+B,CAAA;IAC/B,kCAAqB,CAAA;AACzB,CAAC,EALW,SAAS,yBAAT,SAAS,QAKpB;AAED;;;;;;;;;;;;GAYG;AACH,IAAY,aAGX;AAHD,WAAY,aAAa;IACrB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACvB,CAAC,EAHW,aAAa,6BAAb,aAAa,QAGxB;AAuQD,IAAY,QASX;AATD,WAAY,QAAQ;IAChB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,+BAAmB,CAAA;IACnB,6BAAiB,CAAA;IACjB,6BAAiB,CAAA;IACjB,mCAAuB,CAAA;IACvB,yBAAa,CAAA;IACb,iCAAqB,CAAA;AACzB,CAAC,EATW,QAAQ,wBAAR,QAAQ,QASnB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@depup/angular__cli",
-  "version": "21.2.6-depup.1",
+  "version": "22.0.7-depup.0",
   "description": "CLI tool for Angular (with updated dependencies)",
   "main": "lib/cli/index.js",
   "bin": {
@@ -20,86 +20,97 @@
     "devkit",
     "sdk"
   ],
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/angular/angular-cli.git"
-  },
-  "author": "Angular Authors",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/angular/angular-cli/issues"
-  },
-  "homepage": "https://github.com/angular/angular-cli",
   "dependencies": {
-    "@angular-devkit/architect": "0.2102.6",
-    "@angular-devkit/core": "21.2.6",
-    "@angular-devkit/schematics": "21.2.6",
-    "@inquirer/prompts": "^8.4.0",
-    "@listr2/prompt-adapter-inquirer": "^4.2.2",
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "@schematics/angular": "21.2.6",
+    "@angular-devkit/architect": "0.2200.7",
+    "@angular-devkit/core": "22.0.7",
+    "@angular-devkit/schematics": "22.0.7",
+    "@inquirer/prompts": "^8.5.2",
+    "@listr2/prompt-adapter-inquirer": "^4.2.4",
+    "@modelcontextprotocol/sdk": "1.29.0",
+    "@schematics/angular": "22.0.7",
     "@yarnpkg/lockfile": "1.1.0",
-    "algoliasearch": "^5.50.1",
-    "ini": "6.0.0",
+    "algoliasearch": "^5.56.0",
+    "ini": "^7.0.0",
     "jsonc-parser": "3.3.1",
-    "listr2": "^10.2.1",
-    "npm-package-arg": "13.0.2",
-    "pacote": "^21.5.0",
-    "parse5-html-rewriting-stream": "8.0.0",
-    "semver": "7.7.4",
+    "listr2": "^10.2.2",
+    "npm-package-arg": "^14.0.0",
+    "pacote": "^22.0.0",
+    "parse5-html-rewriting-stream": "8.0.1",
+    "semver": "^7.8.5",
     "yargs": "18.0.0",
-    "zod": "4.3.6"
+    "zod": "^4.4.3"
   },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
-      "@angular/cli": "21.2.6",
-      "@angular/build": "21.2.6",
-      "@angular/ssr": "21.2.6",
-      "@angular-devkit/architect": "0.2102.6",
-      "@angular-devkit/build-angular": "21.2.6",
-      "@angular-devkit/build-webpack": "0.2102.6",
-      "@angular-devkit/core": "21.2.6",
-      "@angular-devkit/schematics": "21.2.6"
+      "@angular/cli": "22.0.7",
+      "@angular/build": "22.0.7",
+      "@angular/ssr": "22.0.7",
+      "@angular-devkit/architect": "0.2200.7",
+      "@angular-devkit/build-angular": "22.0.7",
+      "@angular-devkit/build-webpack": "0.2200.7",
+      "@angular-devkit/core": "22.0.7",
+      "@angular-devkit/schematics": "22.0.7"
     }
   },
-  "packageManager": "pnpm@10.33.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/angular/angular-cli.git"
+  },
   "engines": {
-    "node": "^20.19.0 || ^22.12.0 || >=24.0.0",
+    "node": "^22.22.3 || ^24.15.0 || >=26.0.0",
     "npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
     "yarn": ">= 1.13.0"
   },
+  "author": "Angular Authors",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/angular/angular-cli/issues"
+  },
+  "homepage": "https://github.com/angular/angular-cli",
   "depup": {
     "changes": {
       "@inquirer/prompts": {
-        "from": "7.10.1",
-        "to": "^8.4.0"
+        "from": "8.4.2",
+        "to": "^8.5.2"
       },
       "@listr2/prompt-adapter-inquirer": {
-        "from": "3.0.5",
-        "to": "^4.2.2"
-      },
-      "@modelcontextprotocol/sdk": {
-        "from": "1.26.0",
-        "to": "^1.29.0"
+        "from": "4.2.3",
+        "to": "^4.2.4"
       },
       "algoliasearch": {
-        "from": "5.48.1",
-        "to": "^5.50.1"
+        "from": "5.52.0",
+        "to": "^5.56.0"
+      },
+      "ini": {
+        "from": "6.0.0",
+        "to": "^7.0.0"
       },
       "listr2": {
-        "from": "9.0.5",
-        "to": "^10.2.1"
+        "from": "10.2.1",
+        "to": "^10.2.2"
+      },
+      "npm-package-arg": {
+        "from": "13.0.2",
+        "to": "^14.0.0"
       },
       "pacote": {
-        "from": "21.3.1",
-        "to": "^21.5.0"
+        "from": "21.5.1",
+        "to": "^22.0.0"
+      },
+      "semver": {
+        "from": "7.7.4",
+        "to": "^7.8.5"
+      },
+      "zod": {
+        "from": "4.4.2",
+        "to": "^4.4.3"
       }
     },
-    "depsUpdated": 6,
+    "depsUpdated": 9,
     "originalPackage": "@angular/cli",
-    "originalVersion": "21.2.6",
-    "processedAt": "2026-04-06T20:22:06.130Z",
+    "originalVersion": "22.0.7",
+    "processedAt": "2026-07-21T16:01:34.859Z",
     "smokeTest": "passed"
   }
 }

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

@@ -49,6 +49,7 @@ const helpers_1 = require("yargs/helpers");
 const analytics_1 = require("../analytics/analytics");
 const analytics_collector_1 = require("../analytics/analytics-collector");
 const analytics_parameters_1 = require("../analytics/analytics-parameters");
+const package_managers_1 = require("../package-managers");
 const completion_1 = require("../utilities/completion");
 const memoize_1 = require("../utilities/memoize");
 const definitions_1 = require("./definitions");
@@ -95,13 +96,14 @@ let CommandModule = (() => {
         }
         async handler(args) {
             const { _, $0, ...options } = args;
+            const { logger } = this.context;
             // Camelize options as yargs will return the object in kebab-case when camel casing is disabled.
             const camelCasedOptions = {};
             for (const [key, value] of Object.entries(options)) {
                 camelCasedOptions[helpers_1.Parser.camelCase(key)] = value;
             }
             // Set up autocompletion if appropriate.
-            const autocompletionExitCode = await (0, completion_1.considerSettingUpAutocompletion)(this.commandName, this.context.logger);
+            const autocompletionExitCode = await (0, completion_1.considerSettingUpAutocompletion)(this.commandName, logger);
             if (autocompletionExitCode !== undefined) {
                 process.exitCode = autocompletionExitCode;
                 return;
@@ -119,7 +121,12 @@ let CommandModule = (() => {
             }
             catch (e) {
                 if (e instanceof core_1.schema.SchemaValidationException) {
-                    this.context.logger.fatal(`Error: ${e.message}`);
+                    logger.fatal(`Error: ${e.message}`);
+                    exitCode = 1;
+                }
+                else if (e instanceof package_managers_1.PackageManagerError) {
+                    const output = e.stderr || e.stdout;
+                    logger.fatal(`Error: Package installation failed: ${e.message}${output ? `\nOutput: ${output}` : ''}`);
                     exitCode = 1;
                 }
                 else {
@@ -140,12 +147,20 @@ let CommandModule = (() => {
             const userId = await (0, analytics_1.getAnalyticsUserId)(this.context, 
             // Don't prompt on `ng update`, 'ng version' or `ng analytics`.
             ['version', 'update', 'analytics'].includes(this.commandName));
-            return userId
-                ? new analytics_collector_1.AnalyticsCollector(this.context.logger, userId, {
-                    name: this.context.packageManager.name,
-                    version: await this.context.packageManager.getVersion(),
-                })
-                : undefined;
+            if (!userId) {
+                return undefined;
+            }
+            let version;
+            try {
+                version = await this.context.packageManager.getVersion();
+            }
+            catch {
+                // Ignore errors if the package manager is not available.
+            }
+            return new analytics_collector_1.AnalyticsCollector(this.context.logger, userId, {
+                name: this.context.packageManager.name,
+                version,
+            });
         }
         /**
          * Adds schema options to a command also this keeps track of options that are required for analytics.

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

@@ -1 +1 @@
-{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":"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"}

package/src/commands/add/cli.d.ts

@@ -27,12 +27,15 @@ export default class AddCommandModule extends SchematicsCommandModule implements
     private findCompatiblePackageVersionTask;
     private loadPackageInfoTask;
     private confirmInstallationTask;
+    private cleanUpTemporaryDependency;
     private installPackageTask;
     private isProjectVersionValid;
     private getCollectionName;
     private isPackageInstalled;
     private executeSchematic;
     private findProjectVersion;
+    private getProjectManifest;
+    private resolvePackageJson;
     private getPeerDependencyConflicts;
 }
 export {};

package/src/commands/add/cli.js

@@ -45,13 +45,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const listr2_1 = require("listr2");
 const node_assert_1 = __importDefault(require("node:assert"));
+const node_fs_1 = require("node:fs");
 const promises_1 = __importDefault(require("node:fs/promises"));
 const node_module_1 = require("node:module");
 const node_path_1 = require("node:path");
 const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
 const semver_1 = __importStar(require("semver"));
+const command_module_1 = require("../../command-builder/command-module");
 const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
-const package_managers_1 = require("../../package-managers");
 const error_1 = require("../../utilities/error");
 const tty_1 = require("../../utilities/tty");
 const version_1 = require("../../utilities/version");
@@ -99,6 +100,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
     schematicName = 'ng-add';
     rootRequire = (0, node_module_1.createRequire)(this.context.root + '/');
     #projectVersionCache = new Map();
+    #rootManifestCache = null;
     async builder(argv) {
         const localYargs = (await super.builder(argv))
             .positional('collection', {
@@ -117,6 +119,15 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
                 'Ensure package name is correct prior to using this option.',
             type: 'boolean',
             default: false,
+        })
+            .check(({ registry }) => {
+            if (registry === undefined) {
+                return true;
+            }
+            if (typeof registry === 'string' && URL.canParse(registry)) {
+                return true;
+            }
+            throw new command_module_1.CommandModuleError('Option --registry must be a valid URL.');
         })
             // Prior to downloading we don't know the full schema and therefore we cannot be strict on the options.
             // Possibly in the future update the logic to use the following syntax:
@@ -141,6 +152,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
     }
     async run(options) {
         this.#projectVersionCache.clear();
+        this.#rootManifestCache = null;
         const { logger } = this.context;
         const { collection, skipConfirmation } = options;
         let packageIdentifier;
@@ -210,6 +222,22 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         try {
             const result = await tasks.run(taskContext);
             (0, node_assert_1.default)(result.collectionName, 'Collection name should always be available');
+            let shouldCleanUp = false;
+            if (!result.hasSchematics && !options.dryRun) {
+                const packageJsonPath = this.resolvePackageJson(result.collectionName);
+                if (packageJsonPath && (0, node_fs_1.existsSync)(packageJsonPath)) {
+                    try {
+                        const localManifest = JSON.parse(await promises_1.default.readFile(packageJsonPath, 'utf-8'));
+                        if (localManifest.schematics) {
+                            result.hasSchematics = true;
+                            if (localManifest['ng-add']?.save === false) {
+                                shouldCleanUp = true;
+                            }
+                        }
+                    }
+                    catch { }
+                }
+            }
             // Check if the installed package has actual add actions and not just schematic support
             if (result.hasSchematics && !options.dryRun) {
                 const workflow = this.getOrCreateWorkflowForBuilder(result.collectionName);
@@ -253,7 +281,14 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
                 logger.info("The package's `ng add` actions would be executed next.");
                 return;
             }
-            return this.executeSchematic({ ...options, collection: result.collectionName });
+            const schematicExitCode = await this.executeSchematic({
+                ...options,
+                collection: result.collectionName,
+            });
+            if (shouldCleanUp) {
+                await this.cleanUpTemporaryDependency(result.collectionName);
+            }
+            return schematicExitCode;
         }
         catch (e) {
             if (e instanceof CommandError) {
@@ -450,39 +485,50 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
             throw new CommandError('Command aborted');
         }
     }
+    async cleanUpTemporaryDependency(packageName) {
+        try {
+            this.context.logger.info(`Cleaning up temporary dependency '${packageName}'...`);
+            // 1. Remove from root package.json
+            const projectManifest = await this.getProjectManifest();
+            if (projectManifest) {
+                if (projectManifest.dependencies) {
+                    delete projectManifest.dependencies[packageName];
+                }
+                if (projectManifest.devDependencies) {
+                    delete projectManifest.devDependencies[packageName];
+                }
+                await promises_1.default.writeFile((0, node_path_1.join)(this.context.root, 'package.json'), JSON.stringify(projectManifest, null, 2) + '\n');
+            }
+            // 2. Silent install pass to prune files from node_modules and update the lockfile
+            await this.context.packageManager.install({ ignoreScripts: true });
+        }
+        catch (error) {
+            this.context.logger.warn(`Failed to clean up temporary dependency '${packageName}': ` +
+                `${error instanceof Error ? error.message : error}`);
+        }
+    }
     async installPackageTask(context, task, options) {
         const { registry } = options;
         const { packageIdentifier, savePackage } = context;
         const { packageManager } = this.context;
         // Only show if installation will actually occur
         task.title = 'Installing package';
-        try {
-            if (context.savePackage === false) {
-                task.title += ' in temporary location';
-                // Temporary packages are located in a different directory
-                // Hence we need to resolve them using the temp path
-                const { workingDirectory } = await packageManager.acquireTempPackage(packageIdentifier.toString(), {
-                    registry,
-                });
-                const tempRequire = (0, node_module_1.createRequire)(workingDirectory + '/');
-                (0, node_assert_1.default)(context.collectionName, 'Collection name should always be available');
-                const resolvedCollectionPath = tempRequire.resolve((0, node_path_1.join)(context.collectionName, 'package.json'));
-                context.collectionName = (0, node_path_1.dirname)(resolvedCollectionPath);
-            }
-            else {
-                await packageManager.add(packageIdentifier.toString(), 'none', savePackage === 'devDependencies', false, true, {
-                    registry,
-                });
-            }
+        if (context.savePackage === false) {
+            task.title += ' in temporary location';
+            // Temporary packages are located in a different directory
+            // Hence we need to resolve them using the temp path
+            const { workingDirectory } = await packageManager.acquireTempPackage(packageIdentifier.toString(), {
+                registry,
+            });
+            const tempRequire = (0, node_module_1.createRequire)(workingDirectory + '/');
+            (0, node_assert_1.default)(context.collectionName, 'Collection name should always be available');
+            const resolvedCollectionPath = tempRequire.resolve((0, node_path_1.join)(context.collectionName, 'package.json'));
+            context.collectionName = (0, node_path_1.dirname)(resolvedCollectionPath);
         }
-        catch (e) {
-            if (e instanceof package_managers_1.PackageManagerError) {
-                const output = e.stderr || e.stdout;
-                if (output) {
-                    throw new CommandError(`Package installation failed: ${e.message}\nOutput: ${output}`);
-                }
-            }
-            throw e;
+        else {
+            await packageManager.add(packageIdentifier.toString(), 'none', savePackage === 'devDependencies', false, true, {
+                registry,
+            });
         }
     }
     async isProjectVersionValid(packageIdentifier) {
@@ -528,17 +574,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         return collectionName;
     }
     isPackageInstalled(name) {
-        try {
-            this.rootRequire.resolve((0, node_path_1.join)(name, 'package.json'));
-            return true;
-        }
-        catch (e) {
-            (0, error_1.assertIsError)(e);
-            if (e.code !== 'MODULE_NOT_FOUND') {
-                throw e;
-            }
-        }
-        return false;
+        return !!this.resolvePackageJson(name);
     }
     executeSchematic(options) {
         const { verbose, skipConfirmation, interactive, force, dryRun, registry, defaults, collection: collectionName, schematicName, ...schematicOptions } = options;
@@ -560,12 +596,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         if (cachedVersion !== undefined) {
             return cachedVersion;
         }
-        const { root } = this.context;
-        let installedPackagePath;
-        try {
-            installedPackagePath = this.rootRequire.resolve((0, node_path_1.join)(name, 'package.json'));
-        }
-        catch { }
+        const installedPackagePath = this.resolvePackageJson(name);
         if (installedPackagePath) {
             try {
                 const installedPackage = JSON.parse(await promises_1.default.readFile(installedPackagePath, 'utf-8'));
@@ -574,11 +605,7 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
             }
             catch { }
         }
-        let projectManifest;
-        try {
-            projectManifest = JSON.parse(await promises_1.default.readFile((0, node_path_1.join)(root, 'package.json'), 'utf-8'));
-        }
-        catch { }
+        const projectManifest = await this.getProjectManifest();
         if (projectManifest) {
             const version = projectManifest.dependencies?.[name] || projectManifest.devDependencies?.[name];
             if (version) {
@@ -589,6 +616,50 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
         this.#projectVersionCache.set(name, null);
         return null;
     }
+    async getProjectManifest() {
+        if (this.#rootManifestCache) {
+            return this.#rootManifestCache;
+        }
+        const { root } = this.context;
+        try {
+            this.#rootManifestCache = JSON.parse(await promises_1.default.readFile((0, node_path_1.join)(root, 'package.json'), 'utf-8'));
+            return this.#rootManifestCache;
+        }
+        catch {
+            return null;
+        }
+    }
+    resolvePackageJson(name) {
+        try {
+            return this.rootRequire.resolve((0, node_path_1.join)(name, 'package.json'));
+        }
+        catch (e) {
+            (0, error_1.assertIsError)(e);
+            if (e.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED') {
+                try {
+                    const mainPath = this.rootRequire.resolve(name);
+                    let directory = (0, node_path_1.dirname)(mainPath);
+                    // Stop at the node_modules boundary or the root of the file system
+                    while (directory && (0, node_path_1.basename)(directory) !== 'node_modules') {
+                        const packageJsonPath = (0, node_path_1.join)(directory, 'package.json');
+                        if ((0, node_fs_1.existsSync)(packageJsonPath)) {
+                            return packageJsonPath;
+                        }
+                        const parent = (0, node_path_1.dirname)(directory);
+                        if (parent === directory) {
+                            break;
+                        }
+                        directory = parent;
+                    }
+                }
+                catch (e) {
+                    (0, error_1.assertIsError)(e);
+                    this.context.logger.debug(`Failed to resolve package '${name}' during fallback: ${e.message}`);
+                }
+            }
+        }
+        return undefined;
+    }
     async getPeerDependencyConflicts(manifest) {
         if (!manifest.peerDependencies) {
             return false;