refactor: move prisma to a package (#480)

codepod-io · Aug 28, 2023 · e1a7151 · e1a7151
1 parent d242c4d
commit e1a7151
Show file tree

Hide file tree

Showing 32 changed files with 73 additions and 7 deletions.
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@apollo/client": "^3.7.1",
+    "@codepod/prisma": "workspace:*",
     "@kubernetes/client-node": "^0.17.1",
     "@prisma/client": "4.3.1",
     "apollo-server": "^3.5.0",

diff --git a/apps/api/src/resolver_repo.ts b/apps/api/src/resolver_repo.ts
@@ -1,7 +1,7 @@
 // nanoid v4 does not work with nodejs. https://github.com/ai/nanoid/issues/365
 import { customAlphabet } from "nanoid/async";
 import { lowercase, numbers } from "nanoid-dictionary";
-import prisma from "./client";
+import prisma from "@codepod/prisma";
 
 const nanoid = customAlphabet(lowercase + numbers, 20);
 

diff --git a/apps/api/src/resolver_user.ts b/apps/api/src/resolver_user.ts
@@ -6,7 +6,7 @@ import { OAuth2Client } from "google-auth-library";
 import { customAlphabet } from "nanoid/async";
 import { lowercase, numbers } from "nanoid-dictionary";
 
-import prisma from "./client";
+import prisma from "@codepod/prisma";
 
 const nanoid = customAlphabet(lowercase + numbers, 20);
 

diff --git a/apps/api/src/yjs-blob.ts b/apps/api/src/yjs-blob.ts
@@ -22,7 +22,7 @@ import { Node as ReactflowNode, Edge as ReactflowEdge } from "reactflow";
 
 import debounce from "lodash/debounce";
 
-import prisma from "./client";
+import prisma from "@codepod/prisma";
 import { dbtype2nodetype, json2yxml } from "./yjs-utils";
 import { setupObserversToRuntime } from "./yjs-runtime";
 

diff --git a/apps/api/src/yjs-plain.ts b/apps/api/src/yjs-plain.ts
@@ -4,7 +4,7 @@ import { Node as ReactflowNode, Edge as ReactflowEdge } from "reactflow";
 
 import debounce from "lodash/debounce";
 
-import prisma from "./client";
+import prisma from "@codepod/prisma";
 import {
   dbtype2nodetype,
   json2yxml,

diff --git a/apps/api/src/yjs-server.ts b/apps/api/src/yjs-server.ts
@@ -12,7 +12,7 @@ import { ApolloServerPluginLandingPageLocalDefault } from "apollo-server-core";
 
 import { getYDoc, setupWSConnection } from "./yjs-setupWS";
 
-import prisma from "./client";
+import prisma from "@codepod/prisma";
 import { connectSocket, runtime2socket } from "./yjs-runtime";
 
 interface TokenInterface {

diff --git a/compose/dev/compose.yml b/compose/dev/compose.yml
@@ -27,7 +27,7 @@ services:
       # 2. it is mounted to all service containers, and will cache and speed up
       #    pnpm install and pnpm add/remove
       - pnpm-store:/codepod/.pnpm-store
-    command: sh -c "corepack enable && pnpm install && cd apps/api && pnpm dlx prisma migrate dev"
+    command: sh -c "corepack enable && pnpm install && cd packages/prisma && pnpm dlx prisma migrate dev && pnpm build"
     environment:
       DATABASE_URL: "postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?schema=public"
 

diff --git a/packages/prisma/.gitignore b/packages/prisma/.gitignore
@@ -0,0 +1,3 @@
+dist/
+conns/conn-*.json
+prisma/dev.db
diff --git a/packages/prisma/package.json b/packages/prisma/package.json
@@ -0,0 +1,16 @@
+{
+  "name": "@codepod/prisma",
+  "version": "1.0.0",
+  "license": "MIT",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "@prisma/client": "4.3.1"
+  },
+  "devDependencies": {
+    "typescript": "^5.2.2"
+  }
+}
diff --git a/...rations/20221123231053_init/migration.sql → ...rations/20221123231053_init/migration.sql b/...rations/20221123231053_init/migration.sql → ...rations/20221123231053_init/migration.sql
diff --git a/.../20221123231635_add_sharing/migration.sql → .../20221123231635_add_sharing/migration.sql b/.../20221123231635_add_sharing/migration.sql → .../20221123231635_add_sharing/migration.sql
diff --git a/...1206194247_add_google_login/migration.sql → ...1206194247_add_google_login/migration.sql b/...1206194247_add_google_login/migration.sql → ...1206194247_add_google_login/migration.sql
diff --git a/...72727_backend_userid_repoid/migration.sql → ...72727_backend_userid_repoid/migration.sql b/...72727_backend_userid_repoid/migration.sql → ...72727_backend_userid_repoid/migration.sql
diff --git a/..._relation_for_collaborators/migration.sql → ..._relation_for_collaborators/migration.sql b/..._relation_for_collaborators/migration.sql → ..._relation_for_collaborators/migration.sql
diff --git a/...230223102734_add_updated_at/migration.sql → ...230223102734_add_updated_at/migration.sql b/...230223102734_add_updated_at/migration.sql → ...230223102734_add_updated_at/migration.sql
diff --git a/...23_add_dummy_count_for_repo/migration.sql → ...23_add_dummy_count_for_repo/migration.sql b/...23_add_dummy_count_for_repo/migration.sql → ...23_add_dummy_count_for_repo/migration.sql
diff --git a/...0849_remove_repo_dummycount/migration.sql → ...0849_remove_repo_dummycount/migration.sql b/...0849_remove_repo_dummycount/migration.sql → ...0849_remove_repo_dummycount/migration.sql
diff --git a/...30226065945_add_access_time/migration.sql → ...30226065945_add_access_time/migration.sql b/...30226065945_add_access_time/migration.sql → ...30226065945_add_access_time/migration.sql
diff --git a/...26074748_add_user_repo_data/migration.sql → ...26074748_add_user_repo_data/migration.sql b/...26074748_add_user_repo_data/migration.sql → ...26074748_add_user_repo_data/migration.sql
diff --git a/...129_add_created_at_for_user/migration.sql → ...129_add_created_at_for_user/migration.sql b/...129_add_created_at_for_user/migration.sql → ...129_add_created_at_for_user/migration.sql
diff --git a/.../20230227022751_refine_edge/migration.sql → .../20230227022751_refine_edge/migration.sql b/.../20230227022751_refine_edge/migration.sql → .../20230227022751_refine_edge/migration.sql
diff --git a/...puted_id_for_user_repo_data/migration.sql → ...puted_id_for_user_repo_data/migration.sql b/...puted_id_for_user_repo_data/migration.sql → ...puted_id_for_user_repo_data/migration.sql
diff --git a/...501222052_add_isguset_field/migration.sql → ...501222052_add_isguset_field/migration.sql b/...501222052_add_isguset_field/migration.sql → ...501222052_add_isguset_field/migration.sql
diff --git a/...9175217_add_codeium_api_key/migration.sql → ...9175217_add_codeium_api_key/migration.sql b/...9175217_add_codeium_api_key/migration.sql → ...9175217_add_codeium_api_key/migration.sql
diff --git a/...ons/20230802033453_add_star/migration.sql → ...ons/20230802033453_add_star/migration.sql b/...ons/20230802033453_add_star/migration.sql → ...ons/20230802033453_add_star/migration.sql
diff --git a/...20230804210253_remove_guest/migration.sql → ...20230804210253_remove_guest/migration.sql b/...20230804210253_remove_guest/migration.sql → ...20230804210253_remove_guest/migration.sql
diff --git a/...230809205252_add_y_doc_blob/migration.sql → ...230809205252_add_y_doc_blob/migration.sql b/...230809205252_add_y_doc_blob/migration.sql → ...230809205252_add_y_doc_blob/migration.sql
diff --git a/...api/prisma/migrations/migration_lock.toml → ...sma/prisma/migrations/migration_lock.toml b/...api/prisma/migrations/migration_lock.toml → ...sma/prisma/migrations/migration_lock.toml
diff --git a/apps/api/prisma/schema.prisma → packages/prisma/prisma/schema.prisma b/apps/api/prisma/schema.prisma → packages/prisma/prisma/schema.prisma
diff --git a/apps/api/src/client.ts → packages/prisma/src/index.ts b/apps/api/src/client.ts → packages/prisma/src/index.ts
diff --git a/packages/prisma/tsconfig.json b/packages/prisma/tsconfig.json
@@ -0,0 +1,27 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "dist",
+    "target": "esnext",
+    "allowJs": true,
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "lib": ["esnext"],
+    "moduleResolution": "node",
+    "noFallthroughCasesInSwitch": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "isolatedModules": true,
+    "noImplicitAny": false,
+    "declaration": true
+  },
+  "ts-node": {
+    // these options are overrides used only by ts-node
+    // same as the --compilerOptions flag and the TS_NODE_COMPILER_OPTIONS environment variable
+    "compilerOptions": {
+      "module": "commonjs"
+    }
+  },
+  "include": ["src"]
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml