Skip to content

Cleaning up #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agarny merged 4 commits into from
Mar 25, 2026
Merged

Cleaning up #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec67551
New version.
agarny Mar 25, 2026
48d83f7
Updated our dependencies.
agarny Mar 25, 2026
d56fe43
Some minor cleaning up.
agarny Mar 23, 2026
1edd43c
Config: improved/optimised our `tsconfig.*.json` files.
agarny Mar 25, 2026
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
22 changes: 11 additions & 11 deletions bun.lock
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
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.20260324.0",
"version": "0.20260325.0",
"engines": {
"bun": ">=1.2.0"
},
Expand All @@ -41,8 +41,8 @@
"release": "bun src/renderer/scripts/libopencor.js && electron-builder",
"release:local": "bun src/renderer/scripts/libopencor.js && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --config.mac.notarize=false --publish=never",
"start": "bun src/renderer/scripts/libopencor.js && electron-vite preview",
"typecheck": "bunx --bun vue-tsc --noEmit -p tsconfig.app.json",
"start:web": "bun --cwd src/renderer start",
"typecheck": "bunx --bun vue-tsc --noEmit -p tsconfig.app.json",
"version:new": "bun src/renderer/scripts/version.new.js"
},
"bun": {
Expand Down Expand Up @@ -72,7 +72,7 @@
"@types/node": "^25.5.0",
"@types/plotly.js": "^3.0.10",
"@vitejs/plugin-vue": "^6.0.5",
"@vue/tsconfig": "^0.9.0",
"@vue/tsconfig": "^0.9.1",
"@wasm-fmt/clang-format": "^22.1.1",
"autoprefixer": "^10.4.27",
"cmake-js": "^8.0.0",
Expand All @@ -89,8 +89,8 @@
"stylelint-config-standard": "^40.0.0",
"tailwindcss": "^4.2.2",
"tailwindcss-primeui": "^0.6.1",
"tar": "^7.5.12",
"typescript": "^5.9.3",
"tar": "^7.5.13",
"typescript": "^6.0.2",
"unplugin-vue-components": "^32.0.0",
"vite": "^7.3.1",
"vue-tsc": "^3.2.6"
Expand Down
8 changes: 4 additions & 4 deletions src/main/MainMenu.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import electron from 'electron';

import { formatError } from '../renderer/src/common/common.ts';
import { isMacOs, isPackaged } from '../renderer/src/common/electron.ts';
import { formatError } from '../renderer/src/common/common';
import { isMacOs, isPackaged } from '../renderer/src/common/electron';

import { mainWindow } from './index.ts';
import { clearRecentFiles } from './MainWindow.ts';
import { mainWindow } from './index';
import { clearRecentFiles } from './MainWindow';

let enabledMenu: electron.Menu | null = null;
let disabledMenu: electron.Menu | null = null;
Expand Down
14 changes: 7 additions & 7 deletions src/main/MainWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@ import electron from 'electron';
import { autoUpdater, type ProgressInfo, type UpdateCheckResult } from 'electron-updater';
import path from 'node:path';

import { formatError, isDataUrlOmexFileName, isHttpUrl, type ISettings } from '../renderer/src/common/common.ts';
import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY } from '../renderer/src/common/constants.ts';
import { isLinux, isMacOs, isPackaged, isWindows } from '../renderer/src/common/electron.ts';
import { formatError, isDataUrlOmexFileName, isHttpUrl, type ISettings } from '../renderer/src/common/common';
import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY } from '../renderer/src/common/constants';
import { isLinux, isMacOs, isPackaged, isWindows } from '../renderer/src/common/electron';
/* TODO: enable once our GitHub integration is fully ready.
import { deleteGitHubAccessToken } from '../renderer/src/common/gitHubIntegration';
*/

import icon from './assets/icon.png?asset';
import { ApplicationWindow } from './ApplicationWindow.ts';
import { electronConf, type IElectronConfState } from './index.ts';
import { enableDisableMainMenu, updateReopenMenu } from './MainMenu.ts';
import type { SplashScreenWindow } from './SplashScreenWindow.ts';
import { ApplicationWindow } from './ApplicationWindow';
import { electronConf, type IElectronConfState } from './index';
import { enableDisableMainMenu, updateReopenMenu } from './MainMenu';
import type { SplashScreenWindow } from './SplashScreenWindow';

autoUpdater.autoDownload = false;
autoUpdater.logger = null;
Expand Down
8 changes: 4 additions & 4 deletions src/main/SplashScreenWindow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as electron from 'electron';

