diff --git a/.bazelrc b/.bazelrc index ef377b58e1..7fe46b56c2 100644 --- a/.bazelrc +++ b/.bazelrc @@ -118,8 +118,8 @@ build:remote --jobs=150 # Setup the toolchain and platform for the remote build execution. The platform # is provided by the shared dev-infra package and targets k8 remote containers. -build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite -build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain +build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite +build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain build:remote --extra_execution_platforms=//tools:rbe_platform_with_network_access build:remote --host_platform=//tools:rbe_platform_with_network_access build:remote --platforms=//tools:rbe_platform_with_network_access diff --git a/.ng-dev/caretaker.mts b/.ng-dev/caretaker.mts index 4feac7d530..aeea38ccf3 100644 --- a/.ng-dev/caretaker.mts +++ b/.ng-dev/caretaker.mts @@ -1,4 +1,4 @@ -import { CaretakerConfig } from '@angular/dev-infra-private/ng-dev'; +import { CaretakerConfig } from '@angular/ng-dev'; /** The configuration for `ng-dev caretaker` commands. */ export const caretaker: CaretakerConfig = { diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts index c8a3bcb800..2dd960387e 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mts @@ -1,4 +1,4 @@ -import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev'; +import { CommitMessageConfig } from '@angular/ng-dev'; import packages from '../lib/packages.js'; /** diff --git a/.ng-dev/format.mts b/.ng-dev/format.mts index 8e06c3bb99..3cba8e9830 100644 --- a/.ng-dev/format.mts +++ b/.ng-dev/format.mts @@ -1,4 +1,4 @@ -import { FormatConfig } from '@angular/dev-infra-private/ng-dev'; +import { FormatConfig } from '@angular/ng-dev'; /** * Configuration for the `ng-dev format` command. diff --git a/.ng-dev/github.mts b/.ng-dev/github.mts index 60cc4be968..b7d89780ba 100644 --- a/.ng-dev/github.mts +++ b/.ng-dev/github.mts @@ -1,4 +1,4 @@ -import { GithubConfig } from '@angular/dev-infra-private/ng-dev'; +import { GithubConfig } from '@angular/ng-dev'; /** * Github configuration for the ng-dev command. This repository is diff --git a/.ng-dev/pull-request.mts b/.ng-dev/pull-request.mts index 3d8c5e19d6..6bbdae4b87 100644 --- a/.ng-dev/pull-request.mts +++ b/.ng-dev/pull-request.mts @@ -1,4 +1,4 @@ -import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev'; +import { PullRequestConfig } from '@angular/ng-dev'; /** * Configuration for the merge tool in `ng-dev`. This sets up the labels which diff --git a/.ng-dev/release.mts b/.ng-dev/release.mts index 95f857d1e0..8e2e2333b1 100644 --- a/.ng-dev/release.mts +++ b/.ng-dev/release.mts @@ -1,6 +1,6 @@ import '../lib/bootstrap-local.js'; -import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev'; +import { ReleaseConfig } from '@angular/ng-dev'; import packages from '../lib/packages.js'; import buildPackages from '../scripts/build.js'; diff --git a/package.json b/package.json index 4bac314c5e..06d8b2dfcd 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "build:bazel": "node ./bin/devkit-admin build-bazel", "build-tsc": "tsc -p tsconfig.json", "lint": "eslint --cache --max-warnings=0 \"**/*.ts\"", - "ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs", + "ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/ng-dev/bundles/cli.mjs", "templates": "node ./bin/devkit-admin templates", "validate": "node ./bin/devkit-admin validate", "postinstall": "yarn webdriver-update && yarn husky install", @@ -66,15 +66,16 @@ "devDependencies": { "@ampproject/remapping": "2.2.0", "@angular/animations": "14.1.0", + "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd", "@angular/cdk": "14.1.0", "@angular/common": "14.1.0", "@angular/compiler": "14.1.0", "@angular/compiler-cli": "14.1.0", "@angular/core": "14.1.0", - "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#b2da73b3dddddd6a253ee8ea48ef387b20f5aedf", "@angular/forms": "14.1.0", "@angular/localize": "14.1.0", "@angular/material": "14.1.0", + "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a", "@angular/platform-browser": "14.1.0", "@angular/platform-browser-dynamic": "14.1.0", "@angular/platform-server": "14.1.0", diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index 81b5eaf165..d01ef9b036 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -8,7 +8,7 @@ load("//tools:defaults.bzl", "pkg_npm", "ts_library") # @external_begin load("//tools:ts_json_schema.bzl", "ts_json_schema") -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") # @external_end licenses(["notice"]) # MIT diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel index 2465b9bf7f..52fc3b73e1 100644 --- a/packages/angular_devkit/build_angular/BUILD.bazel +++ b/packages/angular_devkit/build_angular/BUILD.bazel @@ -6,7 +6,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") load("//tools:defaults.bzl", "pkg_npm", "ts_library") load("//tools:ts_json_schema.bzl", "ts_json_schema") -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") licenses(["notice"]) # MIT diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel index 0c57feb90f..2cbde79ccf 100644 --- a/packages/angular_devkit/build_webpack/BUILD.bazel +++ b/packages/angular_devkit/build_webpack/BUILD.bazel @@ -6,7 +6,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") load("//tools:defaults.bzl", "pkg_npm", "ts_library") load("//tools:ts_json_schema.bzl", "ts_json_schema") -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") licenses(["notice"]) # MIT diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel index 77f0175f15..2ef8dcfcd0 100644 --- a/packages/angular_devkit/core/BUILD.bazel +++ b/packages/angular_devkit/core/BUILD.bazel @@ -2,7 +2,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") load("//tools:defaults.bzl", "pkg_npm", "ts_library") # @external_begin -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") # @external_end # Copyright Google Inc. All Rights Reserved. diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel index 7feda19e6c..b0ee2bcc10 100644 --- a/packages/angular_devkit/schematics/BUILD.bazel +++ b/packages/angular_devkit/schematics/BUILD.bazel @@ -2,7 +2,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") load("//tools:defaults.bzl", "pkg_npm", "ts_library") # @external_begin -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") # @external_end # Copyright Google Inc. All Rights Reserved. diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel index 5031fd5b26..9ee6ba2258 100644 --- a/packages/ngtools/webpack/BUILD.bazel +++ b/packages/ngtools/webpack/BUILD.bazel @@ -5,7 +5,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test") load("//tools:defaults.bzl", "pkg_npm", "ts_library") -load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package") +load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") licenses(["notice"]) # MIT diff --git a/scripts/templates.ts b/scripts/templates.ts index 432dfd6cf6..914daf6938 100644 --- a/scripts/templates.ts +++ b/scripts/templates.ts @@ -18,7 +18,7 @@ async function _runTemplate(inputPath: string, outputPath: string, logger: loggi // TODO(ESM): Consider making this an actual import statement. const { COMMIT_TYPES, ScopeRequirement } = await new Function( - `return import('@angular/dev-infra-private/ng-dev');`, + `return import('@angular/ng-dev');`, )(); const template = require(inputPath).default; diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 22bdbd33f1..cecdad25f8 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -34,7 +34,7 @@ platform( exec_properties = { "dockerNetwork": "standard", }, - parents = ["@npm//@angular/dev-infra-private/bazel/remote-execution:platform"], + parents = ["@npm//@angular/build-tooling/bazel/remote-execution:platform"], ) # @external_end diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 4aa686bfaf..5a92fc5a0d 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -3,7 +3,7 @@ load("@npm//@bazel/concatjs/internal:build_defs.bzl", _ts_library = "ts_library_macro") load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", _js_library = "js_library", _pkg_npm = "pkg_npm") load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("@npm//@angular/dev-infra-private/bazel:extract_js_module_output.bzl", "extract_js_module_output") +load("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl", "extract_js_module_output") load("@aspect_bazel_lib//lib:utils.bzl", "to_label") load("@aspect_bazel_lib//lib:jq.bzl", "jq") load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory") diff --git a/yarn.lock b/yarn.lock index 75d3a418e0..c258ab0c62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -122,6 +122,42 @@ "@angular/core" "^13.0.0 || ^14.0.0-0" reflect-metadata "^0.1.13" +"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd": + version "0.0.0-fa61d03a603e04af2b66f3598f1af01da1e1cfb1" + resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd" + dependencies: + "@angular-devkit/build-angular" "14.1.0-rc.3" + "@angular/benchpress" "0.3.0" + "@babel/core" "^7.16.0" + "@bazel/buildifier" "5.1.0" + "@bazel/concatjs" "5.5.2" + "@bazel/esbuild" "5.5.2" + "@bazel/protractor" "5.5.2" + "@bazel/runfiles" "5.5.2" + "@bazel/terser" "5.5.2" + "@bazel/typescript" "5.5.2" + "@microsoft/api-extractor" "7.28.4" + "@types/browser-sync" "^2.26.3" + "@types/node" "16.10.9" + "@types/selenium-webdriver" "^4.0.18" + "@types/send" "^0.17.1" + "@types/tmp" "^0.2.1" + "@types/uuid" "^8.3.1" + "@types/yargs" "^17.0.0" + browser-sync "^2.27.7" + clang-format "1.8.0" + prettier "2.7.1" + protractor "^7.0.0" + selenium-webdriver "4.3.1" + send "^0.18.0" + source-map "^0.7.4" + tmp "^0.2.1" + "true-case-path" "^2.2.1" + tslib "^2.3.0" + typescript "~4.7.3" + uuid "^8.3.2" + yargs "^17.0.0" + "@angular/cdk@14.1.0": version "14.1.0" resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-14.1.0.tgz#abf5ad3cdd96e42666bce949833ac1c2405ab031" @@ -168,43 +204,6 @@ dependencies: tslib "^2.3.0" -"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#b2da73b3dddddd6a253ee8ea48ef387b20f5aedf": - version "0.0.0-114c5a9e0c063e65dc42ded4d2ae07a3cca5418a" - resolved "https://github.com/angular/dev-infra-private-builds.git#b2da73b3dddddd6a253ee8ea48ef387b20f5aedf" - dependencies: - "@angular-devkit/build-angular" "14.1.0-rc.3" - "@angular/benchpress" "0.3.0" - "@babel/core" "^7.16.0" - "@bazel/buildifier" "5.1.0" - "@bazel/concatjs" "5.5.2" - "@bazel/esbuild" "5.5.2" - "@bazel/protractor" "5.5.2" - "@bazel/runfiles" "5.5.2" - "@bazel/terser" "5.5.2" - "@bazel/typescript" "5.5.2" - "@microsoft/api-extractor" "7.28.4" - "@types/browser-sync" "^2.26.3" - "@types/node" "16.10.9" - "@types/selenium-webdriver" "^4.0.18" - "@types/send" "^0.17.1" - "@types/tmp" "^0.2.1" - "@types/uuid" "^8.3.1" - "@types/yargs" "^17.0.0" - "@yarnpkg/lockfile" "^1.1.0" - browser-sync "^2.27.7" - clang-format "1.8.0" - prettier "2.7.1" - protractor "^7.0.0" - selenium-webdriver "4.3.1" - send "^0.18.0" - source-map "^0.7.4" - tmp "^0.2.1" - "true-case-path" "^2.2.1" - tslib "^2.3.0" - typescript "~4.7.3" - uuid "^8.3.2" - yargs "^17.0.0" - "@angular/forms@14.1.0": version "14.1.0" resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-14.1.0.tgz#17a7ec211a11b75572d89359f08c277cfcdb1210" @@ -228,6 +227,13 @@ dependencies: tslib "^2.3.0" +"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a": + version "0.0.0-fa61d03a603e04af2b66f3598f1af01da1e1cfb1" + resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a" + dependencies: + "@yarnpkg/lockfile" "^1.1.0" + typescript "~4.7.3" + "@angular/platform-browser-dynamic@14.1.0": version "14.1.0" resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-14.1.0.tgz#9e30c5c4d2ff507402dcb36a5878068d8d900b81"