Skip to content

Commit 3763615

Browse files
authored
Update npm deps (#1419)
Signed-off-by: Sora Morimoto <sora@morimoto.io>
1 parent 8d0c35c commit 3763615

39 files changed

+4128
-4059
lines changed

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ jobs:
2323
ocaml-compiler:
2424
- "5.2"
2525

26-
2726
runs-on: ${{ matrix.os }}
2827

2928
steps:
@@ -43,8 +42,7 @@ jobs:
4342
node-version: lts/*
4443

4544
- name: Install npm packages
46-
run: yarn --frozen-lockfile
47-
working-directory: ocaml-lsp-server/test/e2e
45+
run: yarn install --frozen-lockfile
4846

4947
- name: Set-up OCaml ${{ matrix.ocaml-compiler }}
5048
uses: ocaml/setup-ocaml@v3

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
_opam/
21
_build/
2+
_opam/
33
.idea/
44
.log/
55
.vscode/
6+
node_modules/
67
tmp/
78
.DS_Store
89
.merlin

Makefile

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ TEST_E2E_DIR = ocaml-lsp-server/test/e2e
44

55
.PHONY: yarn-install
66
yarn-install:
7-
cd $(TEST_E2E_DIR) && yarn --frozen-lockfile
7+
yarn install --frozen-lockfile
88

99
-include Makefile.dev
1010

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

42-
4342
.PHONY: test-ocaml
4443
test-ocaml: ## Run the unit tests
4544
dune build @lsp/test/runtest @lsp-fiber/runtest @jsonrpc-fiber/runtest @ocaml-lsp-server/runtest
@@ -70,7 +69,6 @@ clean: ## Clean build artifacts and other generated files
7069
.PHONY: fmt
7170
fmt: ## Format the codebase with ocamlformat
7271
dune build @fmt --auto-promote
73-
cd $(TEST_E2E_DIR)
7472

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

9189
.PHONY: nix-tests
92-
nix-tests:
93-
(cd $(TEST_E2E_DIR) && yarn --frozen-lockfile)
90+
nix-tests: yarn-install
9491
make test
9592

9693
.PHONY: nix-fmt
97-
nix-fmt:
98-
$(MAKE) yarn-install
94+
nix-fmt: yarn-install
9995
dune build @fmt --auto-promote
100-
cd $(TEST_E2E_DIR)
10196

10297
.PHONY: coverage-deps
10398
coverage-deps:

biome.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"$schema": "node_modules/@biomejs/biome/configuration_schema.json",
3+
"formatter": {
4+
"enabled": true,
5+
"ignore": ["lsp/bin/metamodel/metaModel.json", "package.json"],
6+
"useEditorconfig": true
7+
},
8+
"linter": {
9+
"enabled": true,
10+
"ignore": ["ocaml-lsp-server/test/e2e/**"],
11+
"rules": {
12+
"recommended": true
13+
}
14+
},
15+
"organizeImports": {
16+
"enabled": true
17+
},
18+
"vcs": {
19+
"clientKind": "git",
20+
"enabled": true,
21+
"useIgnoreFile": true
22+
}
23+
}

ocaml-lsp-server/test/e2e/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

ocaml-lsp-server/test/e2e/.prettierignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

ocaml-lsp-server/test/e2e/.prettierrc

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

ocaml-lsp-server/test/e2e/__tests__/Lifecycle.test.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
import * as Protocol from "vscode-languageserver-protocol";
2-
32
import * as LanguageServer from "./../src/LanguageServer";
43

54
test("basic", async () => {
6-
let languageServer = LanguageServer.start();
5+
const languageServer = LanguageServer.start();
76
await LanguageServer.exit(languageServer);
87
});
98

109
test("initialize with empty capabilities", async () => {
11-
let languageServer = LanguageServer.start();
10+
const languageServer = LanguageServer.start();
1211

13-
let capabilities: Protocol.ClientCapabilities = {};
12+
const capabilities: Protocol.ClientCapabilities = {};
1413

15-
let initializeParameters: Protocol.InitializeParams = {
14+
const initializeParameters: Protocol.InitializeParams = {
1615
processId: process.pid,
1716
rootUri: LanguageServer.toURI(__dirname),
1817
capabilities: capabilities,
1918
workspaceFolders: [],
2019
};
2120

22-
let result = await languageServer.sendRequest(
21+
const result = await languageServer.sendRequest(
2322
Protocol.InitializeRequest.type,
2423
initializeParameters,
2524
);

ocaml-lsp-server/test/e2e/__tests__/Request.Debug.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as LanguageServer from "./../src/LanguageServer";
22

33
test("debug/echo", async () => {
4-
let languageServer = await LanguageServer.startAndInitialize();
4+
const languageServer = await LanguageServer.startAndInitialize();
55

6-
let params = {
6+
const params = {
77
message: "testing",
88
};
99

10-
let result: any = await languageServer.sendRequest("debug/echo", params);
10+
const result: any = await languageServer.sendRequest("debug/echo", params);
1111

1212
expect(result.message).toBe("testing");
1313
await LanguageServer.exit(languageServer);

ocaml-lsp-server/test/e2e/__tests__/TextDocument.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import outdent from "outdent";
2-
import * as LanguageServer from "./../src/LanguageServer";
32
import * as Protocol from "vscode-languageserver-protocol";
43
import * as Types from "vscode-languageserver-types";
4+
import * as LanguageServer from "./../src/LanguageServer";
55

66
describe("TextDocument: incremental sync", () => {
77
let languageServer: LanguageServer.LanguageServer;
88

99
async function getDoc(languageServer: LanguageServer.LanguageServer) {
10-
let result: string = await languageServer.sendRequest(
10+
const result: string = await languageServer.sendRequest(
1111
"debug/textDocument/get",
1212
{
1313
textDocument: Types.TextDocumentIdentifier.create(
@@ -309,7 +309,7 @@ describe("TextDocument", () => {
309309
},
310310
);
311311

312-
let result: string = await languageServer.sendRequest(
312+
const result: string = await languageServer.sendRequest(
313313
"debug/textDocument/get",
314314
{
315315
textDocument: Types.TextDocumentIdentifier.create(
@@ -349,7 +349,7 @@ describe("TextDocument", () => {
349349
},
350350
);
351351

352-
let result: string = await languageServer.sendRequest(
352+
const result: string = await languageServer.sendRequest(
353353
"debug/textDocument/get",
354354
{
355355
textDocument: Types.TextDocumentIdentifier.create(

0 commit comments

Comments
 (0)