import { COPYRIGHT } from '../renderer/src/common/constants.ts';
import { COPYRIGHT } from '../renderer/src/common/constants';

import { ApplicationWindow } from './ApplicationWindow.ts';
import { electronConf, type IElectronConfState } from './index.ts';
import { formatError } from '../renderer/src/common/common.ts';
import { ApplicationWindow } from './ApplicationWindow';
import { electronConf, type IElectronConfState } from './index';
import { formatError } from '../renderer/src/common/common';

export class SplashScreenWindow extends ApplicationWindow {
constructor() {
Expand Down
14 changes: 7 additions & 7 deletions src/main/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import fs from 'node:fs';
import path from 'node:path';
import process from 'node:process';

import { formatError, type ISettings } from '../renderer/src/common/common.ts';
import { SHORT_DELAY, URI_SCHEME } from '../renderer/src/common/constants.ts';
import { isLinux, isPackaged, isWindows } from '../renderer/src/common/electron.ts';
import { formatError, type ISettings } from '../renderer/src/common/common';
import { SHORT_DELAY, URI_SCHEME } from '../renderer/src/common/constants';
import { isLinux, isPackaged, isWindows } from '../renderer/src/common/electron';
/* TODO: enable once our GitHub integration is fully ready.
import {
clearGitHubCache,
Expand All @@ -18,9 +18,9 @@ import {
saveGitHubAccessToken
} from '../renderer/src/common/gitHubIntegration';
*/
import { startRendererServer, stopRendererServer } from '../renderer/src/common/rendererServer.ts';
import { startRendererServer, stopRendererServer } from '../renderer/src/common/rendererServer';

import { enableDisableFileCloseAndCloseAllMenuItems, enableDisableMainMenu } from './MainMenu.ts';
import { enableDisableFileCloseAndCloseAllMenuItems, enableDisableMainMenu } from './MainMenu';
import {
checkForUpdates,
downloadAndInstallUpdate,
Expand All @@ -34,8 +34,8 @@ import {
MainWindow,
resetAll,
saveSettings
} from './MainWindow.ts';
import { SplashScreenWindow } from './SplashScreenWindow.ts';
} from './MainWindow';
import { SplashScreenWindow } from './SplashScreenWindow';

// Electron store.

Expand Down
5 changes: 2 additions & 3 deletions src/preload/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import { exec as _exec } from 'node:child_process';
import { promises as fs } from 'node:fs';
import { promisify } from 'node:util';

// @ts-expect-error (libOpenCOR.node is a native module)
import loc from '../../dist/libOpenCOR/Release/libOpenCOR.node';

import type { ISettings } from '../renderer/src/common/common.ts';
import type { ISplashScreenInfo } from '../renderer/src/common/electronApi.ts';
import type { ISettings } from '../renderer/src/common/common';
import type { ISplashScreenInfo } from '../renderer/src/common/electronApi';

const exec = promisify(_exec);

Expand Down
16 changes: 8 additions & 8 deletions src/renderer/bun.lock
View file
Open in desktop

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

12 changes: 0 additions & 12 deletions src/renderer/index.d.ts
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions src/renderer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
},
"./style.css": "./dist/opencor.css"
},
"version": "0.20260324.0",
"version": "0.20260325.0",
"scripts": {
"build": "vite build && bun scripts/generate.version.js",
"build:lib": "vite build --config vite.lib.config.ts && bun scripts/copy.indexdts.js",
"build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",
"clean": "bun scripts/clean.js",
"dependencies:update": "bun scripts/dependencies.update.js",
"dev": "vite dev",
Expand Down Expand Up @@ -81,7 +81,7 @@
"@types/node": "^25.5.0",
"@types/plotly.js": "^3.0.10",
"@vitejs/plugin-vue": "^6.0.5",
"@vue/tsconfig": "^0.9.0",
"@vue/tsconfig": "^0.9.1",
"autoprefixer": "^10.4.27",
"esbuild": "^0.27.4",
"postcss": "^8.5.8",
Expand All @@ -90,7 +90,7 @@
"stylelint-config-standard": "^40.0.0",
"tailwindcss": "^4.2.2",
"tailwindcss-primeui": "^0.6.1",
"typescript": "^5.9.3",
"typescript": "^6.0.2",
"unplugin-vue-components": "^32.0.0",
"vite": "^7.3.1",
"vue-tsc": "^3.2.6"
Expand Down
Loading
Loading