Skip to content

Commit 27b5cbb

Browse files
committed
fixup! build: remove yarn
Silence pnpm runs
1 parent 6a536a0 commit 27b5cbb

File tree

13 files changed

+45
-45
lines changed

13 files changed

+45
-45
lines changed

.bazelrc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ test:saucelabs --define=KARMA_WEB_TEST_MODE=SL_REQUIRED
8383
# Releases should always be stamped with version control info
8484
# This command assumes node on the path and is a workaround for
8585
# https://github.com/bazelbuild/bazel/issues/4802
86-
build:release --workspace_status_command="pnpm run --silent ng-dev release build-env-stamp --mode=release"
86+
build:release --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
8787
build:release --stamp
8888

89-
build:snapshot --workspace_status_command="pnpm run --silent ng-dev release build-env-stamp --mode=snapshot"
89+
build:snapshot --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=snapshot"
9090
build:snapshot --stamp
9191
build:snapshot --//:enable_snapshot_repo_deps
9292

93-
build:e2e --workspace_status_command="pnpm run --silent ng-dev release build-env-stamp --mode=release"
93+
build:e2e --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
9494
build:e2e --stamp
9595
test:e2e --test_timeout=3600 --experimental_ui_max_stdouterr_bytes=2097152
9696

.github/shared-actions/windows-bazel-test/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
shell: wsl-bash {0}
3838
run: |
3939
cd ${{steps.init_wsl.outputs.repo_path}}
40-
pnpm run bazel \
40+
pnpm bazel \
4141
build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
4242
env:
4343
# See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows

.github/workflows/ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ jobs:
2626
run: pnpm install --frozen-lockfile
2727
- name: Generate JSON schema types
2828
# Schema types are required to correctly lint the TypeScript code
29-
run: pnpm run admin build-schema
29+
run: pnpm admin build-schema
3030
- name: Run ESLint
31-
run: pnpm run lint --cache-strategy content
31+
run: pnpm lint --cache-strategy content
3232
- name: Validate NgBot Configuration
33-
run: pnpm run ng-dev ngbot verify
33+
run: pnpm ng-dev ngbot verify
3434
- name: Validate Circular Dependencies
35-
run: pnpm run ts-circular-deps check
35+
run: pnpm ts-circular-deps check
3636
- name: Run Validation
37-
run: pnpm run admin validate
37+
run: pnpm admin validate
3838
- name: Check tooling setup
39-
run: pnpm run check-tooling-setup
39+
run: pnpm check-tooling-setup
4040

4141
build:
4242
runs-on: ubuntu-latest
@@ -50,7 +50,7 @@ jobs:
5050
- name: Install node modules
5151
run: pnpm install --frozen-lockfile
5252
- name: Build release targets
53-
run: pnpm run ng-dev release build
53+
run: pnpm ng-dev release build
5454

5555
test:
5656
needs: build
@@ -65,7 +65,7 @@ jobs:
6565
- name: Install node modules
6666
run: pnpm install --frozen-lockfile
6767
- name: Run module and package tests
68-
run: pnpm run bazel test //modules/... //packages/...
68+
run: pnpm bazel test //modules/... //packages/...
6969
env:
7070
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
7171

@@ -89,7 +89,7 @@ jobs:
8989
- name: Setup Bazel RBE
9090
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
9191
- name: Run CLI E2E tests
92-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
92+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
9393

9494
e2e_windows:
9595
strategy:
@@ -131,7 +131,7 @@ jobs:
131131
- name: Setup Bazel RBE
132132
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
133133
- name: Run CLI E2E tests
134-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
134+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
135135

136136
e2e-snapshots:
137137
needs: test
@@ -153,7 +153,7 @@ jobs:
153153
- name: Setup Bazel RBE
154154
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
155155
- name: Run CLI E2E tests
156-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
156+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
157157

