Migration to drizzle to support cloudflare worker officially

yunusefendi52 · Apr 7, 2024 · d28ed10 · d28ed10
1 parent b9b4e89
commit d28ed10
Show file tree

Hide file tree

Showing 51 changed files with 2,341 additions and 512 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/drizzle.config.ts b/drizzle.config.ts
@@ -0,0 +1,11 @@
+import type { Config } from 'drizzle-kit';
+
+export default {
+  schema: './server/db/schema.ts',
+  out: './server/db/drizzle',
+  driver: 'turso',
+  dbCredentials: {
+    url: process.env.DB_URL!,
+    authToken: process.env.DB_AUTH_TOKEN!,
+  },
+} satisfies Config;
diff --git a/nuxt.config.ts b/nuxt.config.ts
@@ -4,19 +4,20 @@ const { __dirname } = createCommonJS(import.meta.url)
 
 export default defineNuxtConfig({
   runtimeConfig: {
-    JWT_KEY: '',
+    JWT_KEY: 'f4c0f54576b147238afe4c237faf1ebf',
   },
   nitro: {
-    preset: 'bun',
+    preset: 'cloudflare-pages',
     experimental: {
       openAPI: true
     },
+    // node: true,
   },
   imports: {
     presets: [{
       from: '@tanstack/vue-query',
       imports: ['useMutation']
-    },]
+    }]
   },
   vite: {
     define: {

diff --git a/package.json b/package.json
@@ -7,8 +7,6 @@
     "dev": "HOST=localhost nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "prisma:generate": "prisma generate",
-    "prisma:migrate": "prisma migrate dev",
     "postinstall": "nuxt prepare",
     "lint": "eslint --ext \".js,.vue\" --ignore-path .gitignore .",
     "lint:fix": "eslint --fix --ext \".js,.vue\" --ignore-path .gitignore .",
@@ -19,12 +17,13 @@
     "@aws-sdk/client-s3": "^3.540.0",
     "@aws-sdk/s3-request-presigner": "^3.540.0",
     "@hebilicious/vue-query-nuxt": "^0.3.0",
+    "@libsql/client": "^0.6.0",
     "@pinia/nuxt": "^0.5.1",
-    "@prisma/client": "^5.11.0",
     "@tanstack/vue-query": "^5.28.9",
     "chart.js": "3.3.2",
+    "drizzle-orm": "^0.30.7",
     "h3": "^1.11.1",
-    "jsonwebtoken": "^9.0.2",
+    "jose": "^5.2.4",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "pg": "^8.11.3",
@@ -36,11 +35,11 @@
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.9",
-    "@types/jsonwebtoken": "^9.0.6",
     "@types/lodash": "^4.17.0",
     "@types/pg": "^8.11.4",
     "@types/uuid": "^9.0.8",
     "autoprefixer": "^10.4.19",
+    "drizzle-kit": "^0.20.14",
     "eslint": "^8.30.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-nuxt": "^4.0.0",
@@ -50,7 +49,6 @@
     "nuxt-primevue": "^0.3.1",
     "postcss": "^8.4.38",
     "prettier": "2.7.1",
-    "prisma": "^5.11.0",
     "sass": "^1.60.0",
     "sass-loader": "^10.4.1",
     "tailwindcss": "^3.4.3"

diff --git a/pages/apps.vue b/pages/apps.vue
@@ -14,7 +14,7 @@ const orgsStore = useOrgsStore()
 const onRowSelect = (event: any) => {
     const appName = event.data.name
     console.log(event.data)
-    const orgName = event.data.Organization.name
+    const orgName = event.data.organization.name
     navigateTo(`/orgs/${orgName}/apps/${appName}`)
 };
 
@@ -85,6 +85,10 @@ const search = (e: any) => {
     }, _.isEmpty)
 }
 
+const upperCase = (value: string | null | undefined) => {
+    return value?.toUpperCase()
+}
+
 </script>
 
 <template>
@@ -126,7 +130,7 @@ const search = (e: any) => {
                     <div class="flex flex-row gap-3 items-center px-3 py-2">
                         <div class="rounded flex items-center justify-center"
                             style="height: 34px; width: 34px; background-color: #ece9fc; color: #2a1261">
-                            <label class="text-2xl">{{ _.upperCase(prop.data.displayName[0]) }}</label>
+                            <label class="text-2xl">{{ upperCase(prop.data.displayName[0]) }}</label>
                         </div>
                         <label class="font-semibold text-lg">{{ prop.data.displayName }}</label>
                     </div>
@@ -139,7 +143,7 @@ const search = (e: any) => {
             </Column>
             <Column header="Owner" v-if="!isOrg">
                 <template #body="prop">
-                    {{ prop.data.Organization.name }}
+                    {{ prop.data.organization.name }}
                 </template>
             </Column>
             <template #empty>

diff --git a/prisma/data/app.db b/prisma/data/app.db
diff --git a/prisma/migrations/20240330222807_/migration.sql b/prisma/migrations/20240330222807_/migration.sql
diff --git a/prisma/migrations/20240402001549_/migration.sql b/prisma/migrations/20240402001549_/migration.sql
diff --git a/prisma/migrations/20240403222737_/migration.sql b/prisma/migrations/20240403222737_/migration.sql
diff --git a/prisma/migrations/20240403223916_/migration.sql b/prisma/migrations/20240403223916_/migration.sql
diff --git a/prisma/migrations/20240404165653_/migration.sql b/prisma/migrations/20240404165653_/migration.sql
diff --git a/prisma/migrations/20240404171110_/migration.sql b/prisma/migrations/20240404171110_/migration.sql
diff --git a/prisma/migrations/20240404225428_/migration.sql b/prisma/migrations/20240404225428_/migration.sql
diff --git a/prisma/migrations/20240404225611_/migration.sql b/prisma/migrations/20240404225611_/migration.sql
diff --git a/prisma/migrations/migration_lock.toml b/prisma/migrations/migration_lock.toml
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
diff --git a/server/api/add-me-to-org.get.ts b/server/api/add-me-to-org.get.ts
@@ -1,11 +1,12 @@
+import { organizationsPeople } from "../db/schema"
+
 export default defineEventHandler(async ({ context }) => {
     const userId = context.auth.userId
-    const org = await context.prisma.organizations.findFirstOrThrow()
-    await context.prisma.organizationsPeople.create({
-        data: {
-            organizationId: org.id,
-            userId: userId,
-        },
+    const db = context.drizzle
+    const org = await db.query.organizations.findFirst()
+    await db.insert(organizationsPeople).values({
+        organizationId: org!.id,
+        userId: userId,
     })
     return {}
 })