Skip to content

Commit c8ccbd7

Browse files
build: update angular shared dev-infra code to fed4403 (#25187)
* build: update angular shared dev-infra code to fed4403 * test: create `node_modules` directory in PnP integration test The Angular CLI requires the `node_modules` directory for ngcc to be present. With PnP this directory does not exist and we need to make sure it exists. Previously it worked without the explicit command because it went up the execroot, but the CLI made this stricter so that we now notice it until the fix/looser check is available: angular/angular-cli@5319428. Co-authored-by: Paul Gschwendtner <[email protected]> (cherry picked from commit 2b53d7b)
1 parent 7fc4336 commit c8ccbd7

File tree

5 files changed

+28
-56
lines changed

5 files changed

+28
-56
lines changed

.github/workflows/dev-infra.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ jobs:
1212
runs-on: ubuntu-latest
1313
steps:
1414
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
15-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@f5e706a8bd255a86681369fabf0b8ebed4858b30
15+
- uses: angular/dev-infra/github-actions/commit-message-based-labels@b5e4e3227f855adf65529353b73669718bcb8a12
1616
with:
1717
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1818
post_approval_changes:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # tag=v3.0.2
22-
- uses: angular/dev-infra/github-actions/post-approval-changes@f5e706a8bd255a86681369fabf0b8ebed4858b30
22+
- uses: angular/dev-infra/github-actions/post-approval-changes@b5e4e3227f855adf65529353b73669718bcb8a12
2323
with:
2424
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/lock-closed.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
lock_closed:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: angular/dev-infra/github-actions/lock-closed@f5e706a8bd255a86681369fabf0b8ebed4858b30
14+
- uses: angular/dev-infra/github-actions/lock-closed@b5e4e3227f855adf65529353b73669718bcb8a12
1515
with:
1616
lock-bot-key: ${{ secrets.LOCK_BOT_PRIVATE_KEY }}

integration/yarn-pnp-compat/BUILD.bazel

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ node_integration_test(
1616
srcs = glob(["**/*"]),
1717
commands = [
1818
"yarn install --no-immutable",
19+
# TODO(devversion): Remove when https://github.com/angular/angular-cli/commit/5319428e14a7e364a58caa8ca936964cfc5503cf
20+
# is available.
21+
"mkdir node_modules",
1922
"yarn build",
2023
],
2124
environment = {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@angular/bazel": "^14.0.1",
7777
"@angular/cli": "^14.0.1",
7878
"@angular/compiler-cli": "^14.0.1",
79-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#67631cd48a5d0cab942279b1205b0e2b1736ae56",
79+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#fed440324f82e9220f107c74c039210bd9c6ec19",
8080
"@angular/localize": "^14.0.1",
8181
"@angular/platform-browser-dynamic": "^14.0.1",
8282
"@angular/platform-server": "^14.0.1",

yarn.lock

Lines changed: 21 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -327,21 +327,21 @@
327327
dependencies:
328328
tslib "^2.3.0"
329329

330-
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#67631cd48a5d0cab942279b1205b0e2b1736ae56":
331-
version "0.0.0-f5e706a8bd255a86681369fabf0b8ebed4858b30"
332-
uid "67631cd48a5d0cab942279b1205b0e2b1736ae56"
333-
resolved "https://github.com/angular/dev-infra-private-builds.git#67631cd48a5d0cab942279b1205b0e2b1736ae56"
330+
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#fed440324f82e9220f107c74c039210bd9c6ec19":
331+
version "0.0.0-b5e4e3227f855adf65529353b73669718bcb8a12"
332+
uid fed440324f82e9220f107c74c039210bd9c6ec19
333+
resolved "https://github.com/angular/dev-infra-private-builds.git#fed440324f82e9220f107c74c039210bd9c6ec19"
334334
dependencies:
335335
"@angular-devkit/build-angular" "14.1.0-next.2"
336336
"@angular/benchpress" "0.3.0"
337337
"@babel/core" "^7.16.0"
338338
"@bazel/buildifier" "5.1.0"
339-
"@bazel/concatjs" "5.5.0"
340-
"@bazel/esbuild" "5.5.0"
341-
"@bazel/protractor" "5.5.0"
342-
"@bazel/runfiles" "5.5.0"
343-
"@bazel/terser" "5.5.0"
344-
"@bazel/typescript" "5.5.0"
339+
"@bazel/concatjs" "5.5.1"
340+
"@bazel/esbuild" "5.5.1"
341+
"@bazel/protractor" "5.5.1"
342+
"@bazel/runfiles" "5.5.1"
343+
"@bazel/terser" "5.5.1"
344+
"@bazel/typescript" "5.5.1"
345345
"@microsoft/api-extractor" "7.25.2"
346346
"@types/browser-sync" "^2.26.3"
347347
"@types/node" "16.10.9"
@@ -357,6 +357,7 @@
357357
protractor "^7.0.0"
358358
selenium-webdriver "4.2.0"
359359
send "^0.18.0"
360+
source-map "^0.7.4"
360361
tmp "^0.2.1"
361362
"true-case-path" "^2.2.1"
362363
tslib "^2.3.0"
@@ -1971,15 +1972,6 @@
19711972
resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-5.1.0.tgz#ae0b93c5d14b2b080d5a492a8bfee231101b5385"
19721973
integrity sha512-gO0+//hkH+iE3AQ02mYttJAcWiE+rapP8IxmstDhwSqs+CmZJJI8Q1vAaIvMyJUT3NIf7lGljRNpzclkCPk89w==
19731974

1974-
1975-
version "5.5.0"
1976-
resolved "https://registry.yarnpkg.com/@bazel/concatjs/-/concatjs-5.5.0.tgz#e6104ed70595cae59463ae6b0b5389252566221e"
1977-
integrity sha512-hwG+ahivR20Z3iTOlkUz3OdwnW/PUaZyyz8BIX+GNUTg6U3rPHK51CavUirMupOU/LRJ5GyCwBNAAtjCyquo2g==
1978-
dependencies:
1979-
protobufjs "6.8.8"
1980-
source-map-support "0.5.9"
1981-
tsutils "3.21.0"
1982-
19831975
19841976
version "5.5.1"
19851977
resolved "https://registry.yarnpkg.com/@bazel/concatjs/-/concatjs-5.5.1.tgz#151985de8f8538b5dd8fa744c11c697c12e5f39e"
@@ -1989,11 +1981,6 @@
19891981
source-map-support "0.5.9"
19901982
tsutils "3.21.0"
19911983

1992-
1993-
version "5.5.0"
1994-
resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-5.5.0.tgz#51cff0a3f1da93c17cffe3fc52132e25d9aa14b8"
1995-
integrity sha512-kKB1XupmjPJD2R/JpVz5pQWnSVw6j3HF7gGJhoTzbplqqL7jQLfJLWRKmg286vkNe/g6EGrDG1ONN7dF3DT7lQ==
1996-
19971984
19981985
version "5.5.1"
19991986
resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-5.5.1.tgz#b76f64681e741204d6fedb77d9b6ed442542f095"
@@ -2012,11 +1999,6 @@
20121999
c8 "~7.5.0"
20132000
jasmine-reporters "~2.5.0"
20142001

2015-
2016-
version "5.5.0"
2017-
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-5.5.0.tgz#d2a0134e91fad9c60c5835bbce99974245315559"
2018-
integrity sha512-8lXEtjfb77Hku6CdJpUlCCHq4BoXiLMQzW0uJuSGYSZd9oBsHU6u++YrM27Ds/xN8VzsUf4jKBecRpchM3ZOmQ==
2019-
20202002
20212003
version "5.5.1"
20222004
resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-5.5.1.tgz#19f1c2d5fda75157d073295878ddad3592d7c640"
@@ -2029,44 +2011,26 @@
20292011
dependencies:
20302012
"@bazel/worker" "5.5.1"
20312013

2032-
2033-
version "5.5.0"
2034-
resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-5.5.0.tgz#01647efbef624be2eb80d297fa20cdedaed23338"
2035-
integrity sha512-sFEPFhIkDH//98O71WlT/PJPPi7sNeuA+O0wH312QfNdtgnSpNr7CGwfr0JEztwGn2zC16C119fnzra569Y1Uw==
2036-
20372014
20382015
version "5.5.1"
20392016
resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-5.5.1.tgz#3e5860e51bf4fee07d90e1f1fbdc67241315cb55"
20402017
integrity sha512-5leyQVWMqZVMyjeIpQ/3w6ozP7cUgZMalfdzMYJZtPqekXpAQqeV/jXLPW0f86x2ocIDKEkeMDIpzTB9+FiENg==
20412018

2042-
2043-
version "5.5.0"
2044-
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-5.5.0.tgz#3b2b582a417d99d59ae99b50d74576ca0719c03a"
2045-
integrity sha512-aBjNmJ7TbcD7cKAdFErYQYXn4OqTvrmqrtN6Z6Wnv82d+23kbEsF427ixgdCO3GTQJDw7+x7K9TP2CGogaGtcg==
2046-
20472019
20482020
version "5.5.1"
20492021
resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-5.5.1.tgz#1c11154a03a88ec5477e308b3dea3f86fb335278"
20502022
integrity sha512-YxKXn6Td90EUVjUFzeS5TQFCxtnmVNaVeLTwQLr7rhtq8tQ4BnYbWJcKrWJZAfuFkxoK1iU3PeFtIDoaOXUAOg==
20512023

2052-
"@bazel/[email protected].0":
2053-
version "5.5.0"
2054-
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.5.0.tgz#053c255acb1b3cac23d24984cd8d5d5542fe1f7c"
2055-
integrity sha512-Ord0+nCj+B1M4NDbe0uqZf2FyOCzaDAlc4DAsr5UKJrArCipIbMTEAxlsEk+WAYBNAFGO/FS9/zlDtLceqpHqw==
2024+
"@bazel/[email protected].1":
2025+
version "5.5.1"
2026+
resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-5.5.1.tgz#2a30107f7d0b16ef486a473f204b1ffc72c4d28b"
2027+
integrity sha512-5CZROZMOsu4m4VZ39oZOd23XBzVg1YyJLy7rYknfJ+cNiEO8beOy+fuCw39MietN6eNEj0YyPqNaRc5B1hs/xw==
20562028
dependencies:
2057-
"@bazel/worker" "5.5.0"
2058-
protobufjs "6.8.8"
2029+
"@bazel/worker" "5.5.1"
20592030
semver "5.6.0"
20602031
source-map-support "0.5.9"
20612032
tsutils "3.21.0"
20622033

2063-
2064-
version "5.5.0"
2065-
resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.5.0.tgz#d30b75e46f2052d33bcda251b328d36655a5636f"
2066-
integrity sha512-pYfjJKg4D1CQ/AJ1UGC5ySyH09gDqNiBrQJ0uMYVewIBW24uOAkKsJfTE2y4ES0UL1Ik758WO0la0mJeFOKScg==
2067-
dependencies:
2068-
google-protobuf "^3.6.1"
2069-
20702034
20712035
version "5.5.1"
20722036
resolved "https://registry.yarnpkg.com/@bazel/worker/-/worker-5.5.1.tgz#1927143f144f22ed569eece22eb14b724e7c10a9"
@@ -14888,6 +14852,11 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
1488814852
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
1488914853
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
1489014854

14855+
source-map@^0.7.4:
14856+
version "0.7.4"
14857+
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
14858+
integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
14859+
1489114860
source-map@~0.2.0:
1489214861
version "0.2.0"
1489314862
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.2.0.tgz#dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"

0 commit comments

Comments
 (0)