@angular/cli 22.0.0 → 22.1.0-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/config/schema.json +4 -6
- package/lib/config/workspace-schema.d.ts +4 -6
- package/lib/config/workspace-schema.js +4 -6
- package/lib/config/workspace-schema.js.map +1 -1
- package/package.json +20 -20
- package/src/commands/add/cli.d.ts +1 -0
- package/src/commands/add/cli.js +56 -1
- package/src/commands/add/cli.js.map +1 -1
- package/src/commands/mcp/resources/best-practices.md +6 -1
- package/src/commands/update/cli.js +96 -104
- package/src/commands/update/cli.js.map +1 -1
- package/src/commands/update/update-resolver.d.ts +62 -0
- package/src/commands/update/update-resolver.js +801 -0
- package/src/commands/update/update-resolver.js.map +1 -0
- package/src/commands/update/utilities/migration.js +5 -2
- package/src/commands/update/utilities/migration.js.map +1 -1
- package/src/package-managers/package-manager.js +64 -0
- package/src/package-managers/package-manager.js.map +1 -1
- package/src/package-managers/parsers.d.ts +0 -5
- package/src/package-managers/parsers.js +43 -1
- package/src/package-managers/parsers.js.map +1 -1
- package/src/utilities/package-metadata.js +0 -13
- package/src/utilities/package-metadata.js.map +1 -1
- package/src/utilities/version.js +1 -1
- package/src/commands/update/schematic/collection.json +0 -9
- package/src/commands/update/schematic/index.d.ts +0 -11
- package/src/commands/update/schematic/index.js +0 -717
- package/src/commands/update/schematic/index.js.map +0 -1
- package/src/commands/update/schematic/schema.d.ts +0 -51
- package/src/commands/update/schematic/schema.js +0 -16
- package/src/commands/update/schematic/schema.js.map +0 -1
- package/src/commands/update/schematic/schema.json +0 -64
package/lib/config/schema.json
CHANGED
|
@@ -1824,13 +1824,11 @@
|
|
|
1824
1824
|
"type": "string",
|
|
1825
1825
|
"enum": [
|
|
1826
1826
|
"none",
|
|
1827
|
-
"
|
|
1828
|
-
"copilot",
|
|
1829
|
-
"claude",
|
|
1827
|
+
"claude-code",
|
|
1830
1828
|
"cursor",
|
|
1831
|
-
"
|
|
1832
|
-
"
|
|
1833
|
-
"
|
|
1829
|
+
"gemini-cli",
|
|
1830
|
+
"open-ai-codex",
|
|
1831
|
+
"vscode"
|
|
1834
1832
|
]
|
|
1835
1833
|
}
|
|
1836
1834
|
},
|
|
@@ -835,14 +835,12 @@ export type AngularNgNewOptionsSchema = {
|
|
|
835
835
|
zoneless?: boolean;
|
|
836
836
|
};
|
|
837
837
|
export declare enum AiConfig {
|
|
838
|
-
|
|
839
|
-
Claude = "claude",
|
|
840
|
-
Copilot = "copilot",
|
|
838
|
+
ClaudeCode = "claude-code",
|
|
841
839
|
Cursor = "cursor",
|
|
842
|
-
|
|
843
|
-
Jetbrains = "jetbrains",
|
|
840
|
+
GeminiCli = "gemini-cli",
|
|
844
841
|
None = "none",
|
|
845
|
-
|
|
842
|
+
OpenAiCodex = "open-ai-codex",
|
|
843
|
+
Vscode = "vscode"
|
|
846
844
|
}
|
|
847
845
|
/**
|
|
848
846
|
* Configure the initial Git commit for the new repository.
|
|
@@ -121,13 +121,11 @@ var TypeSeparator;
|
|
|
121
121
|
})(TypeSeparator || (exports.TypeSeparator = TypeSeparator = {}));
|
|
122
122
|
var AiConfig;
|
|
123
123
|
(function (AiConfig) {
|
|
124
|
-
AiConfig["
|
|
125
|
-
AiConfig["Claude"] = "claude";
|
|
126
|
-
AiConfig["Copilot"] = "copilot";
|
|
124
|
+
AiConfig["ClaudeCode"] = "claude-code";
|
|
127
125
|
AiConfig["Cursor"] = "cursor";
|
|
128
|
-
AiConfig["
|
|
129
|
-
AiConfig["Jetbrains"] = "jetbrains";
|
|
126
|
+
AiConfig["GeminiCli"] = "gemini-cli";
|
|
130
127
|
AiConfig["None"] = "none";
|
|
131
|
-
AiConfig["
|
|
128
|
+
AiConfig["OpenAiCodex"] = "open-ai-codex";
|
|
129
|
+
AiConfig["Vscode"] = "vscode";
|
|
132
130
|
})(AiConfig || (exports.AiConfig = AiConfig = {}));
|
|
133
131
|
//# sourceMappingURL=workspace-schema.js.map
|
|
@@ -1 +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,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,
|
|
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,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,QAOX;AAPD,WAAY,QAAQ;IAChB,sCAA0B,CAAA;IAC1B,6BAAiB,CAAA;IACjB,oCAAwB,CAAA;IACxB,yBAAa,CAAA;IACb,yCAA6B,CAAA;IAC7B,6BAAiB,CAAA;AACrB,CAAC,EAPW,QAAQ,wBAAR,QAAQ,QAOnB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/cli",
|
|
3
|
-
"version": "22.0.0",
|
|
3
|
+
"version": "22.1.0-next.0",
|
|
4
4
|
"description": "CLI tool for Angular",
|
|
5
5
|
"main": "lib/cli/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -15,36 +15,36 @@
|
|
|
15
15
|
"sdk"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@angular-devkit/architect": "0.
|
|
19
|
-
"@angular-devkit/core": "22.0.0",
|
|
20
|
-
"@angular-devkit/schematics": "22.0.0",
|
|
21
|
-
"@inquirer/prompts": "8.
|
|
22
|
-
"@listr2/prompt-adapter-inquirer": "4.2.
|
|
18
|
+
"@angular-devkit/architect": "0.2201.0-next.0",
|
|
19
|
+
"@angular-devkit/core": "22.1.0-next.0",
|
|
20
|
+
"@angular-devkit/schematics": "22.1.0-next.0",
|
|
21
|
+
"@inquirer/prompts": "8.5.2",
|
|
22
|
+
"@listr2/prompt-adapter-inquirer": "4.2.4",
|
|
23
23
|
"@modelcontextprotocol/sdk": "1.29.0",
|
|
24
|
-
"@schematics/angular": "22.0.0",
|
|
24
|
+
"@schematics/angular": "22.1.0-next.0",
|
|
25
25
|
"@yarnpkg/lockfile": "1.1.0",
|
|
26
|
-
"algoliasearch": "5.
|
|
27
|
-
"ini": "
|
|
26
|
+
"algoliasearch": "5.53.0",
|
|
27
|
+
"ini": "7.0.0",
|
|
28
28
|
"jsonc-parser": "3.3.1",
|
|
29
29
|
"listr2": "10.2.1",
|
|
30
|
-
"npm-package-arg": "
|
|
30
|
+
"npm-package-arg": "14.0.0",
|
|
31
31
|
"pacote": "21.5.0",
|
|
32
32
|
"parse5-html-rewriting-stream": "8.0.1",
|
|
33
|
-
"semver": "7.
|
|
33
|
+
"semver": "7.8.1",
|
|
34
34
|
"yargs": "18.0.0",
|
|
35
|
-
"zod": "4.4.
|
|
35
|
+
"zod": "4.4.3"
|
|
36
36
|
},
|
|
37
37
|
"ng-update": {
|
|
38
38
|
"migrations": "@schematics/angular/migrations/migration-collection.json",
|
|
39
39
|
"packageGroup": {
|
|
40
|
-
"@angular/cli": "22.0.0",
|
|
41
|
-
"@angular/build": "22.0.0",
|
|
42
|
-
"@angular/ssr": "22.0.0",
|
|
43
|
-
"@angular-devkit/architect": "0.
|
|
44
|
-
"@angular-devkit/build-angular": "22.0.0",
|
|
45
|
-
"@angular-devkit/build-webpack": "0.
|
|
46
|
-
"@angular-devkit/core": "22.0.0",
|
|
47
|
-
"@angular-devkit/schematics": "22.0.0"
|
|
40
|
+
"@angular/cli": "22.1.0-next.0",
|
|
41
|
+
"@angular/build": "22.1.0-next.0",
|
|
42
|
+
"@angular/ssr": "22.1.0-next.0",
|
|
43
|
+
"@angular-devkit/architect": "0.2201.0-next.0",
|
|
44
|
+
"@angular-devkit/build-angular": "22.1.0-next.0",
|
|
45
|
+
"@angular-devkit/build-webpack": "0.2201.0-next.0",
|
|
46
|
+
"@angular-devkit/core": "22.1.0-next.0",
|
|
47
|
+
"@angular-devkit/schematics": "22.1.0-next.0"
|
|
48
48
|
}
|
|
49
49
|
},
|
|
50
50
|
"repository": {
|
|
@@ -27,6 +27,7 @@ export default class AddCommandModule extends SchematicsCommandModule implements
|
|
|
27
27
|
private findCompatiblePackageVersionTask;
|
|
28
28
|
private loadPackageInfoTask;
|
|
29
29
|
private confirmInstallationTask;
|
|
30
|
+
private cleanUpTemporaryDependency;
|
|
30
31
|
private installPackageTask;
|
|
31
32
|
private isProjectVersionValid;
|
|
32
33
|
private getCollectionName;
|
package/src/commands/add/cli.js
CHANGED
|
@@ -51,6 +51,7 @@ const node_module_1 = require("node:module");
|
|
|
51
51
|
const node_path_1 = require("node:path");
|
|
52
52
|
const npm_package_arg_1 = __importDefault(require("npm-package-arg"));
|
|
53
53
|
const semver_1 = __importStar(require("semver"));
|
|
54
|
+
const command_module_1 = require("../../command-builder/command-module");
|
|
54
55
|
const schematics_command_module_1 = require("../../command-builder/schematics-command-module");
|
|
55
56
|
const package_managers_1 = require("../../package-managers");
|
|
56
57
|
const error_1 = require("../../utilities/error");
|
|
@@ -119,6 +120,15 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
119
120
|
'Ensure package name is correct prior to using this option.',
|
|
120
121
|
type: 'boolean',
|
|
121
122
|
default: false,
|
|
123
|
+
})
|
|
124
|
+
.check(({ registry }) => {
|
|
125
|
+
if (registry === undefined) {
|
|
126
|
+
return true;
|
|
127
|
+
}
|
|
128
|
+
if (typeof registry === 'string' && URL.canParse(registry)) {
|
|
129
|
+
return true;
|
|
130
|
+
}
|
|
131
|
+
throw new command_module_1.CommandModuleError('Option --registry must be a valid URL.');
|
|
122
132
|
})
|
|
123
133
|
// Prior to downloading we don't know the full schema and therefore we cannot be strict on the options.
|
|
124
134
|
// Possibly in the future update the logic to use the following syntax:
|
|
@@ -213,6 +223,22 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
213
223
|
try {
|
|
214
224
|
const result = await tasks.run(taskContext);
|
|
215
225
|
(0, node_assert_1.default)(result.collectionName, 'Collection name should always be available');
|
|
226
|
+
let shouldCleanUp = false;
|
|
227
|
+
if (!result.hasSchematics && !options.dryRun) {
|
|
228
|
+
const packageJsonPath = this.resolvePackageJson(result.collectionName);
|
|
229
|
+
if (packageJsonPath && (0, node_fs_1.existsSync)(packageJsonPath)) {
|
|
230
|
+
try {
|
|
231
|
+
const localManifest = JSON.parse(await promises_1.default.readFile(packageJsonPath, 'utf-8'));
|
|
232
|
+
if (localManifest.schematics) {
|
|
233
|
+
result.hasSchematics = true;
|
|
234
|
+
if (localManifest['ng-add']?.save === false) {
|
|
235
|
+
shouldCleanUp = true;
|
|
236
|
+
}
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
catch { }
|
|
240
|
+
}
|
|
241
|
+
}
|
|
216
242
|
// Check if the installed package has actual add actions and not just schematic support
|
|
217
243
|
if (result.hasSchematics && !options.dryRun) {
|
|
218
244
|
const workflow = this.getOrCreateWorkflowForBuilder(result.collectionName);
|
|
@@ -256,7 +282,14 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
256
282
|
logger.info("The package's `ng add` actions would be executed next.");
|
|
257
283
|
return;
|
|
258
284
|
}
|
|
259
|
-
|
|
285
|
+
const schematicExitCode = await this.executeSchematic({
|
|
286
|
+
...options,
|
|
287
|
+
collection: result.collectionName,
|
|
288
|
+
});
|
|
289
|
+
if (shouldCleanUp) {
|
|
290
|
+
await this.cleanUpTemporaryDependency(result.collectionName);
|
|
291
|
+
}
|
|
292
|
+
return schematicExitCode;
|
|
260
293
|
}
|
|
261
294
|
catch (e) {
|
|
262
295
|
if (e instanceof CommandError) {
|
|
@@ -453,6 +486,28 @@ class AddCommandModule extends schematics_command_module_1.SchematicsCommandModu
|
|
|
453
486
|
throw new CommandError('Command aborted');
|
|
454
487
|
}
|
|
455
488
|
}
|
|
489
|
+
async cleanUpTemporaryDependency(packageName) {
|
|
490
|
+
try {
|
|
491
|
+
this.context.logger.info(`Cleaning up temporary dependency '${packageName}'...`);
|
|
492
|
+
// 1. Remove from root package.json
|
|
493
|
+
const projectManifest = await this.getProjectManifest();
|
|
494
|
+
if (projectManifest) {
|
|
495
|
+
if (projectManifest.dependencies) {
|
|
496
|
+
delete projectManifest.dependencies[packageName];
|
|
497
|
+
}
|
|
498
|
+
if (projectManifest.devDependencies) {
|
|
499
|
+
delete projectManifest.devDependencies[packageName];
|
|
500
|
+
}
|
|
501
|
+
await promises_1.default.writeFile((0, node_path_1.join)(this.context.root, 'package.json'), JSON.stringify(projectManifest, null, 2) + '\n');
|
|
502
|
+
}
|
|
503
|
+
// 2. Silent install pass to prune files from node_modules and update the lockfile
|
|
504
|
+
await this.context.packageManager.install({ ignoreScripts: true });
|
|
505
|
+
}
|
|
506
|
+
catch (error) {
|
|
507
|
+
this.context.logger.warn(`Failed to clean up temporary dependency '${packageName}': ` +
|
|
508
|
+
`${error instanceof Error ? error.message : error}`);
|
|
509
|
+
}
|
|
510
|
+
}
|
|
456
511
|
async installPackageTask(context, task, options) {
|
|
457
512
|
const { registry } = options;
|
|
458
513
|
const { packageIdentifier, savePackage } = context;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ You are an expert in TypeScript, Angular, and scalable web application developme
|
|
|
10
10
|
|
|
11
11
|
- Always use standalone components over NgModules
|
|
12
12
|
- Must NOT set `standalone: true` inside Angular decorators. It's the default in Angular v20+.
|
|
13
|
+
- Do NOT set `changeDetection: ChangeDetectionStrategy.OnPush` explicitly. `OnPush` is the default in Angular v22+.
|
|
13
14
|
- Use signals for state management
|
|
14
15
|
- Implement lazy loading for feature routes
|
|
15
16
|
- Do NOT use the `@HostBinding` and `@HostListener` decorators. Put host bindings inside the `host` object of the `@Component` or `@Directive` decorator instead
|
|
@@ -25,9 +26,12 @@ You are an expert in TypeScript, Angular, and scalable web application developme
|
|
|
25
26
|
|
|
26
27
|
- Keep components small and focused on a single responsibility
|
|
27
28
|
- Use `input()` and `output()` functions instead of decorators
|
|
29
|
+
- Use `model()` for two-way bound properties with `[(prop)]` syntax instead of pairing `input()` with `output()`
|
|
28
30
|
- Use `computed()` for derived state
|
|
31
|
+
- Use `linkedSignal()` for state derived from multiple reactive sources that must stay synchronized
|
|
29
32
|
- Prefer inline templates for small components
|
|
30
|
-
- Prefer
|
|
33
|
+
- Prefer Signal Forms (`@angular/forms/signals`) for new forms. They are stable in Angular v22+ and provide signal-based state, type-safe field access, and schema-based validation
|
|
34
|
+
- When not using Signal Forms, prefer Reactive forms instead of Template-driven ones
|
|
31
35
|
- Do NOT use `ngClass`, use `class` bindings instead
|
|
32
36
|
- Do NOT use `ngStyle`, use `style` bindings instead
|
|
33
37
|
- When using external templates/styles, use paths relative to the component TS file.
|
|
@@ -50,4 +54,5 @@ You are an expert in TypeScript, Angular, and scalable web application developme
|
|
|
50
54
|
|
|
51
55
|
- Design services around a single responsibility
|
|
52
56
|
- Use the `providedIn: 'root'` option for singleton services
|
|
57
|
+
- Prefer the `@Service` decorator over `@Injectable({providedIn: 'root'})` for new singleton services (Angular v22+)
|
|
53
58
|
- Use the `inject()` function instead of constructor injection
|
|
@@ -54,13 +54,13 @@ const schematic_engine_host_1 = require("../../command-builder/utilities/schemat
|
|
|
54
54
|
const color_1 = require("../../utilities/color");
|
|
55
55
|
const environment_options_1 = require("../../utilities/environment-options");
|
|
56
56
|
const error_1 = require("../../utilities/error");
|
|
57
|
+
const update_resolver_1 = require("./update-resolver");
|
|
57
58
|
const cli_version_1 = require("./utilities/cli-version");
|
|
58
59
|
const constants_1 = require("./utilities/constants");
|
|
59
60
|
const git_1 = require("./utilities/git");
|
|
60
61
|
const migration_1 = require("./utilities/migration");
|
|
61
62
|
class CommandError extends Error {
|
|
62
63
|
}
|
|
63
|
-
const UPDATE_SCHEMATIC_COLLECTION = path.join(__dirname, 'schematic/collection.json');
|
|
64
64
|
class UpdateCommandModule extends command_module_1.CommandModule {
|
|
65
65
|
scope = command_module_1.CommandScope.In;
|
|
66
66
|
shouldReportAnalytics = false;
|
|
@@ -207,15 +207,23 @@ class UpdateCommandModule extends command_module_1.CommandModule {
|
|
|
207
207
|
engineHostCreator: (options) => new schematic_engine_host_1.SchematicEngineHost(options.resolvePaths),
|
|
208
208
|
});
|
|
209
209
|
if (packages.length === 0) {
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
210
|
+
try {
|
|
211
|
+
const plan = await (0, update_resolver_1.resolveUserUpdatePlan)({
|
|
212
|
+
force: options.force,
|
|
213
|
+
next: options.next,
|
|
214
|
+
verbose: options.verbose,
|
|
215
|
+
packageManager: packageManager.name,
|
|
216
|
+
packages: [],
|
|
217
|
+
workspaceRoot: this.context.root,
|
|
218
|
+
}, logger);
|
|
219
|
+
(0, update_resolver_1.printUpdateUsageMessage)(plan.packageInfoMap, logger, options.next);
|
|
220
|
+
return 0;
|
|
221
|
+
}
|
|
222
|
+
catch (error) {
|
|
223
|
+
(0, error_1.assertIsError)(error);
|
|
224
|
+
logger.error(error.message);
|
|
225
|
+
return 1;
|
|
226
|
+
}
|
|
219
227
|
}
|
|
220
228
|
return options.migrateOnly
|
|
221
229
|
? this.migrateOnly(workflow, packages[0].name, rootDependencies, options, packageManager)
|
|
@@ -236,7 +244,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
|
|
|
236
244
|
packageNode = await readPackageManifest(path.join(packagePath, 'package.json'));
|
|
237
245
|
}
|
|
238
246
|
if (!packageNode) {
|
|
239
|
-
const jsonPath = findPackageJson(this.context.root, packageName);
|
|
247
|
+
const jsonPath = (0, update_resolver_1.findPackageJson)(this.context.root, packageName);
|
|
240
248
|
if (jsonPath) {
|
|
241
249
|
packageNode = await readPackageManifest(jsonPath);
|
|
242
250
|
if (!packagePath) {
|
|
@@ -376,103 +384,97 @@ class UpdateCommandModule extends command_module_1.CommandModule {
|
|
|
376
384
|
if (packagesToUpdate.length === 0) {
|
|
377
385
|
return 0;
|
|
378
386
|
}
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
384
|
-
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
|
|
393
|
-
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
|
|
401
|
-
|
|
402
|
-
|
|
403
|
-
|
|
404
|
-
|
|
387
|
+
let plan;
|
|
388
|
+
try {
|
|
389
|
+
plan = await (0, update_resolver_1.resolveUserUpdatePlan)({
|
|
390
|
+
packages: packagesToUpdate,
|
|
391
|
+
force: options.force,
|
|
392
|
+
next: options.next,
|
|
393
|
+
packageManager: packageManager.name,
|
|
394
|
+
verbose: options.verbose,
|
|
395
|
+
workspaceRoot: this.context.root,
|
|
396
|
+
}, logger);
|
|
397
|
+
}
|
|
398
|
+
catch (error) {
|
|
399
|
+
(0, error_1.assertIsError)(error);
|
|
400
|
+
logger.error(error.message);
|
|
401
|
+
return 1;
|
|
402
|
+
}
|
|
403
|
+
try {
|
|
404
|
+
await (0, update_resolver_1.applyUpdatePlan)(this.context.root, plan, logger);
|
|
405
|
+
}
|
|
406
|
+
catch (error) {
|
|
407
|
+
(0, error_1.assertIsError)(error);
|
|
408
|
+
logger.error(`Error updating package.json: ${error.message}`);
|
|
409
|
+
return 1;
|
|
410
|
+
}
|
|
411
|
+
const { root: commandRoot } = this.context;
|
|
412
|
+
const ignorePeerDependencies = await (0, cli_version_1.shouldForcePackageManager)(packageManager, logger, options.verbose);
|
|
413
|
+
const tasks = new listr2_1.Listr([
|
|
414
|
+
{
|
|
415
|
+
title: 'Cleaning node modules directory',
|
|
416
|
+
async task(_, task) {
|
|
417
|
+
try {
|
|
418
|
+
await node_fs_1.promises.rm(path.join(commandRoot, 'node_modules'), {
|
|
419
|
+
force: true,
|
|
420
|
+
recursive: true,
|
|
421
|
+
maxRetries: 3,
|
|
422
|
+
});
|
|
423
|
+
}
|
|
424
|
+
catch (e) {
|
|
425
|
+
(0, error_1.assertIsError)(e);
|
|
426
|
+
if (e.code === 'ENOENT') {
|
|
427
|
+
task.skip('Cleaning not required. Node modules directory not found.');
|
|
405
428
|
}
|
|
406
|
-
}
|
|
429
|
+
}
|
|
407
430
|
},
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
}
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
}
|
|
431
|
+
},
|
|
432
|
+
{
|
|
433
|
+
title: 'Installing packages',
|
|
434
|
+
async task() {
|
|
435
|
+
try {
|
|
436
|
+
await packageManager.install({
|
|
437
|
+
ignorePeerDependencies,
|
|
438
|
+
});
|
|
439
|
+
}
|
|
440
|
+
catch (e) {
|
|
441
|
+
throw new CommandError('Unable to install packages');
|
|
442
|
+
}
|
|
420
443
|
},
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
444
|
+
},
|
|
445
|
+
]);
|
|
446
|
+
try {
|
|
447
|
+
await tasks.run();
|
|
448
|
+
// Clear Node's module resolution path cache to prevent stale lookups
|
|
449
|
+
// when resolving migration package paths.
|
|
450
|
+
const Module = require('node:module');
|
|
451
|
+
if (Module && Module._pathCache) {
|
|
452
|
+
Module._pathCache = Object.create(null);
|
|
424
453
|
}
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
throw e;
|
|
454
|
+
}
|
|
455
|
+
catch (e) {
|
|
456
|
+
if (e instanceof CommandError) {
|
|
457
|
+
return 1;
|
|
430
458
|
}
|
|
459
|
+
throw e;
|
|
431
460
|
}
|
|
432
|
-
if (
|
|
461
|
+
if (options.createCommits) {
|
|
433
462
|
if (!(0, migration_1.commitChanges)(logger, `Angular CLI update for packages - ${packagesToUpdate.join(', ')}`)) {
|
|
434
463
|
return 1;
|
|
435
464
|
}
|
|
436
465
|
}
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
const migrations = global.externalMigrations;
|
|
440
|
-
if (success && migrations) {
|
|
441
|
-
const rootRequire = (0, node_module_1.createRequire)(this.context.root + '/');
|
|
466
|
+
const migrations = plan.migrationsToRun;
|
|
467
|
+
if (migrations) {
|
|
442
468
|
for (const migration of migrations) {
|
|
443
469
|
// Resolve the package from the workspace root, as otherwise it will be resolved from the temp
|
|
444
470
|
// installed CLI version.
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
packagePath = path.dirname(
|
|
450
|
-
// This may fail if the `package.json` is not exported as an entry point
|
|
451
|
-
rootRequire.resolve(path.join(migration.package, 'package.json')));
|
|
452
|
-
}
|
|
453
|
-
catch (e) {
|
|
454
|
-
(0, error_1.assertIsError)(e);
|
|
455
|
-
if (e.code === 'MODULE_NOT_FOUND') {
|
|
456
|
-
// Fallback to trying to resolve the package's main entry point
|
|
457
|
-
packagePath = rootRequire.resolve(migration.package);
|
|
458
|
-
}
|
|
459
|
-
else {
|
|
460
|
-
throw e;
|
|
461
|
-
}
|
|
462
|
-
}
|
|
463
|
-
}
|
|
464
|
-
catch (e) {
|
|
465
|
-
(0, error_1.assertIsError)(e);
|
|
466
|
-
if (e.code === 'MODULE_NOT_FOUND') {
|
|
467
|
-
logVerbose(e.toString());
|
|
468
|
-
logger.error(`Migrations for package (${migration.package}) were not found.` +
|
|
469
|
-
' The package could not be found in the workspace.');
|
|
470
|
-
}
|
|
471
|
-
else {
|
|
472
|
-
logger.error(`Unable to resolve migrations for package (${migration.package}). [${e.message}]`);
|
|
473
|
-
}
|
|
471
|
+
const packageJsonPath = (0, update_resolver_1.findPackageJson)(this.context.root, migration.package);
|
|
472
|
+
if (!packageJsonPath) {
|
|
473
|
+
logger.error(`Migrations for package (${migration.package}) were not found.` +
|
|
474
|
+
' The package could not be found in the workspace.');
|
|
474
475
|
return 1;
|
|
475
476
|
}
|
|
477
|
+
const packagePath = path.dirname(packageJsonPath);
|
|
476
478
|
let migrations;
|
|
477
479
|
// Check if it is a package-local location
|
|
478
480
|
const localMigrations = path.join(packagePath, migration.collection);
|
|
@@ -504,7 +506,7 @@ class UpdateCommandModule extends command_module_1.CommandModule {
|
|
|
504
506
|
}
|
|
505
507
|
}
|
|
506
508
|
}
|
|
507
|
-
return
|
|
509
|
+
return 0;
|
|
508
510
|
}
|
|
509
511
|
}
|
|
510
512
|
exports.default = UpdateCommandModule;
|
|
@@ -517,14 +519,4 @@ async function readPackageManifest(manifestPath) {
|
|
|
517
519
|
return undefined;
|
|
518
520
|
}
|
|
519
521
|
}
|
|
520
|
-
function findPackageJson(workspaceDir, packageName) {
|
|
521
|
-
try {
|
|
522
|
-
const projectRequire = (0, node_module_1.createRequire)(path.join(workspaceDir, 'package.json'));
|
|
523
|
-
const packageJsonPath = projectRequire.resolve(`${packageName}/package.json`);
|
|
524
|
-
return packageJsonPath;
|
|
525
|
-
}
|
|
526
|
-
catch {
|
|
527
|
-
return undefined;
|
|
528
|
-
}
|
|
529
|
-
}
|
|
530
522
|
//# sourceMappingURL=cli.js.map
|