Skip to content

Commit cba5fd0

Browse files
committed
Migrate from yarn to pnpm
1 parent 3451682 commit cba5fd0

39 files changed

+9343
-11972
lines changed

.config/dictionary.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,5 +299,3 @@ xunit
299299
xvfb
300300
yaegassy
301301
yammlint
302-
yarnpkg
303-
yarnrc

.config/mise.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[env]
22
# https://github.com/nodejs/corepack/issues/550
33
COREPACK_ENABLE_DOWNLOAD_PROMPT = 0
4-
# Command such `yarn webpack-dev` might fail with
4+
# Command such `pnpm webpack-dev` might fail with
55
# Reached heap limit Allocation failed - JavaScript heap out of memory
66
# https://nodejs.org/api/cli.html#--max-old-space-sizesize-in-megabytes
77
# default 16 MiB for 64-bit systems and 8 MiB for 32-bit systems
@@ -23,6 +23,6 @@ _.python.venv = {create = true, path = "~/.local/share/virtualenvs/vsa", python
2323
experimental = true
2424

2525
[tools]
26-
# do not add tools unsupported on windows such: gh, yarn
26+
# do not add tools unsupported on windows such: gh
2727
direnv = "latest"
2828
node = "20.19.3"

.depcheckrc.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.envrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# for build and testing purposes.
1010
export VIRTUAL_ENV="${HOME}/.local/share/virtualenvs/vsa"
1111

12-
# Command such `yarn webpack-dev` might fail with
12+
# Command such `pnpm webpack-dev` might fail with
1313
# Reached heap limit Allocation failed - JavaScript heap out of memory
1414
# https://nodejs.org/api/cli.html#--max-old-space-sizesize-in-megabytes
1515
# default 16 MiB for 64-bit systems and 8 MiB for 32-bit systems

.github/workflows/ci.yaml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -152,31 +152,34 @@ jobs:
152152
xvfb
153153
# asdf nodejs plugin requires: dirmngr gpg curl gawk
154154

155-
- name: Setup node.js
155+
- name: Install pnpm # keep before setup-node
156+
uses: pnpm/action-setup@v4
157+
with:
158+
version: 10
159+
run_install: false
160+
161+
- name: Install node.js
156162
uses: actions/[email protected]
157163
with:
158164
node-version: 20
159-
# yarn cache is broken due https://github.com/actions/setup-node/issues/531
160-
# cache: yarn
165+
cache: pnpm
161166

162-
- name: Corepack enable
163-
run: corepack enable
167+
- name: Install node dependencies
168+
run: pnpm install
164169

165170
- name: Enable caching
166171
uses: actions/cache@v4
167172
with:
168173
path: |
169174
.vscode-test
170-
.yarn/cache
171175
node_modules/.cache/webpack
172176
out/ext
173177
out/test-resources*/Visual Studio Code.app
174178
out/test-resources*/chromedriver*
175179
out/test-resources*/driverVersion
176180
out/test-resources*/stable.zip
177181
~/.cache/pip
178-
~/.cache/yarn
179-
key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'yarn.lock', '.config/requirements.txt', 'tools/*.*') }}
182+
key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'pnpm-lock.yaml', '.config/requirements.txt', 'tools/*.*') }}
180183

181184
# - name: Enable caching for podman-machine
182185
# if: "contains(matrix.os, 'macos')"
@@ -185,7 +188,7 @@ jobs:
185188
# path: |
186189
# ~/.local/share/containers
187190
# ~/.config/containers
188-
# key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'yarn.lock', '.config/requirements.txt', '**/Taskfile.yml', 'tools/*.*') }}
191+
# key: ${{ runner.os }}-${{ matrix.task-name }}-${{ hashFiles('package.json', 'pnpm-lock.yaml', '.config/requirements.txt', '**/Taskfile.yml', 'tools/*.*') }}
189192

190193
- name: Setup task
191194
uses: arduino/setup-task@v2
@@ -242,12 +245,6 @@ jobs:
242245
# Ensure NODE_OPTIONS config on CI is identical with the one in .env
243246
[[ "${NODE_OPTIONS:-}" == "$(direnv exec . printenv NODE_OPTIONS)" ]] || { echo "NODE_OPTIONS mismatch between .env and ci.yaml"; exit 97; }
244247
245-
- name: Install dependencies
246-
uses: coactions/actions/yarn-install@fix/install
247-
# backstage/actions/yarn-install@b3c1841fd69e1658ac631afafd0fb140a2309024 # v0.6.17
248-
with:
249-
cache-prefix: ${{ runner.os }}-v${{ matrix.node-version }}
250-
251248
- name: task setup
252249
# starting podman machine can randomly get stuck on macos
253250
timeout-minutes: 25
@@ -515,8 +512,7 @@ jobs:
515512
- name: Install Node
516513
uses: actions/setup-node@v4
517514
with:
518-
cache: yarn
519-
cache-dependency-path: "**/yarn.lock"
515+
cache: pnpm
520516
node-version-file: .tool-versions
521517

522518
- name: Download the artifact
@@ -532,7 +528,7 @@ jobs:
532528
files: "*.vsix"
533529

534530
- run: |
535-
npm exec -- yarn install --immutable
531+
npm exec -- pnpm install --immutable
536532
ls -la *.vsix
537533
538534
- name: Setup python
@@ -563,8 +559,7 @@ jobs:
563559
# Setup .npmrc file to publish to npm
564560
- uses: actions/setup-node@v4
565561
with:
566-
cache: yarn
567-
cache-dependency-path: "**/yarn.lock"
562+
cache: pnpm
568563
node-version-file: .tool-versions
569564
registry-url: "https://registry.npmjs.org"
570565

.gitignore

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ CHANGELOG.html
1111
*.tgz
1212
.task
1313
.venv
14-
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
15-
.yarn/*
16-
!.yarn/patches
17-
!.yarn/plugins
18-
!.yarn/releases
19-
!.yarn/sdks
20-
!.yarn/versions
2114
.DS_Store
2215
.direnv
2316
coverage

.gitleaks.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
[allowlist]
22
description = "Global Allowlist"
33
# Ignore based on any subset of the file path
4-
paths = [
5-
# Ignore yarn
6-
'''\.yarn'''
7-
]
4+
paths = []

.pre-commit-config.yaml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ ci:
1616
exclude: >
1717
(?x)^(
1818
.config/requirements.in|
19+
pnpm-lock.yaml|
1920
.*.svg
2021
)$
2122
minimum_pre_commit_version: 4.0.0 # Related to https://github.com/ekalinin/nodeenv/issues/369
@@ -54,12 +55,6 @@ repos:
5455
- SC1091
5556
- repo: local
5657
hooks:
57-
- id: depcheck
58-
name: depcheck
59-
entry: yarn dlx depcheck
60-
language: system
61-
pass_filenames: false
62-
always_run: true
6358
- id: eslint
6459
name: eslint
6560
entry: npm
@@ -118,7 +113,6 @@ repos:
118113
- id: trailing-whitespace
119114
exclude: >
120115
(?x)^(
121-
.yarn/.*|
122116
examples/playbooks/(with-skip-tag-id|unicode).yml|
123117
examples/playbooks/example.yml|
124118
docs/als/settings.md

.vscode/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@
3838

3939
"files.exclude": {
4040
".task": true,
41-
".yarn": true,
4241
".vscode-test": true
4342
},
4443
"mochaExplorer.cwd": "packages/ansible-language-server",
4544
"search.exclude": {
4645
".vscode-test": true
4746
},
4847
"redhat.telemetry.enabled": false,
49-
"eslint.useESLintClass": true
48+
"eslint.useESLintClass": true,
49+
"npm.packageManager": "pnpm"
5050
}

.yarn/releases/yarn-4.9.2.cjs

Lines changed: 0 additions & 942 deletions
This file was deleted.

0 commit comments

Comments
 (0)