Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/prevent-recursiv…
Browse files Browse the repository at this point in the history
…e-fallback-throw-error
  • Loading branch information
manudeli committed Jan 23, 2025
2 parents 7c872cc + e13e8de commit b5e5c9d
Show file tree
Hide file tree
Showing 10 changed files with 1,405 additions and 1,323 deletions.
16 changes: 8 additions & 8 deletions configs/eslint-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
"clean": "rimraf ./dist && rimraf ./coverage && rimraf ./node_modules"
},
"dependencies": {
"@cspell/eslint-plugin": "^8.16.1",
"@eslint-react/eslint-plugin": "^1.17.3",
"@cspell/eslint-plugin": "^8.17.2",
"@eslint-react/eslint-plugin": "^1.23.2",
"@next/eslint-plugin-next": "catalog:",
"@vitest/eslint-plugin": "^1.1.14",
"eslint-config-prettier": "^9.1.0",
"@vitest/eslint-plugin": "^1.1.25",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-jest-dom": "^5.5.0",
"eslint-plugin-jsdoc": "^50.6.0",
"eslint-plugin-jsdoc": "^50.6.2",
"eslint-plugin-mdx": "^3.1.5",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-react-compiler": "19.0.0-beta-e552027-20250112",
"eslint-plugin-react-hooks": "^5.1.0",
"typescript-eslint": "^8.17.0"
"typescript-eslint": "^8.20.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@suspensive/tsconfig": "workspace:*",
"@types/react": "catalog:react18",
"@types/react-dom": "catalog:react18",
"@vitejs/plugin-react": "^4.3.2",
"@vitejs/plugin-react": "^4.3.4",
"globals": "^15.10.0"
}
}
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/node": "^22.10.1",
"@vitest/browser": "^2.1.8",
"@vitest/coverage-istanbul": "^2.1.8",
"@vitest/coverage-v8": "^2.1.8",
"@vitest/ui": "^2.1.8",
"@vitest/browser": "^3.0.2",
"@vitest/coverage-istanbul": "^3.0.2",
"@vitest/coverage-v8": "^3.0.2",
"@vitest/ui": "^3.0.2",
"broken-link-checker": "^0.7.8",
"eslint": "^9.17.0",
"husky": "^9.1.7",
Expand All @@ -71,7 +71,7 @@
"tsup": "^8.3.5",
"turbo": "^2.3.3",
"typescript": "^5.7.2",
"vite": "^6.0.3",
"vitest": "^2.1.8"
"vite": "^6.0.8",
"vitest": "^3.0.2"
}
}
4 changes: 2 additions & 2 deletions packages/codemods/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
"test:ui": "vitest --ui --coverage --typecheck"
},
"dependencies": {
"@commander-js/extra-typings": "^12.1.0",
"commander": "^12.1.0",
"@commander-js/extra-typings": "^13.0.0",
"commander": "^13.0.0",
"execa": "^5.1.1",
"jscodeshift": "^17.0.0",
"prompts": "^2.4.2"
Expand Down
8 changes: 7 additions & 1 deletion packages/react-dom/src/utils/observe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ export const optionsToId = (options: IntersectionObserverInit & { trackVisibilit
Object.keys(options)
.sort()
.filter((key) => options[key as keyof IntersectionObserverInit] !== undefined)
.map((key) => `${key}_${key === 'root' ? getRootId(options.root) : options[key as keyof IntersectionObserverInit]}`)
.map(
(key) =>
`${key}_${
// eslint-disable-next-line @typescript-eslint/no-base-to-string
key === 'root' ? getRootId(options.root) : options[key as keyof IntersectionObserverInit]
}`
)
.toString()

function createObserver(options: IntersectionObserverInit & { trackVisibility?: boolean; delay?: number }) {
Expand Down
6 changes: 5 additions & 1 deletion packages/react-query-4/src/useSuspenseQueries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,11 @@ export function useSuspenseQueries<T extends any[]>({
context?: UseQueryOptions['context']
}): SuspenseQueriesResults<T> {
return useQueries({
queries: queries.map((query: typeof queries) => ({ ...query, suspense: true })),
queries: queries.map((query: typeof queries) => ({
// eslint-disable-next-line @typescript-eslint/no-misused-spread
...query,
suspense: true,
})),
context,
}) as SuspenseQueriesResults<T>
}
4 changes: 2 additions & 2 deletions packages/react-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
"test:ui": "vitest --ui --coverage --typecheck"
},
"dependencies": {
"@commander-js/extra-typings": "^12.1.0",
"@commander-js/extra-typings": "^13.0.0",
"@suspensive/react-query-4": "workspace:^2.18.12",
"@suspensive/react-query-5": "workspace:^2.18.12",
"cli-table3": "^0.6.5",
"commander": "^12.1.0"
"commander": "^13.0.0"
},
"devDependencies": {
"@suspensive/eslint-config": "workspace:*",
Expand Down
15 changes: 13 additions & 2 deletions packages/react/src/DevMode.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ describe('<DevMode/>', () => {
// eslint-disable-next-line @typescript-eslint/no-deprecated
expect(DevMode({})).toBe(null)
})
;(() => <Suspense devMode={{}} />)() // devMode prop jsdoc deprecated
;(() => <ErrorBoundary fallback={() => null} devMode={{}} />)() // devMode prop jsdoc deprecated
;(() => (
<Suspense
// eslint-disable-next-line @typescript-eslint/no-deprecated
devMode={{}}
/>
))() // devMode prop jsdoc deprecated
;(() => (
<ErrorBoundary
fallback={() => null}
// eslint-disable-next-line @typescript-eslint/no-deprecated
devMode={{}}
/>
))() // devMode prop jsdoc deprecated
})
Loading

0 comments on commit b5e5c9d

Please sign in to comment.