Skip to content

Commit cdcbd89

Browse files
authored
build: update to pnpm 12 (#33802)
Updates to pnpm 12 and resolves a few breaking changes. Also update `ng-dev` to include some pnpm 12 fixes to the release script.
1 parent 7e73582 commit cdcbd89

16 files changed

Lines changed: 195 additions & 38 deletions

‎.bazelrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ test --test_output=errors
5858

5959
# Configures script to do version stamping.
6060
# See https://docs.bazel.build/versions/master/user-manual.html#flag--workspace_status_command
61-
build:release --workspace_status_command="pnpm -s ng-dev:stamp --mode=release"
61+
build:release --workspace_status_command="pnpm --silent ng-dev:stamp --mode=release"
6262
build:release --stamp
6363

64-
build:snapshot-build --workspace_status_command="pnpm -s ng-dev:stamp --mode=snapshot"
64+
build:snapshot-build --workspace_status_command="pnpm --silent ng-dev:stamp --mode=snapshot"
6565
build:snapshot-build --stamp
6666
build:snapshot-build --//:enable_snapshot_adev_assets
6767

‎.github/workflows/ci.material-aio.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Install node modules
3030
run: pnpm install --frozen-lockfile
3131
- name: Execute Build
32-
run: pnpm -s build //docs/...
32+
run: pnpm --silent build //docs/...
3333

3434
test:
3535
runs-on: ubuntu-latest
@@ -64,7 +64,7 @@ jobs:
6464
- name: Install node modules
6565
run: pnpm install --frozen-lockfile
6666
- name: Execute Lighthouse Audit
67-
run: pnpm -s bazel test --test_tag_filters=audit //docs/...
67+
run: pnpm --silent bazel test --test_tag_filters=audit //docs/...
6868
- name: Store Audit Logs
6969
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
7070
if: always()

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
- name: Check code lint
4444
run: pnpm tslint
4545
- name: Check for circular dependencies
46-
run: pnpm -s ts-circular-deps:check
46+
run: pnpm --silent ts-circular-deps:check
4747

4848
api_golden_checks:
4949
runs-on: ubuntu-latest

‎.github/workflows/deploy-dev-app-main-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
- name: Building dev-app
2929
run: |
30-
pnpm -s bazel build //src/dev-app:web_package --symlink_prefix=dist/
30+
pnpm --silent bazel build //src/dev-app:web_package --symlink_prefix=dist/
3131
cp -R dist/bin/src/dev-app/web_package dist/dev-app-web-pkg
3232
3333
- name: Configure Firebase deploy target

‎.github/workflows/pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Check code lint
4242
run: pnpm tslint
4343
- name: Check for circular dependencies
44-
run: pnpm -s ts-circular-deps:check
44+
run: pnpm --silent ts-circular-deps:check
4545
- name: Check code format
4646
run: pnpm ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
4747
- name: Check Package Licenses

‎.husky/commit-msg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Ahead of creating the commit, validate the commit message.
2-
pnpm -s ng-dev commit-message pre-commit-validate --file $1;
2+
pnpm --silent ng-dev commit-message pre-commit-validate --file $1;

‎.husky/pre-commit‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Allow for the formatting command to fail without exiting the script.
22
set +e
33

4-
pnpm -s ng-dev format staged 2>/dev/null
4+
pnpm --silent ng-dev format staged 2>/dev/null
55

66
if [ $? -ne 0 ]; then
77
echo "WARNING: failed to run file formatting (ng-dev format staged)"

‎.husky/prepare-commit-msg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# When a commit is started, restore the previous commit message draft if it exists.
2-
pnpm -s ng-dev commit-message restore-commit-message-draft $1 $2;
2+
pnpm --silent ng-dev commit-message restore-commit-message-draft $1 $2;

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"url": "https://github.com/angular/components.git"
99
},
1010
"license": "MIT",
11-
"packageManager": "pnpm@11.25.0",
11+
"packageManager": "pnpm@12.4.1",
1212
"engines": {
1313
"npm": "Please use pnpm instead of NPM to install dependencies",
1414
"yarn": "Please use pnpm instead of Yarn to install dependencies",
1515
"pnpm": "11.25.0"
1616
},
1717
"scripts": {
1818
"ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
19-
"ng-dev:stamp": "pnpm -s ng-dev release build-env-stamp --additional-stamping-script=tools/bazel-additional-stamp.mjs",
19+
"ng-dev:stamp": "pnpm --silent ng-dev release build-env-stamp --additional-stamping-script=tools/bazel-additional-stamp.mjs",
2020
"build": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/build-packages-dist-main.mts",
2121
"build-docs-content": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/build-docs-content-main.mts",
2222
"build-and-check-release-output": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/build-and-check-release-output.mts",
@@ -25,24 +25,24 @@
2525
"docs-app": "ibazel run //docs:serve",
2626
"universal-app": "bazel run //src/universal-app:server",
2727
"test": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/run-component-tests.mts",
28-
"test-local": "pnpm -s test --local",
29-
"test-firefox": "pnpm -s test --firefox",
28+
"test-local": "pnpm --silent test --local",
29+
"test-firefox": "pnpm --silent test --firefox",
3030
"test-tsec": "pnpm bazelisk test //... --build_tag_filters=tsec --test_tag_filters=tsec",
31-
"lint": "pnpm -s tslint && pnpm -s stylelint && pnpm -s ng-dev format changed --check",
31+
"lint": "pnpm --silent tslint && pnpm --silent stylelint && pnpm --silent ng-dev format changed --check",
3232
"e2e": "bazel test //src/... --build_tag_filters=e2e --test_tag_filters=e2e --build_tests_only",
3333
"deploy-dev-app": "node ./scripts/deploy-dev-app.js",
3434
"breaking-changes": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/breaking-changes.mts",
3535
"check-entry-point-setup": "node ./scripts/check-entry-point-setup.mjs",
3636
"check-package-externals": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/check-package-externals.mts",
37-
"format": "pnpm -s ng-dev format changed",
37+
"format": "pnpm --silent ng-dev format changed",
3838
"cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/tsconfig.json tools/cherry-pick-patch/cherry-pick-patch.ts",
3939
"detect-component-id-collisions": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/detect-component-id-collisions.mts",
4040
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
4141
"stylelint": "stylelint \"(src|docs)/**/*.+(css|scss)\" --config .stylelintrc.json",
4242
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
43-
"ts-circular-deps:check": "pnpm -s ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.cjs",
44-
"ts-circular-deps:approve": "pnpm -s ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.cjs",
45-
"merge": "pnpm -s ng-dev pr merge",
43+
"ts-circular-deps:check": "pnpm --silent ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.cjs",
44+
"ts-circular-deps:approve": "pnpm --silent ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.cjs",
45+
"merge": "pnpm --silent ng-dev pr merge",
4646
"approve-api": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/approve-api-golden.mts",
4747
"integration-tests": "bazel test --test_tag_filters=-linker-integration-test --build_tests_only -- //integration/...",
4848
"test-linker-aot": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only -- //integration/... //src/...",
@@ -55,11 +55,11 @@
5555
},
5656
"version": "22.2.0-next.5",
5757
"dependencies": {
58-
"@angular/compiler-cli": "catalog:",
5958
"@angular-devkit/core": "catalog:",
6059
"@angular-devkit/schematics": "catalog:",
6160
"@angular/common": "catalog:",
6261
"@angular/compiler": "catalog:",
62+
"@angular/compiler-cli": "catalog:",
6363
"@angular/core": "catalog:",
6464
"@angular/forms": "catalog:",
6565
"@angular/platform-browser": "catalog:",
@@ -77,7 +77,7 @@
7777
},
7878
"devDependencies": {
7979
"@angular/localize": "catalog:",
80-
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#c3d7ed184d71d390d3eacff85f4b2b3f16b82660",
80+
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#f166178ac5c37cd3aadab7b8cb7212f34d71b2a6",
8181
"@angular/platform-server": "catalog:",
8282
"@angular/router": "catalog:",
8383
"@babel/core": "^8.0.1",

‎pnpm-lock.yaml‎

Lines changed: 166 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)