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 vitest to support vs code extension #5658

Closed
wants to merge 4 commits 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions examples/next-prisma-starter/package.json
Expand Up @@ -48,8 +48,8 @@
"@playwright/test": "^1.26.1",
"@types/node": "^20.10.0",
"@types/react": "^18.2.33",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"autoprefixer": "^10.4.7",
"dotenv": "^16.0.1",
"eslint": "^8.56.0",
Expand All @@ -65,7 +65,7 @@
"tsx": "^4.0.0",
"typescript": "^5.4.0",
"vite": "^5.1.0",
"vitest": "^1.2.2"
"vitest": "^1.5.0"
},
"publishConfig": {
"access": "restricted"
Expand Down
4 changes: 2 additions & 2 deletions examples/next-prisma-websockets-starter/package.json
Expand Up @@ -61,8 +61,8 @@
"@types/node": "^20.10.0",
"@types/react": "^18.2.33",
"@types/ws": "^8.2.0",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"autoprefixer": "^10.4.7",
"cross-env": "^7.0.3",
"eslint": "^8.56.0",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Expand Up @@ -51,10 +51,10 @@
"@testing-library/user-event": "^14.4.3",
"@types/node": "^20.10.0",
"@types/prettier": "^2.7.2",
"@typescript-eslint/eslint-plugin": "^7.0.1",
"@typescript-eslint/parser": "^7.0.1",
"@vitest/coverage-istanbul": "^1.2.2",
"@vitest/ui": "^1.2.2",
"@typescript-eslint/eslint-plugin": "^7.7.0",
"@typescript-eslint/parser": "^7.7.0",
"@vitest/coverage-istanbul": "^1.5.0",
"@vitest/ui": "^1.5.0",
"concurrently": "^8.0.0",
"eslint": "^8.56.0",
"eslint-config-prettier": "^8.8.0",
Expand Down Expand Up @@ -82,8 +82,8 @@
"turbo": "^1.10.2",
"typescript": "^5.4.0",
"vite": "^5.1.0",
"vitest": "^1.2.2",
"vitest-environment-miniflare": "^2.14.1",
"vitest": "^1.5.0",
"vitest-environment-miniflare": "^2.14.2",
"zod": "^3.0.0"
},
"pnpm": {
Expand Down
3 changes: 1 addition & 2 deletions packages/client/src/internals/getAbortController.ts
Expand Up @@ -8,11 +8,10 @@ export function getAbortController(
return customAbortControllerImpl;
}

// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
if (typeof window !== 'undefined' && window.AbortController) {
return window.AbortController;
}
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain

if (typeof globalThis !== 'undefined' && globalThis.AbortController) {
return globalThis.AbortController;
}
Expand Down
3 changes: 1 addition & 2 deletions packages/client/src/links/internals/getTextDecoder.ts
Expand Up @@ -7,11 +7,10 @@ export function getTextDecoder(
return customTextDecoder;
}

// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
if (typeof window !== 'undefined' && window.TextDecoder) {
return new window.TextDecoder();
}
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain

if (typeof globalThis !== 'undefined' && globalThis.TextDecoder) {
return new globalThis.TextDecoder();
}
Expand Down