History

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
  1. apps/cloud/package.json +1 −1
  2. apps/cloud/src/db/executor-schema.ts +1 −1
  3. apps/cloud/src/db/fuma.ts +3 −3
  4. apps/host-cloudflare/package.json +1 −1
  5. apps/host-cloudflare/src/db/d1.ts +1 −1
  6. apps/host-selfhost/package.json +1 −1
  7. apps/host-selfhost/src/db/self-host-db.ts +3 −3
  8. apps/local/package.json +1 −1
  9. apps/local/src/db/sqlite-fumadb.ts +3 −3
  10. apps/local/src/db/v1-v2-migration.ts +1 −1
apps/cloud/package.json+1−1
@@ -35,6 +35,7 @@ · 34 unmodified lines
35 "@executor-js/api": "workspace:*",35 "@executor-js/api": "workspace:*",
36 "@executor-js/cloudflare": "workspace:*",36 "@executor-js/cloudflare": "workspace:*",
37 "@executor-js/execution": "workspace:*",37 "@executor-js/execution": "workspace:*",
38 "@executor-js/fumadb": "workspace:*",
38 "@executor-js/host-mcp": "workspace:*",39 "@executor-js/host-mcp": "workspace:*",
39 "@executor-js/plugin-graphql": "workspace:*",40 "@executor-js/plugin-graphql": "workspace:*",
40 "@executor-js/plugin-mcp": "workspace:*",41 "@executor-js/plugin-mcp": "workspace:*",
@@ -63,7 +64,6 @@ · 22 unmodified lines
63 "autumn-js": "^1.2.8",64 "autumn-js": "^1.2.8",
64 "drizzle-orm": "catalog:",65 "drizzle-orm": "catalog:",
65 "effect": "catalog:",66 "effect": "catalog:",
66 "fumadb": "workspace:*",
67 "jose": "^5.6.3",67 "jose": "^5.6.3",
68 "postgres": "^3.4.9",68 "postgres": "^3.4.9",
69 "posthog-js": "^1.372.5",69 "posthog-js": "^1.372.5",
apps/cloud/src/db/executor-schema.ts+1−1
@@ -8,7 +8,7 @@ import { · 7 unmodified lines
8 uniqueIndex,8 uniqueIndex,
9 bigint,9 bigint,
10} from "drizzle-orm/pg-core";10} from "drizzle-orm/pg-core";
11import { createId } from "fumadb/cuid";11import { createId } from "@executor-js/fumadb/cuid";
12 12
13export const integration = pgTable(13export const integration = pgTable(
14 "integration",14 "integration",
apps/cloud/src/db/fuma.ts+3−3
@@ -1,7 +1,7 @@
1import { Effect, Layer } from "effect";1import { Effect, Layer } from "effect";
2import { type FumaDB } from "fumadb";2import { type FumaDB } from "@executor-js/fumadb";
3import { type DrizzleConfig } from "fumadb/adapters/drizzle";3import { type DrizzleConfig } from "@executor-js/fumadb/adapters/drizzle";
4import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";4import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
5 5
6import {6import {
7 createExecutorFumaDb,7 createExecutorFumaDb,
apps/host-cloudflare/package.json+1−1
@@ -20,6 +20,7 @@ · 19 unmodified lines
20 "@executor-js/app": "workspace:*",20 "@executor-js/app": "workspace:*",
21 "@executor-js/cloudflare": "workspace:*",21 "@executor-js/cloudflare": "workspace:*",
22 "@executor-js/execution": "workspace:*",22 "@executor-js/execution": "workspace:*",
23 "@executor-js/fumadb": "workspace:*",
23 "@executor-js/host-mcp": "workspace:*",24 "@executor-js/host-mcp": "workspace:*",
24 "@executor-js/plugin-encrypted-secrets": "workspace:*",25 "@executor-js/plugin-encrypted-secrets": "workspace:*",
25 "@executor-js/plugin-graphql": "workspace:*",26 "@executor-js/plugin-graphql": "workspace:*",
@@ -33,7 +34,6 @@ · 7 unmodified lines
33 "@tanstack/react-router": "catalog:",34 "@tanstack/react-router": "catalog:",
34 "drizzle-orm": "catalog:",35 "drizzle-orm": "catalog:",
35 "effect": "catalog:",36 "effect": "catalog:",
36 "fumadb": "workspace:*",
37 "jose": "^5.9.6",37 "jose": "^5.9.6",
38 "quickjs-emscripten-core": "0.31.0",38 "quickjs-emscripten-core": "0.31.0",
39 "react": "catalog:",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
2import {2import {
3 createDrizzleRuntimeSchemaFromTables,3 createDrizzleRuntimeSchemaFromTables,
4 ensureDrizzleRuntimeSchemaFromTables,4 ensureDrizzleRuntimeSchemaFromTables,
5} from "fumadb/adapters/drizzle";5} from "@executor-js/fumadb/adapters/drizzle";
6import type { D1Database, R2Bucket } from "@cloudflare/workers-types";6import type { D1Database, R2Bucket } from "@cloudflare/workers-types";
7 7
8import { wrapD1WithR2Offload } from "./r2-blob-offload";8import { wrapD1WithR2Offload } from "./r2-blob-offload";
apps/host-selfhost/package.json+1−1
@@ -23,6 +23,7 @@ · 22 unmodified lines
23 "@executor-js/api": "workspace:*",23 "@executor-js/api": "workspace:*",
24 "@executor-js/app": "workspace:*",24 "@executor-js/app": "workspace:*",
25 "@executor-js/execution": "workspace:*",25 "@executor-js/execution": "workspace:*",
26 "@executor-js/fumadb": "workspace:*",
26 "@executor-js/host-mcp": "workspace:*",27 "@executor-js/host-mcp": "workspace:*",
27 "@executor-js/plugin-encrypted-secrets": "workspace:*",28 "@executor-js/plugin-encrypted-secrets": "workspace:*",
28 "@executor-js/plugin-graphql": "workspace:*",29 "@executor-js/plugin-graphql": "workspace:*",
@@ -38,7 +39,6 @@ · 9 unmodified lines
38 "better-auth": "^1.6.11",39 "better-auth": "^1.6.11",
39 "drizzle-orm": "catalog:",40 "drizzle-orm": "catalog:",
40 "effect": "catalog:",41 "effect": "catalog:",
41 "fumadb": "workspace:*",
42 "react": "catalog:",42 "react": "catalog:",
43 "react-dom": "catalog:"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
4import { createClient, type Client } from "@libsql/client";4import { createClient, type Client } from "@libsql/client";
5import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";5import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
6import { type FumaDB } from "fumadb";6import { type FumaDB } from "@executor-js/fumadb";
7import {7import {
8 createDrizzleRuntimeSchemaFromTables,8 createDrizzleRuntimeSchemaFromTables,
9 ensureDrizzleRuntimeSchemaFromTables,9 ensureDrizzleRuntimeSchemaFromTables,
10} from "fumadb/adapters/drizzle";10} from "@executor-js/fumadb/adapters/drizzle";
11import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";11import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
12import { Context, Effect, Layer } from "effect";12import { Context, Effect, Layer } from "effect";
13 13
14import {14import {
apps/local/package.json+1−1
@@ -25,6 +25,7 @@ · 24 unmodified lines
25 "@executor-js/app": "workspace:*",25 "@executor-js/app": "workspace:*",
26 "@executor-js/config": "workspace:*",26 "@executor-js/config": "workspace:*",
27 "@executor-js/execution": "workspace:*",27 "@executor-js/execution": "workspace:*",
28 "@executor-js/fumadb": "workspace:*",
28 "@executor-js/host-mcp": "workspace:*",29 "@executor-js/host-mcp": "workspace:*",
29 "@executor-js/integrations-registry": "workspace:*",30 "@executor-js/integrations-registry": "workspace:*",
30 "@executor-js/plugin-desktop-settings": "workspace:*",31 "@executor-js/plugin-desktop-settings": "workspace:*",
@@ -44,7 +45,6 @@ · 13 unmodified lines
44 "@tanstack/react-router": "catalog:",45 "@tanstack/react-router": "catalog:",
45 "drizzle-orm": "catalog:",46 "drizzle-orm": "catalog:",
46 "effect": "catalog:",47 "effect": "catalog:",
47 "fumadb": "workspace:*",
48 "jsonc-parser": "^3.3.1",48 "jsonc-parser": "^3.3.1",
49 "react": "catalog:",49 "react": "catalog:",
50 "react-dom": "catalog:"50 "react-dom": "catalog:"
apps/local/src/db/sqlite-fumadb.ts+3−3
@@ -1,12 +1,12 @@
1import { type Client } from "@libsql/client";1import { type Client } from "@libsql/client";
2import { Layer } from "effect";2import { Layer } from "effect";
3import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";3import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
4import { type FumaDB } from "fumadb";4import { type FumaDB } from "@executor-js/fumadb";
5import {5import {
6 createDrizzleRuntimeSchemaFromTables,6 createDrizzleRuntimeSchemaFromTables,
7 createDrizzleRuntimeSchemaSqlFromTables,7 createDrizzleRuntimeSchemaSqlFromTables,
8} from "fumadb/adapters/drizzle";8} from "@executor-js/fumadb/adapters/drizzle";
9import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";9import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
10 10
11import { createExecutorFumaDb, DbProvider, type ExecutorDbHandle } from "@executor-js/api/server";11import { createExecutorFumaDb, DbProvider, type ExecutorDbHandle } from "@executor-js/api/server";
12import type { FumaDb, FumaTables } from "@executor-js/sdk";12import 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
4import { drizzle } from "drizzle-orm/libsql";4import { drizzle } from "drizzle-orm/libsql";
5import { migrate } from "drizzle-orm/libsql/migrator";5import { migrate } from "drizzle-orm/libsql/migrator";
6import { Effect } from "effect";6import { Effect } from "effect";
7import { createId } from "fumadb/cuid";7import { createId } from "@executor-js/fumadb/cuid";
8import { createHash, randomBytes } from "node:crypto";8import { createHash, randomBytes } from "node:crypto";
9import * as fs from "node:fs";9import * as fs from "node:fs";
10import { homedir, tmpdir } from "node:os";10import { homedir, tmpdir } from "node:os";