Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 73 additions & 79 deletions bun.lock

Large diffs are not rendered by default.

5 changes: 0 additions & 5 deletions electron.vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ export default electronVite.defineConfig({
target: 'esnext'
},
envDir: path.join(import.meta.dirname, 'src/renderer'),
optimizeDeps: {
esbuildOptions: {
target: 'esnext'
}
},
plugins: [
// Note: this must be in sync with src/renderer/vite.config.ts.

Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"url": "git+https://github.com/opencor/webapp.git"
},
"type": "module",
"version": "0.20260325.2",
"version": "0.20260330.0",
"engines": {
"bun": ">=1.2.0"
},
Expand Down Expand Up @@ -64,7 +64,7 @@
"xxhash-wasm": "^1.1.0"
},
"devDependencies": {
"@biomejs/biome": "^2.4.8",
"@biomejs/biome": "^2.4.9",
"@electron-toolkit/tsconfig": "^2.0.0",
"@electron-toolkit/utils": "^4.0.0",
"@tailwindcss/postcss": "^4.2.2",
Expand All @@ -73,26 +73,26 @@
"@types/plotly.js": "^3.0.10",
"@vitejs/plugin-vue": "^6.0.5",
"@vue/tsconfig": "^0.9.1",
"@wasm-fmt/clang-format": "^22.1.1",
"@wasm-fmt/clang-format": "^22.1.2",
"autoprefixer": "^10.4.27",
"cmake-js": "^8.0.0",
"electron": "^41.0.3",
"electron": "^41.1.0",
"electron-builder": "^26.8.1",
"electron-conf": "^1.3.0",
"electron-updater": "^6.8.3",
"electron-vite": "^5.0.0",
"esbuild": "^0.27.4",
"node-addon-api": "^8.6.0",
"node-addon-api": "^8.7.0",
"postcss": "^8.5.8",
"rollup-plugin-visualizer": "^7.0.1",
"stylelint": "^17.5.0",
"stylelint": "^17.6.0",
"stylelint-config-standard": "^40.0.0",
"tailwindcss": "^4.2.2",
"tailwindcss-primeui": "^0.6.1",
"tar": "^7.5.13",
"typescript": "^6.0.2",
"unplugin-vue-components": "^32.0.0",
"vite": "^7.3.1",
"vite": "^8.0.3",
"vue-tsc": "^3.2.6"
}
}
124 changes: 58 additions & 66 deletions src/renderer/bun.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions src/renderer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
},
"./style.css": "./dist/opencor.css"
},
"version": "0.20260325.2",
"version": "0.20260330.0",
"scripts": {
"build": "vite build && bun scripts/generate.version.js",
"build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",
Expand Down Expand Up @@ -75,7 +75,7 @@
"xxhash-wasm": "^1.1.0"
},
"devDependencies": {
"@biomejs/biome": "^2.4.8",
"@biomejs/biome": "^2.4.9",
"@tailwindcss/postcss": "^4.2.2",
"@tailwindcss/vite": "^4.2.2",
"@types/node": "^25.5.0",
Expand All @@ -86,13 +86,13 @@
"esbuild": "^0.27.4",
"postcss": "^8.5.8",
"rollup-plugin-visualizer": "^7.0.1",
"stylelint": "^17.5.0",
"stylelint": "^17.6.0",
"stylelint-config-standard": "^40.0.0",
"tailwindcss": "^4.2.2",
"tailwindcss-primeui": "^0.6.1",
"typescript": "^6.0.2",
"unplugin-vue-components": "^32.0.0",
"vite": "^7.3.1",
"vite": "^8.0.3",
"vue-tsc": "^3.2.6"
}
}
6 changes: 3 additions & 3 deletions src/renderer/scripts/dependencies.update.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ import path from 'node:path';
import { fileURLToPath } from 'node:url';

const run = (command, args) => {
const result = spawnSync({
const res = spawnSync({
cmd: [command, ...args],
stdio: ['inherit', 'inherit', 'inherit']
});

if (result.exitCode !== 0) {
if (res.exitCode !== 0) {
console.error(`Command failed: ${command} ${args.join(' ')}`);

process.exit(result.exitCode);
process.exit(res.exitCode);
}
};

Expand Down
10 changes: 5 additions & 5 deletions src/renderer/src/common/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,23 +120,23 @@ export const formatTime = (time: number): string => {
let res = '';

if (d) {
res = `${String(d)}d`;
res = `${d}d`;
}

if (h || ((m || s || ms) && res)) {
res += `${res ? ' ' : ''}${String(h)}h`;
res += `${res ? ' ' : ''}${h}h`;
}

if (m || ((s || ms) && res)) {
res += `${res ? ' ' : ''}${String(m)}m`;
res += `${res ? ' ' : ''}${m}m`;
}

if (s || (ms && res)) {
res += `${res ? ' ' : ''}${String(s)}s`;
res += `${res ? ' ' : ''}${s}s`;
}

if (ms || !res) {
res += `${res ? ' ' : ''}${String(ms)}ms`;
res += `${res ? ' ' : ''}${ms}ms`;
}

return res;
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/src/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ export const SPIN_REPEAT_DELAY: number = 40;

const crtYear: number = new Date().getFullYear();

export const COPYRIGHT: string = crtYear === 2025 ? '2025' : `2025-${String(crtYear)}`;
export const COPYRIGHT: string = crtYear === 2025 ? '2025' : `2025-${crtYear}`;
4 changes: 2 additions & 2 deletions src/renderer/src/common/locCommon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export const file = (
}

throw new Error(
`Failed to fetch the file through OpenCOR's CORS proxy. The server responded with a status of ${String(response.status)}.`
`Failed to fetch the file through OpenCOR's CORS proxy. The server responded with a status of ${response.status}.`
);
})
.catch((error: unknown) => {
Expand All @@ -209,7 +209,7 @@ export const file = (
}

throw new Error(
`Failed to fetch the file directly. The server responded with a status of ${String(response.status)}.`
`Failed to fetch the file directly. The server responded with a status of ${response.status}.`
);
});
})
Expand Down
Loading
Loading