Skip to content

Commit a098fe1

Browse files
committed
Switch to Yarn (Berry) workspace
1 parent 393e6e5 commit a098fe1

File tree

46 files changed

+3727
-7187
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3727
-7187
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
*.mli linguist-language=OCaml
33
*.res linguist-language=ReScript
44
*.resi linguist-language=ReScript
5+
6+
.yarn/releases/* binary linguist-vendored

.github/workflows/ci.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
- name: Use Node.js
136136
uses: actions/setup-node@v4
137137
with:
138-
cache: npm
138+
cache: yarn
139139
node-version-file: .nvmrc
140140

141141
- name: Get artifact dir name
@@ -254,7 +254,7 @@ jobs:
254254
run: opam exec -- dune build --display quiet --profile static
255255

256256
- name: Install npm packages
257-
run: npm ci --ignore-scripts
257+
run: yarn install --immutable
258258

259259
- name: Copy compiler exes to platform bin dir
260260
run: node ./scripts/copyExes.js -compiler
@@ -402,11 +402,11 @@ jobs:
402402
- name: Use Node.js
403403
uses: actions/setup-node@v4
404404
with:
405-
cache: npm
405+
cache: yarn
406406
node-version-file: .nvmrc
407407

408408
- name: NPM install
409-
run: npm ci --ignore-scripts
409+
run: yarn install --immutable
410410

411411
- name: Download artifacts
412412
uses: actions/download-artifact@v4
@@ -463,7 +463,6 @@ jobs:
463463
- name: Use Node.js
464464
uses: actions/setup-node@v4
465465
with:
466-
cache: npm
467466
node-version-file: .nvmrc
468467

469468
- name: Download artifacts
@@ -498,7 +497,7 @@ jobs:
498497
- name: Use Node.js
499498
uses: actions/setup-node@v4
500499
with:
501-
cache: npm
500+
cache: yarn
502501
node-version-file: .nvmrc
503502
registry-url: https://registry.npmjs.org # Needed to make auth work for publishing
504503

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,10 @@ tests/tools_tests/**/*.res.js
8181
tests/tools_tests/lib
8282
tests/analysis_tests*/lib
8383
tests/analysis_tests/**/*.bs.js
84+
85+
.yarn/*
86+
!.yarn/patches
87+
!.yarn/plugins
88+
!.yarn/releases
89+
!.yarn/sdks
90+
!.yarn/versions

.yarn/releases/yarn-4.7.0.cjs

Lines changed: 935 additions & 0 deletions
Large diffs are not rendered by default.

.yarnrc.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
yarnPath: .yarn/releases/yarn-4.7.0.cjs
2+
3+
nodeLinker: node-modules
4+
5+
nmMode: hardlinks-global

Makefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ ninja/ninja:
2626

2727
ninja: ninja/ninja
2828

29-
node_modules/.bin/semver:
30-
npm install
31-
3229
test: lib
3330
node scripts/test.js -all
3431

@@ -54,7 +51,7 @@ test-all: test test-gentype test-analysis test-tools
5451
reanalyze:
5552
reanalyze.exe -set-exit-code -all-cmt _build/default/compiler _build/default/tests -exclude-paths compiler/outcome_printer,compiler/ml,compiler/js_parser,compiler/frontend,compiler/ext,compiler/depends,compiler/core,compiler/common,compiler/cmij,compiler/bsb_helper,compiler/bsb
5653

57-
lib: build node_modules/.bin/semver
54+
lib: build
5855
./scripts/buildRuntime.sh
5956
./scripts/prebuilt.js
6057

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
lib
22
.merlin
33
package-lock.json
4+
yarn.lock
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/node_modules
22
/lib
33
package-lock.json
4+
yarn.lock

analysis/examples/workspace-project/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ lib
2626
.bsb.lock
2727
/node_modules/
2828
package-lock.json
29+
yarn.lock

0 commit comments

Comments
 (0)