Skip to content

Commit 2fc4949

Browse files
authored
Merge branch 'main' into vscode-query-execution
2 parents 4ca443c + bb7e9d3 commit 2fc4949

34 files changed

+12574
-18847
lines changed

.changeset/ninety-panthers-pretend.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@neo4j-cypher/react-codemirror": patch
3+
---
4+
5+
Simplify detection and handling of value prop updates

.eslintignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ out/
22
dist/
33
esm/
44
packages/language-support/src/generated-parser/*
5-
jest.config.js
6-
jest.config.cjs
5+
vitest.workspace.ts
6+
vitest.config.ts
7+
vitest.config.mts
78
rollup.config.js
89
index.html
910
packages/language-support/src/highlighting/semanticAnalysis.js

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- main
99

1010
env:
11-
NODE_OPTIONS: '--max_old_space_size=4096'
11+
NODE_OPTIONS: '--max_old_space_size=8192'
1212

1313
jobs:
1414
lint-and-format:
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: Build project
2727
env:
28-
NODE_OPTIONS: '--max_old_space_size=4096'
28+
NODE_OPTIONS: '--max_old_space_size=8192'
2929
run: npm run build
3030

3131
- name: Check there are no linting errors
@@ -51,7 +51,7 @@ jobs:
5151
- name: Builds and run tests
5252
# Tests with the same flags that VSCode does
5353
run: |
54-
npm test -- --filter=!antlr4 -- --passWithNoTests --testLocationInResults
54+
npm test -- --filter=!antlr4 -- --passWithNoTests
5555
npm test -- --filter=antlr4
5656
5757
e2e-test:

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
3-
"Orta.vscode-jest",
3+
"vitest.explorer",
44
"esbenp.prettier-vscode",
55
"dbaeumer.vscode-eslint",
66
"bradlc.vscode-tailwindcss"

.vscode/settings.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
"[javascript]": {
1010
"editor.defaultFormatter": "esbenp.prettier-vscode"
1111
},
12-
"jest.autoRun": "off",
13-
"jest.jestCommandLine": "npm test -- --filter=language-support -- --passWithNoTests",
14-
"jest.rootPath": "./",
1512
"playwright.env": {
1613
"NODE_OPTIONS": "--max_old_space_size=8192"
1714
}

jest.config.base.js

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

0 commit comments

Comments
 (0)