fix(workspace): Fix regression causing malformed d.ts output (#2870)

Co-authored-by: Phil Pluckthun <[email protected]>

.changeset/brown-doors-tan.md

@@ -0,0 +1,10 @@
+---
+'@urql/exchange-graphcache': patch
+'@urql/exchange-execute': patch
+'@urql/core': patch
+'next-urql': patch
+'@urql/svelte': patch
+'@urql/vue': patch
+---
+
+Fix type-generation, with a change in TS/Rollup the type generation took the paths as src and resolved them into the types dir

.github/workflows/ci.yml

@@ -94,7 +94,7 @@ jobs:
         run: pnpm install --frozen-lockfile --prefer-offline
 
       - name: Build
-        run: pnpm -F urql build
+        run: pnpm -F @urql/core build && pnpm -F urql build
 
       - name: e2e tests 🧪
         uses: cypress-io/github-action@v4

exchanges/auth/package.json

@@ -55,6 +55,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/auth/tsconfig.json

@@ -1,15 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "target": "es2019",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/context/package.json

@@ -54,6 +54,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/context/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/execute/package.json

@@ -55,6 +55,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/execute/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/graphcache/default-storage/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "dependencies": {
-    "@urql/core": ">=3.0.5",
+    "@urql/core": ">=3.1.0",
     "wonka": "^6.0.0"
   }
 }

exchanges/graphcache/package.json

@@ -70,13 +70,14 @@
   },
   "devDependencies": {
     "@cypress/react": "^7.0.1",
-    "@urql/exchange-execute": "*",
-    "@urql/introspection": "*",
+    "@urql/core": "workspace:@urql/core@*",
+    "@urql/exchange-execute": "workspace:@urql/exchange-execute@*",
+    "@urql/introspection": "workspace:@urql/introspection@*",
     "cypress": "^11.1.0",
     "graphql": "^16.0.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
-    "urql": "*"
+    "urql": "workspace:urql@*"
   },
   "publishConfig": {
     "access": "public"

exchanges/graphcache/src/cacheExchange.ts

@@ -111,6 +111,7 @@ export const cacheExchange = <C extends Partial<CacheExchangeOpts>>(
 
   // This registers queries with the data layer to ensure commutativity
   const prepareForwardedOperation = (operation: Operation) => {
+    operation.context.bakka + {};
     if (operation.kind === 'query') {
       // Pre-reserve the position of the result layer
       reserveLayer(store.data, operation.key);

exchanges/graphcache/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/multipart-fetch/package.json

@@ -54,6 +54,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/multipart-fetch/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/persisted-fetch/package.json

@@ -53,6 +53,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/persisted-fetch/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/populate/package.json

@@ -53,6 +53,7 @@
     "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "publishConfig": {

exchanges/populate/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/refocus/package.json

@@ -48,6 +48,7 @@
     "prepublishOnly": "run-s clean build"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "@types/react": "^17.0.4",
     "graphql": "^16.0.0"
   },

exchanges/refocus/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/request-policy/package.json

@@ -47,6 +47,7 @@
     "prepublishOnly": "run-s clean build"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "peerDependencies": {

exchanges/request-policy/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

exchanges/retry/package.json

@@ -47,6 +47,7 @@
     "prepublishOnly": "run-s clean build"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "graphql": "^16.0.0"
   },
   "peerDependencies": {

exchanges/retry/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

packages/core/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

packages/introspection/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

packages/next-urql/package.json

@@ -31,6 +31,8 @@
     "prepublishOnly": "run-s clean build"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
+    "urql": "workspace:urql@*",
     "@types/enzyme": "^3.10.3",
     "@types/enzyme-adapter-react-16": "^1.0.5",
     "@types/node-fetch": "^2.5.4",

packages/next-urql/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

packages/preact-urql/package.json

@@ -48,6 +48,7 @@
     "prepublishOnly": "run-s clean build"
   },
   "devDependencies": {
+    "@urql/core": "workspace:@urql/core@*",
     "@testing-library/preact": "^2.0.0",
     "graphql": "^16.0.0",
     "preact": "^10.5.5"

packages/preact-urql/tsconfig.json

@@ -1,14 +1,4 @@
 {
   "extends": "../../tsconfig.json",
-  "include": ["src"],
-  "compilerOptions": {
-    "baseUrl": "./",
-    "paths": {
-      "urql": ["../../packages/react-urql/src"],
-      "*-urql": ["../../packages/*-urql/src"],
-      "@urql/exchange-*": ["../../exchanges/*/src"],
-      "@urql/core/*": ["../../packages/core/src/*"],
-      "@urql/*": ["../../packages/*-urql/src", "../../packages/*/src"]
-    }
-  }
+  "include": ["src"]
 }

packages/react-urql/package.json

@@ -46,6 +46,7 @@
     "@testing-library/react-hooks": "^5.1.2",
     "@types/react": "^17.0.4",
     "@types/react-test-renderer": "^17.0.1",
+    "@urql/core": "workspace:@urql/core@*",
     "cypress": "^11.1.0",
     "graphql": "^16.0.0",
     "react": "^17.0.1",

packages/react-urql/src/context.ts

@@ -5,9 +5,12 @@ import { Client, createClient } from '@urql/core';
 // but not to error catastrophically if someone is just playing around
 const defaultClient = createClient({ url: '/graphql' });
 
-export const Context = createContext<Client>(defaultClient);
-export const Provider = Context.Provider;
-export const Consumer = Context.Consumer;
+export const Context: import('react').Context<Client> = createContext(
+  defaultClient
+);
+export const Provider: import('react').Provider<Client> = Context.Provider;
+export const Consumer: import('react').Consumer<Client> = Context.Consumer;
+
 Context.displayName = 'UrqlContext';
 
 let hasWarnedAboutDefault = false;