Fix published package imports (#934)

The vendored fumadb fork was published under the bare name "fumadb", which collides with the upstream npm package — so a published @executor-js/sdk would resolve the wrong dependency. Scope the package to @executor-js/fumadb and update every workspace dependency, import specifier, and the build filter to match.

Rhys Sullivan committed 5 months ago

Commit 17174c41 parent 2c8f2d037 files · +89 −80Browse files

Showing the changes to apps (10 of 37 files). Show all

Unified · Split

10 files

apps/cloud/package.json +1 −1
apps/cloud/src/db/executor-schema.ts +1 −1
apps/cloud/src/db/fuma.ts +3 −3
apps/host-cloudflare/package.json +1 −1
apps/host-cloudflare/src/db/d1.ts +1 −1
apps/host-selfhost/package.json +1 −1
apps/host-selfhost/src/db/self-host-db.ts +3 −3
apps/local/package.json +1 −1
apps/local/src/db/sqlite-fumadb.ts +3 −3
apps/local/src/db/v1-v2-migration.ts +1 −1

apps/cloud/package.json+1−1

@@ -35,6 +35,7 @@ · 34 unmodified lines
35	35	"@executor-js/api": "workspace:*",
36	36	"@executor-js/cloudflare": "workspace:*",
37	37	"@executor-js/execution": "workspace:*",
	38	+ "@executor-js/fumadb": "workspace:*",
38	39	"@executor-js/host-mcp": "workspace:*",
39	40	"@executor-js/plugin-graphql": "workspace:*",
40	41	"@executor-js/plugin-mcp": "workspace:*",
@@ -63,7 +64,6 @@ · 22 unmodified lines
63	64	"autumn-js": "^1.2.8",
64	65	"drizzle-orm": "catalog:",
65	66	"effect": "catalog:",
66		− "fumadb": "workspace:*",
67	67	"jose": "^5.6.3",
68	68	"postgres": "^3.4.9",
69	69	"posthog-js": "^1.372.5",

apps/cloud/src/db/executor-schema.ts+1−1

@@ -8,7 +8,7 @@ import { · 7 unmodified lines
8	8	uniqueIndex,
9	9	bigint,
10	10	} from "drizzle-orm/pg-core";
11		−import { createId } from "fumadb/cuid";
	11	+import { createId } from "@executor-js/fumadb/cuid";
12	12
13	13	export const integration = pgTable(
14	14	"integration",

apps/cloud/src/db/fuma.ts+3−3

@@ -1,7 +1,7 @@
1	1	import { Effect, Layer } from "effect";
2		−import { type FumaDB } from "fumadb";
3		−import { type DrizzleConfig } from "fumadb/adapters/drizzle";
4		−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
	2	+import { type FumaDB } from "@executor-js/fumadb";
	3	+import { type DrizzleConfig } from "@executor-js/fumadb/adapters/drizzle";
	4	+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
5	5
6	6	import {
7	7	createExecutorFumaDb,

apps/host-cloudflare/package.json+1−1

@@ -20,6 +20,7 @@ · 19 unmodified lines
20	20	"@executor-js/app": "workspace:*",
21	21	"@executor-js/cloudflare": "workspace:*",
22	22	"@executor-js/execution": "workspace:*",
	23	+ "@executor-js/fumadb": "workspace:*",
23	24	"@executor-js/host-mcp": "workspace:*",
24	25	"@executor-js/plugin-encrypted-secrets": "workspace:*",
25	26	"@executor-js/plugin-graphql": "workspace:*",
@@ -33,7 +34,6 @@ · 7 unmodified lines
33	34	"@tanstack/react-router": "catalog:",
34	35	"drizzle-orm": "catalog:",
35	36	"effect": "catalog:",
36		− "fumadb": "workspace:*",
37	37	"jose": "^5.9.6",
38	38	"quickjs-emscripten-core": "0.31.0",
39	39	"react": "catalog:",

apps/host-cloudflare/src/db/d1.ts+1−1

@@ -2,7 +2,7 @@ import { drizzle } from "drizzle-orm/d1"; · 1 unmodified line
2	2	import {
3	3	createDrizzleRuntimeSchemaFromTables,
4	4	ensureDrizzleRuntimeSchemaFromTables,
5		−} from "fumadb/adapters/drizzle";
	5	+} from "@executor-js/fumadb/adapters/drizzle";
6	6	import type { D1Database, R2Bucket } from "@cloudflare/workers-types";
7	7
8	8	import { wrapD1WithR2Offload } from "./r2-blob-offload";

apps/host-selfhost/package.json+1−1

@@ -23,6 +23,7 @@ · 22 unmodified lines
23	23	"@executor-js/api": "workspace:*",
24	24	"@executor-js/app": "workspace:*",
25	25	"@executor-js/execution": "workspace:*",
	26	+ "@executor-js/fumadb": "workspace:*",
26	27	"@executor-js/host-mcp": "workspace:*",
27	28	"@executor-js/plugin-encrypted-secrets": "workspace:*",
28	29	"@executor-js/plugin-graphql": "workspace:*",
@@ -38,7 +39,6 @@ · 9 unmodified lines
38	39	"better-auth": "^1.6.11",
39	40	"drizzle-orm": "catalog:",
40	41	"effect": "catalog:",
41		− "fumadb": "workspace:*",
42	42	"react": "catalog:",
43	43	"react-dom": "catalog:"
44	44	},

apps/host-selfhost/src/db/self-host-db.ts+3−3

@@ -3,12 +3,12 @@ import { dirname, resolve } from "node:path"; · 2 unmodified lines
3	3
4	4	import { createClient, type Client } from "@libsql/client";
5	5	import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
6		−import { type FumaDB } from "fumadb";
	6	+import { type FumaDB } from "@executor-js/fumadb";
7	7	import {
8	8	createDrizzleRuntimeSchemaFromTables,
9	9	ensureDrizzleRuntimeSchemaFromTables,
10		−} from "fumadb/adapters/drizzle";
11		−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
	10	+} from "@executor-js/fumadb/adapters/drizzle";
	11	+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
