diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json
index e55f97ca72..1579e59404 100644
--- a/.codesandbox/ci.json
+++ b/.codesandbox/ci.json
@@ -1,6 +1,11 @@
 {
   "installCommand": "install:csb",
-  "sandboxes": ["/examples/react/basic-typescript", "/examples/solid/basic-typescript", "/examples/svelte/basic", "/examples/vue/basic"],
+  "sandboxes": [
+    "/examples/react/basic-typescript",
+    "/examples/solid/basic-typescript",
+    "/examples/svelte/basic",
+    "/examples/vue/basic"
+  ],
   "packages": ["packages/**"],
   "node": "16"
 }
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
index 574da2aebe..a732b82fde 100644
--- a/.eslintrc.cjs
+++ b/.eslintrc.cjs
@@ -1,7 +1,7 @@
 // @ts-check
 
 /** @type {import('eslint').Linter.Config} */
-module.exports = {
+const config = {
   root: true,
   parser: '@typescript-eslint/parser',
   plugins: ['@typescript-eslint', 'import'],
@@ -36,7 +36,8 @@ module.exports = {
     '@typescript-eslint/ban-types': 'off',
     '@typescript-eslint/ban-ts-comment': 'off',
     '@typescript-eslint/consistent-type-imports': [
-      'error', { prefer: 'type-imports' }
+      'error',
+      { prefer: 'type-imports' },
     ],
     '@typescript-eslint/explicit-module-boundary-types': 'off',
     '@typescript-eslint/no-empty-interface': 'off',
@@ -45,10 +46,12 @@ module.exports = {
     '@typescript-eslint/no-unnecessary-condition': 'error',
     '@typescript-eslint/no-unnecessary-type-assertion': 'error',
     '@typescript-eslint/no-inferrable-types': [
-      'error', { ignoreParameters: true },
+      'error',
+      { ignoreParameters: true },
     ],
     'import/default': 'off',
     'import/export': 'off',
+    'import/newline-after-import': 'error',
     'import/no-cycle': 'error',
     'import/no-duplicates': 'off',
     'import/no-unresolved': ['error', { ignore: ['^@tanstack/'] }],
@@ -65,3 +68,5 @@ module.exports = {
     },
   ],
 }
+
+module.exports = config
diff --git a/.prettierignore b/.prettierignore
index 33552c173e..addf185fd7 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,5 @@
-/packages/svelte-query/.svelte-kit
-/packages/react-query/build
+**/.next
+**/.svelte-kit
+**/build
+**/dist
 /packages/codemods/**/__testfixtures__
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cb15bae920..b810dd5949 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,14 +27,17 @@ If you have been assigned to fix an issue or develop a new feature, please follo
 - Submit PR for review.
 
 ### Running examples
+
 - Make sure you've installed the dependencies by running `$ pnpm install` in the repo's root directory.
 - If you want to run the example against your local changes, run `pnpm run watch` in the repo's root directory. Otherwise, it will be run against the latest TanStack Query release.
 - Run `pnpm run dev` in the selected examples' directory.
 
 #### Note on `examples/react-native`
+
 React Native example requires Expo to work. Please follow the instructions from example's README.md file to learn more.
 
 #### Note on standalone execution
+
 If you want to run an example without installing dependencies for the whole repo, just follow instructions from the example's README.md file. It will be then run against the latest TanStack Query release.
 
 ## Online one-click setup
diff --git a/examples/react/algolia/tsconfig.json b/examples/react/algolia/tsconfig.json
index ba028c590e..1bccf6db01 100644
--- a/examples/react/algolia/tsconfig.json
+++ b/examples/react/algolia/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -20,7 +16,5 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }
diff --git a/examples/react/auto-refetching/pages/api/data.js b/examples/react/auto-refetching/pages/api/data.js
index 1d05eedc93..9c0cb35897 100755
--- a/examples/react/auto-refetching/pages/api/data.js
+++ b/examples/react/auto-refetching/pages/api/data.js
@@ -10,7 +10,7 @@ export default async (req, res) => {
     list = []
   }
 
-  await new Promise(r => setTimeout(r, 100))
+  await new Promise((r) => setTimeout(r, 100))
 
   res.json(list)
 }
diff --git a/examples/react/basic-typescript/tsconfig.json b/examples/react/basic-typescript/tsconfig.json
index ba028c590e..1bccf6db01 100644
--- a/examples/react/basic-typescript/tsconfig.json
+++ b/examples/react/basic-typescript/tsconfig.json
@@ -1,11 +1,7 @@
 {
   "compilerOptions": {
     "target": "ES2020",
-    "lib": [
-      "dom",
-      "dom.iterable",
-      "esnext"
-    ],
+    "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
@@ -20,7 +16,5 @@
     "noEmit": true,
     "jsx": "react-jsx"
   },
-  "include": [
-    "src"
-  ]
+  "include": ["src"]
 }
