Merge branch 'beta' into feature/depend-on-beta

TkDodo · TkDodo · commit e1aae31161d0 · 2023-07-25T09:56:04.000+02:00
# Conflicts:
#	examples/solid/basic-typescript/package.json
#	examples/solid/default-query-function/package.json
#	examples/solid/simple/package.json
#	examples/solid/solid-start-streaming/package.json
diff --git a/docs/react/guides/migrating-to-v5.md b/docs/react/guides/migrating-to-v5.md
@@ -108,7 +108,7 @@ If you want to run it against `.js` or `.jsx` files, please use the command belo
 ```
 npx jscodeshift ./path/to/src/ \
   --extensions=js,jsx \
-  --transform=./node_modules/@tanstack/react-query/build/codemods/v5/remove-overloads/remove-overloads.js
+  --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js
 ```
 
 If you want to run it against `.ts` or `.tsx` files, please use the command below:
@@ -117,7 +117,7 @@ If you want to run it against `.ts` or `.tsx` files, please use the command belo
 npx jscodeshift ./path/to/src/ \
   --extensions=ts,tsx \
   --parser=tsx \
-  --transform=./node_modules/@tanstack/react-query/build/codemods/v5/remove-overloads/remove-overloads.js
+  --transform=./node_modules/@tanstack/react-query/build/codemods/src/v5/remove-overloads/remove-overloads.js
 ```
 
 Please note in the case of `TypeScript` you need to use `tsx` as the parser; otherwise, the codemod won't be applied properly!
diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
@@ -12,11 +12,11 @@
     "@tanstack/solid-query": "^5.0.0-beta.0",
     "graphql": "^16.6.0",
     "graphql-request": "^6.1.0",
-    "solid-js": "^1.6.13"
+    "solid-js": "^1.7.8"
   },
   "devDependencies": {
     "typescript": "^5.0.4",
     "vite": "^4.4.4",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/examples/solid/basic-typescript/package.json b/examples/solid/basic-typescript/package.json
@@ -10,11 +10,11 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^5.0.0-beta.0",
-    "solid-js": "^1.6.13"
+    "solid-js": "^1.7.8"
   },
   "devDependencies": {
     "typescript": "^5.0.4",
     "vite": "^4.4.4",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
@@ -10,11 +10,11 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^5.0.0-beta.0",
-    "solid-js": "^1.6.13"
+    "solid-js": "^1.7.8"
   },
   "devDependencies": {
     "typescript": "^5.0.4",
     "vite": "^4.4.4",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
@@ -10,12 +10,12 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^5.0.0-beta.0",
-    "solid-js": "^1.6.13"
+    "solid-js": "^1.7.8"
   },
   "devDependencies": {
     "@tanstack/eslint-plugin-query": "^5.0.0-beta.0",
     "typescript": "^5.0.4",
     "vite": "^4.4.4",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
@@ -11,7 +11,7 @@
     "@solidjs/meta": "^0.28.2",
     "@solidjs/router": "^0.7.0",
     "@tanstack/solid-query": "^5.0.0-beta.0",
-    "solid-js": "^1.6.13",
+    "solid-js": "^1.7.8",
     "solid-start": "^0.2.23",
     "undici": "^5.22.1"
   },
diff --git a/integrations/solid-vite/package.json b/integrations/solid-vite/package.json
@@ -7,8 +7,8 @@
   },
   "dependencies": {
     "@tanstack/solid-query": "workspace:*",
-    "solid-js": "^1.6.13",
+    "solid-js": "^1.7.8",
     "vite": "^4.4.4",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/package.json b/package.json
@@ -78,7 +78,7 @@
     "react-dom": "^18.2.0",
     "rimraf": "^5.0.1",
     "semver": "^7.5.1",
-    "solid-js": "^1.6.13",
+    "solid-js": "^1.7.8",
     "stream-to-array": "^2.3.0",
     "tsup": "^7.1.0",
     "type-fest": "^3.13.0",
diff --git a/packages/query-devtools/package.json b/packages/query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-devtools",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.1",
   "description": "Developer tools to interact with and visualize the TanStack Query cache",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -57,6 +57,6 @@
     "solid-transition-group": "^0.2.2",
     "superjson": "^1.12.4",
     "tsup-preset-solid": "^2.0.1",
-    "vite-plugin-solid": "^2.5.0"
+    "vite-plugin-solid": "^2.7.0"
   }
 }
diff --git a/packages/query-devtools/tsup.config.js b/packages/query-devtools/tsup.config.js
@@ -1,28 +1,20 @@
 // @ts-check
 
 import { defineConfig } from 'tsup'
-import * as preset from 'tsup-preset-solid'
+import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid'
 
 const preset_options = {
-  // array or single object
-  entries: [
-    // default entry (index)
-    {
-      // entries with '.tsx' extension will have `solid` export condition generated
-      entry: 'src/index.tsx',
-      // will generate a separate development entry
-      dev_entry: true,
-    },
-  ],
-  // Set to `true` to remove all `console.*` calls and `debugger` statements in prod builds
-  drop_console: true,
-  // Set to `true` to generate a CommonJS build alongside ESM
+  entries: {
+    entry: 'src/index.tsx',
+    dev_entry: true,
+  },
   cjs: true,
+  drop_console: true,
 }
 
 export default defineConfig(() => {
-  const parsed_options = preset.parsePresetOptions(preset_options)
-  const tsup_options = preset.generateTsupOptions(parsed_options)
+  const parsed_data = parsePresetOptions(preset_options)
+  const tsup_options = generateTsupOptions(parsed_data)
 
   tsup_options.forEach((tsup_option) => {
     tsup_option.outDir = 'build'
diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/react-query-devtools",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.1",
   "description": "Developer tools to interact with and visualize the TanStack/react-query cache",
   "author": "tannerlinsley",
   "license": "MIT",
diff --git a/packages/react-query/package.json b/packages/react-query/package.json
@@ -37,12 +37,13 @@
     "test:build": "publint --strict && attw --pack",
     "build": "pnpm build:tsup && pnpm build:codemods",
     "build:tsup": "tsup",
-    "build:codemods": "cpy ../codemods/src/**/* ./build/codemods"
+    "build:codemods": "cpy ../codemods/* ./build/codemods"
   },
   "files": [
     "build",
     "src",
-    "!build/codemods/jest.config.js",
+    "!build/codemods/node_modules",
+    "!build/codemods/vitest.config.ts",
     "!build/codemods/**/__testfixtures__",
     "!build/codemods/**/__tests__"
   ],
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.1",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -16,22 +16,24 @@
   "types": "./build/index.d.ts",
   "browser": {},
   "exports": {
-    "solid": {
-      "development": "./build/dev.js",
-      "import": "./build/index.js"
-    },
     "development": {
       "import": {
         "types": "./build/index.d.ts",
         "default": "./build/dev.js"
       },
-      "require": "./build/dev.cjs"
+      "require": {
+        "types": "./build/index.d.cts",
+        "default": "./build/dev.cjs"
+      }
     },
     "import": {
       "types": "./build/index.d.ts",
       "default": "./build/index.js"
     },
-    "require": "./build/index.cjs"
+    "require": {
+      "types": "./build/index.d.cts",
+      "default": "./build/index.cjs"
+    }
   },
   "sideEffects": [
     "./src/setBatchUpdatesFn.ts"
@@ -50,13 +52,14 @@
     "src"
   ],
   "dependencies": {
-    "@tanstack/query-core": "workspace:*"
+    "@tanstack/query-core": "workspace:*",
+    "solid-js": "^1.7.8"
   },
   "devDependencies": {
-    "tsup-preset-solid": "^0.1.8",
-    "vite-plugin-solid": "^2.5.0"
+    "tsup-preset-solid": "^2.0.1",
+    "vite-plugin-solid": "^2.7.0"
   },
   "peerDependencies": {
-    "solid-js": "^1.6.13"
+    "solid-js": "^1.6.0"
   }
 }
diff --git a/packages/solid-query/src/__tests__/createQuery.test.tsx b/packages/solid-query/src/__tests__/createQuery.test.tsx
@@ -1452,7 +1452,7 @@ describe('createQuery', () => {
       return (
         <div>
           <h1>
-            data: {state.data}, count: {count}, isFetching:{' '}
+            data: {state.data}, count: {count()}, isFetching:{' '}
             {String(state.isFetching)}
           </h1>
           <button onClick={() => setCount(1)}>inc</button>
@@ -4265,7 +4265,7 @@ describe('createQuery', () => {
       return (
         <div>
           <h2>Data: {JSON.stringify(state.data)}</h2>
-          <h2>forceValue: {forceValue}</h2>
+          <h2>forceValue: {forceValue()}</h2>
           <button onClick={forceUpdate}>forceUpdate</button>
         </div>
       )
@@ -4320,7 +4320,7 @@ describe('createQuery', () => {
       return (
         <div>
           <h2>Data: {JSON.stringify(state.data)}</h2>
-          <h2>forceValue: {forceValue}</h2>
+          <h2>forceValue: {forceValue()}</h2>
           <button onClick={forceUpdate}>forceUpdate</button>
         </div>
       )
diff --git a/packages/solid-query/src/__tests__/useIsFetching.test.tsx b/packages/solid-query/src/__tests__/useIsFetching.test.tsx
@@ -239,7 +239,7 @@ describe('useIsFetching', () => {
 
       return (
         <div>
-          <div>isFetching: {isFetching}</div>
+          <div>isFetching: {isFetching()}</div>
         </div>
       )
     }
diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx
@@ -175,7 +175,7 @@ describe('useIsMutating', () => {
       })
       return (
         <div>
-          <div>mutating: {isMutating}</div>
+          <div>mutating: {isMutating()}</div>
         </div>
       )
     }
diff --git a/packages/solid-query/tsup.config.js b/packages/solid-query/tsup.config.js
@@ -1,18 +1,24 @@
 // @ts-check
 
-import { defineConfig } from 'tsup-preset-solid'
+import { defineConfig } from 'tsup'
+import { generateTsupOptions, parsePresetOptions } from 'tsup-preset-solid'
 
-export default defineConfig(
-  {
+const preset_options = {
+  entries: {
     entry: 'src/index.ts',
-    devEntry: true,
+    dev_entry: true,
   },
-  {
-    dropConsole: true,
-    cjs: true,
-    tsupOptions: (config) => ({
-      ...config,
-      outDir: 'build',
-    }),
-  },
-)
+  cjs: true,
+  drop_console: true,
+}
+
+export default defineConfig(() => {
+  const parsed_data = parsePresetOptions(preset_options)
+  const tsup_options = generateTsupOptions(parsed_data)
+
+  tsup_options.forEach((tsup_option) => {
+    tsup_option.outDir = 'build'
+  })
+
+  return tsup_options
+})
diff --git a/packages/svelte-query-devtools/package.json b/packages/svelte-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/svelte-query-devtools",
-  "version": "5.0.0-beta.0",
+  "version": "5.0.0-beta.1",
   "description": "Developer tools to interact with and visualize the TanStack/svelte-query cache",
   "author": "Lachlan Collins",
   "license": "MIT",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@`
