Skip to content

Commit 75b6457

Browse files
committed
fix ci
1 parent fe75b41 commit 75b6457

File tree

14 files changed

+213
-15
lines changed

14 files changed

+213
-15
lines changed

.eslintrc.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -406,11 +406,7 @@ module.exports = {
406406
'**/__{tests,mocks}__/*.{js,jsx,ts,tsx}',
407407
'**/*.spec.{ts,js.jsx.tsx}',
408408
],
409-
extends: ['plugin:jest/recommended'],
410-
rules: {
411-
'jest/no-conditional-expect': 'off',
412-
'jest/expect-expect': ['error', { assertFunctionNames: ['expect*'] }],
413-
},
409+
extends: ['plugin:@vitest/legacy-recommended'],
414410
},
415411
{
416412
// Resources are typically our helper scripts; make life easier there

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ package-lock.json
2626
.eslintcache
2727
.cspellcache
2828

29-
vite.config.d.ts
29+
vitest.config.*.mjs
3030
vite.config.js
3131

3232
.next/

examples/monaco-graphql-webpack/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"@babel/core": "^7.21.0",
2323
"@babel/plugin-proposal-class-properties": "^7.18.6",
2424
"@babel/plugin-syntax-dynamic-import": "^7.8.3",
25+
"@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
2526
"@babel/preset-env": "^7.20.2",
2627
"@babel/preset-react": "^7.18.6",
2728
"@babel/preset-typescript": "^7.21.0",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"eslint-import-resolver-typescript": "^3.6.1",
9696
"eslint-plugin-cypress": "^4.1.0",
9797
"eslint-plugin-import-x": "^3.1.0",
98-
"eslint-plugin-jest": "^28.6.0",
98+
"@vitest/eslint-plugin": "^1.1.16",
9999
"eslint-plugin-mdx": "^3.1.5",
100100
"eslint-plugin-promise": "^7.0.0",
101101
"eslint-plugin-react": "^7.37.2",

packages/cm6-graphql/__tests__/test.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ describe('codemirror 6 language', () => {
2020
fs.readFileSync(path.join(caseDir, file), 'utf8'),
2121
file,
2222
)) {
23+
// eslint-disable-next-line @vitest/expect-expect
2324
it(`${name}`, () => {
2425
try {
2526
run(graphqlLanguage.parser);

packages/codemirror-graphql/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
"graphql-language-service": "5.3.0"
4848
},
4949
"devDependencies": {
50+
"jsdom": "^25.0.1",
5051
"@codemirror/language": "^6.0.0",
5152
"codemirror": "^5.65.3",
5253
"cross-env": "^7.0.2",

packages/codemirror-graphql/src/utils/__tests__/jsonParse.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ describe('jsonParse', () => {
2020
expect(ast.members[0].value).toStrictEqual(value);
2121
}
2222

23+
// eslint-disable-next-line @vitest/expect-expect
2324
it('correctly parses escaped strings', () => {
2425
expectEscapedString(
2526
'{ "test": "\\"" }',

packages/codemirror-graphql/src/variables/__tests__/hint.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @vitest/expect-expect */
12
/**
23
* Copyright (c) 2021 GraphQL Contributors
34
* All rights reserved.

packages/graphiql-react/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
"set-value": "^4.1.0"
6969
},
7070
"devDependencies": {
71+
"jsdom": "^25.0.1",
7172
"babel-plugin-react-compiler": "19.0.0-beta-37ed2a7-20241206",
7273
"@types/react-dom": "^18.3.1",
7374
"@babel/helper-string-parser": "^7.19.4",

packages/graphql-language-service-server/src/__tests__/__utils__/MockProject.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ const modules = [
2626
'@babel/code-frame',
2727
'@babel/highlight',
2828
// these I think are just required by jest when you console log from a test
29-
'jest-message-util',
30-
'stack-utils',
3129
'pretty-format',
3230
'ansi-regex',
3331
'js-tokens',

0 commit comments

Comments
 (0)