Skip to content

Commit

Permalink
Fix issues on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
andreterron committed Nov 13, 2024
1 parent 7ac8f57 commit e6b4c52
Show file tree
Hide file tree
Showing 9 changed files with 288 additions and 12 deletions.
275 changes: 272 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"packages/*"
],
"scripts": {
"dev": "turbo run \"@mainframe-api/node#serve\" dev --env-mode=loose --filter=!@mainframe-api/node",
"dev": "turbo run \"@mainframe-api/node#serve\" dev --env-mode=loose --filter=!@mainframe-api/node --ui=tui",
"build": "turbo run build --env-mode=loose",
"publish-package": "turbo run publish-package",
"publish-jsr": "turbo run publish-jsr",
Expand Down
4 changes: 3 additions & 1 deletion packages/node/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@
},
"optionalDependencies": {
"@esbuild/linux-x64": "^0.18.20",
"@rollup/rollup-linux-x64-gnu": "^4.18.0"
"@libsql/win32-x64-msvc": "^0.4.7",
"@rollup/rollup-linux-x64-gnu": "^4.18.0",
"@rollup/rollup-win32-x64-msvc": "^4.18.0"
}
}
3 changes: 2 additions & 1 deletion packages/node/src/db/db.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { createClient } from "@libsql/client";
import { mkdirSync } from "node:fs";
import { join, resolve } from "node:path";
import { __dirnameFromImportMetaUrl } from "@mainframe-api/server";
import { pathToFileURL } from "node:url";

const __dirname = __dirnameFromImportMetaUrl(import.meta.url);

Expand All @@ -21,4 +22,4 @@ try {
}
}

export const dbClient = createClient({ url: `file://${dbPath}` });
export const dbClient = createClient({ url: pathToFileURL(dbPath).toString() });
4 changes: 3 additions & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@
},
"optionalDependencies": {
"@esbuild/linux-x64": "^0.21.5",
"@rollup/rollup-linux-x64-gnu": "^4.18.0"
"@libsql/win32-x64-msvc": "^0.4.7",
"@rollup/rollup-linux-x64-gnu": "^4.18.0",
"@rollup/rollup-win32-x64-msvc": "^4.18.0"
}
}
2 changes: 1 addition & 1 deletion packages/server/src/db/migrate-libsql.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { drizzle, LibSQLDatabase } from "drizzle-orm/libsql";
import { migrate } from "drizzle-orm/libsql/migrator";
import { migrationsFolder } from "./migrate";
import { migrationsFolder } from "./migrate.ts";
import { Client } from "@libsql/client";

export function migrateLibsqlDB(db: LibSQLDatabase) {
Expand Down
Loading

0 comments on commit e6b4c52

Please sign in to comment.