Skip to content

Commit b712fda

Browse files
feat: Replace yarn with npm
1 parent 17836ec commit b712fda

File tree

10 files changed

+2201
-1397
lines changed

10 files changed

+2201
-1397
lines changed

.github/workflows/generate.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,12 @@ jobs:
3636
with:
3737
node-version: ${{ env.NODE_VERSION }}
3838

39-
- name: Enable Corepack
40-
run: |
41-
corepack enable
42-
yarn config set enableGlobalCache false
43-
4439
- name: Load cached dependencies
4540
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
4641
with:
47-
path: .yarn/cache
48-
key: ${{ runner.os }}-node${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
49-
restore-keys: |
50-
${{ runner.os }}-node${{ env.NODE_VERSION }}
42+
path: ~/.npm
43+
key: ${{ runner.os }}-node{{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
44+
restore-keys: ${{ runner.os }}-node${{ env.NODE_VERSION }}
5145

5246
- name: Generate Data
5347
run: |

.github/workflows/nightly.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,11 @@ jobs:
161161
node-version: ${{ env.NODE_VERSION }}
162162
registry-url: https://registry.npmjs.org
163163

164-
- name: Enable Corepack
165-
run: |
166-
corepack enable
167-
yarn config set enableGlobalCache false
168-
169164
- name: Load cached dependencies
170165
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
171166
with:
172-
path: .yarn/cache
173-
key: ${{ runner.os }}-node${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
167+
path: ~/.npm
168+
key: ${{ runner.os }}-node{{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
174169
restore-keys: ${{ runner.os }}-node${{ env.NODE_VERSION }}
175170

176171
- name: Build release

.github/workflows/pre-release.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,11 @@ jobs:
147147
node-version: ${{ env.NODE_VERSION }}
148148
registry-url: https://registry.npmjs.org
149149

150-
- name: Enable Corepack
151-
run: |
152-
corepack enable
153-
yarn config set enableGlobalCache false
154-
155150
- name: Load cached dependencies
156151
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
157152
with:
158-
path: .yarn/cache
159-
key: ${{ runner.os }}-node${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
153+
path: ~/.npm
154+
key: ${{ runner.os }}-node{{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
160155
restore-keys: ${{ runner.os }}-node${{ env.NODE_VERSION }}
161156

162157
- name: Build release

.github/workflows/release.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,16 +146,11 @@ jobs:
146146
node-version: ${{ env.NODE_VERSION }}
147147
registry-url: https://registry.npmjs.org
148148

149-
- name: Enable Corepack
150-
run: |
151-
corepack enable
152-
yarn config set enableGlobalCache false
153-
154149
- name: Load cached dependencies
155150
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
156151
with:
157-
path: .yarn/cache
158-
key: ${{ runner.os }}-node${{ env.NODE_VERSION }}-${{ hashFiles('**/yarn.lock') }}
152+
path: ~/.npm
153+
key: ${{ runner.os }}-node{{ env.NODE_VERSION }}-${{ hashFiles('**/package-lock.json') }}
159154
restore-keys: ${{ runner.os }}-node${{ env.NODE_VERSION }}
160155

161156
- name: Build release

.gitignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
.yarn/*.*
2-
.yarn/cache/**
3-
!.yarn/releases
4-
!.yarn/plugins
5-
!.yarn/sdks
6-
!.yarn/versions
7-
.pnp.*
8-
91
build/
102
coverage/
113
data/

.yarnrc.yml

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

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ git-hook:
1414
echo "make pretty" > .git/hooks/pre-commit; chmod +x .git/hooks/pre-commit
1515

1616
pretty: node_modules
17-
yarn biome check --write --no-errors-on-unmatched
17+
npm exec -- biome check --write --no-errors-on-unmatched
1818
npm pkg fix
1919

2020
lint: node_modules
21-
yarn biome check .
22-
yarn tsc --noEmit
21+
npm exec -- biome check .
22+
npm exec -- tsc --noEmit
2323

2424
test: run
2525

@@ -31,7 +31,7 @@ lib: output kittensgame
3131
cd lib; node ../output/main.js ../kittensgame
3232

3333
node_modules:
34-
yarn install
34+
npm install
3535

3636
output: node_modules kittensgame
3737
node build.js

0 commit comments

Comments
 (0)