diff --git a/examples/react/basic-typescript/vite.config.ts b/examples/react/basic-typescript/vite.config.ts
index b1b5f91e5f..9cc50ead1c 100644
--- a/examples/react/basic-typescript/vite.config.ts
+++ b/examples/react/basic-typescript/vite.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()]
-})
+  plugins: [react()],
+});
diff --git a/examples/react/load-more-infinite-scroll/pages/about.js b/examples/react/load-more-infinite-scroll/pages/about.js
index 9b74a26f20..e0a7edf054 100755
--- a/examples/react/load-more-infinite-scroll/pages/about.js
+++ b/examples/react/load-more-infinite-scroll/pages/about.js
@@ -2,7 +2,7 @@ export default () => {
   return (
     <a
       href=""
-      onClick={e => {
+      onClick={(e) => {
         window.history.back()
         e.preventDefault()
       }}
diff --git a/examples/react/load-more-infinite-scroll/pages/index.js b/examples/react/load-more-infinite-scroll/pages/index.js
index 782a3aa75f..e06e50796f 100755
--- a/examples/react/load-more-infinite-scroll/pages/index.js
+++ b/examples/react/load-more-infinite-scroll/pages/index.js
@@ -109,9 +109,7 @@ function Example() {
         </>
       )}
       <hr />
-      <Link href="/about">
-        Go to another page
-      </Link>
+      <Link href="/about">Go to another page</Link>
       <ReactQueryDevtools initialIsOpen />
     </div>
   )
diff --git a/examples/react/nextjs/components/Header/index.js b/examples/react/nextjs/components/Header/index.js
index cdd1d701a4..dca3216946 100644
--- a/examples/react/nextjs/components/Header/index.js
+++ b/examples/react/nextjs/components/Header/index.js
@@ -10,7 +10,10 @@ export const Header = () => {
       <Link href="/" className={pathname === '/' ? 'is-active' : ''}>
         Home
       </Link>
-      <Link href="/client-only" className={pathname === '/client-only' ? 'is-active' : ''}>
+      <Link
+        href="/client-only"
+        className={pathname === '/client-only' ? 'is-active' : ''}
+      >
         Client-Only
       </Link>
       <style jsx>{`
diff --git a/examples/react/offline/public/mockServiceWorker.js b/examples/react/offline/public/mockServiceWorker.js
index ba0c013b83..ae4e96565b 100644
--- a/examples/react/offline/public/mockServiceWorker.js
+++ b/examples/react/offline/public/mockServiceWorker.js
@@ -8,118 +8,118 @@
  * - Please do NOT serve this file on production.
  */
 
-const INTEGRITY_CHECKSUM = '02f4ad4a2797f85668baf196e553d929'
-const bypassHeaderName = 'x-msw-bypass'
-const activeClientIds = new Set()
+const INTEGRITY_CHECKSUM = "02f4ad4a2797f85668baf196e553d929";
+const bypassHeaderName = "x-msw-bypass";
+const activeClientIds = new Set();
 
-self.addEventListener('install', function () {
-  return self.skipWaiting()
-})
+self.addEventListener("install", function () {
+  return self.skipWaiting();
+});
 
-self.addEventListener('activate', async function (event) {
-  return self.clients.claim()
-})
+self.addEventListener("activate", async function (event) {
+  return self.clients.claim();
+});
 
-self.addEventListener('message', async function (event) {
-  const clientId = event.source.id
+self.addEventListener("message", async function (event) {
+  const clientId = event.source.id;
 
   if (!clientId || !self.clients) {
-    return
+    return;
   }
 
-  const client = await self.clients.get(clientId)
+  const client = await self.clients.get(clientId);
 
   if (!client) {
-    return
+    return;
   }
 
-  const allClients = await self.clients.matchAll()
+  const allClients = await self.clients.matchAll();
 
   switch (event.data) {
-    case 'KEEPALIVE_REQUEST': {
+    case "KEEPALIVE_REQUEST": {
       sendToClient(client, {
-        type: 'KEEPALIVE_RESPONSE',
-      })
-      break
+        type: "KEEPALIVE_RESPONSE",
+      });
+      break;
     }
 
-    case 'INTEGRITY_CHECK_REQUEST': {
+    case "INTEGRITY_CHECK_REQUEST": {
       sendToClient(client, {
-        type: 'INTEGRITY_CHECK_RESPONSE',
+        type: "INTEGRITY_CHECK_RESPONSE",
         payload: INTEGRITY_CHECKSUM,
-      })
-      break
+      });
+      break;
     }
 
-    case 'MOCK_ACTIVATE': {
-      activeClientIds.add(clientId)
+    case "MOCK_ACTIVATE": {
+      activeClientIds.add(clientId);
 
       sendToClient(client, {
-        type: 'MOCKING_ENABLED',
+        type: "MOCKING_ENABLED",
         payload: true,
-      })
-      break
+      });
+      break;
     }
 
-    case 'MOCK_DEACTIVATE': {
-      activeClientIds.delete(clientId)
-      break
+    case "MOCK_DEACTIVATE": {
+      activeClientIds.delete(clientId);
+      break;
     }
 
-    case 'CLIENT_CLOSED': {
-      activeClientIds.delete(clientId)
+    case "CLIENT_CLOSED": {
+      activeClientIds.delete(clientId);
 
       const remainingClients = allClients.filter((client) => {
-        return client.id !== clientId
-      })
+        return client.id !== clientId;
+      });
 
       // Unregister itself when there are no more clients
       if (remainingClients.length === 0) {
-        self.registration.unregister()
+        self.registration.unregister();
       }
 
-      break
+      break;
     }
   }
-})
+});
 
 // Resolve the "main" client for the given event.
 // Client that issues a request doesn't necessarily equal the client
 // that registered the worker. It's with the latter the worker should
 // communicate with during the response resolving phase.
 async function resolveMainClient(event) {
-  const client = await self.clients.get(event.clientId)
+  const client = await self.clients.get(event.clientId);
 
-  if (client.frameType === 'top-level') {
-    return client
+  if (client.frameType === "top-level") {
+    return client;
   }
 
-  const allClients = await self.clients.matchAll()
+  const allClients = await self.clients.matchAll();
 
   return allClients
     .filter((client) => {
       // Get only those clients that are currently visible.
-      return client.visibilityState === 'visible'
+      return client.visibilityState === "visible";
     })
     .find((client) => {
       // Find the client ID that's recorded in the
       // set of clients that have registered the worker.
-      return activeClientIds.has(client.id)
-    })
+      return activeClientIds.has(client.id);
+    });
 }
 
 async function handleRequest(event, requestId) {
-  const client = await resolveMainClient(event)
-  const response = await getResponse(event, client, requestId)
+  const client = await resolveMainClient(event);
+  const response = await getResponse(event, client, requestId);
 
   // Send back the response clone for the "response:*" life-cycle events.
   // Ensure MSW is active and ready to handle the message, otherwise
   // this message will pend indefinitely.
   if (client && activeClientIds.has(client.id)) {
-    ;(async function () {
-      const clonedResponse = response.clone()
+    (async function () {
+      const clonedResponse = response.clone();
       sendToClient(client, {
-        type: 'RESPONSE',
+        type: "RESPONSE",
         payload: {
           requestId,
           type: clonedResponse.type,
@@ -131,21 +131,21 @@ async function handleRequest(event, requestId) {
           headers: serializeHeaders(clonedResponse.headers),
           redirected: clonedResponse.redirected,
         },
-      })
-    })()
+      });
+    })();
   }
 
-  return response
+  return response;
 }
 
 async function getResponse(event, client, requestId) {
-  const { request } = event
-  const requestClone = request.clone()
-  const getOriginalResponse = () => fetch(requestClone)
+  const { request } = event;
+  const requestClone = request.clone();
+  const getOriginalResponse = () => fetch(requestClone);
 
   // Bypass mocking when the request client is not active.
   if (!client) {
-    return getOriginalResponse()
+    return getOriginalResponse();
   }
 
   // Bypass initial page load requests (i.e. static assets).
@@ -153,29 +153,29 @@ async function getResponse(event, client, requestId) {
   // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
   // and is not ready to handle requests.
   if (!activeClientIds.has(client.id)) {
-    return await getOriginalResponse()
+    return await getOriginalResponse();
   }
 
   // Bypass requests with the explicit bypass header
-  if (requestClone.headers.get(bypassHeaderName) === 'true') {
-    const cleanRequestHeaders = serializeHeaders(requestClone.headers)
+  if (requestClone.headers.get(bypassHeaderName) === "true") {
+    const cleanRequestHeaders = serializeHeaders(requestClone.headers);
 
     // Remove the bypass header to comply with the CORS preflight check.
-    delete cleanRequestHeaders[bypassHeaderName]
+    delete cleanRequestHeaders[bypassHeaderName];
 
     const originalRequest = new Request(requestClone, {
       headers: new Headers(cleanRequestHeaders),
-    })
+    });
 
-    return fetch(originalRequest)
+    return fetch(originalRequest);
   }
 
   // Send the request to the client-side MSW.
-  const reqHeaders = serializeHeaders(request.headers)
-  const body = await request.text()
+  const reqHeaders = serializeHeaders(request.headers);
+  const body = await request.text();
 
   const clientMessage = await sendToClient(client, {
-    type: 'REQUEST',
+    type: "REQUEST",
     payload: {
       id: requestId,
       url: request.url,
@@ -193,31 +193,31 @@ async function getResponse(event, client, requestId) {
       bodyUsed: request.bodyUsed,
       keepalive: request.keepalive,
     },
-  })
+  });
 
   switch (clientMessage.type) {
-    case 'MOCK_SUCCESS': {
+    case "MOCK_SUCCESS": {
       return delayPromise(
         () => respondWithMock(clientMessage),
-        clientMessage.payload.delay,
-      )
+        clientMessage.payload.delay
+      );
     }
 
-    case 'MOCK_NOT_FOUND': {
-      return getOriginalResponse()
+    case "MOCK_NOT_FOUND": {
+      return getOriginalResponse();
     }
 
-    case 'NETWORK_ERROR': {
-      const { name, message } = clientMessage.payload
-      const networkError = new Error(message)
-      networkError.name = name
+    case "NETWORK_ERROR": {
+      const { name, message } = clientMessage.payload;
+      const networkError = new Error(message);
+      networkError.name = name;
 
       // Rejecting a request Promise emulates a network error.
-      throw networkError
+      throw networkError;
     }
 
-    case 'INTERNAL_ERROR': {
-      const parsedBody = JSON.parse(clientMessage.payload.body)
+    case "INTERNAL_ERROR": {
+      const parsedBody = JSON.parse(clientMessage.payload.body);
 
       console.error(
         `\
@@ -228,54 +228,54 @@ ${parsedBody.location}
 This exception has been gracefully handled as a 500 response, however, it's strongly recommended to resolve this error, as it indicates a mistake in your code. If you wish to mock an error response, please see this guide: https://mswjs.io/docs/recipes/mocking-error-responses\
 `,
         request.method,
-        request.url,
-      )
+        request.url
+      );
 
-      return respondWithMock(clientMessage)
+      return respondWithMock(clientMessage);
     }
   }
 
-  return getOriginalResponse()
+  return getOriginalResponse();
 }
 
