Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build.yml
skjsjhb committed Jan 29, 2025
2 parents d9912a2 + c089271 commit 4da213e
Showing 4 changed files with 71 additions and 64 deletions.
114 changes: 60 additions & 54 deletions bun.lock

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -17,12 +17,12 @@
"devDependencies": {
"@electron/packager": "^18.3.6",
"@esbuild-plugins/tsconfig-paths": "^0.1.2",
"@types/bun": "latest",
"@types/bun": "^1.2.1",
"@types/fs-extra": "^11.0.4",
"@types/lzma": "^2.3.0",
"@types/lzma-native": "^4.0.4",
"@types/node": "^22.10.7",
"@types/react": "^19.0.7",
"@types/node": "^22.12.0",
"@types/react": "^19.0.8",
"@types/react-dom": "^19.0.3",
"@types/uuid": "^10.0.0",
"@vitejs/plugin-react-swc": "^3.7.2",
@@ -33,7 +33,7 @@
"type-fest": "^4.33.0",
"typed-emitter": "^2.1.0",
"typescript": "^5.7.3",
"vite": "^6.0.11",
"vite": "^5.4.14",
"vite-tsconfig-paths": "^5.1.4",
"xvfb-maybe": "^0.2.1"
},
@@ -44,18 +44,18 @@
"clsx": "^2.1.1",
"debounce": "^2.2.0",
"fast-xml-parser": "^4.5.1",
"framer-motion": "^12.0.1",
"framer-motion": "^12.0.6",
"fs-extra": "^11.3.0",
"get-port": "^7.1.0",
"i18next": "^24.2.1",
"i18next": "^24.2.2",
"i18next-browser-languagedetector": "^8.0.2",
"lazy-value": "^3.0.0",
"lucide-react": "^0.474.0",
"lzma": "^2.3.2",
"lzma-native": "^8.0.6",
"mergician": "^2.0.2",
"nanoid": "^5.0.9",
"node-sqlite3-wasm": "^0.8.31",
"node-sqlite3-wasm": "^0.8.32",
"node-stream-zip": "^1.15.0",
"p-event": "^6.0.1",
"p-limit": "^6.2.0",
@@ -66,9 +66,9 @@
"superserial": "^0.3.5",
"ts-dedent": "^2.2.0",
"v8-compile-cache": "^2.4.0",
"virtua": "^0.39.3",
"virtua": "^0.40.0",
"workerpool": "^9.2.0",
"wouter": "^3.3.5",
"wouter": "^3.5.0",
"yaml": "^2.7.0"
},
"trustedDependencies": [
2 changes: 1 addition & 1 deletion scripts/instrumented-test.ts
Original file line number Diff line number Diff line change
@@ -21,4 +21,4 @@ export async function printTestSummary(f: string): Promise<void> {
console.error("There are failed tests and need to be resolved.");
process.exit(1);
}
}
}
1 change: 1 addition & 0 deletions vite.config.ts
Original file line number Diff line number Diff line change
@@ -33,6 +33,7 @@ export default defineConfig(({ command }) => {
tsConfigPaths(),
i18nHotReload()
],
define: {},
css: {
postcss: {
plugins: [tailwindcss()]

0 comments on commit 4da213e

Please sign in to comment.