158158
browsers:
159159
needs: build
@@ -182,7 +182,7 @@ jobs:
182182
run: |
183183
./scripts/saucelabs/start-tunnel.sh &
184184
./scripts/saucelabs/wait-for-tunnel.sh
185-
pnpm run bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
185+
pnpm bazel test --config=saucelabs //tests/legacy-cli:e2e.saucelabs
186186
./scripts/saucelabs/stop-tunnel.sh
187187
- uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
188188
if: ${{ failure() }}
@@ -202,6 +202,6 @@ jobs:
202202
run: pnpm install --frozen-lockfile
203203
- name: Setup Bazel
204204
uses: angular/dev-infra/github-actions/bazel/setup@f2a610b26cd7a451eddd50eb071dc495e3346a80
205-
- run: pnpm run admin snapshots --verbose
205+
- run: pnpm admin snapshots --verbose
206206
env:
207207
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}

.github/workflows/perf.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install node modules
2828
run: pnpm install --frozen-lockfile
2929
- id: workflows
30-
run: echo "workflows=$(pnpm run --silent ng-dev perf workflows --list)" >> "$GITHUB_OUTPUT"
30+
run: echo "workflows=$(pnpm -s ng-dev perf workflows --list)" >> "$GITHUB_OUTPUT"
3131

3232
workflow:
3333
timeout-minutes: 30
@@ -52,4 +52,4 @@ jobs:
5252
project_id: 'internal-200822'
5353
workload_identity_provider: 'projects/823469418460/locations/global/workloadIdentityPools/measurables-tracking/providers/angular'
5454
service_account: '[email protected]'
55-
- run: pnpm run ng-dev perf workflows --name ${{ matrix.workflow }} --commit-sha ${{github.sha}}
55+
- run: pnpm ng-dev perf workflows --name ${{ matrix.workflow }} --commit-sha ${{github.sha}}

.github/workflows/pr.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ jobs:
4444
run: pnpm install --frozen-lockfile
4545
- name: Generate JSON schema types
4646
# Schema types are required to correctly lint the TypeScript code
47-
run: pnpm run admin build-schema
47+
run: pnpm admin build-schema
4848
- name: Run ESLint
49-
run: pnpm run lint --cache-strategy content
49+
run: pnpm lint --cache-strategy content
5050
- name: Validate NgBot Configuration
51-
run: pnpm run ng-dev ngbot verify
51+
run: pnpm ng-dev ngbot verify
5252
- name: Validate Circular Dependencies
53-
run: pnpm run ts-circular-deps check
53+
run: pnpm ts-circular-deps check
5454
- name: Run Validation
55-
run: pnpm run admin validate
55+
run: pnpm admin validate
5656
- name: Check Package Licenses
5757
uses: angular/dev-infra/github-actions/linting/licenses@f2a610b26cd7a451eddd50eb071dc495e3346a80
5858
- name: Check tooling setup
59-
run: pnpm run check-tooling-setup
59+
run: pnpm check-tooling-setup
6060
- name: Check commit message
6161
# Commit message validation is only done on pull requests as its too late to validate once
6262
# it has been merged.
63-
run: pnpm run ng-dev commit-message validate-range ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
63+
run: pnpm ng-dev commit-message validate-range ${{ github.event.pull_request.base.sha }} ${{ github.event.pull_request.head.sha }}
6464
- name: Check code format
6565
# Code formatting checks are only done on pull requests as its too late to validate once
6666
# it has been merged.
67-
run: pnpm run ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
67+
run: pnpm ng-dev format changed --check ${{ github.event.pull_request.base.sha }}
6868

6969
build:
7070
runs-on: ubuntu-latest
@@ -78,7 +78,7 @@ jobs:
7878
- name: Install node modules
7979
run: pnpm install --frozen-lockfile
8080
- name: Build release targets
81-
run: pnpm run ng-dev release build
81+
run: pnpm ng-dev release build
8282
- name: Store PR release packages
8383
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8484
with:
@@ -99,7 +99,7 @@ jobs:
9999
- name: Install node modules
100100
run: pnpm install --frozen-lockfile
101101
- name: Run module and package tests
102-
run: pnpm run bazel test //modules/... //packages/...
102+
run: pnpm bazel test //modules/... //packages/...
103103
env:
104104
ASPECT_RULES_JS_FROZEN_PNPM_LOCK: '1'
105105

@@ -123,7 +123,7 @@ jobs:
123123
- name: Setup Bazel RBE
124124
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
125125
- name: Run CLI E2E tests
126-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
126+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
127127

128128
e2e-windows-subset:
129129
needs: build
@@ -157,7 +157,7 @@ jobs:
157157
- name: Setup Bazel RBE
158158
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
159159
- name: Run CLI E2E tests
160-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
160+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
161161