-self.addEventListener('fetch', function (event) {
-  const { request } = event
-  const accept = request.headers.get('accept') || ''
+self.addEventListener("fetch", function (event) {
+  const { request } = event;
+  const accept = request.headers.get("accept") || "";
 
   // Bypass server-sent events.
-  if (accept.includes('text/event-stream')) {
-    return
+  if (accept.includes("text/event-stream")) {
+    return;
   }
 
   // Bypass navigation requests.
-  if (request.mode === 'navigate') {
-    return
+  if (request.mode === "navigate") {
+    return;
   }
 
   // Opening the DevTools triggers the "only-if-cached" request
   // that cannot be handled by the worker. Bypass such requests.
-  if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
-    return
+  if (request.cache === "only-if-cached" && request.mode !== "same-origin") {
+    return;
   }
 
   // Bypass all requests when there are no active clients.
   // Prevents the self-unregistered worked from handling requests
   // after it's been deleted (still remains active until the next reload).
   if (activeClientIds.size === 0) {
-    return
+    return;
   }
 
-  const requestId = uuidv4()
+  const requestId = uuidv4();
 
   return event.respondWith(
     handleRequest(event, requestId).catch((error) => {
-      if (error.name === 'NetworkError') {
+      if (error.name === "NetworkError") {
         console.warn(
           '[MSW] Successfully emulated a network error for the "%s %s" request.',
           request.method,
-          request.url,
-        )
-        return
+          request.url
+        );
+        return;
       }
 
       // At this point, any exception indicates an issue with the original request/response.
@@ -284,55 +284,55 @@ self.addEventListener('fetch', function (event) {
 [MSW] Caught an exception from the "%s %s" request (%s). This is probably not a problem with Mock Service Worker. There is likely an additional logging output above.`,
         request.method,
         request.url,
-        `${error.name}: ${error.message}`,
-      )
-    }),
-  )
-})
+        `${error.name}: ${error.message}`
+      );
+    })
+  );
+});
 
 function serializeHeaders(headers) {
-  const reqHeaders = {}
+  const reqHeaders = {};
   headers.forEach((value, name) => {
     reqHeaders[name] = reqHeaders[name]
       ? [].concat(reqHeaders[name]).concat(value)
-      : value
-  })
-  return reqHeaders
+      : value;
+  });
+  return reqHeaders;
 }
 
 function sendToClient(client, message) {
   return new Promise((resolve, reject) => {
-    const channel = new MessageChannel()
+    const channel = new MessageChannel();
 
     channel.port1.onmessage = (event) => {
       if (event.data && event.data.error) {
-        return reject(event.data.error)
+        return reject(event.data.error);
       }
 
-      resolve(event.data)
-    }
+      resolve(event.data);
+    };
 
-    client.postMessage(JSON.stringify(message), [channel.port2])
-  })
+    client.postMessage(JSON.stringify(message), [channel.port2]);
+  });
 }
 
 function delayPromise(cb, duration) {
   return new Promise((resolve) => {
-    setTimeout(() => resolve(cb()), duration)
-  })
+    setTimeout(() => resolve(cb()), duration);
+  });
 }
 
 function respondWithMock(clientMessage) {
   return new Response(clientMessage.payload.body, {
     ...clientMessage.payload,
     headers: clientMessage.payload.headers,
-  })
+  });
 }
 
 function uuidv4() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-    const r = (Math.random() * 16) | 0
-    const v = c == 'x' ? r : (r & 0x3) | 0x8
-    return v.toString(16)
-  })
+  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0;
+    const v = c == "x" ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
 }
diff --git a/examples/react/optimistic-updates-typescript/pages/api/data.js b/examples/react/optimistic-updates-typescript/pages/api/data.js
index 10cab56281..d94e339e7a 100755
--- a/examples/react/optimistic-updates-typescript/pages/api/data.js
+++ b/examples/react/optimistic-updates-typescript/pages/api/data.js
@@ -1,7 +1,7 @@
 const items = []
 
 export default async (req, res) => {
-  await new Promise(r => setTimeout(r, 1000))
+  await new Promise((r) => setTimeout(r, 1000))
 
   if (req.method === 'POST') {
     const { text } = req.body
diff --git a/examples/react/optimistic-updates-typescript/tsconfig.json b/examples/react/optimistic-updates-typescript/tsconfig.json
index 7f1edf84a6..aebbceec22 100644
--- a/examples/react/optimistic-updates-typescript/tsconfig.json
+++ b/examples/react/optimistic-updates-typescript/tsconfig.json
@@ -1,14 +1,9 @@
 {
-  "include": [
-    "./pages/**/*"
-  ],
+  "include": ["./pages/**/*"],
   "compilerOptions": {
     "strict": true,
     "esModuleInterop": true,
-    "lib": [
-      "dom",
-      "es2015"
-    ],
+    "lib": ["dom", "es2015"],
     "jsx": "preserve",
     "target": "es5",
     "allowJs": true,
@@ -21,7 +16,5 @@
     "isolatedModules": true,
     "incremental": true
   },
-  "exclude": [
-    "node_modules"
-  ]
+  "exclude": ["node_modules"]
 }
diff --git a/examples/react/pagination/pages/api/projects.js b/examples/react/pagination/pages/api/projects.js
index 123fab439f..a0799644eb 100755
--- a/examples/react/pagination/pages/api/projects.js
+++ b/examples/react/pagination/pages/api/projects.js
@@ -14,7 +14,7 @@ export default async (req, res) => {
       }
     })
 
-  await new Promise(r => setTimeout(r, 1000))
+  await new Promise((r) => setTimeout(r, 1000))
 
   res.json({ projects, hasMore: page < 9 })
 }
diff --git a/examples/react/prefetching/pages/[user]/[repo].js b/examples/react/prefetching/pages/[user]/[repo].js
index 81a4fe5d80..df6dc5bd2b 100755
--- a/examples/react/prefetching/pages/[user]/[repo].js
+++ b/examples/react/prefetching/pages/[user]/[repo].js
@@ -32,9 +32,7 @@ export default () => {
       )}
       <br />
       <br />
-      <Link href="/">
-        Back
-      </Link>
+      <Link href="/">Back</Link>
     </div>
   )
 }
diff --git a/examples/react/prefetching/pages/api/data.js b/examples/react/prefetching/pages/api/data.js
index 0d31ff593d..fac5320741 100755
--- a/examples/react/prefetching/pages/api/data.js
+++ b/examples/react/prefetching/pages/api/data.js
@@ -11,8 +11,8 @@ export default (req, res) => {
   if (req.query.id) {
     // a slow endpoint for getting repo data
     fetch(`https://api.github.com/repos/${req.query.id}`)
-      .then(resp => resp.json())
-      .then(data => {
+      .then((resp) => resp.json())
+      .then((data) => {
         setTimeout(() => {
           res.json(data)
         }, 2000)
diff --git a/examples/react/react-native/babel.config.js b/examples/react/react-native/babel.config.js
index 2900afe9d8..9d89e13119 100644
--- a/examples/react/react-native/babel.config.js
+++ b/examples/react/react-native/babel.config.js
@@ -1,4 +1,4 @@
-module.exports = function(api) {
+module.exports = function (api) {
   api.cache(true);
   return {
     presets: ['babel-preset-expo'],
diff --git a/examples/solid/solid-start-streaming/vite.config.ts b/examples/solid/solid-start-streaming/vite.config.ts
index bdb7b243fd..fb4b5ce051 100644
--- a/examples/solid/solid-start-streaming/vite.config.ts
+++ b/examples/solid/solid-start-streaming/vite.config.ts
@@ -1,6 +1,6 @@
-import solid from "solid-start/vite";
-import { defineConfig } from "vite";
+import solid from 'solid-start/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
   plugins: [solid({})],
-});
+})
diff --git a/examples/svelte/auto-refetching/svelte.config.js b/examples/svelte/auto-refetching/svelte.config.js
index 836e30422d..6089017e79 100644
--- a/examples/svelte/auto-refetching/svelte.config.js
+++ b/examples/svelte/auto-refetching/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,8 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/auto-refetching/vite.config.ts b/examples/svelte/auto-refetching/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/auto-refetching/vite.config.ts
+++ b/examples/svelte/auto-refetching/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/basic/svelte.config.js b/examples/svelte/basic/svelte.config.js
index 836e30422d..6089017e79 100644
--- a/examples/svelte/basic/svelte.config.js
+++ b/examples/svelte/basic/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,8 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/basic/vite.config.ts b/examples/svelte/basic/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/basic/vite.config.ts
+++ b/examples/svelte/basic/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/load-more-infinite-scroll/svelte.config.js b/examples/svelte/load-more-infinite-scroll/svelte.config.js
index 05e80f6c7d..71abffe5f0 100644
--- a/examples/svelte/load-more-infinite-scroll/svelte.config.js
+++ b/examples/svelte/load-more-infinite-scroll/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,8 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/load-more-infinite-scroll/vite.config.ts b/examples/svelte/load-more-infinite-scroll/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/load-more-infinite-scroll/vite.config.ts
+++ b/examples/svelte/load-more-infinite-scroll/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/optimistic-updates-typescript/svelte.config.js b/examples/svelte/optimistic-updates-typescript/svelte.config.js
index 836e30422d..6089017e79 100644
--- a/examples/svelte/optimistic-updates-typescript/svelte.config.js
+++ b/examples/svelte/optimistic-updates-typescript/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,8 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/optimistic-updates-typescript/vite.config.ts b/examples/svelte/optimistic-updates-typescript/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/optimistic-updates-typescript/vite.config.ts
+++ b/examples/svelte/optimistic-updates-typescript/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/playground/svelte.config.js b/examples/svelte/playground/svelte.config.js
index a16d0de80a..8fa2889901 100644
--- a/examples/svelte/playground/svelte.config.js
+++ b/examples/svelte/playground/svelte.config.js
@@ -1,13 +1,13 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/playground/vite.config.ts b/examples/svelte/playground/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/playground/vite.config.ts
+++ b/examples/svelte/playground/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/simple/svelte.config.js b/examples/svelte/simple/svelte.config.js
index 49c64ac5bf..ec6a224d76 100644
--- a/examples/svelte/simple/svelte.config.js
+++ b/examples/svelte/simple/svelte.config.js
@@ -3,5 +3,5 @@ import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
 export default {
   // Consult https://github.com/sveltejs/svelte-preprocess
   // for more information about preprocessors
-  preprocess: vitePreprocess()
+  preprocess: vitePreprocess(),
 }
diff --git a/examples/svelte/simple/vite.config.ts b/examples/svelte/simple/vite.config.ts
index 401b4d4bd6..d70196943d 100644
--- a/examples/svelte/simple/vite.config.ts
+++ b/examples/svelte/simple/vite.config.ts
@@ -3,5 +3,5 @@ import { svelte } from '@sveltejs/vite-plugin-svelte'
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [svelte()]
+  plugins: [svelte()],
 })
diff --git a/examples/svelte/ssr/svelte.config.js b/examples/svelte/ssr/svelte.config.js
index 836e30422d..6089017e79 100644
--- a/examples/svelte/ssr/svelte.config.js
+++ b/examples/svelte/ssr/svelte.config.js
@@ -1,5 +1,5 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
@@ -8,8 +8,8 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/ssr/vite.config.ts b/examples/svelte/ssr/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/ssr/vite.config.ts
+++ b/examples/svelte/ssr/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/svelte/star-wars/postcss.config.cjs b/examples/svelte/star-wars/postcss.config.cjs
index 116848f66a..4193e8ab57 100644
--- a/examples/svelte/star-wars/postcss.config.cjs
+++ b/examples/svelte/star-wars/postcss.config.cjs
@@ -1,3 +1,3 @@
 module.exports = {
-  plugins: [require("tailwindcss"), require("autoprefixer")],
-};
+  plugins: [require('tailwindcss'), require('autoprefixer')],
+}
diff --git a/examples/svelte/star-wars/svelte.config.js b/examples/svelte/star-wars/svelte.config.js
index a16d0de80a..8fa2889901 100644
--- a/examples/svelte/star-wars/svelte.config.js
+++ b/examples/svelte/star-wars/svelte.config.js
@@ -1,13 +1,13 @@
-import adapter from '@sveltejs/adapter-auto';
-import { vitePreprocess } from '@sveltejs/kit/vite';
+import adapter from '@sveltejs/adapter-auto'
+import { vitePreprocess } from '@sveltejs/kit/vite'
 
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    adapter: adapter()
-  }
-};
+    adapter: adapter(),
+  },
+}
 
-export default config;
+export default config
diff --git a/examples/svelte/star-wars/tailwind.config.cjs b/examples/svelte/star-wars/tailwind.config.cjs
index fdcf583098..bf2dbaa9f2 100644
--- a/examples/svelte/star-wars/tailwind.config.cjs
+++ b/examples/svelte/star-wars/tailwind.config.cjs
@@ -1,11 +1,9 @@
 module.exports = {
-  content: ["./src/**/*.{html,js,svelte,ts}"],
+  content: ['./src/**/*.{html,js,svelte,ts}'],
   theme: {
     fontFamily: {
-      sans:
-        "Roboto, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif",
-      mono:
-        "Roboto Mono, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif",
+      sans: 'Roboto, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif',
+      mono: 'Roboto Mono, BlinkMacSystemFont, -apple-system, Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, Helvetica, Arial, sans-serif',
     },
   },
-};
+}
diff --git a/examples/svelte/star-wars/vite.config.ts b/examples/svelte/star-wars/vite.config.ts
index 3406f32d68..dd1b8b7fa1 100644
--- a/examples/svelte/star-wars/vite.config.ts
+++ b/examples/svelte/star-wars/vite.config.ts
@@ -1,6 +1,6 @@
-import { sveltekit } from '@sveltejs/kit/vite';
-import { defineConfig } from 'vite';
+import { sveltekit } from '@sveltejs/kit/vite'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
-  plugins: [sveltekit()]
-});
+  plugins: [sveltekit()],
+})
diff --git a/examples/vue/basic/vite.config.ts b/examples/vue/basic/vite.config.ts
index d6bd97afbe..e2529e6f28 100644
--- a/examples/vue/basic/vite.config.ts
+++ b/examples/vue/basic/vite.config.ts
@@ -1,10 +1,10 @@
-import { defineConfig } from "vite";
-import createVuePlugin from "@vitejs/plugin-vue";
+import { defineConfig } from 'vite'
+import createVuePlugin from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [createVuePlugin()],
   optimizeDeps: {
-    exclude: ["@tanstack/vue-query", "vue-demi"],
+    exclude: ['@tanstack/vue-query', 'vue-demi'],
   },
-});
+})
diff --git a/examples/vue/dependent-queries/vite.config.ts b/examples/vue/dependent-queries/vite.config.ts
index 0c166913f9..e23ec347c8 100644
--- a/examples/vue/dependent-queries/vite.config.ts
+++ b/examples/vue/dependent-queries/vite.config.ts
@@ -1,10 +1,10 @@
-import { defineConfig } from "vite";
-import vue from "@vitejs/plugin-vue";
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   optimizeDeps: {
-    exclude: ["@tanstack/vue-query", "vue-demi"],
+    exclude: ['@tanstack/vue-query', 'vue-demi'],
   },
