Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update yarn to 3.6.3 #1216

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,7 @@ jobs:
run: opam install . --deps-only --with-test

- name: Install npm packages
run: |
yarn --frozen-lockfile --cwd astexplorer
yarn --frozen-lockfile
run: yarn --immutable

- name: Check formatting
run: yarn fmt:check
Expand Down
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,11 @@ dist/

# build cache
.parcel-cache/

# yarn
.yarn/*
!.yarn/patches/
!.yarn/plugins/
!.yarn/releases/
!.yarn/sdks/
!.yarn/versions/
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.3.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.3.cjs
7 changes: 3 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ all:

.PHONY: yarn-deps
yarn-deps:
yarn --frozen-lockfile
yarn --frozen-lockfile --cwd astexplorer
yarn --immutable

.PHONY: deps
deps: ## Install development dependencies
Expand All @@ -25,7 +24,7 @@ switch: create_switch deps ## Create an opam switch and install development depe
.PHONY: build
build: ## Build the project
dune build src/vscode_ocaml_platform.bc.js
yarn --cwd astexplorer build
yarn workspace astexplorer build
yarn esbuild _build/default/src/vscode_ocaml_platform.bc.js \
--bundle \
--external:vscode \
Expand All @@ -37,7 +36,7 @@ build: ## Build the project
.PHONY: build-release
build-release:
dune build src/vscode_ocaml_platform.bc.js --profile=release
yarn --cwd astexplorer build
yarn workspace astexplorer build
yarn esbuild _build/default/src/vscode_ocaml_platform.bc.js \
--bundle \
--external:vscode \
Expand Down
1,621 changes: 0 additions & 1,621 deletions astexplorer/yarn.lock

This file was deleted.

8 changes: 6 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -1189,6 +1189,9 @@
}
]
},
"workspaces": [
"astexplorer"
],
"scripts": {
"test:esy": "node ./test/runEsyTests.js",
"test:opam": "node ./test/runOpamTests.js",
Expand All @@ -1207,13 +1210,13 @@
},
"devDependencies": {
"@types/vscode": "1.64.0",
"@vscode/vsce": "2.21.0",
"esbuild": "0.19.2",
"fs-extra": "11.1.1",
"mocha": "10.2.0",
"npm-run-all": "4.1.5",
"ovsx": "0.8.3",
"prettier": "3.0.3",
"@vscode/vsce": "2.21.0",
"vscode-test": "1.6.1"
},
"prettier": {
Expand All @@ -1227,5 +1230,6 @@
}
}
]
}
},
"packageManager": "[email protected]"
}
Loading