Skip to content

Commit

Permalink
fix(repo): replace remaining instances of yarn with pnpm (#16571)
Browse files Browse the repository at this point in the history
  • Loading branch information
meeroslav authored Apr 27, 2023
1 parent 9d71c71 commit f004e22
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- host: ubuntu-latest
target: x86_64-unknown-linux-musl
docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
build: set -e && yarn nx -- run-many --target=build-native -- --target=x86_64-unknown-linux-musl
build: set -e && pnpm nx run-many --target=build-native -- --target=x86_64-unknown-linux-musl
- host: macos-latest
target: aarch64-apple-darwin
build: |
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
with:
node-version: 18
check-latest: true
cache: yarn
cache: pnpm
architecture: x86
- name: Build in docker
uses: addnab/docker-run-action@v3
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/js/executors/swc.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/js/executors/tsc.json
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
}
Expand Down
2 changes: 1 addition & 1 deletion docs/generated/packages/next/executors/build.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
},
Expand Down
2 changes: 1 addition & 1 deletion nx-dev/nx-dev/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/nx-dev/nx-dev/public",
"command": "yarn next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
"command": "pnpm next-sitemap --config ./nx-dev/nx-dev/next-sitemap.config.js"
}
},
"sync-documentation": {
Expand Down
8 changes: 4 additions & 4 deletions nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,10 @@
"options": {
"commands": [
{
"command": "yarn e2e-start-local-registry"
"command": "pnpm e2e-start-local-registry"
},
{
"command": "yarn e2e-build-package-publish"
"command": "pnpm e2e-build-package-publish"
},
{
"command": "nx run-e2e-tests {projectName}"
Expand All @@ -159,10 +159,10 @@
"options": {
"commands": [
{
"command": "yarn e2e-start-local-registry"
"command": "pnpm e2e-start-local-registry"
},
{
"command": "yarn e2e-build-package-publish"
"command": "pnpm e2e-build-package-publish"
},
{
"command": "nx run-e2e-tests {projectName}"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"version": "pnpm prettier lerna.json --write",
"depcheck": "ts-node -P ./scripts/tsconfig.scripts.json ./scripts/depcheck",
"local-registry": "./scripts/local-registry.sh",
"documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && yarn check-documentation-map",
"documentation": "ts-node -P scripts/tsconfig.scripts.json ./scripts/documentation/generators/main.ts && pnpm check-documentation-map",
"submit-plugin": "node ./scripts/submit-plugin.js",
"prepare": "is-ci || husky install",
"echo": "echo 123458",
Expand Down
2 changes: 1 addition & 1 deletion packages/js/src/executors/swc/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/js/src/executors/tsc/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/next/src/executors/build/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
},
"generateLockfile": {
"type": "boolean",
"description": "Generate a lockfile (e.g. yarn.lock) that matches the workspace lockfile to ensure package versions match.",
"description": "Generate a lockfile (e.g. package-lock.json) that matches the workspace lockfile to ensure package versions match.",
"default": false,
"x-priority": "internal"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/nx/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}
},
"artifacts": {
"command": "yarn napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
"command": "pnpm napi artifacts -c build/packages/nx/package.json -d ./artifacts --dist build/packages/nx/native-packages"
},
"build-base": {
"executor": "@nx/js:tsc",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pipelines:
- pnpm install --frozen-lockfile
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
- pnpm exec nx-cloud record -- yarn nx format:check
- pnpm exec nx-cloud record -- pnpm exec nx format:check
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
- pnpm exec nx-cloud stop-all-agents
- step: *agent
Expand Down Expand Up @@ -385,7 +385,7 @@ pipelines:
- pnpm install --frozen-lockfile
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
- pnpm exec nx-cloud record -- yarn nx format:check
- pnpm exec nx-cloud record -- pnpm exec nx format:check
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
- pnpm exec nx-cloud stop-all-agents
- step: *agent
Expand Down Expand Up @@ -679,7 +679,7 @@ pipelines:
- pnpm install --frozen-lockfile
- pnpm exec nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
- pnpm exec nx-cloud record -- yarn nx format:check
- pnpm exec nx-cloud record -- pnpm exec nx format:check
- pnpm exec nx affected --target=lint & pnpm exec nx affected --target=test & pnpm exec nx affected --target=build
- pnpm exec nx-cloud stop-all-agents
- step: *agent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pipelines:
<% } %>
- <%= packageManagerInstall %>
- <%= packageManagerPrefix %> nx-cloud start-ci-run --stop-agents-after="build" --agent-count=3
- <%= packageManagerPrefix %> nx-cloud record -- yarn nx format:check
- <%= packageManagerPrefix %> nx-cloud record -- <%= packageManagerPrefix %> nx format:check
- <%= packageManagerPrefix %> nx affected --target=lint & <%= packageManagerPrefix %> nx affected --target=test & <%= packageManagerPrefix %> nx affected --target=build
- <%= packageManagerPrefix %> nx-cloud stop-all-agents
- step: *agent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export function generateDevkitDocumentation() {
);

execSync(
`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`,
`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`,
execSyncOptions
);
execSync(
Expand All @@ -27,7 +27,7 @@ export function generateDevkitDocumentation() {
execSyncOptions
);
execSync(
`npx prettier docs/generated/devkit --write --config ${join(
`pnpm prettier docs/generated/devkit --write --config ${join(
__dirname,
'..',
'..',
Expand Down

0 comments on commit f004e22

Please sign in to comment.