-});
+})
diff --git a/examples/vue/nuxt3/app.vue b/examples/vue/nuxt3/app.vue
index 0a59dc421a..aefa25002c 100644
--- a/examples/vue/nuxt3/app.vue
+++ b/examples/vue/nuxt3/app.vue
@@ -3,14 +3,14 @@
 </template>
 
 <script setup lang="ts">
-import { useQuery } from "@tanstack/vue-query";
+import { useQuery } from '@tanstack/vue-query'
 
 const fetcher = async () =>
-  await fetch("https://jsonplaceholder.typicode.com/posts").then((response) =>
-    response.json()
-  );
+  await fetch('https://jsonplaceholder.typicode.com/posts').then((response) =>
+    response.json(),
+  )
 
-const { data, suspense } = useQuery({ queryKey: ["test"], queryFn: fetcher });
+const { data, suspense } = useQuery({ queryKey: ['test'], queryFn: fetcher })
 
-await suspense();
+await suspense()
 </script>
diff --git a/examples/vue/nuxt3/nuxt.config.ts b/examples/vue/nuxt3/nuxt.config.ts
index b50924548c..fdb44d0fe3 100644
--- a/examples/vue/nuxt3/nuxt.config.ts
+++ b/examples/vue/nuxt3/nuxt.config.ts
@@ -1,4 +1,4 @@
-import { defineNuxtConfig } from "nuxt/config";
+import { defineNuxtConfig } from 'nuxt/config'
 
 // https://v3.nuxtjs.org/docs/directory-structure/nuxt.config
-export default defineNuxtConfig({});
+export default defineNuxtConfig({})
diff --git a/examples/vue/nuxt3/plugins/vue-query.ts b/examples/vue/nuxt3/plugins/vue-query.ts
index 3a69fbc4bf..9423b208a6 100644
--- a/examples/vue/nuxt3/plugins/vue-query.ts
+++ b/examples/vue/nuxt3/plugins/vue-query.ts
@@ -1,28 +1,36 @@
-import type { DehydratedState, VueQueryPluginOptions } from "@tanstack/vue-query";
-import { VueQueryPlugin, QueryClient, hydrate, dehydrate } from "@tanstack/vue-query";
+import type {
+  DehydratedState,
+  VueQueryPluginOptions,
+} from '@tanstack/vue-query'
+import {
+  VueQueryPlugin,
+  QueryClient,
+  hydrate,
+  dehydrate,
+} from '@tanstack/vue-query'
 // Nuxt 3 app aliases
-import { useState } from "#app";
+import { useState } from '#app'
 
 export default defineNuxtPlugin((nuxt) => {
-  const vueQueryState = useState<DehydratedState | null>("vue-query");
+  const vueQueryState = useState<DehydratedState | null>('vue-query')
 
   // Modify your Vue Query global settings here
   const queryClient = new QueryClient({
     defaultOptions: { queries: { staleTime: 5000 } },
-  });
-  const options: VueQueryPluginOptions = { queryClient };
+  })
+  const options: VueQueryPluginOptions = { queryClient }
 
-  nuxt.vueApp.use(VueQueryPlugin, options);
+  nuxt.vueApp.use(VueQueryPlugin, options)
 
   if (process.server) {
-    nuxt.hooks.hook("app:rendered", () => {
-      vueQueryState.value = dehydrate(queryClient);
-    });
+    nuxt.hooks.hook('app:rendered', () => {
+      vueQueryState.value = dehydrate(queryClient)
+    })
   }
 
   if (process.client) {
-    nuxt.hooks.hook("app:created", () => {
-      hydrate(queryClient, vueQueryState.value);
-    });
+    nuxt.hooks.hook('app:created', () => {
+      hydrate(queryClient, vueQueryState.value)
+    })
   }
-});
+})
diff --git a/examples/vue/persister/vite.config.ts b/examples/vue/persister/vite.config.ts
index 0c166913f9..e23ec347c8 100644
--- a/examples/vue/persister/vite.config.ts
+++ b/examples/vue/persister/vite.config.ts
@@ -1,10 +1,10 @@
-import { defineConfig } from "vite";
-import vue from "@vitejs/plugin-vue";
+import { defineConfig } from 'vite'
+import vue from '@vitejs/plugin-vue'
 
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [vue()],
   optimizeDeps: {
-    exclude: ["@tanstack/vue-query", "vue-demi"],
+    exclude: ['@tanstack/vue-query', 'vue-demi'],
   },
-});
+})
diff --git a/nx.json b/nx.json
index a6ccb24f5c..ded2930fbb 100644
--- a/nx.json
+++ b/nx.json
@@ -65,9 +65,7 @@
       "dependsOn": ["^test:types"]
     },
     "build": {
-      "outputs": [
-        "{projectRoot}/build/**/*"
-      ],
+      "outputs": ["{projectRoot}/build/**/*"],
       "inputs": ["default", "^public"],
       "dependsOn": ["^build"]
     },
diff --git a/package.json b/package.json
index c7b6b8587a..f3892f0482 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "build": "nx run-many --target=build --projects=root --parallel=5",
     "watch": "concurrently --kill-others \"pnpm -r build:rollup -w\" \"pnpm -r build:types --watch\"",
     "dev": "pnpm run watch",
-    "prettier": "prettier --plugin-search-dir . \"{packages,examples}/**/src/**/*.{md,js,jsx,cjs,ts,tsx,json,vue,svelte}\"",
+    "prettier": "prettier --plugin-search-dir . \"{packages,examples,scripts}/**/*.{md,js,jsx,cjs,mjs,ts,tsx,json,vue,svelte}\"",
     "prettier:write": "pnpm run prettier --write",
     "cipublish": "node scripts/publish.mjs",
     "validatePackages": "node scripts/validate-packages.mjs"
@@ -58,7 +58,7 @@
     "axios": "^1.4.0",
     "babel-preset-solid": "^1.6.10",
     "bundlewatch": "^0.3.3",
-    "chalk": "^4.1.2",
+    "chalk": "^5.2.0",
     "concurrently": "^8.0.1",
     "cpy-cli": "^4.2.0",
     "current-git-branch": "^1.1.0",
@@ -75,6 +75,7 @@
     "nx-cloud": "^16.0.5",
     "prettier": "^2.8.8",
     "prettier-plugin-svelte": "^2.10.0",
+    "publint": "^0.1.12",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "rimraf": "^4.1.2",
diff --git a/packages/query-async-storage-persister/rollup.config.mjs b/packages/query-async-storage-persister/rollup.config.mjs
index 3aedf53b70..08afdabc0f 100644
--- a/packages/query-async-storage-persister/rollup.config.mjs
+++ b/packages/query-async-storage-persister/rollup.config.mjs
@@ -1,17 +1,16 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'query-async-storage-persister',
-    packageDir: '.',
     jsName: 'QueryAsyncStoragePersister',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
     },
   }),
-])
+)
diff --git a/packages/query-broadcast-client-experimental/rollup.config.mjs b/packages/query-broadcast-client-experimental/rollup.config.mjs
index 68f4752063..fb979d8a5e 100644
--- a/packages/query-broadcast-client-experimental/rollup.config.mjs
+++ b/packages/query-broadcast-client-experimental/rollup.config.mjs
@@ -1,18 +1,17 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'query-broadcast-client-experimental',
-    packageDir: '.',
     jsName: 'QueryBroadcastClient',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       '@tanstack/query-core': 'QueryCore',
       'broadcast-channel': 'BroadcastChannel',
     },
   }),
-])
+)
diff --git a/packages/query-core/rollup.config.mjs b/packages/query-core/rollup.config.mjs
index b199d11c03..a40f15a940 100644
--- a/packages/query-core/rollup.config.mjs
+++ b/packages/query-core/rollup.config.mjs
@@ -1,15 +1,14 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-    ...buildConfigs({
-      name: 'query-core',
-      packageDir: '.',
-      jsName: 'QueryCore',
-      outputFile: 'index',
-      entryFile: ['src/index.ts'],
-      globals: {},
-    }),
-])
+export default defineConfig(
+  buildConfigs({
+    name: 'query-core',
+    jsName: 'QueryCore',
+    outputFile: 'index',
+    entryFile: './src/index.ts',
+    globals: {},
+  }),
+)
diff --git a/packages/query-devtools/rollup.config.mjs b/packages/query-devtools/rollup.config.mjs
index 3acdac859f..facc4e6802 100644
--- a/packages/query-devtools/rollup.config.mjs
+++ b/packages/query-devtools/rollup.config.mjs
@@ -1,8 +1,6 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { createTanstackQueryDevtoolsConfig } from "../../scripts/getRollupConfig.mjs"
+import { createTanstackQueryDevtoolsConfig } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  createTanstackQueryDevtoolsConfig(),
-])
+export default defineConfig(createTanstackQueryDevtoolsConfig())
diff --git a/packages/query-persist-client-core/rollup.config.mjs b/packages/query-persist-client-core/rollup.config.mjs
index 1ef1ab1bec..cb6b0152b7 100644
--- a/packages/query-persist-client-core/rollup.config.mjs
+++ b/packages/query-persist-client-core/rollup.config.mjs
@@ -1,17 +1,16 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'query-persist-client-core',
-    packageDir: '.',
     jsName: 'QueryPersistClientCore',
     outputFile: 'index',
