Skip to content

Commit 5f73cd4

Browse files
committed
just use npm
1 parent 06e42eb commit 5f73cd4

File tree

8 files changed

+12403
-8043
lines changed

8 files changed

+12403
-8043
lines changed

.github/workflows/deploy-site.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ jobs:
3939
uses: actions/setup-node@v4
4040
with:
4141
node-version: "20"
42-
cache: yarn
43-
cache-dependency-path: site/yarn.lock
42+
cache: npm
43+
cache-dependency-path: site/package-lock.json
4444

4545
- name: Install site dependencies
46-
run: cd site && yarn install
46+
run: cd site && npm ci
4747

4848
- name: Setup Pages
4949
uses: actions/configure-pages@v4
@@ -79,7 +79,7 @@ jobs:
7979
ruby scripts/export_typescript_types.rb
8080
8181
- name: Build with Next.js
82-
run: cd site && yarn build
82+
run: cd site && npm run build
8383

8484
- name: Upload artifact
8585
uses: actions/upload-pages-artifact@v3

.github/workflows/test.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,16 @@ jobs:
2424
uses: actions/setup-node@v4
2525
with:
2626
node-version: 20
27-
cache: "yarn"
27+
cache: "npm"
2828
cache-dependency-path: |
29-
yarn.lock
30-
site/yarn.lock
29+
package-lock.json
30+
site/package-lock.json
3131
3232
- name: Install dependencies
3333
run: |
34-
# Install root and site yarn dependencies
35-
yarn install
36-
cd site && yarn install && cd ..
34+
# Install root and site npm dependencies
35+
npm ci
36+
cd site && npm ci && cd ..
3737
3838
# Make sure bundler is using the correct Ruby version
3939
ruby -v
@@ -179,11 +179,11 @@ jobs:
179179
uses: actions/setup-node@v4
180180
with:
181181
node-version: 20
182-
cache: "yarn"
183-
cache-dependency-path: "site/yarn.lock"
182+
cache: "npm"
183+
cache-dependency-path: "site/package-lock.json"
184184

185185
- name: Install site dependencies
186-
run: cd site && yarn install
186+
run: cd site && npm ci
187187

188188
- name: Export TypeScript types
189189
run: |
@@ -195,4 +195,4 @@ jobs:
195195
196196
- name: Run TypeScript tests
197197
run: |
198-
cd site && yarn test
198+
cd site && npm test

bin/generate_lockfile_words

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -euo pipefail
44
echo "Generating lockfile words for root"
55
npx @docspring/cspell-lockfile-dicts \
66
--path .cspell/generated-lockfile-words-root.txt \
7-
--lockfiles Gemfile.lock yarn.lock
7+
--lockfiles Gemfile.lock package-lock.json
88

99
echo "Generating lockfile words for site"
1010
npx @docspring/cspell-lockfile-dicts \
1111
--path .cspell/generated-lockfile-words-site.txt \
12-
--lockfiles site/yarn.lock
12+
--lockfiles site/package-lock.json

0 commit comments

Comments
 (0)