move to gel

Author: sebasptsch

.github/workflows/build.yml

@@ -21,14 +21,11 @@ jobs:
         with:
           bun-version: latest
 
-      - name: edgedb install
-        run: bash <(curl --proto '=https' --tlsv1.2 -sSf https://sh.edgedb.com) -y
+      - name: init gel
+        run: cd apps/server && bunx gel project init --non-interactive
 
-      - name: init edgedb
-        run: cd apps/server && edgedb project init --non-interactive
-
-      - name: generate edgedb schema types
-        run: bun server generate
+      - name: generate gel schema types
+        run: bun run --filter server generate
 
       - name: Docker Meta Release
         id: meta-release

.github/workflows/test.yml

@@ -16,17 +16,11 @@ jobs:
         with:
           bun-version: latest
 
-      - name: edgedb install
-        run: bash <(curl --proto '=https' --tlsv1.2 -sSf https://sh.edgedb.com) -y
+      - name: init gel
+        run: cd apps/server && bunx gel project init --non-interactive
 
-      - name: install
-        run: bun install
-
-      - name: init edgedb
-        run: cd apps/server && edgedb project init --non-interactive
-
-      - name: generate edgedb schema types
-        run: bun server gen-edgedb
+      - name: generate gel schema types
+        run: bun run --filter server generate
 
       - name: check linting
         run: bun lint

Dockerfile

@@ -17,14 +17,12 @@ FROM oven/bun:1.1.17-alpine
 
 WORKDIR /app
 
-RUN bun install --global edgedb
-
 COPY --from=builder /app/apps/server/dist ./apps/server/dist
 COPY --from=builder /app/apps/server/src/dbschema ./apps/server/src/dbschema
-COPY --from=builder /app/apps/server/edgedb.toml ./apps/server/edgedb.toml
+COPY --from=builder /app/apps/server/gel.toml ./apps/server/gel.toml
 COPY --from=builder /app/apps/client/dist ./apps/client/dist
 
 ENV NODE_ENV=production
 ENV PUBLIC_DIR=/app/apps/client/dist
 
-CMD bun run edgedb migrate && bun apps/server/main.js
+CMD bunx gel migrate && bun apps/server/main.js

apps/server/.gitignore

@@ -4,3 +4,4 @@ dist
 
 src/dbschema/edgeql-js
 src/dbschema/interfaces.ts
+**/*.local.toml

apps/server/edgedb.toml

@@ -0,0 +1,8 @@
+[instance]
+server-version = "6.4"
+
+[project]
+schema-dir = "src/dbschema"
+
+[hooks]
+schema.update.after = "bunx @gel/generate interfaces && bunx @gel/generate edgeql-js"

apps/server/gel.toml

@@ -7,22 +7,22 @@
     "dev": "bun --watch ./src/main.ts",
     "build": "bun build --sourcemap=inline --target bun --outdir ./dist ./src/main.ts",
     "start": "bun ./dist/main.js",
-    "migrate": "edgedb migration create && edgedb migrate && bun gen-edgedb",
-    "generate": "bunx @edgedb/generate interfaces && bunx @edgedb/generate edgeql-js"
+    "migrate": "gel migration create && gel migrate && bun generate",
+    "generate": "bunx @gel/generate interfaces && bunx @gel/generate edgeql-js"
   },
   "dependencies": {
     "@trpc/server": "^10.7.0",
     "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "dotenv-cli": "^6.0.0",
-    "edgedb": "^1.5.7",
     "express": "^4.18.1",
+    "gel": "^2.1.1",
     "nanoid": "^3.3.4",
     "ws": "^8.9.0",
     "zod": "^3.19.1"
   },
   "devDependencies": {
-    "@edgedb/generate": "^0.5.3",
+    "@gel/generate": "^0.7.0",
     "@types/bun": "^1.1.6",
     "@types/cors": "^2.8.12",
     "@types/express": "^4.17.14",

apps/server/package.json

@@ -1,3 +1,3 @@
-import * as edgedb from 'edgedb';
+import * as gel from 'gel';
 
-export const dbClient = edgedb.createClient();
+export const dbClient = gel.createClient();

apps/server/src/dbschema/client.ts

@@ -8,17 +8,14 @@ services:
       - 8080:8080
     environment:
       PORT: 8080
-      EDGEDB_DSN: edgedb://edgedb
-      EDGEDB_CLIENT_TLS_SECURITY: insecure
+      GEL_DSN: gel://gel
+      GEL_CLIENT_TLS_SECURITY: insecure
 
     # volumes:
 
-  edgedb:
-    image: edgedb/edgedb
+  gel:
+    image: geldata/gel:6.4
     restart: unless-stopped
     environment:
-      # EDGEDB_SERVER_PASSWORD: edgedb
-      EDGEDB_SERVER_TLS_CERT_MODE: generate_self_signed
-      EDGEDB_SERVER_SECURITY: insecure_dev_mode
-    # ports:
-    # volumes:
+      GEL_SERVER_TLS_CERT_MODE: generate_self_signed
+      GEL_SERVER_SECURITY: insecure_dev_mode