-    entryFile: ['src/index.ts'],
+    entryFile: './src/index.ts',
     globals: {
       '@tanstack/query-core': 'QueryCore',
     },
   }),
-])
+)
diff --git a/packages/query-sync-storage-persister/rollup.config.mjs b/packages/query-sync-storage-persister/rollup.config.mjs
index 2191b1b15e..46ef8a4ca6 100644
--- a/packages/query-sync-storage-persister/rollup.config.mjs
+++ b/packages/query-sync-storage-persister/rollup.config.mjs
@@ -1,17 +1,16 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'query-sync-storage-persister',
-    packageDir: '.',
     jsName: 'QuerySyncStoragePersister',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
     },
   }),
-])
+)
diff --git a/packages/react-query-devtools/.eslintrc.cjs b/packages/react-query-devtools/.eslintrc.cjs
index 2578431a12..a9fa6e620d 100644
--- a/packages/react-query-devtools/.eslintrc.cjs
+++ b/packages/react-query-devtools/.eslintrc.cjs
@@ -2,10 +2,7 @@
 
 /** @type {import('eslint').Linter.Config} */
 const config = {
-  extends: [
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-  ],
+  extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'],
   parserOptions: {
     tsconfigRootDir: __dirname,
     project: './tsconfig.eslint.json',
@@ -13,7 +10,7 @@ const config = {
   rules: {
     'react/jsx-key': ['error', { checkFragmentShorthand: true }],
     'react-hooks/exhaustive-deps': 'error',
-  }
+  },
 }
 
 module.exports = config
diff --git a/packages/react-query-devtools/rollup.config.mjs b/packages/react-query-devtools/rollup.config.mjs
index e7e936715e..73e04b9593 100644
--- a/packages/react-query-devtools/rollup.config.mjs
+++ b/packages/react-query-devtools/rollup.config.mjs
@@ -1,15 +1,14 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
 export default defineConfig([
   ...buildConfigs({
     name: 'react-query-devtools',
-    packageDir: '.',
     jsName: 'ReactQueryDevtools',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       react: 'React',
       'react-dom': 'ReactDOM',
@@ -20,10 +19,9 @@ export default defineConfig([
   }),
   ...buildConfigs({
     name: 'react-query-devtools-prod',
-    packageDir: '.',
     jsName: 'ReactQueryDevtools',
     outputFile: 'index.prod',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       react: 'React',
       'react-dom': 'ReactDOM',
diff --git a/packages/react-query-devtools/src/devtools.tsx b/packages/react-query-devtools/src/devtools.tsx
index f1bc83c91b..551635e620 100644
--- a/packages/react-query-devtools/src/devtools.tsx
+++ b/packages/react-query-devtools/src/devtools.tsx
@@ -9,6 +9,7 @@ import type {
 } from '@tanstack/query-devtools'
 import { TanstackQueryDevtools } from '@tanstack/query-devtools'
 import React from 'react'
+
 export interface DevtoolsOptions {
   /**
    * Set this true if you want the dev tools to default to being open
diff --git a/packages/react-query-persist-client/.eslintrc.cjs b/packages/react-query-persist-client/.eslintrc.cjs
index 2578431a12..a9fa6e620d 100644
--- a/packages/react-query-persist-client/.eslintrc.cjs
+++ b/packages/react-query-persist-client/.eslintrc.cjs
@@ -2,10 +2,7 @@
 
 /** @type {import('eslint').Linter.Config} */
 const config = {
-  extends: [
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-  ],
+  extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'],
   parserOptions: {
     tsconfigRootDir: __dirname,
     project: './tsconfig.eslint.json',
@@ -13,7 +10,7 @@ const config = {
   rules: {
     'react/jsx-key': ['error', { checkFragmentShorthand: true }],
     'react-hooks/exhaustive-deps': 'error',
-  }
+  },
 }
 
 module.exports = config
diff --git a/packages/react-query-persist-client/rollup.config.mjs b/packages/react-query-persist-client/rollup.config.mjs
index 2aee612bbc..e1d236a144 100644
--- a/packages/react-query-persist-client/rollup.config.mjs
+++ b/packages/react-query-persist-client/rollup.config.mjs
@@ -1,15 +1,14 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'react-query-persist-client',
-    packageDir: '.',
     jsName: 'ReactQueryPersistClient',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       react: 'React',
       '@tanstack/query-persist-client-core': 'QueryPersistClientCore',
@@ -17,4 +16,4 @@ export default defineConfig([
     },
     bundleUMDGlobals: ['@tanstack/query-persist-client-core'],
   }),
-])
+)
diff --git a/packages/react-query-persist-client/test-setup.ts b/packages/react-query-persist-client/test-setup.ts
index 21dfe80c07..e184eb4e20 100644
--- a/packages/react-query-persist-client/test-setup.ts
+++ b/packages/react-query-persist-client/test-setup.ts
@@ -4,4 +4,4 @@ import { notifyManager } from '@tanstack/react-query'
 // Wrap notifications with act to make sure React knows about React Query updates
 notifyManager.setNotifyFunction((fn) => {
   act(fn)
-})
\ No newline at end of file
+})
diff --git a/packages/react-query/.eslintrc.cjs b/packages/react-query/.eslintrc.cjs
index 2578431a12..a9fa6e620d 100644
--- a/packages/react-query/.eslintrc.cjs
+++ b/packages/react-query/.eslintrc.cjs
@@ -2,10 +2,7 @@
 
 /** @type {import('eslint').Linter.Config} */
 const config = {
-  extends: [
-    'plugin:react/recommended',
-    'plugin:react-hooks/recommended',
-  ],
+  extends: ['plugin:react/recommended', 'plugin:react-hooks/recommended'],
   parserOptions: {
     tsconfigRootDir: __dirname,
     project: './tsconfig.eslint.json',
@@ -13,7 +10,7 @@ const config = {
   rules: {
     'react/jsx-key': ['error', { checkFragmentShorthand: true }],
     'react-hooks/exhaustive-deps': 'error',
-  }
+  },
 }
 
 module.exports = config
diff --git a/packages/react-query/rollup.config.mjs b/packages/react-query/rollup.config.mjs
index 657bfe93be..03a9f53e83 100644
--- a/packages/react-query/rollup.config.mjs
+++ b/packages/react-query/rollup.config.mjs
@@ -1,15 +1,14 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'react-query',
-    packageDir: '.',
     jsName: 'ReactQuery',
     outputFile: 'index',
-    entryFile: ['src/index.ts'],
+    entryFile: './src/index.ts',
     globals: {
       react: 'React',
       'react-dom': 'ReactDOM',
@@ -18,4 +17,4 @@ export default defineConfig([
     },
     bundleUMDGlobals: ['@tanstack/query-core'],
   }),
-])
+)
diff --git a/packages/solid-query/rollup.config.mjs b/packages/solid-query/rollup.config.mjs
index 923bf1bc3b..a2ea35366e 100644
--- a/packages/solid-query/rollup.config.mjs
+++ b/packages/solid-query/rollup.config.mjs
@@ -1,8 +1,6 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { createSolidQueryConfig } from "../../scripts/getRollupConfig.mjs"
+import { createSolidQueryConfig } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  createSolidQueryConfig(),
-])
+export default defineConfig(createSolidQueryConfig())
diff --git a/packages/svelte-query-devtools/tsconfig.json b/packages/svelte-query-devtools/tsconfig.json
index 9c3bb082d0..4e88910caa 100644
--- a/packages/svelte-query-devtools/tsconfig.json
+++ b/packages/svelte-query-devtools/tsconfig.json
@@ -21,5 +21,11 @@
     "strict": true,
     "target": "ES2020"
   },
-  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.svelte", ".eslintrc.cjs", "vite.config.ts"]
+  "include": [
+    "src/**/*.js",
+    "src/**/*.ts",
+    "src/**/*.svelte",
+    ".eslintrc.cjs",
+    "vite.config.ts"
+  ]
 }
diff --git a/packages/svelte-query-devtools/vite.config.ts b/packages/svelte-query-devtools/vite.config.ts
index 2235b6b2b0..2779794d9b 100644
--- a/packages/svelte-query-devtools/vite.config.ts
+++ b/packages/svelte-query-devtools/vite.config.ts
@@ -1,14 +1,19 @@
-import { resolve } from 'node:path';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
-import { defineConfig } from 'vite';
+import { resolve } from 'node:path'
+import { svelte } from '@sveltejs/vite-plugin-svelte'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
   plugins: [svelte()],
   resolve: {
     alias: {
-      "@tanstack/query-core": resolve(__dirname, '..', 'query-core', 'src'),
-      "@tanstack/query-devtools": resolve(__dirname, '..', 'query-devtools', 'src'),
-      "@tanstack/svelte-query": resolve(__dirname, '..', 'svelte-query', 'src'),
-    }
-  }
-});
+      '@tanstack/query-core': resolve(__dirname, '..', 'query-core', 'src'),
+      '@tanstack/query-devtools': resolve(
+        __dirname,
+        '..',
+        'query-devtools',
+        'src',
+      ),
+      '@tanstack/svelte-query': resolve(__dirname, '..', 'svelte-query', 'src'),
+    },
+  },
+})
diff --git a/packages/svelte-query/svelte.config.js b/packages/svelte-query/svelte.config.js
index 96277a570b..94ca454ac7 100644
--- a/packages/svelte-query/svelte.config.js
+++ b/packages/svelte-query/svelte.config.js
@@ -1,7 +1,7 @@
-import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
+import { vitePreprocess } from '@sveltejs/vite-plugin-svelte'
 
 const config = {
   preprocess: vitePreprocess(),
-};
+}
 
