Skip to content

Commit

Permalink
Update npm deps
Browse files Browse the repository at this point in the history
Signed-off-by: Sora Morimoto <[email protected]>
  • Loading branch information
smorimoto committed Dec 10, 2024
1 parent 93d9d65 commit a4787bd
Show file tree
Hide file tree
Showing 40 changed files with 19,055 additions and 18,977 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
ocaml-compiler:
- "5.2"


runs-on: ${{ matrix.os }}

steps:
Expand All @@ -43,8 +42,7 @@ jobs:
node-version: lts/*

- name: Install npm packages
run: yarn --frozen-lockfile
working-directory: ocaml-lsp-server/test/e2e
run: yarn install --frozen-lockfile

- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v3
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
_opam/
_build/
_opam/
.idea/
.log/
.vscode/
node_modules/
tmp/
.DS_Store
.merlin
Expand Down
11 changes: 3 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ TEST_E2E_DIR = ocaml-lsp-server/test/e2e

.PHONY: yarn-install
yarn-install:
cd $(TEST_E2E_DIR) && yarn --frozen-lockfile
yarn install --frozen-lockfile

-include Makefile.dev

Expand Down Expand Up @@ -39,7 +39,6 @@ lock: ## Generate the lock files
bench: ##
dune exec ocaml-lsp-server/bench/ocaml_lsp_bench.exe --profile bench


.PHONY: test-ocaml
test-ocaml: ## Run the unit tests
dune build @lsp/test/runtest @lsp-fiber/runtest @jsonrpc-fiber/runtest @ocaml-lsp-server/runtest
Expand Down Expand Up @@ -70,7 +69,6 @@ clean: ## Clean build artifacts and other generated files
.PHONY: fmt
fmt: ## Format the codebase with ocamlformat
dune build @fmt --auto-promote
cd $(TEST_E2E_DIR)

.PHONY: watch
watch: ## Watch for the filesystem and rebuild on every change
Expand All @@ -89,15 +87,12 @@ release: ## Release on Opam
dune-release opam submit

.PHONY: nix-tests
nix-tests:
(cd $(TEST_E2E_DIR) && yarn --frozen-lockfile)
nix-tests: yarn-install
make test

.PHONY: nix-fmt
nix-fmt:
$(MAKE) yarn-install
nix-fmt: yarn-install
dune build @fmt --auto-promote
cd $(TEST_E2E_DIR)

.PHONY: coverage-deps
coverage-deps:
Expand Down
32 changes: 32 additions & 0 deletions biome.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"$schema": "node_modules/@biomejs/biome/configuration_schema.json",
"files": {
"ignore": ["package.json"]
},
"formatter": {
"enabled": true,
"useEditorconfig": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"organizeImports": {
"enabled": true
},
"overrides": [
{
"include": ["ocaml-lsp-server/test/e2e/**"],
"linter": {
"enabled": false
}
}
],
"vcs": {
"clientKind": "git",
"enabled": true,
"useIgnoreFile": true
}
}
Loading

0 comments on commit a4787bd

Please sign in to comment.