From ca8969b946254a8eacc38ea996a356b41cb81f07 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Wed, 10 Apr 2024 12:49:40 -0700 Subject: [PATCH] Revert "docs(docs-infra): move CLI docs to ADEV (#55242)" (#55291) This reverts commit 4d2a8005e89a711c56656ac6e65ef5ae21be6377. PR Close #55291 --- .github/workflows/update-cli-help.yml | 2 +- adev/scripts/update-cli-help/README.md | 3 --- adev/src/assets/BUILD.bazel | 4 ++-- {adev/src => aio}/content/cli/BUILD.bazel | 4 ++-- {adev/src => aio}/content/cli/help/BUILD.bazel | 0 {adev/src => aio}/content/cli/help/add.json | 0 {adev/src => aio}/content/cli/help/analytics.json | 0 {adev/src => aio}/content/cli/help/build-info.json | 0 {adev/src => aio}/content/cli/help/build.json | 0 {adev/src => aio}/content/cli/help/cache.json | 0 {adev/src => aio}/content/cli/help/completion.json | 0 {adev/src => aio}/content/cli/help/config.json | 0 {adev/src => aio}/content/cli/help/deploy.json | 0 {adev/src => aio}/content/cli/help/doc.json | 0 {adev/src => aio}/content/cli/help/e2e.json | 0 {adev/src => aio}/content/cli/help/extract-i18n.json | 0 {adev/src => aio}/content/cli/help/generate.json | 0 {adev/src => aio}/content/cli/help/lint.json | 0 {adev/src => aio}/content/cli/help/new.json | 0 {adev/src => aio}/content/cli/help/run.json | 0 {adev/src => aio}/content/cli/help/serve.json | 0 {adev/src => aio}/content/cli/help/test.json | 0 {adev/src => aio}/content/cli/help/update.json | 0 {adev/src => aio}/content/cli/help/version.json | 0 {adev/src => aio}/content/cli/index.md | 0 aio/scripts/update-cli-help/README.md | 3 +++ {adev => aio}/scripts/update-cli-help/index.mjs | 2 +- 27 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 adev/scripts/update-cli-help/README.md rename {adev/src => aio}/content/cli/BUILD.bazel (67%) rename {adev/src => aio}/content/cli/help/BUILD.bazel (100%) rename {adev/src => aio}/content/cli/help/add.json (100%) rename {adev/src => aio}/content/cli/help/analytics.json (100%) rename {adev/src => aio}/content/cli/help/build-info.json (100%) rename {adev/src => aio}/content/cli/help/build.json (100%) rename {adev/src => aio}/content/cli/help/cache.json (100%) rename {adev/src => aio}/content/cli/help/completion.json (100%) rename {adev/src => aio}/content/cli/help/config.json (100%) rename {adev/src => aio}/content/cli/help/deploy.json (100%) rename {adev/src => aio}/content/cli/help/doc.json (100%) rename {adev/src => aio}/content/cli/help/e2e.json (100%) rename {adev/src => aio}/content/cli/help/extract-i18n.json (100%) rename {adev/src => aio}/content/cli/help/generate.json (100%) rename {adev/src => aio}/content/cli/help/lint.json (100%) rename {adev/src => aio}/content/cli/help/new.json (100%) rename {adev/src => aio}/content/cli/help/run.json (100%) rename {adev/src => aio}/content/cli/help/serve.json (100%) rename {adev/src => aio}/content/cli/help/test.json (100%) rename {adev/src => aio}/content/cli/help/update.json (100%) rename {adev/src => aio}/content/cli/help/version.json (100%) rename {adev/src => aio}/content/cli/index.md (100%) create mode 100644 aio/scripts/update-cli-help/README.md rename {adev => aio}/scripts/update-cli-help/index.mjs (98%) diff --git a/.github/workflows/update-cli-help.yml b/.github/workflows/update-cli-help.yml index 7ae1b273a8c..93de71e7f96 100644 --- a/.github/workflows/update-cli-help.yml +++ b/.github/workflows/update-cli-help.yml @@ -28,7 +28,7 @@ jobs: # This is needed as otherwise the PR creation will fail with `shallow update not allowed` when the forked branch is not in sync. fetch-depth: 0 - name: Generate CLI help - run: node adev/scripts/update-cli-help/index.mjs + run: node aio/scripts/update-cli-help/index.mjs env: ANGULAR_CLI_BUILDS_READONLY_GITHUB_TOKEN: ${{ secrets.ANGULAR_CLI_BUILDS_READONLY_GITHUB_TOKEN }} - name: Create a PR (if necessary) diff --git a/adev/scripts/update-cli-help/README.md b/adev/scripts/update-cli-help/README.md deleted file mode 100644 index a2844a52240..00000000000 --- a/adev/scripts/update-cli-help/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Generating data for `angular.dev/cli` - -This script updates the Angular CLI help JSON files stored in `adev/src/content/cli/help`. This files are used to generate the [angular.dev CLI](https://angular.dev/cli) pages. diff --git a/adev/src/assets/BUILD.bazel b/adev/src/assets/BUILD.bazel index 08ed332d28e..16ccc835ab5 100644 --- a/adev/src/assets/BUILD.bazel +++ b/adev/src/assets/BUILD.bazel @@ -8,7 +8,6 @@ copy_to_directory( "//adev/src/content", "//adev/src/content/best-practices", "//adev/src/content/best-practices/runtime-performance", - "//adev/src/content/cli/help:cli_docs", "//adev/src/content/ecosystem", "//adev/src/content/ecosystem/service-workers", "//adev/src/content/guide", @@ -39,6 +38,7 @@ copy_to_directory( "//adev/src/content/tutorials", "//adev/src/content/tutorials/first-app:first-app-guides", "//adev/src/content/tutorials/learn-angular:learn-angular-guides", + "//aio/content/cli/help:cli_docs", "//packages/animations:animations_docs", "//packages/animations/browser:animations_browser_docs", "//packages/animations/browser/testing:animations_browser_testing_docs", @@ -74,7 +74,7 @@ copy_to_directory( "//tools/manual_api_docs/elements:elements_docs", ], replace_prefixes = { - "adev/src/content/cli/**/": "cli/", + "aio/content/cli/**/": "cli/", "adev/src/content": "", "packages/**/": "api/", "tools/**/": "api/", diff --git a/adev/src/content/cli/BUILD.bazel b/aio/content/cli/BUILD.bazel similarity index 67% rename from adev/src/content/cli/BUILD.bazel rename to aio/content/cli/BUILD.bazel index 1e2db063cf4..56bbe48b43b 100644 --- a/adev/src/content/cli/BUILD.bazel +++ b/aio/content/cli/BUILD.bazel @@ -8,7 +8,7 @@ filegroup( "BUILD.bazel", ], ) + [ - "//adev/src/content/cli/help", - "//adev/src/content/cli/help:build-info.json", + "//aio/content/cli/help", + "//aio/content/cli/help:build-info.json", ], ) diff --git a/adev/src/content/cli/help/BUILD.bazel b/aio/content/cli/help/BUILD.bazel similarity index 100% rename from adev/src/content/cli/help/BUILD.bazel rename to aio/content/cli/help/BUILD.bazel diff --git a/adev/src/content/cli/help/add.json b/aio/content/cli/help/add.json similarity index 100% rename from adev/src/content/cli/help/add.json rename to aio/content/cli/help/add.json diff --git a/adev/src/content/cli/help/analytics.json b/aio/content/cli/help/analytics.json similarity index 100% rename from adev/src/content/cli/help/analytics.json rename to aio/content/cli/help/analytics.json diff --git a/adev/src/content/cli/help/build-info.json b/aio/content/cli/help/build-info.json similarity index 100% rename from adev/src/content/cli/help/build-info.json rename to aio/content/cli/help/build-info.json diff --git a/adev/src/content/cli/help/build.json b/aio/content/cli/help/build.json similarity index 100% rename from adev/src/content/cli/help/build.json rename to aio/content/cli/help/build.json diff --git a/adev/src/content/cli/help/cache.json b/aio/content/cli/help/cache.json similarity index 100% rename from adev/src/content/cli/help/cache.json rename to aio/content/cli/help/cache.json diff --git a/adev/src/content/cli/help/completion.json b/aio/content/cli/help/completion.json similarity index 100% rename from adev/src/content/cli/help/completion.json rename to aio/content/cli/help/completion.json diff --git a/adev/src/content/cli/help/config.json b/aio/content/cli/help/config.json similarity index 100% rename from adev/src/content/cli/help/config.json rename to aio/content/cli/help/config.json diff --git a/adev/src/content/cli/help/deploy.json b/aio/content/cli/help/deploy.json similarity index 100% rename from adev/src/content/cli/help/deploy.json rename to aio/content/cli/help/deploy.json diff --git a/adev/src/content/cli/help/doc.json b/aio/content/cli/help/doc.json similarity index 100% rename from adev/src/content/cli/help/doc.json rename to aio/content/cli/help/doc.json diff --git a/adev/src/content/cli/help/e2e.json b/aio/content/cli/help/e2e.json similarity index 100% rename from adev/src/content/cli/help/e2e.json rename to aio/content/cli/help/e2e.json diff --git a/adev/src/content/cli/help/extract-i18n.json b/aio/content/cli/help/extract-i18n.json similarity index 100% rename from adev/src/content/cli/help/extract-i18n.json rename to aio/content/cli/help/extract-i18n.json diff --git a/adev/src/content/cli/help/generate.json b/aio/content/cli/help/generate.json similarity index 100% rename from adev/src/content/cli/help/generate.json rename to aio/content/cli/help/generate.json diff --git a/adev/src/content/cli/help/lint.json b/aio/content/cli/help/lint.json similarity index 100% rename from adev/src/content/cli/help/lint.json rename to aio/content/cli/help/lint.json diff --git a/adev/src/content/cli/help/new.json b/aio/content/cli/help/new.json similarity index 100% rename from adev/src/content/cli/help/new.json rename to aio/content/cli/help/new.json diff --git a/adev/src/content/cli/help/run.json b/aio/content/cli/help/run.json similarity index 100% rename from adev/src/content/cli/help/run.json rename to aio/content/cli/help/run.json diff --git a/adev/src/content/cli/help/serve.json b/aio/content/cli/help/serve.json similarity index 100% rename from adev/src/content/cli/help/serve.json rename to aio/content/cli/help/serve.json diff --git a/adev/src/content/cli/help/test.json b/aio/content/cli/help/test.json similarity index 100% rename from adev/src/content/cli/help/test.json rename to aio/content/cli/help/test.json diff --git a/adev/src/content/cli/help/update.json b/aio/content/cli/help/update.json similarity index 100% rename from adev/src/content/cli/help/update.json rename to aio/content/cli/help/update.json diff --git a/adev/src/content/cli/help/version.json b/aio/content/cli/help/version.json similarity index 100% rename from adev/src/content/cli/help/version.json rename to aio/content/cli/help/version.json diff --git a/adev/src/content/cli/index.md b/aio/content/cli/index.md similarity index 100% rename from adev/src/content/cli/index.md rename to aio/content/cli/index.md diff --git a/aio/scripts/update-cli-help/README.md b/aio/scripts/update-cli-help/README.md new file mode 100644 index 00000000000..4a727b88250 --- /dev/null +++ b/aio/scripts/update-cli-help/README.md @@ -0,0 +1,3 @@ +# Generating data for `angular.io/cli` + +This script updates the Angular CLI help JSON files stored in `aio/content/cli/help`. This files are used to generate the [angular.io CLI](https://angular.io/cli) pages. diff --git a/adev/scripts/update-cli-help/index.mjs b/aio/scripts/update-cli-help/index.mjs similarity index 98% rename from adev/scripts/update-cli-help/index.mjs rename to aio/scripts/update-cli-help/index.mjs index 30eb8206459..e2f710f2902 100644 --- a/adev/scripts/update-cli-help/index.mjs +++ b/aio/scripts/update-cli-help/index.mjs @@ -11,7 +11,7 @@ const CLI_BUILDS_REPO = 'angular/cli-builds'; const GITHUB_API_CLI_BUILDS = posix.join(GITHUB_API, CLI_BUILDS_REPO); const scriptDir = dirname(fileURLToPath(import.meta.url)); -const CLI_HELP_CONTENT_PATH = resolvePath(scriptDir, '../../src/content/cli/help'); +const CLI_HELP_CONTENT_PATH = resolvePath(scriptDir, '../../content/cli/help'); const CLI_SHA_PATH = join(CLI_HELP_CONTENT_PATH, 'build-info.json'); async function main() {