-export default config;
+export default config
diff --git a/packages/svelte-query/tsconfig.json b/packages/svelte-query/tsconfig.json
index b0af9016dd..cd010880a6 100644
--- a/packages/svelte-query/tsconfig.json
+++ b/packages/svelte-query/tsconfig.json
@@ -22,5 +22,11 @@
     "target": "ES2020",
     "types": ["vitest/globals", "@testing-library/jest-dom"]
   },
-  "include": ["src/**/*.js", "src/**/*.ts", "src/**/*.svelte", ".eslintrc.cjs", "vite.config.ts"]
+  "include": [
+    "src/**/*.js",
+    "src/**/*.ts",
+    "src/**/*.svelte",
+    ".eslintrc.cjs",
+    "vite.config.ts"
+  ]
 }
diff --git a/packages/svelte-query/vite.config.ts b/packages/svelte-query/vite.config.ts
index 1c26042f0d..fa3e88c238 100644
--- a/packages/svelte-query/vite.config.ts
+++ b/packages/svelte-query/vite.config.ts
@@ -1,13 +1,13 @@
-import { resolve } from 'node:path';
-import { svelte } from '@sveltejs/vite-plugin-svelte';
-import { defineConfig } from 'vite';
+import { resolve } from 'node:path'
+import { svelte } from '@sveltejs/vite-plugin-svelte'
+import { defineConfig } from 'vite'
 
 export default defineConfig({
   plugins: [svelte()],
   resolve: {
     alias: {
-      "@tanstack/query-core": resolve(__dirname, '..', 'query-core', 'src'),
-    }
+      '@tanstack/query-core': resolve(__dirname, '..', 'query-core', 'src'),
+    },
   },
   test: {
     name: 'svelte-query',
@@ -15,6 +15,6 @@ export default defineConfig({
     coverage: { provider: 'istanbul' },
     environment: 'jsdom',
     include: ['src/**/*.{test,spec}.{js,ts}'],
-    setupFiles: ['vitest.setup.ts']
-  }
-});
+    setupFiles: ['vitest.setup.ts'],
+  },
+})
diff --git a/packages/svelte-query/vitest.setup.ts b/packages/svelte-query/vitest.setup.ts
index b210af530c..d263e51f4f 100644
--- a/packages/svelte-query/vitest.setup.ts
+++ b/packages/svelte-query/vitest.setup.ts
@@ -1,4 +1,4 @@
-import matchers from '@testing-library/jest-dom/matchers';
-import { expect } from 'vitest';
+import matchers from '@testing-library/jest-dom/matchers'
+import { expect } from 'vitest'
 
-expect.extend(matchers);
+expect.extend(matchers)
diff --git a/packages/vue-query/README.md b/packages/vue-query/README.md
index 2125d07623..4d24a42a5c 100644
--- a/packages/vue-query/README.md
+++ b/packages/vue-query/README.md
@@ -47,37 +47,41 @@ Visit https://tanstack.com/query/v4/docs/adapters/vue-query
 2. Initialize **Vue Query** via **VueQueryPlugin**
 
    ```tsx
-   import { createApp } from "vue";
-   import { VueQueryPlugin } from "@tanstack/vue-query";
+   import { createApp } from 'vue'
+   import { VueQueryPlugin } from '@tanstack/vue-query'
 
-   import App from "./App.vue";
+   import App from './App.vue'
 
-   createApp(App).use(VueQueryPlugin).mount("#app");
+   createApp(App).use(VueQueryPlugin).mount('#app')
    ```
 
 3. Use query
 
    ```tsx
-   import { defineComponent } from "vue";
-   import { useQuery } from "@tanstack/vue-query";
+   import { defineComponent } from 'vue'
+   import { useQuery } from '@tanstack/vue-query'
 
    export default defineComponent({
-     name: "MyComponent",
+     name: 'MyComponent',
      setup() {
-       const query = useQuery({ queryKey: ["todos"], queryFn: getTodos });
+       const query = useQuery({ queryKey: ['todos'], queryFn: getTodos })
 
        return {
          query,
-       };
+       }
      },
-   });
+   })
    ```
 
 4. If you need to update options on your query dynamically, make sure to pass them as reactive variables
 
    ```tsx
-   const id = ref(1);
-   const enabled = ref(false);
-
-   const query = useQuery({ queryKey: ["todos", id], queryFn: () => getTodos(id), enabled });
+   const id = ref(1)
+   const enabled = ref(false)
+
+   const query = useQuery({
+     queryKey: ['todos', id],
+     queryFn: () => getTodos(id),
+     enabled,
+   })
    ```
diff --git a/packages/vue-query/rollup.config.mjs b/packages/vue-query/rollup.config.mjs
index 102ffb97e8..4a308526eb 100644
--- a/packages/vue-query/rollup.config.mjs
+++ b/packages/vue-query/rollup.config.mjs
@@ -1,15 +1,14 @@
 // @ts-check
 
 import { defineConfig } from 'rollup'
-import { buildConfigs } from "../../scripts/getRollupConfig.mjs"
+import { buildConfigs } from '../../scripts/getRollupConfig.mjs'
 
