Skip to content

Commit f004e22

Browse files
authoredApr 27, 2023
fix(repo): replace remaining instances of yarn with pnpm (#16571)
1 parent 9d71c71 commit f004e22

File tree

14 files changed

+21
-21
lines changed

14 files changed

+21
-21
lines changed
 

‎.github/workflows/publish.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- host: ubuntu-latest
3535
target: x86_64-unknown-linux-musl
3636
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
37-
build: set -e && yarn nx -- run-many --target=build-native -- --target=x86_64-unknown-linux-musl
37+
build: set -e && pnpm nx run-many --target=build-native -- --target=x86_64-unknown-linux-musl
3838
- host: macos-latest
3939
target: aarch64-apple-darwin
4040
build: |
@@ -131,7 +131,7 @@ jobs:
131131
with:
132132
node-version: 18
133133
check-latest: true
134-
cache: yarn
134+
cache: pnpm
135135
architecture: x86
136136
- name: Build in docker
137137
uses: addnab/docker-run-action@v3

‎docs/generated/packages/js/executors/swc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
},
122122
"generateLockfile": {
123123
"type": "boolean",
124-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
124+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
125125
"default": false,
126126
"x-priority": "internal"
127127
}

‎docs/generated/packages/js/executors/tsc.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
},
121121
"generateLockfile": {
122122
"type": "boolean",
123-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
123+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
124124
"default": false,
125125
"x-priority": "internal"
126126
}

‎docs/generated/packages/next/executors/build.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
},
6363
"generateLockfile": {
6464
"type": "boolean",
65-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
65+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
6666
"default": false,
6767
"x-priority": "internal"
6868
},

‎nx-dev/nx-dev/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"outputs": ["{options.outputPath}"],
2727
"options": {
2828
"outputPath": "dist/nx-dev/nx-dev/public",
29-
"command": "yarn next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
29+
"command": "pnpm next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
3030
}
3131
},
3232
"sync-documentation": {

‎nx.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@
129129
"options": {
130130
"commands": [
131131
{
132-
"command": "yarn e2e-start-local-registry"
132+
"command": "pnpm e2e-start-local-registry"
133133
},
134134
{
135-
"command": "yarn e2e-build-package-publish"
135+
"command": "pnpm e2e-build-package-publish"
136136
},
137137
{
138138
"command": "nx run-e2e-tests {projectName}"
@@ -159,10 +159,10 @@
159159
"options": {
160160
"commands": [
161161
{
162-
"command": "yarn e2e-start-local-registry"
162+
"command": "pnpm e2e-start-local-registry"
163163
},
164164
{
165-
"command": "yarn e2e-build-package-publish"
165+
"command": "pnpm e2e-build-package-publish"
166166
},
167167
{
168168
"command": "nx run-e2e-tests {projectName}"

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"version": "pnpm prettier lerna.json --write",
1919
"depcheck": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/depcheck",
2020
"local-registry": "./scripts/local-registry.sh",
21-
"documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && yarn check-documentation-map",
21+
"documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && pnpm check-documentation-map",
2222
"submit-plugin": "node ./scripts/submit-plugin.js",
2323
"prepare": "is-ci || husky install",
2424
"echo": "echo 123458",

‎packages/js/src/executors/swc/schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
},
103103
"generateLockfile": {
104104
"type": "boolean",
105-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
105+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
106106
"default": false,
107107
"x-priority": "internal"
108108
}

‎packages/js/src/executors/tsc/schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
},
9191
"generateLockfile": {
9292
"type": "boolean",
93-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
93+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
9494
"default": false,
9595
"x-priority": "internal"
9696
}

‎packages/next/src/executors/build/schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
},
6060
"generateLockfile": {
6161
"type": "boolean",
62-
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
62+
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
6363
"default": false,
6464
"x-priority": "internal"
6565
},

‎packages/nx/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
}
1616
},
1717
"artifacts": {
18-
"command": "yarn napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
18+
"command": "pnpm napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
1919
},
2020
"build-base": {
2121
"executor": "@nx/js:tsc",

‎packages/workspace/src/generators/ci-workflow/__snapshots__/ci-workflow.spec.ts.snap

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ pipelines:
9191
9292
- pnpm install --frozen-lockfile
9393
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
94-
- pnpm exec nx-cloud record -- yarn nx format:check
94+
- pnpm exec nx-cloud record -- pnpm exec nx format:check
9595
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
9696
- pnpm exec nx-cloud stop-all-agents
9797
- step: *agent
@@ -385,7 +385,7 @@ pipelines:
385385
386386
- pnpm install --frozen-lockfile
387387
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
388-
- pnpm exec nx-cloud record -- yarn nx format:check
388+
- pnpm exec nx-cloud record -- pnpm exec nx format:check
389389
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
390390
- pnpm exec nx-cloud stop-all-agents
391391
- step: *agent
@@ -679,7 +679,7 @@ pipelines:
679679
680680
- pnpm install --frozen-lockfile
681681
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
682-
- pnpm exec nx-cloud record -- yarn nx format:check
682+
- pnpm exec nx-cloud record -- pnpm exec nx format:check
683683
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
684684
- pnpm exec nx-cloud stop-all-agents
685685
- step: *agent

‎packages/workspace/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pipelines:
2828
<% } %>
2929
- <%= packageManagerInstall %>
3030
- <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
31-
- <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check
31+
- <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
3232
- <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
3333
- <%= packageManagerPrefix %> nx-cloud stop-all-agents
3434
- step: *agent

‎scripts/documentation/generators/generate-devkit-documentation.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function generateDevkitDocumentation() {
1515
);
1616

1717
execSync(
18-
`rm -rf docs/generated/devkit && npx typedoc packages/devkit/index.d.ts packages/devkit/ngcli-adapter.ts --tsconfig packages/devkit/tsconfig.lib.json --out ./docs/generated/devkit --hideBreadcrumbs true --disableSources --publicPath ../../devkit/ --theme nx-markdown-theme --readme none`,
18+
`rm -rf docs/generated/devkit && pnpm typedoc packages/devkit/index.d.ts packages/devkit/ngcli-adapter.ts --tsconfig packages/devkit/tsconfig.lib.json --out ./docs/generated/devkit --hideBreadcrumbs true --disableSources --publicPath ../../devkit/ --theme nx-markdown-theme --readme none`,
1919
execSyncOptions
2020
);
2121
execSync(
@@ -27,7 +27,7 @@ export function generateDevkitDocumentation() {
2727
execSyncOptions
2828
);
2929
execSync(
30-
`npx prettier docs/generated/devkit --write --config ${join(
30+
`pnpm prettier docs/generated/devkit --write --config ${join(
3131
__dirname,
3232
'..',
3333
'..',

0 commit comments

Comments
 (0)
Please sign in to comment.