162162
e2e-snapshots:
163163
needs: [analyze, build]
@@ -180,4 +180,4 @@ jobs:
180180
- name: Setup Bazel RBE
181181
uses: angular/dev-infra/github-actions/bazel/configure-remote@f2a610b26cd7a451eddd50eb071dc495e3346a80
182182
- name: Run CLI E2E tests
183-
run: pnpm run bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
183+
run: pnpm bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

.husky/commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pnpm run ng-dev commit-message pre-commit-validate --file $1;
1+
pnpm -s 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 +1 @@
1-
pnpm run ng-dev format staged;
1+
pnpm -s ng-dev format staged;

.husky/prepare-commit-msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pnpm run ng-dev commit-message restore-commit-message-draft $1 $2;
1+
pnpm -s ng-dev commit-message restore-commit-message-draft $1 $2;

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@ Our Public API surface is tracked using golden files.
306306

307307
You check all golden files by running:
308308
```bash
309-
pnpm run public-api:check
309+
pnpm public-api:check
310310
```
311311

312312
If you modified the public API, the test will fail. To update the golden files you need to run:
313313
```bash
314-
pnpm run public-api:update
314+
pnpm public-api:update
315315
```

docs/DEVELOPER.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ To get started locally, follow these instructions:
1515
To make a local build:
1616

1717
```shell
18-
pnpm run build --local
18+
pnpm build --local
1919
```
2020

2121
This generates a number of tarballs in the `dist/` directory. To actually use

goldens/public-api/manage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const argv = parser(process.argv.slice(2));
77
const USER_COMMAND = argv._[0];
88
// The shell command to query for all Public API guard tests.
99
const BAZEL_PUBLIC_API_TARGET_QUERY_CMD =
10-
`pnpm run --silent bazel query --output label 'kind(nodejs_test, ...) intersect attr("tags", "api_guard", ...)'`
10+
`pnpm -s bazel query --output label 'kind(nodejs_test, ...) intersect attr("tags", "api_guard", ...)'`
1111
// Bazel targets for testing Public API goldens
1212
process.stdout.write('Gathering all Public API targets');
1313
const ALL_PUBLIC_API_TESTS = exec(BAZEL_PUBLIC_API_TARGET_QUERY_CMD, {silent: true})

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
"admin": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/devkit-admin.mjs",
1515
"bazel": "bazelisk",
1616
"test": "bazel test //packages/...",
17-
"build": "pnpm run admin build",
17+
"build": "pnpm -s admin build",
1818
"lint": "eslint --cache --max-warnings=0 \"**/*.@(ts|mts|cts)\"",
19-
"templates": "pnpm run admin templates",
20-
"validate": "pnpm run admin validate",
21-
"postinstall": "patch-package && pnpm run webdriver-update && husky",
19+
"templates": "pnpm -s admin templates",
20+
"validate": "pnpm -s admin validate",
21+
"postinstall": "patch-package && pnpm -s webdriver-update && husky",
2222
"//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
2323
"webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 106.0.5249.21",
2424
"public-api:check": "node goldens/public-api/manage.js test",
2525
"ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
2626
"public-api:update": "node goldens/public-api/manage.js accept",
27-
"ts-circular-deps": "pnpm run ng-dev ts-circular-deps --config ./scripts/circular-deps-test.conf.mjs",
27+
"ts-circular-deps": "pnpm -s ng-dev ts-circular-deps --config ./scripts/circular-deps-test.conf.mjs",
2828
"check-tooling-setup": "tsc --project .ng-dev/tsconfig.json",
2929
"diff-release-package": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/diff-release-package.mts"
3030
},

scripts/build-packages-dist.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const releaseTargetTag = 'release-package';
2626
const projectDir = join(dirname(fileURLToPath(import.meta.url)), '../');
2727

2828
/** Command that runs Bazel. */
29-
const bazelCmd = process.env.BAZEL || `pnpm bazel`;
29+
const bazelCmd = process.env.BAZEL || `pnpm -s bazel`;
3030

3131
/** Command that queries Bazel for all release package targets. */
3232
const queryPackagesCmd =

0 commit comments

Comments
 (0)