fix(core): import from fuse directly rather than hoping for a dedupe (#…

…148) * import from fuse directly rather than hoping for a dedupe * add changeset * convert vitest to mts * try out without workspace link * apply to more areas * also reflect thsi in examples
StellateHQ · Feb 7, 2024 · 31f66fc · 31f66fc
1 parent 8f8db40
commit 31f66fc
Show file tree

Hide file tree

Showing 11 changed files with 205 additions and 364 deletions.
diff --git a/.changeset/clever-berries-tie.md b/.changeset/clever-berries-tie.md
@@ -0,0 +1,5 @@
+---
+'fuse': patch
+---
+
+Dedupe the builder so that we can't end up with multiple fuse copies
diff --git a/examples/standalone/package.json b/examples/standalone/package.json
@@ -19,7 +19,7 @@
     "@types/react-dom": "^18.2.15",
     "@vitejs/plugin-react": "^4.2.0",
     "concurrently": "^8.2.2",
-    "fuse": "workspace:*",
+    "fuse": "file:../../packages/core",
     "typescript": "^5.2.2",
     "vite": "^5.0.0"
   }

diff --git a/packages/core/src/adapters/bun.ts b/packages/core/src/adapters/bun.ts
@@ -1,7 +1,7 @@
 /// <reference types="bun" />
 import { createYoga } from 'graphql-yoga'
-
-import { builder } from '../builder'
+// @ts-ignore
+import { builder } from 'fuse'
 import { getYogaPlugins, wrappedContext } from '../utils/yoga-helpers'
 
 export async function main() {

diff --git a/packages/core/src/adapters/cloudflare.ts b/packages/core/src/adapters/cloudflare.ts
@@ -1,6 +1,6 @@
 import { createYoga } from 'graphql-yoga'
-
-import { builder } from '../builder'
+// @ts-ignore
+import { builder } from 'fuse'
 import { getYogaPlugins, wrappedContext } from '../utils/yoga-helpers'
 
 function fetch(request) {

diff --git a/packages/core/src/adapters/lambda.ts b/packages/core/src/adapters/lambda.ts
@@ -4,8 +4,8 @@ import type {
   Context,
 } from 'aws-lambda'
 import { createYoga } from 'graphql-yoga'
-
-import { builder } from '../builder'
+// @ts-ignore
+import { builder } from 'fuse'
 import { getYogaPlugins, wrappedContext } from '../utils/yoga-helpers'
 
 export async function fetch(

diff --git a/packages/core/src/adapters/node.ts b/packages/core/src/adapters/node.ts
@@ -1,7 +1,7 @@
 import http from 'http'
 import { createYoga } from 'graphql-yoga'
-
-import { builder } from '../builder'
+// @ts-ignore
+import { builder } from 'fuse'
 import { getYogaPlugins, wrappedContext } from '../utils/yoga-helpers'
 
 export async function main() {

diff --git a/packages/core/src/dev.ts b/packages/core/src/dev.ts
@@ -1,8 +1,9 @@
+// @ts-ignore
+import { builder } from 'fuse'
 import { printSchema } from 'graphql'
 import { createYoga } from 'graphql-yoga'
 
 import { getYogaPlugins, wrappedContext } from './utils/yoga-helpers'
-import { builder } from './builder'
 
 // prettier-ignore
 const defaultQuery = /* GraphQL */ `query {

diff --git a/packages/core/test/fixtures/simple/package.json b/packages/core/test/fixtures/simple/package.json
@@ -4,7 +4,7 @@
   "version": "0.0.0",
   "type": "module",
   "devDependencies": {
-    "fuse": "workspace:*",
+    "fuse": "file:../../../",
     "typescript": "^5.2.2"
   }
 }
diff --git a/packages/core/test/fixtures/tada/package.json b/packages/core/test/fixtures/tada/package.json
@@ -5,7 +5,7 @@
   "type": "module",
   "devDependencies": {
     "@0no-co/graphqlsp": "1.3.3",
-    "fuse": "workspace:*",
+    "fuse": "file:../../../",
     "typescript": "^5.2.2",
     "gql.tada": "1.2.1"
   }

diff --git a/packages/core/vitest.config.ts → packages/core/vitest.config.mts b/packages/core/vitest.config.ts → packages/core/vitest.config.mts
@@ -1,5 +1,10 @@
 import { defineConfig } from 'vitest/config'
 
 export default defineConfig({
-  test: {},
+
+  test: {
+    alias: {
+      fuse: './builder.mjs'
+    }
+  },
 })