@angular/cli 21.1.1 → 21.2.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/code-examples.db +0 -0
- package/package.json +17 -18
- package/src/analytics/analytics-collector.d.ts +6 -3
- package/src/analytics/analytics-collector.js +7 -7
- package/src/analytics/analytics-collector.js.map +1 -1
- package/src/analytics/analytics.d.ts +1 -1
- package/src/command-builder/command-module.d.ts +4 -33
- package/src/command-builder/command-module.js +11 -48
- package/src/command-builder/command-module.js.map +1 -1
- package/src/command-builder/command-runner.js +59 -4
- package/src/command-builder/command-runner.js.map +1 -1
- package/src/command-builder/definitions.d.ts +41 -0
- package/src/command-builder/definitions.js +20 -0
- package/src/command-builder/definitions.js.map +1 -0
- package/src/command-builder/schematics-command-module.js +13 -1
- package/src/command-builder/schematics-command-module.js.map +1 -1
- package/src/command-builder/utilities/prettier.d.ts +13 -0
- package/src/command-builder/utilities/prettier.js +71 -0
- package/src/command-builder/utilities/prettier.js.map +1 -0
- package/src/commands/add/cli.d.ts +0 -1
- package/src/commands/add/cli.js +21 -34
- package/src/commands/add/cli.js.map +1 -1
- package/src/commands/mcp/devserver.d.ts +18 -3
- package/src/commands/mcp/devserver.js +23 -3
- package/src/commands/mcp/devserver.js.map +1 -1
- package/src/commands/mcp/mcp-server.d.ts +28 -12
- package/src/commands/mcp/resources/best-practices.md +0 -1
- package/src/commands/mcp/shared-options.d.ts +12 -0
- package/src/commands/mcp/shared-options.js +22 -0
- package/src/commands/mcp/shared-options.js.map +1 -0
- package/src/commands/mcp/tools/build.d.ts +4 -4
- package/src/commands/mcp/tools/build.js +13 -12
- package/src/commands/mcp/tools/build.js.map +1 -1
- package/src/commands/mcp/tools/devserver/devserver-start.d.ts +1 -8
- package/src/commands/mcp/tools/devserver/devserver-start.js +18 -13
- package/src/commands/mcp/tools/devserver/devserver-start.js.map +1 -1
- package/src/commands/mcp/tools/devserver/devserver-stop.d.ts +3 -20
- package/src/commands/mcp/tools/devserver/devserver-stop.js +18 -33
- package/src/commands/mcp/tools/devserver/devserver-stop.js.map +1 -1
- package/src/commands/mcp/tools/devserver/devserver-wait-for-build.d.ts +3 -12
- package/src/commands/mcp/tools/devserver/devserver-wait-for-build.js +22 -37
- package/src/commands/mcp/tools/devserver/devserver-wait-for-build.js.map +1 -1
- package/src/commands/mcp/tools/e2e.d.ts +1 -0
- package/src/commands/mcp/tools/e2e.js +14 -14
- package/src/commands/mcp/tools/e2e.js.map +1 -1
- package/src/commands/mcp/tools/modernize.d.ts +5 -4
- package/src/commands/mcp/tools/modernize.js +29 -38
- package/src/commands/mcp/tools/modernize.js.map +1 -1
- package/src/commands/mcp/tools/onpush-zoneless-migration/migrate-test-file.js +2 -2
- package/src/commands/mcp/tools/onpush-zoneless-migration/migrate-test-file.js.map +1 -1
- package/src/commands/mcp/tools/test.d.ts +4 -4
- package/src/commands/mcp/tools/test.js +13 -12
- package/src/commands/mcp/tools/test.js.map +1 -1
- package/src/commands/mcp/utils.d.ts +0 -31
- package/src/commands/mcp/utils.js +4 -61
- package/src/commands/mcp/utils.js.map +1 -1
- package/src/commands/mcp/workspace-utils.d.ts +53 -0
- package/src/commands/mcp/workspace-utils.js +138 -0
- package/src/commands/mcp/workspace-utils.js.map +1 -0
- package/src/commands/update/cli.js +46 -30
- package/src/commands/update/cli.js.map +1 -1
- package/src/commands/update/schematic/index.js.map +1 -1
- package/src/commands/update/utilities/cli-version.d.ts +1 -1
- package/src/commands/version/cli.js +1 -1
- package/src/commands/version/cli.js.map +1 -1
- package/src/commands/version/version-info.d.ts +2 -7
- package/src/commands/version/version-info.js +2 -2
- package/src/commands/version/version-info.js.map +1 -1
- package/src/package-managers/factory.d.ts +5 -1
- package/src/package-managers/factory.js +39 -31
- package/src/package-managers/factory.js.map +1 -1
- package/src/package-managers/host.d.ts +9 -0
- package/src/package-managers/host.js +2 -1
- package/src/package-managers/host.js.map +1 -1
- package/src/package-managers/package-manager-descriptor.d.ts +2 -2
- package/src/package-managers/package-manager-descriptor.js +3 -3
- package/src/package-managers/package-manager-descriptor.js.map +1 -1
- package/src/package-managers/package-manager.d.ts +8 -3
- package/src/package-managers/package-manager.js +31 -3
- package/src/package-managers/package-manager.js.map +1 -1
- package/src/package-managers/package-metadata.d.ts +4 -0
- package/src/package-managers/parsers.d.ts +32 -19
- package/src/package-managers/parsers.js +94 -61
- package/src/package-managers/parsers.js.map +1 -1
- package/src/utilities/config.js +6 -6
- package/src/utilities/config.js.map +1 -1
- package/src/utilities/find-up.d.ts +14 -1
- package/src/utilities/find-up.js +47 -43
- package/src/utilities/find-up.js.map +1 -1
- package/src/utilities/package-metadata.d.ts +3 -0
- package/src/utilities/package-metadata.js.map +1 -1
- package/src/utilities/project.js +1 -1
- package/src/utilities/project.js.map +1 -1
- package/src/utilities/version.js +1 -1
- package/src/utilities/package-manager.d.ts +0 -49
- package/src/utilities/package-manager.js +0 -327
- package/src/utilities/package-manager.js.map +0 -1
- package/src/utilities/package-tree.d.ts +0 -32
- package/src/utilities/package-tree.js +0 -95
- package/src/utilities/package-tree.js.map +0 -1
package/lib/code-examples.db
CHANGED
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@angular/cli",
|
|
3
|
-
"version": "21.
|
|
3
|
+
"version": "21.2.0-next.0",
|
|
4
4
|
"description": "CLI tool for Angular",
|
|
5
5
|
"main": "lib/cli/index.js",
|
|
6
6
|
"bin": {
|
|
@@ -25,40 +25,39 @@
|
|
|
25
25
|
},
|
|
26
26
|
"homepage": "https://github.com/angular/angular-cli",
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@angular-devkit/architect": "0.
|
|
29
|
-
"@angular-devkit/core": "21.
|
|
30
|
-
"@angular-devkit/schematics": "21.
|
|
28
|
+
"@angular-devkit/architect": "0.2102.0-next.0",
|
|
29
|
+
"@angular-devkit/core": "21.2.0-next.0",
|
|
30
|
+
"@angular-devkit/schematics": "21.2.0-next.0",
|
|
31
31
|
"@inquirer/prompts": "7.10.1",
|
|
32
32
|
"@listr2/prompt-adapter-inquirer": "3.0.5",
|
|
33
|
-
"@modelcontextprotocol/sdk": "1.25.
|
|
34
|
-
"@schematics/angular": "21.
|
|
33
|
+
"@modelcontextprotocol/sdk": "1.25.3",
|
|
34
|
+
"@schematics/angular": "21.2.0-next.0",
|
|
35
35
|
"@yarnpkg/lockfile": "1.1.0",
|
|
36
|
-
"algoliasearch": "5.
|
|
36
|
+
"algoliasearch": "5.47.0",
|
|
37
37
|
"ini": "6.0.0",
|
|
38
38
|
"jsonc-parser": "3.3.1",
|
|
39
39
|
"listr2": "9.0.5",
|
|
40
40
|
"npm-package-arg": "13.0.2",
|
|
41
41
|
"pacote": "21.0.4",
|
|
42
42
|
"parse5-html-rewriting-stream": "8.0.0",
|
|
43
|
-
"resolve": "1.22.11",
|
|
44
43
|
"semver": "7.7.3",
|
|
45
44
|
"yargs": "18.0.0",
|
|
46
|
-
"zod": "4.3.
|
|
45
|
+
"zod": "4.3.6"
|
|
47
46
|
},
|
|
48
47
|
"ng-update": {
|
|
49
48
|
"migrations": "@schematics/angular/migrations/migration-collection.json",
|
|
50
49
|
"packageGroup": {
|
|
51
|
-
"@angular/cli": "21.
|
|
52
|
-
"@angular/build": "21.
|
|
53
|
-
"@angular/ssr": "21.
|
|
54
|
-
"@angular-devkit/architect": "0.
|
|
55
|
-
"@angular-devkit/build-angular": "21.
|
|
56
|
-
"@angular-devkit/build-webpack": "0.
|
|
57
|
-
"@angular-devkit/core": "21.
|
|
58
|
-
"@angular-devkit/schematics": "21.
|
|
50
|
+
"@angular/cli": "21.2.0-next.0",
|
|
51
|
+
"@angular/build": "21.2.0-next.0",
|
|
52
|
+
"@angular/ssr": "21.2.0-next.0",
|
|
53
|
+
"@angular-devkit/architect": "0.2102.0-next.0",
|
|
54
|
+
"@angular-devkit/build-angular": "21.2.0-next.0",
|
|
55
|
+
"@angular-devkit/build-webpack": "0.2102.0-next.0",
|
|
56
|
+
"@angular-devkit/core": "21.2.0-next.0",
|
|
57
|
+
"@angular-devkit/schematics": "21.2.0-next.0"
|
|
59
58
|
}
|
|
60
59
|
},
|
|
61
|
-
"packageManager": "pnpm@10.28.
|
|
60
|
+
"packageManager": "pnpm@10.28.2",
|
|
62
61
|
"engines": {
|
|
63
62
|
"node": "^20.19.0 || ^22.12.0 || >=24.0.0",
|
|
64
63
|
"npm": "^6.11.0 || ^7.5.6 || >=8.0.0",
|
|
@@ -5,14 +5,17 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
|
-
import
|
|
8
|
+
import { logging } from '@angular-devkit/core';
|
|
9
9
|
import { EventCustomDimension, EventCustomMetric, PrimitiveTypes } from './analytics-parameters';
|
|
10
10
|
export declare class AnalyticsCollector {
|
|
11
|
-
private
|
|
11
|
+
private logger;
|
|
12
12
|
private trackingEventsQueue;
|
|
13
13
|
private readonly requestParameterStringified;
|
|
14
14
|
private readonly userParameters;
|
|
15
|
-
constructor(
|
|
15
|
+
constructor(logger: logging.Logger, userId: string, packageManagerInfo: {
|
|
16
|
+
name: string;
|
|
17
|
+
version: string | undefined;
|
|
18
|
+
});
|
|
16
19
|
reportWorkspaceInfoEvent(parameters: Partial<Record<EventCustomMetric, string | boolean | number | undefined>>): void;
|
|
17
20
|
reportRebuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;
|
|
18
21
|
reportBuildRunEvent(parameters: Partial<Record<EventCustomMetric & EventCustomDimension, string | boolean | number | undefined>>): void;
|
|
@@ -53,12 +53,12 @@ const analytics_parameters_1 = require("./analytics-parameters");
|
|
|
53
53
|
const TRACKING_ID_PROD = 'G-VETNJBW8L4';
|
|
54
54
|
const TRACKING_ID_STAGING = 'G-TBMPRL1BTM';
|
|
55
55
|
class AnalyticsCollector {
|
|
56
|
-
|
|
56
|
+
logger;
|
|
57
57
|
trackingEventsQueue;
|
|
58
58
|
requestParameterStringified;
|
|
59
59
|
userParameters;
|
|
60
|
-
constructor(
|
|
61
|
-
this.
|
|
60
|
+
constructor(logger, userId, packageManagerInfo) {
|
|
61
|
+
this.logger = logger;
|
|
62
62
|
const requestParameters = {
|
|
63
63
|
[analytics_parameters_1.RequestParameter.ProtocolVersion]: 2,
|
|
64
64
|
[analytics_parameters_1.RequestParameter.ClientId]: userId,
|
|
@@ -81,7 +81,7 @@ class AnalyticsCollector {
|
|
|
81
81
|
}
|
|
82
82
|
this.requestParameterStringified = querystring.stringify(requestParameters);
|
|
83
83
|
const parsedVersion = semver.parse(process.version);
|
|
84
|
-
const packageManagerVersion =
|
|
84
|
+
const packageManagerVersion = packageManagerInfo.version;
|
|
85
85
|
this.userParameters = {
|
|
86
86
|
// While architecture is being collect by GA as UserAgentArchitecture.
|
|
87
87
|
// It doesn't look like there is a way to query this. Therefore we collect this as a custom user dimension too.
|
|
@@ -92,7 +92,7 @@ class AnalyticsCollector {
|
|
|
92
92
|
? `${parsedVersion.major}.${parsedVersion.minor}.${parsedVersion.patch}`
|
|
93
93
|
: 'other',
|
|
94
94
|
[analytics_parameters_1.UserCustomDimension.NodeMajorVersion]: parsedVersion?.major,
|
|
95
|
-
[analytics_parameters_1.UserCustomDimension.PackageManager]:
|
|
95
|
+
[analytics_parameters_1.UserCustomDimension.PackageManager]: packageManagerInfo.name,
|
|
96
96
|
[analytics_parameters_1.UserCustomDimension.PackageManagerVersion]: packageManagerVersion,
|
|
97
97
|
[analytics_parameters_1.UserCustomDimension.PackageManagerMajorVersion]: packageManagerVersion
|
|
98
98
|
? +packageManagerVersion.split('.', 1)[0]
|
|
@@ -148,7 +148,7 @@ class AnalyticsCollector {
|
|
|
148
148
|
}
|
|
149
149
|
async flush() {
|
|
150
150
|
const pendingTrackingEvents = this.trackingEventsQueue;
|
|
151
|
-
this.
|
|
151
|
+
this.logger.debug(`Analytics flush size. ${pendingTrackingEvents?.length}.`);
|
|
152
152
|
if (!pendingTrackingEvents?.length) {
|
|
153
153
|
return;
|
|
154
154
|
}
|
|
@@ -161,7 +161,7 @@ class AnalyticsCollector {
|
|
|
161
161
|
catch (error) {
|
|
162
162
|
// Failure to report analytics shouldn't crash the CLI.
|
|
163
163
|
(0, error_1.assertIsError)(error);
|
|
164
|
-
this.
|
|
164
|
+
this.logger.debug(`Send analytics error. ${error.message}.`);
|
|
165
165
|
}
|
|
166
166
|
}
|
|
167
167
|
async send(data) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analytics-collector.js","sourceRoot":"","sources":["analytics-collector.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"analytics-collector.js","sourceRoot":"","sources":["analytics-collector.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
|
-
import type { CommandContext } from '../command-builder/
|
|
8
|
+
import type { CommandContext } from '../command-builder/definitions';
|
|
9
9
|
/**
|
|
10
10
|
* This is the ultimate safelist for checking if a package name is safe to report to analytics.
|
|
11
11
|
*/
|
|
@@ -5,43 +5,14 @@
|
|
|
5
5
|
* Use of this source code is governed by an MIT-style license that can be
|
|
6
6
|
* found in the LICENSE file at https://angular.dev/license
|
|
7
7
|
*/
|
|
8
|
-
import {
|
|
9
|
-
import type { ArgumentsCamelCase, Argv, CamelCaseKey, CommandModule as YargsCommandModule } from 'yargs';
|
|
8
|
+
import type { ArgumentsCamelCase, Argv, CommandModule as YargsCommandModule } from 'yargs';
|
|
10
9
|
import { AnalyticsCollector } from '../analytics/analytics-collector';
|
|
11
10
|
import { EventCustomDimension, EventCustomMetric } from '../analytics/analytics-parameters';
|
|
12
11
|
import { AngularWorkspace } from '../utilities/config';
|
|
13
|
-
import {
|
|
12
|
+
import { CommandContext, CommandScope, Options, OtherOptions } from './definitions';
|
|
14
13
|
import { Option } from './utilities/json-schema';
|
|
15
|
-
export
|
|
16
|
-
|
|
17
|
-
};
|
|
18
|
-
export declare enum CommandScope {
|
|
19
|
-
/** Command can only run inside an Angular workspace. */
|
|
20
|
-
In = 0,
|
|
21
|
-
/** Command can only run outside an Angular workspace. */
|
|
22
|
-
Out = 1,
|
|
23
|
-
/** Command can run inside and outside an Angular workspace. */
|
|
24
|
-
Both = 2
|
|
25
|
-
}
|
|
26
|
-
export interface CommandContext {
|
|
27
|
-
currentDirectory: string;
|
|
28
|
-
root: string;
|
|
29
|
-
workspace?: AngularWorkspace;
|
|
30
|
-
globalConfiguration: AngularWorkspace;
|
|
31
|
-
logger: logging.Logger;
|
|
32
|
-
packageManager: PackageManagerUtils;
|
|
33
|
-
yargsInstance: Argv<{}>;
|
|
34
|
-
/** Arguments parsed in free-from without parser configuration. */
|
|
35
|
-
args: {
|
|
36
|
-
positional: string[];
|
|
37
|
-
options: {
|
|
38
|
-
help: boolean;
|
|
39
|
-
jsonHelp: boolean;
|
|
40
|
-
getYargsCompletions: boolean;
|
|
41
|
-
} & Record<string, unknown>;
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
export type OtherOptions = Record<string, unknown>;
|
|
14
|
+
export { CommandScope };
|
|
15
|
+
export type { CommandContext, Options, OtherOptions };
|
|
45
16
|
export interface CommandModuleImplementation<T extends {} = {}> extends Omit<YargsCommandModule<{}, T>, 'builder' | 'handler'> {
|
|
46
17
|
/** Scope in which the command can be executed in. */
|
|
47
18
|
scope: CommandScope;
|
|
@@ -6,22 +6,6 @@
|
|
|
6
6
|
* Use of this source code is governed by an MIT-style license that can be
|
|
7
7
|
* found in the LICENSE file at https://angular.dev/license
|
|
8
8
|
*/
|
|
9
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
-
}
|
|
15
|
-
Object.defineProperty(o, k2, desc);
|
|
16
|
-
}) : (function(o, m, k, k2) {
|
|
17
|
-
if (k2 === undefined) k2 = k;
|
|
18
|
-
o[k2] = m[k];
|
|
19
|
-
}));
|
|
20
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
-
}) : function(o, v) {
|
|
23
|
-
o["default"] = v;
|
|
24
|
-
});
|
|
25
9
|
var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
|
|
26
10
|
var useValue = arguments.length > 2;
|
|
27
11
|
for (var i = 0; i < initializers.length; i++) {
|
|
@@ -56,44 +40,20 @@ var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn,
|
|
|
56
40
|
if (target) Object.defineProperty(target, contextIn.name, descriptor);
|
|
57
41
|
done = true;
|
|
58
42
|
};
|
|
59
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
60
|
-
var ownKeys = function(o) {
|
|
61
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
62
|
-
var ar = [];
|
|
63
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
64
|
-
return ar;
|
|
65
|
-
};
|
|
66
|
-
return ownKeys(o);
|
|
67
|
-
};
|
|
68
|
-
return function (mod) {
|
|
69
|
-
if (mod && mod.__esModule) return mod;
|
|
70
|
-
var result = {};
|
|
71
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
72
|
-
__setModuleDefault(result, mod);
|
|
73
|
-
return result;
|
|
74
|
-
};
|
|
75
|
-
})();
|
|
76
43
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
77
44
|
exports.CommandModuleError = exports.CommandModule = exports.CommandScope = void 0;
|
|
78
45
|
const core_1 = require("@angular-devkit/core");
|
|
79
46
|
const node_fs_1 = require("node:fs");
|
|
80
|
-
const
|
|
47
|
+
const node_path_1 = require("node:path");
|
|
81
48
|
const helpers_1 = require("yargs/helpers");
|
|
82
49
|
const analytics_1 = require("../analytics/analytics");
|
|
83
50
|
const analytics_collector_1 = require("../analytics/analytics-collector");
|
|
84
51
|
const analytics_parameters_1 = require("../analytics/analytics-parameters");
|
|
85
52
|
const completion_1 = require("../utilities/completion");
|
|
86
53
|
const memoize_1 = require("../utilities/memoize");
|
|
54
|
+
const definitions_1 = require("./definitions");
|
|
55
|
+
Object.defineProperty(exports, "CommandScope", { enumerable: true, get: function () { return definitions_1.CommandScope; } });
|
|
87
56
|
const json_schema_1 = require("./utilities/json-schema");
|
|
88
|
-
var CommandScope;
|
|
89
|
-
(function (CommandScope) {
|
|
90
|
-
/** Command can only run inside an Angular workspace. */
|
|
91
|
-
CommandScope[CommandScope["In"] = 0] = "In";
|
|
92
|
-
/** Command can only run outside an Angular workspace. */
|
|
93
|
-
CommandScope[CommandScope["Out"] = 1] = "Out";
|
|
94
|
-
/** Command can run inside and outside an Angular workspace. */
|
|
95
|
-
CommandScope[CommandScope["Both"] = 2] = "Both";
|
|
96
|
-
})(CommandScope || (exports.CommandScope = CommandScope = {}));
|
|
97
57
|
let CommandModule = (() => {
|
|
98
58
|
let _instanceExtraInitializers = [];
|
|
99
59
|
let _getAnalytics_decorators;
|
|
@@ -106,7 +66,7 @@ let CommandModule = (() => {
|
|
|
106
66
|
}
|
|
107
67
|
context = __runInitializers(this, _instanceExtraInitializers);
|
|
108
68
|
shouldReportAnalytics = true;
|
|
109
|
-
scope = CommandScope.Both;
|
|
69
|
+
scope = definitions_1.CommandScope.Both;
|
|
110
70
|
optionsWithAnalytics = new Map();
|
|
111
71
|
constructor(context) {
|
|
112
72
|
this.context = context;
|
|
@@ -124,9 +84,7 @@ let CommandModule = (() => {
|
|
|
124
84
|
describe: this.describe,
|
|
125
85
|
...(this.longDescriptionPath
|
|
126
86
|
? {
|
|
127
|
-
longDescriptionRelativePath:
|
|
128
|
-
.relative(path.join(__dirname, '../../../../'), this.longDescriptionPath)
|
|
129
|
-
.replace(/\\/g, path.posix.sep),
|
|
87
|
+
longDescriptionRelativePath: (0, node_path_1.relative)((0, node_path_1.join)(__dirname, '../../../../'), this.longDescriptionPath).replace(/\\/g, node_path_1.posix.sep),
|
|
130
88
|
longDescription: (0, node_fs_1.readFileSync)(this.longDescriptionPath, 'utf8').replace(/\r\n/g, '\n'),
|
|
131
89
|
}
|
|
132
90
|
: {}),
|
|
@@ -182,7 +140,12 @@ let CommandModule = (() => {
|
|
|
182
140
|
const userId = await (0, analytics_1.getAnalyticsUserId)(this.context,
|
|
183
141
|
// Don't prompt on `ng update`, 'ng version' or `ng analytics`.
|
|
184
142
|
['version', 'update', 'analytics'].includes(this.commandName));
|
|
185
|
-
return userId
|
|
143
|
+
return userId
|
|
144
|
+
? new analytics_collector_1.AnalyticsCollector(this.context.logger, userId, {
|
|
145
|
+
name: this.context.packageManager.name,
|
|
146
|
+
version: await this.context.packageManager.getVersion(),
|
|
147
|
+
})
|
|
148
|
+
: undefined;
|
|
186
149
|
}
|
|
187
150
|
/**
|
|
188
151
|
* Adds schema options to a command also this keeps track of options that are required for analytics.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG
|
|
1
|
+
{"version":3,"file":"command-module.js","sourceRoot":"","sources":["command-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,21 +11,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
};
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.runCommand = runCommand;
|
|
14
|
+
const core_1 = require("@angular-devkit/core");
|
|
15
|
+
const promises_1 = require("node:fs/promises");
|
|
16
|
+
const node_path_1 = require("node:path");
|
|
14
17
|
const yargs_1 = __importDefault(require("yargs"));
|
|
15
18
|
const helpers_1 = require("yargs/helpers");
|
|
19
|
+
const utilities_1 = require("../commands/cache/utilities");
|
|
16
20
|
const command_config_1 = require("../commands/command-config");
|
|
21
|
+
const package_managers_1 = require("../package-managers");
|
|
17
22
|
const color_1 = require("../utilities/color");
|
|
18
23
|
const config_1 = require("../utilities/config");
|
|
19
24
|
const error_1 = require("../utilities/error");
|
|
20
|
-
const package_manager_1 = require("../utilities/package-manager");
|
|
21
25
|
const version_1 = require("../utilities/version");
|
|
22
26
|
const command_module_1 = require("./command-module");
|
|
23
27
|
const command_1 = require("./utilities/command");
|
|
24
28
|
const json_help_1 = require("./utilities/json-help");
|
|
25
29
|
const normalize_options_middleware_1 = require("./utilities/normalize-options-middleware");
|
|
26
30
|
async function runCommand(args, logger) {
|
|
27
|
-
const { $0, _, help = false, jsonHelp = false, getYargsCompletions = false, ...rest } = (0, helpers_1.Parser)(args, {
|
|
28
|
-
boolean: ['help', 'json-help', 'get-yargs-completions'],
|
|
31
|
+
const { $0, _, help = false, dryRun = false, jsonHelp = false, getYargsCompletions = false, ...rest } = (0, helpers_1.Parser)(args, {
|
|
32
|
+
boolean: ['help', 'json-help', 'get-yargs-completions', 'dry-run'],
|
|
29
33
|
alias: { 'collection': 'c' },
|
|
30
34
|
});
|
|
31
35
|
// When `getYargsCompletions` is true the scriptName 'ng' at index 0 is not removed.
|
|
@@ -44,6 +48,14 @@ async function runCommand(args, logger) {
|
|
|
44
48
|
return 1;
|
|
45
49
|
}
|
|
46
50
|
const root = workspace?.basePath ?? process.cwd();
|
|
51
|
+
const cacheConfig = workspace && (0, utilities_1.getCacheConfig)(workspace);
|
|
52
|
+
const packageManager = await (0, package_managers_1.createPackageManager)({
|
|
53
|
+
cwd: root,
|
|
54
|
+
logger,
|
|
55
|
+
dryRun: dryRun || help || jsonHelp || getYargsCompletions,
|
|
56
|
+
tempDirectory: cacheConfig?.enabled ? cacheConfig.path : undefined,
|
|
57
|
+
configuredPackageManager: await getConfiguredPackageManager(root, workspace, globalConfiguration),
|
|
58
|
+
});
|
|
47
59
|
const localYargs = (0, yargs_1.default)(args);
|
|
48
60
|
const context = {
|
|
49
61
|
globalConfiguration,
|
|
@@ -52,7 +64,7 @@ async function runCommand(args, logger) {
|
|
|
52
64
|
currentDirectory: process.cwd(),
|
|
53
65
|
yargsInstance: localYargs,
|
|
54
66
|
root,
|
|
55
|
-
packageManager
|
|
67
|
+
packageManager,
|
|
56
68
|
args: {
|
|
57
69
|
positional: positional.map((v) => v.toString()),
|
|
58
70
|
options: {
|
|
@@ -137,4 +149,47 @@ async function getCommandsToRegister(commandName) {
|
|
|
137
149
|
}
|
|
138
150
|
return Promise.all(commands.map((command) => command.factory().then((m) => m.default)));
|
|
139
151
|
}
|
|
152
|
+
/**
|
|
153
|
+
* Gets the configured package manager by checking package.json, or the local and global angular.json files.
|
|
154
|
+
*
|
|
155
|
+
* @param root The root directory of the workspace.
|
|
156
|
+
* @param localWorkspace The local workspace.
|
|
157
|
+
* @param globalWorkspace The global workspace.
|
|
158
|
+
* @returns The package manager name and version.
|
|
159
|
+
*/
|
|
160
|
+
async function getConfiguredPackageManager(root, localWorkspace, globalWorkspace) {
|
|
161
|
+
let result;
|
|
162
|
+
try {
|
|
163
|
+
const packageJsonPath = (0, node_path_1.join)(root, 'package.json');
|
|
164
|
+
const pkgJson = JSON.parse(await (0, promises_1.readFile)(packageJsonPath, 'utf-8'));
|
|
165
|
+
result = getPackageManager(pkgJson);
|
|
166
|
+
}
|
|
167
|
+
catch { }
|
|
168
|
+
if (result) {
|
|
169
|
+
return result;
|
|
170
|
+
}
|
|
171
|
+
if (localWorkspace) {
|
|
172
|
+
const project = (0, config_1.getProjectByCwd)(localWorkspace);
|
|
173
|
+
if (project) {
|
|
174
|
+
result = getPackageManager(localWorkspace.projects.get(project)?.extensions['cli']);
|
|
175
|
+
}
|
|
176
|
+
result ??= getPackageManager(localWorkspace.extensions['cli']);
|
|
177
|
+
}
|
|
178
|
+
result ??= getPackageManager(globalWorkspace.extensions['cli']);
|
|
179
|
+
return result;
|
|
180
|
+
}
|
|
181
|
+
/**
|
|
182
|
+
* Get the package manager name from a JSON value.
|
|
183
|
+
* @param source The JSON value to get the package manager name from.
|
|
184
|
+
* @returns The package manager name and version.
|
|
185
|
+
*/
|
|
186
|
+
function getPackageManager(source) {
|
|
187
|
+
if (source && (0, core_1.isJsonObject)(source)) {
|
|
188
|
+
const value = source['packageManager'];
|
|
189
|
+
if (typeof value === 'string') {
|
|
190
|
+
return value.split('@', 2);
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
return undefined;
|
|
194
|
+
}
|
|
140
195
|
//# sourceMappingURL=command-runner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["command-runner.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;
|
|
1
|
+
{"version":3,"file":"command-runner.js","sourceRoot":"","sources":["command-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
7
|
+
*/
|
|
8
|
+
import { logging } from '@angular-devkit/core';
|
|
9
|
+
import type { Argv, CamelCaseKey } from 'yargs';
|
|
10
|
+
import type { PackageManager } from '../package-managers/package-manager';
|
|
11
|
+
import { AngularWorkspace } from '../utilities/config';
|
|
12
|
+
export declare enum CommandScope {
|
|
13
|
+
/** Command can only run inside an Angular workspace. */
|
|
14
|
+
In = 0,
|
|
15
|
+
/** Command can only run outside an Angular workspace. */
|
|
16
|
+
Out = 1,
|
|
17
|
+
/** Command can run inside and outside an Angular workspace. */
|
|
18
|
+
Both = 2
|
|
19
|
+
}
|
|
20
|
+
export interface CommandContext {
|
|
21
|
+
currentDirectory: string;
|
|
22
|
+
root: string;
|
|
23
|
+
workspace?: AngularWorkspace;
|
|
24
|
+
globalConfiguration: AngularWorkspace;
|
|
25
|
+
logger: logging.Logger;
|
|
26
|
+
packageManager: PackageManager;
|
|
27
|
+
yargsInstance: Argv<{}>;
|
|
28
|
+
/** Arguments parsed in free-from without parser configuration. */
|
|
29
|
+
args: {
|
|
30
|
+
positional: string[];
|
|
31
|
+
options: {
|
|
32
|
+
help: boolean;
|
|
33
|
+
jsonHelp: boolean;
|
|
34
|
+
getYargsCompletions: boolean;
|
|
35
|
+
} & Record<string, unknown>;
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
export type Options<T> = {
|
|
39
|
+
[key in keyof T as CamelCaseKey<key>]: T[key];
|
|
40
|
+
};
|
|
41
|
+
export type OtherOptions = Record<string, unknown>;
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* @license
|
|
4
|
+
* Copyright Google LLC All Rights Reserved.
|
|
5
|
+
*
|
|
6
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
7
|
+
* found in the LICENSE file at https://angular.dev/license
|
|
8
|
+
*/
|
|
9
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
|
+
exports.CommandScope = void 0;
|
|
11
|
+
var CommandScope;
|
|
12
|
+
(function (CommandScope) {
|
|
13
|
+
/** Command can only run inside an Angular workspace. */
|
|
14
|
+
CommandScope[CommandScope["In"] = 0] = "In";
|
|
15
|
+
/** Command can only run outside an Angular workspace. */
|
|
16
|
+
CommandScope[CommandScope["Out"] = 1] = "Out";
|
|
17
|
+
/** Command can run inside and outside an Angular workspace. */
|
|
18
|
+
CommandScope[CommandScope["Both"] = 2] = "Both";
|
|
19
|
+
})(CommandScope || (exports.CommandScope = CommandScope = {}));
|
|
20
|
+
//# sourceMappingURL=definitions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"definitions.js","sourceRoot":"","sources":["definitions.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAOH,IAAY,YASX;AATD,WAAY,YAAY;IACtB,wDAAwD;IACxD,2CAAE,CAAA;IAEF,yDAAyD;IACzD,6CAAG,CAAA;IAEH,+DAA+D;IAC/D,+CAAI,CAAA;AACN,CAAC,EATW,YAAY,4BAAZ,YAAY,QASvB"}
|
|
@@ -87,6 +87,7 @@ const memoize_1 = require("../utilities/memoize");
|
|
|
87
87
|
const tty_1 = require("../utilities/tty");
|
|
88
88
|
const command_module_1 = require("./command-module");
|
|
89
89
|
const json_schema_1 = require("./utilities/json-schema");
|
|
90
|
+
const prettier_1 = require("./utilities/prettier");
|
|
90
91
|
const schematic_engine_host_1 = require("./utilities/schematic-engine-host");
|
|
91
92
|
const schematic_workflow_1 = require("./utilities/schematic-workflow");
|
|
92
93
|
exports.DEFAULT_SCHEMATICS_COLLECTION = '@schematics/angular';
|
|
@@ -345,7 +346,19 @@ let SchematicsCommandModule = (() => {
|
|
|
345
346
|
}
|
|
346
347
|
if (executionOptions.dryRun) {
|
|
347
348
|
logger.warn(`\nNOTE: The "--dry-run" option means no changes were made.`);
|
|
349
|
+
return 0;
|
|
348
350
|
}
|
|
351
|
+
if (files.size) {
|
|
352
|
+
// Note: we could use a task executor to format the files but this is simpler.
|
|
353
|
+
try {
|
|
354
|
+
await (0, prettier_1.formatFiles)(this.context.root, files);
|
|
355
|
+
}
|
|
356
|
+
catch (error) {
|
|
357
|
+
(0, error_1.assertIsError)(error);
|
|
358
|
+
logger.warn(`WARNING: Formatting of files failed with the following error: ${error.message}`);
|
|
359
|
+
}
|
|
360
|
+
}
|
|
361
|
+
return 0;
|
|
349
362
|
}
|
|
350
363
|
catch (err) {
|
|
351
364
|
// In case the workflow was not successful, show an appropriate error message.
|
|
@@ -362,7 +375,6 @@ let SchematicsCommandModule = (() => {
|
|
|
362
375
|
finally {
|
|
363
376
|
unsubscribe();
|
|
364
377
|
}
|
|
365
|
-
return 0;
|
|
366
378
|
}
|
|
367
379
|
getProjectName() {
|
|
368
380
|
const { workspace } = this.context;
|