From 99c3caefed87959201b39f813215332bb3a6f773 Mon Sep 17 00:00:00 2001 From: Benjamin Strasser Date: Tue, 11 Jun 2024 19:29:22 +0200 Subject: [PATCH 1/2] renamed migration script for windows users and updated setupdb npm script Signed-off-by: Benjamin Strasser --- package.json | 2 +- .../{2024-04-28T09:42:38Z_init.ts => 2024-04-28T09_init.ts} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename services/src/kysely/migrations/{2024-04-28T09:42:38Z_init.ts => 2024-04-28T09_init.ts} (100%) diff --git a/package.json b/package.json index 10f812ef..869ef749 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "test:integration": "cross-env DATABASE_LOCATION=:memory: vitest run --project integration", "test:e2e": "playwright test", "---- DB ------------------------------------------------------------": "", - "setupdb": "pnpm migrate && pnpm db-types", + "setupdb": "pnpm migrate:latest && pnpm db-types", "migrate": "tsx ./services/src/kysely/migrator.ts", "migrate:latest": "pnpm run migrate -- latest", "migrate:up": "pnpm run migrate -- up", diff --git a/services/src/kysely/migrations/2024-04-28T09:42:38Z_init.ts b/services/src/kysely/migrations/2024-04-28T09_init.ts similarity index 100% rename from services/src/kysely/migrations/2024-04-28T09:42:38Z_init.ts rename to services/src/kysely/migrations/2024-04-28T09_init.ts From e9d1de5ceed9ca6f902b45d611dcf7849ea7ecc4 Mon Sep 17 00:00:00 2001 From: Benjamin Strasser Date: Wed, 12 Jun 2024 19:55:32 +0200 Subject: [PATCH 2/2] feedback Signed-off-by: Benjamin Strasser --- .github/workflows/ci.yaml | 2 +- package.json | 8 ++++---- pnpm-lock.yaml | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af727086..651123fa 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -42,7 +42,7 @@ jobs: run: pnpm migrate:latest - name: Database Generate Types - run: pnpm db-types + run: pnpm sync:db - name: Check run: pnpm check diff --git a/package.json b/package.json index 869ef749..2f510bd5 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "private": true, "scripts": { - "dev": "pnpm run migrate:latest && vite dev", + "dev": "pnpm run setup:db && vite dev", "build": "vite build", "preview": "vite preview", "sync:svelte": "svelte-kit sync", @@ -17,12 +17,12 @@ "test:integration": "cross-env DATABASE_LOCATION=:memory: vitest run --project integration", "test:e2e": "playwright test", "---- DB ------------------------------------------------------------": "", - "setupdb": "pnpm migrate:latest && pnpm db-types", + "setup:db": "pnpm migrate:latest && pnpm sync:db", "migrate": "tsx ./services/src/kysely/migrator.ts", "migrate:latest": "pnpm run migrate -- latest", "migrate:up": "pnpm run migrate -- up", "migrate:down": "pnpm run migrate -- down", - "db-types": "cross-env DATABASE_URL=db.sqlite kysely-codegen", + "sync:db": "cross-env DATABASE_URL=db.sqlite kysely-codegen", "---- DOCS ----------------------------------------------------------": "", "docs:dev": "vitepress dev docs", "docs:build": "vitepress build docs", @@ -32,7 +32,7 @@ }, "dependencies": { "bcrypt": "^5.1.1", - "better-sqlite3": "^11.0.0", + "better-sqlite3": "^10.0.0", "bits-ui": "^0.21.7", "clsx": "^2.1.1", "formsnap": "^1.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d9892470..e820fa21 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -12,8 +12,8 @@ importers: specifier: ^5.1.1 version: 5.1.1 better-sqlite3: - specifier: ^11.0.0 - version: 11.0.0 + specifier: ^10.0.0 + version: 10.1.0 bits-ui: specifier: ^0.21.7 version: 0.21.10(svelte@4.2.18) @@ -137,7 +137,7 @@ importers: version: 24.1.0 kysely-codegen: specifier: ^0.15.0 - version: 0.15.0(better-sqlite3@11.0.0)(kysely@0.27.3) + version: 0.15.0(better-sqlite3@10.1.0)(kysely@0.27.3) lint-staged: specifier: ^15.2.2 version: 15.2.5 @@ -1499,8 +1499,8 @@ packages: resolution: {integrity: sha512-AGBHOG5hPYZ5Xl9KXzU5iKq9516yEmvCKDg3ecP5kX2aB6UqTeXZxk2ELnDgDm6BQSMlLt9rDB4LoSMx0rYwww==} engines: {node: '>= 10.0.0'} - better-sqlite3@11.0.0: - resolution: {integrity: sha512-1NnNhmT3EZTsKtofJlMox1jkMxdedILury74PwUbQBjWgo4tL4kf7uTAjU55mgQwjdzqakSTjkf+E1imrFwjnA==} + better-sqlite3@10.1.0: + resolution: {integrity: sha512-hqpHJaCfKEZFaAWdMh6crdzRWyzQzfP6Ih8TYI0vFn01a6ZTDSbJIMXN+6AMBaBOh99DzUy8l3PsV9R3qnJDng==} binary-extensions@2.3.0: resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==} @@ -5231,7 +5231,7 @@ snapshots: - encoding - supports-color - better-sqlite3@11.0.0: + better-sqlite3@10.1.0: dependencies: bindings: 1.5.0 prebuild-install: 7.1.2 @@ -6425,7 +6425,7 @@ snapshots: known-css-properties@0.31.0: {} - kysely-codegen@0.15.0(better-sqlite3@11.0.0)(kysely@0.27.3): + kysely-codegen@0.15.0(better-sqlite3@10.1.0)(kysely@0.27.3): dependencies: chalk: 4.1.2 dotenv: 16.4.5 @@ -6435,7 +6435,7 @@ snapshots: micromatch: 4.0.5 minimist: 1.2.8 optionalDependencies: - better-sqlite3: 11.0.0 + better-sqlite3: 10.1.0 kysely@0.27.3: {}