12	12	import { Context, Effect, Layer } from "effect";
13	13
14	14	import {

apps/local/package.json+1−1

@@ -25,6 +25,7 @@ · 24 unmodified lines
25	25	"@executor-js/app": "workspace:*",
26	26	"@executor-js/config": "workspace:*",
27	27	"@executor-js/execution": "workspace:*",
	28	+ "@executor-js/fumadb": "workspace:*",
28	29	"@executor-js/host-mcp": "workspace:*",
29	30	"@executor-js/integrations-registry": "workspace:*",
30	31	"@executor-js/plugin-desktop-settings": "workspace:*",
@@ -44,7 +45,6 @@ · 13 unmodified lines
44	45	"@tanstack/react-router": "catalog:",
45	46	"drizzle-orm": "catalog:",
46	47	"effect": "catalog:",
47		− "fumadb": "workspace:*",
48	48	"jsonc-parser": "^3.3.1",
49	49	"react": "catalog:",
50	50	"react-dom": "catalog:"

apps/local/src/db/sqlite-fumadb.ts+3−3

@@ -1,12 +1,12 @@
1	1	import { type Client } from "@libsql/client";
2	2	import { Layer } from "effect";
3	3	import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
4		−import { type FumaDB } from "fumadb";
	4	+import { type FumaDB } from "@executor-js/fumadb";
5	5	import {
6	6	createDrizzleRuntimeSchemaFromTables,
7	7	createDrizzleRuntimeSchemaSqlFromTables,
8		−} from "fumadb/adapters/drizzle";
9		−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
	8	+} from "@executor-js/fumadb/adapters/drizzle";
	9	+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
10	10
11	11	import { createExecutorFumaDb, DbProvider, type ExecutorDbHandle } from "@executor-js/api/server";
12	12	import type { FumaDb, FumaTables } from "@executor-js/sdk";

apps/local/src/db/v1-v2-migration.ts+1−1

@@ -4,7 +4,7 @@ import type { Client } from "@libsql/client"; · 3 unmodified lines
4	4	import { drizzle } from "drizzle-orm/libsql";
5	5	import { migrate } from "drizzle-orm/libsql/migrator";
6	6	import { Effect } from "effect";
7		−import { createId } from "fumadb/cuid";
	7	+import { createId } from "@executor-js/fumadb/cuid";
8	8	import { createHash, randomBytes } from "node:crypto";
9	9	import * as fs from "node:fs";
10	10	import { homedir, tmpdir } from "node:os";