-export default defineConfig([
-  ...buildConfigs({
+export default defineConfig(
+  buildConfigs({
     name: 'vue-query',
-    packageDir: '.',
     jsName: 'VueQuery',
     outputFile: 'index',
-    entryFile: 'src/index.ts',
+    entryFile: './src/index.ts',
     globals: {
       '@tanstack/query-core': 'QueryCore',
       vue: 'Vue',
@@ -23,4 +22,4 @@ export default defineConfig([
       '@vue/devtools-api',
     ],
   }),
-])
+)
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 47ab0f355f..7e529208a4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -94,8 +94,8 @@ importers:
         specifier: ^0.3.3
         version: 0.3.3
       chalk:
-        specifier: ^4.1.2
-        version: 4.1.2
+        specifier: ^5.2.0
+        version: 5.2.0
       concurrently:
         specifier: ^8.0.1
         version: 8.0.1
@@ -144,6 +144,9 @@ importers:
       prettier-plugin-svelte:
         specifier: ^2.10.0
         version: 2.10.0(prettier@2.8.8)(svelte@3.55.0)
+      publint:
+        specifier: ^0.1.12
+        version: 0.1.12
       react:
         specifier: ^18.2.0
         version: 18.2.0
@@ -9932,6 +9935,13 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  /ignore-walk@5.0.1:
+    resolution: {integrity: sha512-yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dependencies:
+      minimatch: 5.1.6
+    dev: true
+
   /ignore@5.2.0:
     resolution: {integrity: sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==}
     engines: {node: '>= 4'}
@@ -12508,6 +12518,18 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /npm-bundled@2.0.1:
+    resolution: {integrity: sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dependencies:
+      npm-normalize-package-bin: 2.0.0
+    dev: true
+
+  /npm-normalize-package-bin@2.0.0:
+    resolution: {integrity: sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    dev: true
+
   /npm-package-arg@7.0.0:
     resolution: {integrity: sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==}
     dependencies:
@@ -12517,6 +12539,17 @@ packages:
       validate-npm-package-name: 3.0.0
     dev: false
 
+  /npm-packlist@5.1.3:
+    resolution: {integrity: sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg==}
+    engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
+    hasBin: true
+    dependencies:
+      glob: 8.1.0
+      ignore-walk: 5.0.1
+      npm-bundled: 2.0.1
+      npm-normalize-package-bin: 2.0.0
+    dev: true
+
   /npm-run-path@2.0.2:
     resolution: {integrity: sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==}
     engines: {node: '>=4'}
@@ -13357,6 +13390,16 @@ packages:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
     dev: true
 
+  /publint@0.1.12:
+    resolution: {integrity: sha512-8LxkO430t/SOhUl0qXQWdXq34m6oyLcPhE4Kc8eXhOEnB82vCHcShPQ2kH53n/ksC7jWdRWDP7MPGxKJbntQfg==}
+    engines: {node: '>=16'}
+    hasBin: true
+    dependencies:
+      npm-packlist: 5.1.3
+      picocolors: 1.0.0
+      sade: 1.8.1
+    dev: true
+
   /pump@3.0.0:
     resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==}
     dependencies:
diff --git a/scripts/config.mjs b/scripts/config.mjs
index 4186948537..6c66aaac7c 100644
--- a/scripts/config.mjs
+++ b/scripts/config.mjs
@@ -1,7 +1,7 @@
 // @ts-check
 
 import { resolve } from 'node:path'
-import { fileURLToPath } from "node:url";
+import { fileURLToPath } from 'node:url'
 
 /**
  * List your npm packages here. The first package will be used as the versioner.
@@ -10,86 +10,72 @@ import { fileURLToPath } from "node:url";
 export const packages = [
   {
     name: '@tanstack/query-core',
-    packageDir: 'query-core',
-    srcDir: 'src',
+    packageDir: 'packages/query-core',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/query-persist-client-core',
-    packageDir: 'query-persist-client-core',
-    srcDir: 'src',
+    packageDir: 'packages/query-persist-client-core',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/query-async-storage-persister',
-    packageDir: 'query-async-storage-persister',
-    srcDir: 'src',
+    packageDir: 'packages/query-async-storage-persister',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/query-broadcast-client-experimental',
-    packageDir: 'query-broadcast-client-experimental',
-    srcDir: 'src',
+    packageDir: 'packages/query-broadcast-client-experimental',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/query-sync-storage-persister',
-    packageDir: 'query-sync-storage-persister',
-    srcDir: 'src',
+    packageDir: 'packages/query-sync-storage-persister',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/react-query',
-    packageDir: 'react-query',
-    srcDir: 'src',
+    packageDir: 'packages/react-query',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/query-devtools',
-    packageDir: 'query-devtools',
-    srcDir: 'src',
+    packageDir: 'packages/query-devtools',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/react-query-devtools',
-    packageDir: 'react-query-devtools',
-    srcDir: 'src',
+    packageDir: 'packages/react-query-devtools',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/react-query-persist-client',
-    packageDir: 'react-query-persist-client',
-    srcDir: 'src',
+    packageDir: 'packages/react-query-persist-client',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/solid-query',
-    packageDir: 'solid-query',
-    srcDir: 'src',
+    packageDir: 'packages/solid-query',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/svelte-query',
-    packageDir: 'svelte-query',
-    srcDir: 'src',
+    packageDir: 'packages/svelte-query',
     entries: ['module', 'svelte', 'types'],
   },
   {
     name: '@tanstack/svelte-query-devtools',
-    packageDir: 'svelte-query-devtools',
-    srcDir: 'src',
+    packageDir: 'packages/svelte-query-devtools',
     entries: ['module', 'svelte', 'types'],
   },
   {
     name: '@tanstack/vue-query',
-    packageDir: 'vue-query',
-    srcDir: 'src',
+    packageDir: 'packages/vue-query',
     entries: ['main', 'module', 'types'],
   },
   {
     name: '@tanstack/eslint-plugin-query',
-    packageDir: 'eslint-plugin-query',
-    srcDir: 'src',
+    packageDir: 'packages/eslint-plugin-query',
     entries: ['main'],
   },
 ]
@@ -116,5 +102,5 @@ export const branchConfigs = {
   },
 }
 
-const __dirname = fileURLToPath(new URL(".", import.meta.url));
+const __dirname = fileURLToPath(new URL('.', import.meta.url))
 export const rootDir = resolve(__dirname, '..')
diff --git a/scripts/getRollupConfig.mjs b/scripts/getRollupConfig.mjs
index 0fba7aabf9..2bba0b8c71 100644
--- a/scripts/getRollupConfig.mjs
+++ b/scripts/getRollupConfig.mjs
@@ -1,7 +1,6 @@
 // @ts-check
 
 import { resolve } from 'node:path'
-import { fileURLToPath } from "node:url"
 import { babel } from '@rollup/plugin-babel'
 import terser from '@rollup/plugin-terser'
 import size from 'rollup-plugin-size'
@@ -11,8 +10,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve'
 import commonJS from '@rollup/plugin-commonjs'
 import withSolid from 'rollup-preset-solid'
 import preserveDirectives from 'rollup-plugin-preserve-directives'
-
-const __dirname = fileURLToPath(new URL(".", import.meta.url));
+import { rootDir } from './config.mjs'
 
 /** @param {'development' | 'production'} type */
 const forceEnvPlugin = (type) =>
@@ -25,7 +23,7 @@ const forceEnvPlugin = (type) =>
 /** @param {'legacy' | 'modern'} type */
 const babelPlugin = (type) =>
   babel({
-    configFile: resolve(__dirname, '../babel.config.js'),
+    configFile: resolve(rootDir, 'babel.config.js'),
     browserslistConfigFile: type === 'modern' ? true : false,
     targets:
       type === 'modern'
@@ -45,11 +43,10 @@ const babelPlugin = (type) =>
 
 /**
  * @param {Object} opts - Options for building configurations.
- * @param {string} opts.packageDir - The package directory.
  * @param {string} opts.name - The name.
  * @param {string} opts.jsName - The JavaScript name.
  * @param {string} opts.outputFile - The output file.
- * @param {string | string[]} opts.entryFile - The entry file or array of entry files.
+ * @param {string} opts.entryFile - The entry file.
  * @param {Record<string, string>} opts.globals - The globals record.
  * @param {string[]} [opts.bundleUMDGlobals] - List of dependencies to bundle for UMD build.
  * @param {boolean} [opts.forceDevEnv] - Flag indicating whether to force development environment.
@@ -58,14 +55,8 @@ const babelPlugin = (type) =>
  * @returns {import('rollup').RollupOptions[]}
  */
 export function buildConfigs(opts) {
-  const firstEntry = resolve(
-    opts.packageDir,
-    Array.isArray(opts.entryFile) ? opts.entryFile[0] : opts.entryFile,
-  )
-  const entries = Array.isArray(opts.entryFile)
-    ? opts.entryFile
-    : [opts.entryFile]
-  const input = entries.map((entry) => resolve(opts.packageDir, entry))
+  const firstEntry = opts.entryFile
+  const input = [opts.entryFile]
   const externalDeps = Object.keys(opts.globals)
 
   const bundleUMDGlobals = opts.bundleUMDGlobals || []
@@ -73,15 +64,12 @@ export function buildConfigs(opts) {
     (external) => !bundleUMDGlobals.includes(external),
   )
 
-  const external = (moduleName) => externalDeps.includes(moduleName)
-
   /** @type {import('./types').Options} */
   const options = {
     input,
     jsName: opts.jsName,
     outputFile: opts.outputFile,
-    packageDir: opts.packageDir,
-    external,
+    external: (moduleName) => externalDeps.includes(moduleName),
     globals: opts.globals,
     forceDevEnv: opts.forceDevEnv || false,
     forceBundle: opts.forceBundle || false,
@@ -103,25 +91,18 @@ export function buildConfigs(opts) {
  * @param {import('./types').Options} options - Options for building configurations.
  * @returns {import('rollup').RollupOptions}
  */
-function mjs({
-  input,
-  packageDir,
-  external,
-  outputFile,
-  forceDevEnv,
-  forceBundle,
-}) {
+function mjs({ input, external, outputFile, forceDevEnv, forceBundle }) {
   /** @type {import('rollup').OutputOptions} */
   const bundleOutput = {
     format: 'esm',
-    file: `${packageDir}/build/lib/${outputFile}.mjs`,
+    file: `./build/lib/${outputFile}.mjs`,
     sourcemap: true,
   }
 
   /** @type {import('rollup').OutputOptions} */
   const normalOutput = {
     format: 'esm',
-    dir: `${packageDir}/build/lib`,
+    dir: `./build/lib`,
     sourcemap: true,
     preserveModules: true,
     entryFileNames: '[name].mjs',
@@ -146,25 +127,18 @@ function mjs({
  * @param {import('./types').Options} options - Options for building configurations.
  * @returns {import('rollup').RollupOptions}
  */
-function esm({
-  input,
-  packageDir,
-  external,
-  outputFile,
-  forceDevEnv,
-  forceBundle,
-}) {
+function esm({ input, external, outputFile, forceDevEnv, forceBundle }) {
   /** @type {import('rollup').OutputOptions} */
   const bundleOutput = {
     format: 'esm',
-    file: `${packageDir}/build/lib/${outputFile}.esm.js`,
+    file: `./build/lib/${outputFile}.esm.js`,
     sourcemap: true,
   }
 
   /** @type {import('rollup').OutputOptions} */
   const normalOutput = {
     format: 'esm',
-    dir: `${packageDir}/build/lib`,
+    dir: `./build/lib`,
     sourcemap: true,
     preserveModules: true,
     entryFileNames: '[name].esm.js',
@@ -189,18 +163,11 @@ function esm({
  * @param {import('./types').Options} options - Options for building configurations.
  * @returns {import('rollup').RollupOptions}
  */
-function cjs({
-  input,
-  external,
-  packageDir,
-  outputFile,
-  forceDevEnv,
-  forceBundle,
-}) {
+function cjs({ input, external, outputFile, forceDevEnv, forceBundle }) {
   /** @type {import('rollup').OutputOptions} */
   const bundleOutput = {
     format: 'cjs',
-    file: `${packageDir}/build/lib/${outputFile}.js`,
+    file: `./build/lib/${outputFile}.js`,
     sourcemap: true,
     exports: 'named',
   }
@@ -208,7 +175,7 @@ function cjs({
   /** @type {import('rollup').OutputOptions} */
   const normalOutput = {
     format: 'cjs',
-    dir: `${packageDir}/build/lib`,
+    dir: `./build/lib`,
     sourcemap: true,
     exports: 'named',
     preserveModules: true,
@@ -234,14 +201,7 @@ function cjs({
  * @param {import('./types').Options} options - Options for building configurations.
  * @returns {import('rollup').RollupOptions}
  */
-function umdDev({
-  input,
-  external,
-  packageDir,
-  outputFile,
-  globals,
-  jsName,
-}) {
+function umdDev({ input, external, outputFile, globals, jsName }) {
   return {
     // UMD (Dev)
     external,
@@ -249,7 +209,7 @@ function umdDev({
     output: {
       format: 'umd',
       sourcemap: true,
-      file: `${packageDir}/build/umd/${outputFile}.development.js`,
+      file: `./build/umd/${outputFile}.development.js`,
       name: jsName,
       globals,
     },
@@ -266,14 +226,7 @@ function umdDev({
  * @param {import('./types').Options} options - Options for building configurations.
  * @returns {import('rollup').RollupOptions}
  */
-function umdProd({
-  input,
-  external,
-  packageDir,
-  outputFile,
-  globals,
-  jsName,
-}) {
+function umdProd({ input, external, outputFile, globals, jsName }) {
   return {
     // UMD (Prod)
     external,
@@ -281,7 +234,7 @@ function umdProd({
     output: {
       format: 'umd',
       sourcemap: true,
-      file: `${packageDir}/build/umd/${outputFile}.production.js`,
+      file: `./build/umd/${outputFile}.production.js`,
       name: jsName,
       globals,
     },
@@ -296,12 +249,12 @@ function umdProd({
       }),
       size({}),
       visualizer({
-        filename: `${packageDir}/build/stats-html.html`,
+        filename: `./build/stats-html.html`,
         template: 'treemap',
         gzipSize: true,
       }),
       visualizer({
-        filename: `${packageDir}/build/stats.json`,
+        filename: `./build/stats.json`,
         template: 'raw-data',
         gzipSize: true,
       }),
@@ -310,12 +263,13 @@ function umdProd({
 }
 
 export function createSolidQueryConfig() {
-  const packageDir = '.'
-  const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (withSolid({
-    input: `${packageDir}/src/index.ts`,
-    targets: ['esm', 'cjs', 'umd'],
-    external: ['@tanstack/query-core'],
-  }))
+  const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (
+    withSolid({
+      input: `./src/index.ts`,
+      targets: ['esm', 'cjs', 'umd'],
+      external: ['@tanstack/query-core'],
+    })
+  )
 
   const outputs = !solidRollupOptions.output
     ? []
@@ -333,10 +287,12 @@ export function createSolidQueryConfig() {
         '@tanstack/query-core': 'QueryCore',
       }
     }
-    output.dir = `${packageDir}/build/${format}`
+    output.dir = `./build/${format}`
   })
 
-  const plugins = /** @type {import('rollup').Plugin[]} */ (solidRollupOptions.plugins)
+  const plugins = /** @type {import('rollup').Plugin[]} */ (
+    solidRollupOptions.plugins
+  )
   // Prevent types generation since it doesn't resolve the directory correctly
   // Instead build:types will generate those types anyway
   const filtered = plugins.filter((plugin) => plugin.name !== 'ts')
@@ -347,11 +303,12 @@ export function createSolidQueryConfig() {
 }
 
 export function createTanstackQueryDevtoolsConfig() {
-  const packageDir = '.'
-  const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (withSolid({
-    input: `${packageDir}/src/index.tsx`,
-    targets: ['esm', 'cjs', 'umd'],
-  }))
+  const solidRollupOptions = /** @type {import('rollup').RollupOptions} */ (
+    withSolid({
+      input: `./src/index.tsx`,
+      targets: ['esm', 'cjs', 'umd'],
+    })
+  )
 
   const outputs = !solidRollupOptions.output
     ? []
@@ -361,16 +318,18 @@ export function createTanstackQueryDevtoolsConfig() {
 
   outputs.forEach((output) => {
     const format = output.format
-    output.dir = `${packageDir}/build/${format}`
+    output.dir = `./build/${format}`
     if (output.format === 'esm') {
       output.dir = undefined
-      output.file = `${packageDir}/build/${format}/index.mjs`
+      output.file = `./build/${format}/index.mjs`
     }
   })
 
   solidRollupOptions.external = []
 
-  const plugins = /** @type {import('rollup').Plugin[]} */ (solidRollupOptions.plugins)
+  const plugins = /** @type {import('rollup').Plugin[]} */ (
+    solidRollupOptions.plugins
+  )
   // Prevent types generation since it doesn't resolve the directory correctly
   // Instead build:types will generate those types anyway
   const filtered = plugins.filter((plugin) => plugin.name !== 'ts')
diff --git a/scripts/publish.mjs b/scripts/publish.mjs
index ea4546da5e..5a0a14e964 100644
--- a/scripts/publish.mjs
+++ b/scripts/publish.mjs
@@ -18,7 +18,9 @@ import { branchConfigs, latestBranch, packages, rootDir } from './config.mjs'
 const releaseCommitMsg = (version) => `release: v${version}`
 
 async function run() {
-  const branchName = /** @type {string} */ (process.env.BRANCH ?? currentGitBranch())
+  const branchName = /** @type {string} */ (
+    process.env.BRANCH ?? currentGitBranch()
+  )
 
   /** @type {import('./types').BranchConfig | undefined} */
   const branchConfig = branchConfigs[branchName]
@@ -152,7 +154,10 @@ async function run() {
     -1,
   )
 
-    /** @type {string[]} */
+  /**
+   * Uses git diff to determine which files have changed since the latest tag
+   * @type {string[]}
+   */
   const changedFiles = process.env.TAG
     ? []
     : execSync(`git diff ${latestTag} --name-only`)
@@ -160,11 +165,14 @@ async function run() {
         .split('\n')
         .filter(Boolean)
 
+  /** Uses packages and changedFiles to determine which packages have changed */
   const changedPackages = RELEASE_ALL
     ? packages
     : changedFiles.reduce((acc, file) => {
-        const pkg = packages.find((p) =>
-          file.startsWith(path.join('packages', p.packageDir, p.srcDir)),
+        const pkg = packages.find(
+          (p) =>
+            file.startsWith(path.join(p.packageDir, 'src')) ||
+            file.startsWith(path.join(p.packageDir, 'package.json')),
         )
         if (pkg && !acc.find((d) => d.name === pkg.name)) {
           acc.push(pkg)
@@ -179,7 +187,7 @@ async function run() {
   for (let runs = 0; runs < 3; runs++) {
     for (const pkg of packages) {
       const packageJson = await readPackageJson(
-        path.resolve(rootDir, 'packages', pkg.packageDir, 'package.json'),
+        path.resolve(rootDir, pkg.packageDir, 'package.json'),
       )
       const allDependencies = Object.keys(
         Object.assign(
@@ -302,7 +310,9 @@ async function run() {
 
   const releaseType = branchConfig.prerelease
     ? 'prerelease'
-    : /** @type {const} */ ({ 0: 'patch', 1: 'minor', 2: 'major' })[recommendedReleaseLevel]
+    : /** @type {const} */ ({ 0: 'patch', 1: 'minor', 2: 'major' })[
+        recommendedReleaseLevel
+      ]
 
   if (!releaseType) {
     throw new Error(`Invalid release level: ${recommendedReleaseLevel}`)
@@ -358,7 +368,7 @@ async function run() {
     console.info(`  Updating ${pkg.name} version to ${version}...`)
 
     await updatePackageJson(
-      path.resolve(rootDir, 'packages', pkg.packageDir, 'package.json'),
+      path.resolve(rootDir, pkg.packageDir, 'package.json'),
       (config) => {
         config.version = version
       },
@@ -388,7 +398,7 @@ async function run() {
 
   // Publish each package
   changedPackages.forEach((pkg) => {
-    const packageDir = path.join(rootDir, 'packages', pkg.packageDir)
+    const packageDir = path.join(rootDir, pkg.packageDir)
     const cmd = `cd ${packageDir} && pnpm publish --tag ${npmTag} --access=public --no-git-checks`
     console.info(
       `  Publishing ${pkg.name}@${version} to npm with tag "${npmTag}"...`,
@@ -444,15 +454,15 @@ function capitalize(str) {
 }
 
 /**
- * @param {string} pathName 
+ * @param {string} pathName
  * @returns {Promise<import('type-fest').PackageJson>}
  */
 async function readPackageJson(pathName) {
-  return (await jsonfile.readFile(pathName))
+  return await jsonfile.readFile(pathName)
 }
 
 /**
- * @param {string} pathName 
+ * @param {string} pathName
  * @param {(json: import('type-fest').PackageJson) => Promise<void> | void} transform
  */
 async function updatePackageJson(pathName, transform) {
diff --git a/scripts/types.d.ts b/scripts/types.d.ts
index 401a85e9e6..46e51dc10a 100644
--- a/scripts/types.d.ts
+++ b/scripts/types.d.ts
@@ -39,7 +39,6 @@ export type Parsed = {
 export type Package = {
   name: string
   packageDir: string
-  srcDir: string
   entries: Array<'main' | 'module' | 'svelte' | 'types'>
 }
 
@@ -50,7 +49,6 @@ export type BranchConfig = {
 
 export type Options = {
   input: string | string[]
-  packageDir: string
   external: RollupOptions['external']
   jsName: string
   outputFile: string
diff --git a/scripts/validate-packages.mjs b/scripts/validate-packages.mjs
index 3daaa1e7a7..672276640a 100644
--- a/scripts/validate-packages.mjs
+++ b/scripts/validate-packages.mjs
@@ -3,6 +3,7 @@
 import path from 'node:path'
 import fsp from 'node:fs/promises'
 import jsonfile from 'jsonfile'
+import { publint } from 'publint'
 import { packages, rootDir } from './config.mjs'
 
 async function run() {
@@ -13,7 +14,7 @@ async function run() {
   await Promise.all(
     packages.map(async (pkg) => {
       const pkgJson = await readPackageJson(
-        path.resolve(rootDir, 'packages', pkg.packageDir, 'package.json'),
+        path.resolve(rootDir, pkg.packageDir, 'package.json'),
       )
 
       await Promise.all(
@@ -26,12 +27,7 @@ async function run() {
             )
           }
 
-          const filePath = path.resolve(
-            rootDir,
-            'packages',
-            pkg.packageDir,
-            entry,
-          )
+          const filePath = path.resolve(rootDir, pkg.packageDir, entry)
 
           try {
             await fsp.access(filePath)
@@ -40,8 +36,10 @@ async function run() {
           }
         }),
       )
-      
-      const defaultExport = /** @type {unknown} */ (pkgJson.exports?.['.']?.['default'])
+
+      const defaultExport = /** @type {unknown} */ (
+        pkgJson.exports?.['.']?.['default']
+      )
 
       if (typeof defaultExport !== 'string') {
         throw new Error(
@@ -49,18 +47,19 @@ async function run() {
         )
       }
 
-      const filePath = path.resolve(
-        rootDir,
-        'packages',
-        pkg.packageDir,
-        defaultExport,
-      )
+      const filePath = path.resolve(rootDir, pkg.packageDir, defaultExport)
 
       try {
         await fsp.access(filePath)
       } catch (err) {
         failedValidations.push(`Missing build file: ${filePath}`)
       }
+
+      const publintResult = await publint({ pkgDir: pkg.packageDir })
+
+      publintResult.forEach((message) => {
+        console.log(`Publint warning: ${JSON.stringify(message, null, 2)}`)
+      })
     }),
   )
   console.info('')
@@ -77,9 +76,9 @@ run().catch((err) => {
 })
 
 /**
- * @param {string} pathName 
+ * @param {string} pathName
  * @returns {Promise<import('type-fest').PackageJson>}
  */
 async function readPackageJson(pathName) {
-  return (await jsonfile.readFile(pathName))
+  return await jsonfile.readFile(pathName)
 }