Skip to content

Commit d1de1ba

Browse files
agarnyagarny
authored
Cleaning up.
2 parents cea6bb0 + 1edd43c commit d1de1ba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+161
-199
lines changed

‎bun.lock‎

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"url": "git+https://github.com/opencor/webapp.git"
2424
},
2525
"type": "module",
26-
"version": "0.20260324.0",
26+
"version": "0.20260325.0",
2727
"engines": {
2828
"bun": ">=1.2.0"
2929
},
@@ -41,8 +41,8 @@
4141
"release": "bun src/renderer/scripts/libopencor.js && electron-builder",
4242
"release:local": "bun src/renderer/scripts/libopencor.js && CSC_IDENTITY_AUTO_DISCOVERY=false electron-builder --config.mac.notarize=false --publish=never",
4343
"start": "bun src/renderer/scripts/libopencor.js && electron-vite preview",
44-
"typecheck": "bunx --bun vue-tsc --noEmit -p tsconfig.app.json",
4544
"start:web": "bun --cwd src/renderer start",
45+
"typecheck": "bunx --bun vue-tsc --noEmit -p tsconfig.app.json",
4646
"version:new": "bun src/renderer/scripts/version.new.js"
4747
},
4848
"bun": {
@@ -72,7 +72,7 @@
7272
"@types/node": "^25.5.0",
7373
"@types/plotly.js": "^3.0.10",
7474
"@vitejs/plugin-vue": "^6.0.5",
75-
"@vue/tsconfig": "^0.9.0",
75+
"@vue/tsconfig": "^0.9.1",
7676
"@wasm-fmt/clang-format": "^22.1.1",
7777
"autoprefixer": "^10.4.27",
7878
"cmake-js": "^8.0.0",
@@ -89,8 +89,8 @@
8989
"stylelint-config-standard": "^40.0.0",
9090
"tailwindcss": "^4.2.2",
9191
"tailwindcss-primeui": "^0.6.1",
92-
"tar": "^7.5.12",
93-
"typescript": "^5.9.3",
92+
"tar": "^7.5.13",
93+
"typescript": "^6.0.2",
9494
"unplugin-vue-components": "^32.0.0",
9595
"vite": "^7.3.1",
9696
"vue-tsc": "^3.2.6"

‎src/main/MainMenu.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import electron from 'electron';
22

3-
import { formatError } from '../renderer/src/common/common.ts';
4-
import { isMacOs, isPackaged } from '../renderer/src/common/electron.ts';
3+
import { formatError } from '../renderer/src/common/common';
4+
import { isMacOs, isPackaged } from '../renderer/src/common/electron';
55

6-
import { mainWindow } from './index.ts';
7-
import { clearRecentFiles } from './MainWindow.ts';
6+
import { mainWindow } from './index';
7+
import { clearRecentFiles } from './MainWindow';
88

99
let enabledMenu: electron.Menu | null = null;
1010
let disabledMenu: electron.Menu | null = null;

‎src/main/MainWindow.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ import electron from 'electron';
22
import { autoUpdater, type ProgressInfo, type UpdateCheckResult } from 'electron-updater';
33
import path from 'node:path';
44

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

1212
import icon from './assets/icon.png?asset';
13-
import { ApplicationWindow } from './ApplicationWindow.ts';
14-
import { electronConf, type IElectronConfState } from './index.ts';
15-
import { enableDisableMainMenu, updateReopenMenu } from './MainMenu.ts';
16-
import type { SplashScreenWindow } from './SplashScreenWindow.ts';
13+
import { ApplicationWindow } from './ApplicationWindow';
14+
import { electronConf, type IElectronConfState } from './index';
15+
import { enableDisableMainMenu, updateReopenMenu } from './MainMenu';
16+
import type { SplashScreenWindow } from './SplashScreenWindow';
1717

1818
autoUpdater.autoDownload = false;
1919
autoUpdater.logger = null;

‎src/main/SplashScreenWindow.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import * as electron from 'electron';
22

3-
import { COPYRIGHT } from '../renderer/src/common/constants.ts';
3+
import { COPYRIGHT } from '../renderer/src/common/constants';
44

5-
import { ApplicationWindow } from './ApplicationWindow.ts';
6-
import { electronConf, type IElectronConfState } from './index.ts';
7-
import { formatError } from '../renderer/src/common/common.ts';
5+
import { ApplicationWindow } from './ApplicationWindow';
6+
import { electronConf, type IElectronConfState } from './index';
7+
import { formatError } from '../renderer/src/common/common';
88

99
export class SplashScreenWindow extends ApplicationWindow {
1010
constructor() {

‎src/main/index.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import fs from 'node:fs';
77
import path from 'node:path';
88
import process from 'node:process';
99

10-
import { formatError, type ISettings } from '../renderer/src/common/common.ts';
11-
import { SHORT_DELAY, URI_SCHEME } from '../renderer/src/common/constants.ts';
12-
import { isLinux, isPackaged, isWindows } from '../renderer/src/common/electron.ts';
10+
import { formatError, type ISettings } from '../renderer/src/common/common';
11+
import { SHORT_DELAY, URI_SCHEME } from '../renderer/src/common/constants';
12+
import { isLinux, isPackaged, isWindows } from '../renderer/src/common/electron';
1313
/* TODO: enable once our GitHub integration is fully ready.
1414
import {
1515
clearGitHubCache,
@@ -18,9 +18,9 @@ import {
1818
saveGitHubAccessToken
1919
} from '../renderer/src/common/gitHubIntegration';
2020
*/
21-
import { startRendererServer, stopRendererServer } from '../renderer/src/common/rendererServer.ts';
21+
import { startRendererServer, stopRendererServer } from '../renderer/src/common/rendererServer';
2222

23-
import { enableDisableFileCloseAndCloseAllMenuItems, enableDisableMainMenu } from './MainMenu.ts';
23+
import { enableDisableFileCloseAndCloseAllMenuItems, enableDisableMainMenu } from './MainMenu';
2424
import {
2525
checkForUpdates,
2626
downloadAndInstallUpdate,
@@ -34,8 +34,8 @@ import {
3434
MainWindow,
3535
resetAll,
3636
saveSettings
37-
} from './MainWindow.ts';
38-
import { SplashScreenWindow } from './SplashScreenWindow.ts';
37+
} from './MainWindow';
38+
import { SplashScreenWindow } from './SplashScreenWindow';
3939

4040
// Electron store.
4141

‎src/preload/index.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import { exec as _exec } from 'node:child_process';
33
import { promises as fs } from 'node:fs';
44
import { promisify } from 'node:util';
55

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

9-
import type { ISettings } from '../renderer/src/common/common.ts';
10-
import type { ISplashScreenInfo } from '../renderer/src/common/electronApi.ts';
8+
import type { ISettings } from '../renderer/src/common/common';
9+
import type { ISplashScreenInfo } from '../renderer/src/common/electronApi';
1110

1211
const exec = promisify(_exec);
1312

‎src/renderer/bun.lock‎

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/renderer/index.d.ts‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/renderer/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
},
4343
"./style.css": "./dist/opencor.css"
4444
},
45-
"version": "0.20260324.0",
45+
"version": "0.20260325.0",
4646
"scripts": {
4747
"build": "vite build && bun scripts/generate.version.js",
48-
"build:lib": "vite build --config vite.lib.config.ts && bun scripts/copy.indexdts.js",
48+
"build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",
4949
"clean": "bun scripts/clean.js",
5050
"dependencies:update": "bun scripts/dependencies.update.js",
5151
"dev": "vite dev",
@@ -81,7 +81,7 @@
8181
"@types/node": "^25.5.0",
8282
"@types/plotly.js": "^3.0.10",
8383
"@vitejs/plugin-vue": "^6.0.5",
84-
"@vue/tsconfig": "^0.9.0",
84+
"@vue/tsconfig": "^0.9.1",
8585
"autoprefixer": "^10.4.27",
8686
"esbuild": "^0.27.4",
8787
"postcss": "^8.5.8",
@@ -90,7 +90,7 @@
9090
"stylelint-config-standard": "^40.0.0",
9191
"tailwindcss": "^4.2.2",
9292
"tailwindcss-primeui": "^0.6.1",
93-
"typescript": "^5.9.3",
93+
"typescript": "^6.0.2",
9494
"unplugin-vue-components": "^32.0.0",
9595
"vite": "^7.3.1",
9696
"vue-tsc": "^3.2.6"

0 commit comments

Comments
 (0)