From fba40fb1cd0865f06c84bf6e6d132343fc5c06af Mon Sep 17 00:00:00 2001
From: John Daly <john.daly2@gmail.com>
Date: Mon, 25 Jul 2022 23:35:38 -0700
Subject: [PATCH 1/2] - Fix UMD build getting overwritten - Updating "browser"
 field for @tanstack/react-query-devtools

---
 packages/react-query-devtools/package.json |  2 +-
 rollup.config.ts                           | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index 81b380cde9..6b91e1e5ea 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -12,7 +12,7 @@
   },
   "module": "build/esm/index.js",
   "main": "build/cjs/packages/react-query-devtools/src/index.js",
-  "browser": "build/umd/index.production.js",
+  "browser": "build/umd/noop.production.js",
   "types": "build/types/react-query-devtools/src/index.d.ts",
   "files": [
     "build/*",
diff --git a/rollup.config.ts b/rollup.config.ts
index 01b7b1c78f..a5a8e51c5c 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -37,7 +37,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'query-core',
       packageDir: 'packages/query-core',
       jsName: 'QueryCore',
-      outputFile: 'query-core',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {},
     }),
@@ -45,7 +45,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'query-async-storage-persister',
       packageDir: 'packages/query-async-storage-persister',
       jsName: 'QueryAsyncStoragePersister',
-      outputFile: 'query-async-storage-persister',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {},
     }),
@@ -53,7 +53,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'query-broadcast-client-experimental',
       packageDir: 'packages/query-broadcast-client-experimental',
       jsName: 'QueryBroadcastClient',
-      outputFile: 'query-broadcast-client-experimental',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {},
     }),
@@ -61,7 +61,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'query-sync-storage-persister',
       packageDir: 'packages/query-sync-storage-persister',
       jsName: 'QuerySyncStoragePersister',
-      outputFile: 'query-sync-storage-persister',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {},
     }),
@@ -69,7 +69,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'react-query',
       packageDir: 'packages/react-query',
       jsName: 'ReactQuery',
-      outputFile: 'react-query',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {
         react: 'React',
@@ -79,7 +79,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'react-query-devtools',
       packageDir: 'packages/react-query-devtools',
       jsName: 'ReactQueryDevtools',
-      outputFile: 'react-query-devtools',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {
         react: 'React',
@@ -90,7 +90,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'react-query-devtools-noop',
       packageDir: 'packages/react-query-devtools',
       jsName: 'ReactQueryDevtools',
-      outputFile: 'react-query-devtools',
+      outputFile: 'noop',
       entryFile: 'src/noop.ts',
       globals: {
         react: 'React',
@@ -101,7 +101,7 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
       name: 'react-query-persist-client',
       packageDir: 'packages/react-query-persist-client',
       jsName: 'ReactQueryPersistClient',
-      outputFile: 'react-query-persist-client',
+      outputFile: 'index',
       entryFile: 'src/index.ts',
       globals: {
         react: 'React',
@@ -194,7 +194,7 @@ function umdDev({
     output: {
       format: 'umd',
       sourcemap: true,
-      file: `${packageDir}/build/umd/index.development.js`,
+      file: `${packageDir}/build/umd/${outputFile}.development.js`,
       name: jsName,
       globals,
       banner,
@@ -224,7 +224,7 @@ function umdProd({
     output: {
       format: 'umd',
       sourcemap: true,
-      file: `${packageDir}/build/umd/index.production.js`,
+      file: `${packageDir}/build/umd/${outputFile}.production.js`,
       name: jsName,
       globals,
       banner,

From d85684bb3b6e9d6b78388c46a7936130ad019690 Mon Sep 17 00:00:00 2001
From: John Daly <john.daly2@gmail.com>
Date: Fri, 5 Aug 2022 17:45:22 -0700
Subject: [PATCH 2/2] Updating the "browser" field to be the same as "main"

---
 packages/react-query-devtools/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index 3636173ef7..7e1d85b247 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -10,10 +10,10 @@
     "type": "github",
     "url": "https://github.com/sponsors/tannerlinsley"
   },
-  "module": "build/esm/index.js",
-  "main": "build/cjs/packages/react-query-devtools/src/index.js",
-  "browser": "build/umd/noop.production.js",
-  "types": "build/types/react-query-devtools/src/index.d.ts",
+  "module": "build/lib/index.mjs",
+  "main": "build/lib/index.js",
+  "browser": "build/lib/index.js",
+  "types": "build/lib/index.d.ts",
   "files": [
     "build/lib/*",
     "build/umd/*",