Skip to content

refactor(@angular/cli): replace command line arguments parser #22778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions goldens/circular-deps/packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,25 @@
[
"packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts",
"packages/angular_devkit/build_angular/src/webpack/utils/stats.ts"
],
[
"packages/angular/cli/src/commands/add/add-impl.ts",
"packages/angular/cli/src/commands/add/cli.ts"
],
[
"packages/angular/cli/src/commands/config/cli.ts",
"packages/angular/cli/src/commands/config/config-impl.ts"
],
[
"packages/angular/cli/src/commands/generate/cli.ts",
"packages/angular/cli/src/commands/generate/generate-impl.ts"
],
[
"packages/angular/cli/src/commands/new/cli.ts",
"packages/angular/cli/src/commands/new/new-impl.ts"
],
[
"packages/angular/cli/src/commands/update/cli.ts",
"packages/angular/cli/src/commands/update/update-impl.ts"
]
]
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
"@types/semver": "^7.0.0",
"@types/text-table": "^0.2.1",
"@types/uuid": "^8.0.0",
"@types/yargs": "^17.0.8",
"@types/yargs-parser": "^21.0.0",
"@typescript-eslint/eslint-plugin": "5.14.0",
"@typescript-eslint/parser": "5.14.0",
Expand Down Expand Up @@ -216,6 +217,7 @@
"webpack-dev-server": "4.7.4",
"webpack-merge": "5.8.0",
"webpack-subresource-integrity": "5.1.0",
"yargs": "17.3.1",
"yargs-parser": "21.0.1",
"zone.js": "^0.11.3"
}
Expand Down
164 changes: 2 additions & 162 deletions packages/angular/cli/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,6 @@ ts_library(
# @external_begin
# These files are generated from the JSON schema
"//packages/angular/cli:lib/config/workspace-schema.ts",
"//packages/angular/cli:commands/analytics.ts",
"//packages/angular/cli:commands/add.ts",
"//packages/angular/cli:commands/build.ts",
"//packages/angular/cli:commands/deploy.ts",
"//packages/angular/cli:commands/config.ts",
"//packages/angular/cli:commands/doc.ts",
"//packages/angular/cli:commands/e2e.ts",
"//packages/angular/cli:commands/easter-egg.ts",
"//packages/angular/cli:commands/generate.ts",
"//packages/angular/cli:commands/help.ts",
"//packages/angular/cli:commands/lint.ts",
"//packages/angular/cli:commands/new.ts",
"//packages/angular/cli:commands/serve.ts",
"//packages/angular/cli:commands/test.ts",
"//packages/angular/cli:commands/update.ts",
"//packages/angular/cli:commands/version.ts",
"//packages/angular/cli:commands/run.ts",
"//packages/angular/cli:commands/extract-i18n.ts",
"//packages/angular/cli:src/commands/update/schematic/schema.ts",
# @external_end
],
Expand Down Expand Up @@ -79,6 +61,7 @@ ts_library(
"@npm//@types/resolve",
"@npm//@types/semver",
"@npm//@types/uuid",
"@npm//@types/yargs",
"@npm//@yarnpkg/lockfile",
"@npm//ansi-colors",
"@npm//ini",
Expand All @@ -88,6 +71,7 @@ ts_library(
"@npm//ora",
"@npm//pacote",
"@npm//semver",
"@npm//yargs",
],
)

Expand Down Expand Up @@ -132,150 +116,6 @@ ts_json_schema(
data = CLI_SCHEMA_DATA,
)

ts_json_schema(
name = "analytics_schema",
src = "commands/analytics.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "add_schema",
src = "commands/add.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "build_schema",
src = "commands/build.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "deploy_schema",
src = "commands/deploy.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "config_schema",
src = "commands/config.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "doc_schema",
src = "commands/doc.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "e2e_schema",
src = "commands/e2e.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "easter_egg_schema",
src = "commands/easter-egg.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "generate_schema",
src = "commands/generate.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "help_schema",
src = "commands/help.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "lint_schema",
src = "commands/lint.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "new_schema",
src = "commands/new.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "run_schema",
src = "commands/run.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "serve_schema",
src = "commands/serve.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "test_schema",
src = "commands/test.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "update_schema",
src = "commands/update.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "version_schema",
src = "commands/version.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "extract-i18n_schema",
src = "commands/extract-i18n.json",
data = [
"commands/definitions.json",
],
)

ts_json_schema(
name = "update_schematic_schema",
src = "src/commands/update/schematic/schema.json",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular/cli/bin/postinstall/analytics-prompt.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if ('NG_CLI_ANALYTICS' in process.env) {
}

try {
var analytics = require('../../models/analytics');
var analytics = require('../../src/analytics/analytics');

analytics
.hasGlobalAnalyticsConfiguration()
Expand Down
20 changes: 0 additions & 20 deletions packages/angular/cli/commands.json

This file was deleted.

54 changes: 0 additions & 54 deletions packages/angular/cli/commands/add.json

This file was deleted.

Loading