From 912230c83bebd85e7ee81432edf4a6a41598d9a1 Mon Sep 17 00:00:00 2001
From: Songkeys <songv587@gmail.com>
Date: Thu, 21 Jul 2022 00:53:08 +0800
Subject: [PATCH 1/2] fix(react-query-devtools): support cjs in noop build

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

diff --git a/package.json b/package.json
index f109b75aef..0bc8968378 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
     "test:jest:dev": "jest --config ./jest.config.ts --watch",
     "test:size": "npm run build && bundlewatch",
     "build": "rollup --config rollup.config.js && npm run typecheck",
-    "postbuild": "cp ./packages/react-query-devtools/src/noop.ts ./packages/react-query-devtools/build/esm/noop.js",
     "typecheck": "tsc -b",
     "watch": "concurrently --kill-others \"rollup --config rollup.config.js -w\" \"npm run typecheck -- --watch\" \"npm run test\"",
     "linkAll": "lerna exec 'npm run link' --parallel",
diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index 5b051d9e5a..703e8f1178 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -20,9 +20,13 @@
   ],
   "exports": {
     "development": {
+      "require": "./build/cjs/packages/react-query-devtools/src/noop.js",
       "default": "./build/esm/index.js"
     },
-    "default": "./build/esm/noop.js"
+    "default": {
+      "require": "./build/cjs/packages/react-query-devtools/src/index.js",
+      "default": "./build/esm/noop.js"
+    }
   },
   "scripts": {
     "test:eslint": "../../node_modules/.bin/eslint --ext .ts,.tsx ./src",
diff --git a/rollup.config.ts b/rollup.config.ts
index c6662e5548..01b7b1c78f 100644
--- a/rollup.config.ts
+++ b/rollup.config.ts
@@ -86,6 +86,17 @@ export default function rollup(options: RollupOptions): RollupOptions[] {
         '@tanstack/react-query': 'ReactQuery',
       },
     }),
+    ...buildConfigs({
+      name: 'react-query-devtools-noop',
+      packageDir: 'packages/react-query-devtools',
+      jsName: 'ReactQueryDevtools',
+      outputFile: 'react-query-devtools',
+      entryFile: 'src/noop.ts',
+      globals: {
+        react: 'React',
+        '@tanstack/react-query': 'ReactQuery',
+      },
+    }),
     ...buildConfigs({
       name: 'react-query-persist-client',
       packageDir: 'packages/react-query-persist-client',

From 9bd505f5c2bc84456a2d5315641e2060945d527d Mon Sep 17 00:00:00 2001
From: Songkeys <songv587@gmail.com>
Date: Thu, 21 Jul 2022 00:54:38 +0800
Subject: [PATCH 2/2] fix: typo

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

diff --git a/packages/react-query-devtools/package.json b/packages/react-query-devtools/package.json
index 703e8f1178..efba666b75 100644
--- a/packages/react-query-devtools/package.json
+++ b/packages/react-query-devtools/package.json
@@ -20,11 +20,11 @@
   ],
   "exports": {
     "development": {
-      "require": "./build/cjs/packages/react-query-devtools/src/noop.js",
+      "require": "./build/cjs/packages/react-query-devtools/src/index.js",
       "default": "./build/esm/index.js"
     },
     "default": {
-      "require": "./build/cjs/packages/react-query-devtools/src/index.js",
+      "require": "./build/cjs/packages/react-query-devtools/src/noop.js",
       "default": "./build/esm/noop.js"
     }
   },