Skip to content

Commit

Permalink
chore: typescript 5.7 (#8327)
Browse files Browse the repository at this point in the history
* chore: typescript 5.7

and run tests against ts 5.0 - 5.7

* chore: make eslint happy

* chore: type import issue

* chore: the type assertion is necessary for ts 5.4 and lower

* fix: write code so that it narrows in all ts versions

* fix: import assertion

* fix: angular examples stay at typescript 5.4

* Add JSON import attribute, update vue-tsc

* angular fixes

* Fix vue-tsc compatibility

---------

Co-authored-by: Arnoud de Vries <6420061+arnoud-dv@users.noreply.github.com>
Co-authored-by: Lachlan Collins <1667261+lachlancollins@users.noreply.github.com>
  • Loading branch information
3 people authored Nov 25, 2024
1 parent ecc17d5 commit ef0b7b2
Show file tree
Hide file tree
Showing 83 changed files with 900 additions and 669 deletions.
8 changes: 5 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
"react-dom",
"tsup",
"typescript",
"typescript47",
"typescript48",
"typescript49",
"typescript50",
"typescript51",
"typescript52",
"typescript53",
"typescript54",
"typescript55",
"typescript56",
"typescript57",
"vue",
"vue-tsc",
"vue2",
Expand Down
2 changes: 1 addition & 1 deletion examples/angular/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
4 changes: 2 additions & 2 deletions examples/angular/devtools-panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"@angular/platform-browser": "^17.3.12",
"@angular/platform-browser-dynamic": "^17.3.12",
"@angular/router": "^17.3.12",
"@tanstack/angular-query-experimental": "^5.61.3",
"@tanstack/angular-query-devtools-experimental": "^5.61.3",
"@tanstack/angular-query-experimental": "^5.61.3",
"rxjs": "^7.8.1",
"tslib": "^2.6.3",
"zone.js": "^0.14.8"
Expand All @@ -25,6 +25,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/angular/pagination/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/angular/query-options-from-a-service/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/angular/router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/angular/rxjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/angular/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"@angular-devkit/build-angular": "^17.3.8",
"@angular/cli": "^17.3.8",
"@angular/compiler-cli": "^17.3.12",
"typescript": "5.3.3"
"typescript": "5.4.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/algolia/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/auto-refetching/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/default-query-function/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/devtools-panel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/infinite-query-with-max-pages/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/load-more-infinite-scroll/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/nextjs-app-prefetching/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"devDependencies": {
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/nextjs-suspense-streaming/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
},
"devDependencies": {
"@types/react": "^18.2.79",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/offline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
},
"msw": {
Expand Down
2 changes: 1 addition & 1 deletion examples/react/optimistic-updates-cache/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/optimistic-updates-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/pagination/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/prefetching/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
"devDependencies": {
"@types/react": "^18.2.79",
"@types/react-dom": "^18.2.25",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/react-native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"devDependencies": {
"@babel/core": "^7.24.9",
"@expo/config": "^10.0.5",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/react/react-router/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/react-dom": "^18.2.25",
"@types/sort-by": "^1.2.3",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
23 changes: 7 additions & 16 deletions examples/react/react-router/src/routes/contact.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,9 @@
import {
ActionFunctionArgs,
Form,
Link,
LoaderFunctionArgs,
useFetcher,
useLoaderData,
} from 'react-router-dom'
import { Contact, getContact, updateContact } from '../contacts'
import {
QueryClient,
queryOptions,
useSuspenseQuery,
} from '@tanstack/react-query'
import { Form, Link, useFetcher, useLoaderData } from 'react-router-dom'
import { queryOptions, useSuspenseQuery } from '@tanstack/react-query'
import { getContact, updateContact } from '../contacts'
import type { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router-dom'
import type { Contact } from '../contacts'
import type { QueryClient } from '@tanstack/react-query'

export const contactDetailQuery = (id: string) =>
queryOptions({
Expand Down Expand Up @@ -41,7 +33,7 @@ export const loader =
export const action =
(queryClient: QueryClient) =>
async ({ request, params }: ActionFunctionArgs) => {
let formData = await request.formData()
const formData = await request.formData()
if (!params.contactId) {
throw new Error('No contact ID provided')
}
Expand Down Expand Up @@ -94,7 +86,6 @@ export default function Contact() {
method="post"
action="destroy"
onSubmit={(event) => {
// eslint-disable-next-line no-restricted-globals
if (!confirm('Please confirm you want to delete this record.')) {
event.preventDefault()
}
Expand Down
2 changes: 1 addition & 1 deletion examples/react/rick-morty/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/shadow-dom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@types/react": "npm:types-react@rc",
"@types/react-dom": "npm:types-react-dom@rc",
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/star-wars/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/react/suspense/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"devDependencies": {
"@vitejs/plugin-react": "^4.3.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/solid/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"astro": "^4.16.1",
"solid-js": "^1.9.3",
"tailwindcss": "^3.4.7",
"typescript": "5.3.3"
"typescript": "5.7.2"
}
}
2 changes: 1 addition & 1 deletion examples/solid/basic-graphql-request/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"solid-js": "^1.9.3"
},
"devDependencies": {
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5",
"vite-plugin-solid": "^2.10.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"solid-js": "^1.9.3"
},
"devDependencies": {
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5",
"vite-plugin-solid": "^2.10.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/default-query-function/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"solid-js": "^1.9.3"
},
"devDependencies": {
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5",
"vite-plugin-solid": "^2.10.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/solid/simple/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@tanstack/eslint-plugin-query": "^5.61.3",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5",
"vite-plugin-solid": "^2.10.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/svelte/auto-refetching/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"svelte": "^4.2.18",
"svelte-check": "^4.0.0",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"svelte": "^4.2.18",
"svelte-check": "^4.0.0",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
2 changes: 1 addition & 1 deletion examples/svelte/load-more-infinite-scroll/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"svelte": "^4.2.18",
"svelte-check": "^4.0.0",
"typescript": "5.3.3",
"typescript": "5.7.2",
"vite": "^5.3.5"
}
}
Loading

0 comments on commit ef0b7b2

Please sign in to comment.