`12`	`12`	`"@tanstack/solid-query": "^5.0.0-beta.0",`
`13`	`13`	`"graphql": "^16.6.0",`
`14`	`14`	`"graphql-request": "^6.1.0",`
`15`		`- "solid-js": "^1.6.13"`
	`15`	`+ "solid-js": "^1.7.8"`
`16`	`16`	`},`
`17`	`17`	`"devDependencies": {`
`18`	`18`	`"typescript": "^5.0.4",`
`19`	`19`	`"vite": "^4.4.4",`
`20`		`- "vite-plugin-solid": "^2.5.0"`
	`20`	`+ "vite-plugin-solid": "^2.7.0"`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@`
`10`	`10`	`"license": "MIT",`
`11`	`11`	`"dependencies": {`
`12`	`12`	`"@tanstack/solid-query": "^5.0.0-beta.0",`
`13`		`- "solid-js": "^1.6.13"`
	`13`	`+ "solid-js": "^1.7.8"`
`14`	`14`	`},`
`15`	`15`	`"devDependencies": {`
`16`	`16`	`"typescript": "^5.0.4",`
`17`	`17`	`"vite": "^4.4.4",`
`18`		`- "vite-plugin-solid": "^2.5.0"`
	`18`	`+ "vite-plugin-solid": "^2.7.0"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`	`},`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"@tanstack/solid-query": "workspace:*",`
`10`		`- "solid-js": "^1.6.13",`
	`10`	`+ "solid-js": "^1.7.8",`
`11`	`11`	`"vite": "^4.4.4",`
`12`		`- "vite-plugin-solid": "^2.5.0"`
	`12`	`+ "vite-plugin-solid": "^2.7.0"`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tanstack/query-devtools",`
`3`		`- "version": "5.0.0-beta.0",`
	`3`	`+ "version": "5.0.0-beta.1",`
`4`	`4`	`"description": "Developer tools to interact with and visualize the TanStack Query cache",`
`5`	`5`	`"author": "tannerlinsley",`
`6`	`6`	`"license": "MIT",`
`@@ -57,6 +57,6 @@`
`57`	`57`	`"solid-transition-group": "^0.2.2",`
`58`	`58`	`"superjson": "^1.12.4",`
`59`	`59`	`"tsup-preset-solid": "^2.0.1",`
`60`		`- "vite-plugin-solid": "^2.5.0"`
	`60`	`+ "vite-plugin-solid": "^2.7.0"`
`61`	`61`	`}`
`62`	`62`	`}`