From f31827175dee96c638e297258b39b357898c307d Mon Sep 17 00:00:00 2001
From: jdecroock <decroockjovi@gmail.com>
Date: Thu, 21 Jul 2022 11:06:15 +0200
Subject: [PATCH 1/2] remove graphql modules

---
 package.json                     | 1 -
 scripts/rollup/cleanup-plugin.js | 6 +-----
 yarn.lock                        | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 30d0f61bff..484d62cbc5 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,6 @@
     "@types/jest": "^26.0.23",
     "@typescript-eslint/eslint-plugin": "^4.22.0",
     "@typescript-eslint/parser": "^4.22.0",
-    "babel-plugin-modular-graphql": "^1.1.0",
     "babel-plugin-transform-async-to-promises": "^0.8.15",
     "cjs-module-lexer": "^1.2.2",
     "cypress": "^9.5.1",
diff --git a/scripts/rollup/cleanup-plugin.js b/scripts/rollup/cleanup-plugin.js
index 2c087b8efe..4ff02742b3 100644
--- a/scripts/rollup/cleanup-plugin.js
+++ b/scripts/rollup/cleanup-plugin.js
@@ -1,6 +1,5 @@
 import { transformSync as transform } from '@babel/core';
 import { createFilter } from '@rollup/pluginutils';
-import babelPluginModularGraphQL from 'babel-plugin-modular-graphql';
 
 function removeEmptyImports({ types: t }) {
   return {
@@ -37,10 +36,7 @@ function cleanup(opts = {}) {
       }
 
       return transform(code, {
-        plugins: [
-          !opts.maintainImports && [babelPluginModularGraphQL, { extension: opts.extension }],
-          removeEmptyImports
-        ].filter(Boolean),
+        plugins: [removeEmptyImports],
         babelrc: false
       });
     }
diff --git a/yarn.lock b/yarn.lock
index 20236f3576..9ed390e490 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4083,11 +4083,6 @@ babel-plugin-macros@^3.0.1:
     cosmiconfig "^7.0.0"
     resolve "^1.19.0"
 
-babel-plugin-modular-graphql@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-modular-graphql/-/babel-plugin-modular-graphql-1.1.0.tgz#d1d509913295f0320cc1ce38361b229ca04480ba"
-  integrity sha512-U9QXdxvJhxLU4YYrF7646bB4muLXWdW0sXXKrI9FkGDErqjw0utVn+Zk5W0nNXP82rAmg5vl+cv2nAyZ1dnbxg==
-
 babel-plugin-named-asset-import@^0.3.1:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd"

From 1b8254ceb785d89c96a716e2c76bcf7fdf89a294 Mon Sep 17 00:00:00 2001
From: jdecroock <decroockjovi@gmail.com>
Date: Thu, 21 Jul 2022 11:09:31 +0200
Subject: [PATCH 2/2] add changeset

---
 .changeset/beige-chefs-add.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .changeset/beige-chefs-add.md

diff --git a/.changeset/beige-chefs-add.md b/.changeset/beige-chefs-add.md
new file mode 100644
index 0000000000..34270633e6
--- /dev/null
+++ b/.changeset/beige-chefs-add.md
@@ -0,0 +1,10 @@
+---
+'@urql/exchange-auth': minor
+'@urql/exchange-execute': minor
+'@urql/exchange-graphcache': minor
+'@urql/exchange-persisted-fetch': minor
+'@urql/exchange-populate': minor
+'@urql/core': minor
+---
+
+Remove the `babel-plugin-modular-graphql` helper, this because the graphql package hasn't converted to ESM yet which gives issues in node environments