diff --git a/bun.lock b/bun.lock index 5d8ad05c..929608fa 100644 --- a/bun.lock +++ b/bun.lock @@ -23,7 +23,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", @@ -40,8 +40,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", @@ -422,7 +422,7 @@ "@vue/shared": ["@vue/shared@3.4.21", "", {}, "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="], - "@vue/tsconfig": ["@vue/tsconfig@0.9.0", "", { "peerDependencies": { "typescript": "5.x", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-RP+v9Cpbsk1ZVXltCHHkYBr7+624x6gcijJXVjIcsYk7JXqvIpRtMwU2ARLvWDhmy9ffdFYxhsfJnPztADBohQ=="], + "@vue/tsconfig": ["@vue/tsconfig@0.9.1", "", { "peerDependencies": { "typescript": ">= 5.8", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-buvjm+9NzLCJL29KY1j1991YYJ5e6275OiK+G4jtmfIb+z4POywbdm0wXusT9adVWqe0xqg70TbI7+mRx4uU9w=="], "@vueuse/core": ["@vueuse/core@14.2.1", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.2.1", "@vueuse/shared": "14.2.1" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ=="], @@ -480,7 +480,7 @@ "boolean": ["boolean@3.2.0", "", {}, "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw=="], - "brace-expansion": ["brace-expansion@5.0.4", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-h+DEnpVvxmfVefa4jFbCf5HdH5YMDXRsmKflpf1pILZWRFlTbJpxeU55nJl4Smt5HQaGzg1o6RHFPJaOqnmBDg=="], + "brace-expansion": ["brace-expansion@5.0.5", "", { "dependencies": { "balanced-match": "^4.0.2" } }, "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ=="], "braces": ["braces@3.0.3", "", { "dependencies": { "fill-range": "^7.1.1" } }, "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA=="], @@ -626,7 +626,7 @@ "electron-publish": ["electron-publish@26.8.1", "", { "dependencies": { "@types/fs-extra": "^9.0.11", "builder-util": "26.8.1", "builder-util-runtime": "9.5.1", "chalk": "^4.1.2", "form-data": "^4.0.5", "fs-extra": "^10.1.0", "lazy-val": "^1.0.5", "mime": "^2.5.2" } }, "sha512-q+jrSTIh/Cv4eGZa7oVR+grEJo/FoLMYBAnSL5GCtqwUpr1T+VgKB/dn1pnzxIxqD8S/jP1yilT9VrwCqINR4w=="], - "electron-to-chromium": ["electron-to-chromium@1.5.321", "", {}, "sha512-L2C7Q279W2D/J4PLZLk7sebOILDSWos7bMsMNN06rK482umHUrh/3lM8G7IlHFOYip2oAg5nha1rCMxr/rs6ZQ=="], + "electron-to-chromium": ["electron-to-chromium@1.5.322", "", {}, "sha512-vFU34OcrvMcH66T+dYC3G4nURmgfDVewMIu6Q2urXpumAPSMmzvcn04KVVV8Opikq8Vs5nUbO/8laNhNRqSzYw=="], "electron-updater": ["electron-updater@6.8.3", "", { "dependencies": { "builder-util-runtime": "9.5.1", "fs-extra": "^10.1.0", "js-yaml": "^4.1.0", "lazy-val": "^1.0.5", "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", "semver": "~7.7.3", "tiny-typed-emitter": "^2.1.0" } }, "sha512-Z6sgw3jgbikWKXei1ENdqFOxBP0WlXg3TtKfz0rgw2vIZFJUyI4pD7ZN7jrkm7EoMK+tcm/qTnPUdqfZukBlBQ=="], @@ -1018,7 +1018,7 @@ "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], - "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="], + "picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], "pkg-types": ["pkg-types@2.3.0", "", { "dependencies": { "confbox": "^0.2.2", "exsolve": "^1.0.7", "pathe": "^2.0.3" } }, "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig=="], @@ -1174,9 +1174,9 @@ "tailwindcss-primeui": ["tailwindcss-primeui@0.6.1", "", { "peerDependencies": { "tailwindcss": ">=3.1.0" } }, "sha512-T69Rylcrmnt8zy9ik+qZvsLuRIrS9/k6rYJSIgZ1trnbEzGDDQSCIdmfyZknevqiHwpSJHSmQ9XT2C+S/hJY4A=="], - "tapable": ["tapable@2.3.0", "", {}, "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="], + "tapable": ["tapable@2.3.2", "", {}, "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA=="], - "tar": ["tar@7.5.12", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-9TsuLcdhOn4XztcQqhNyq1KOwOOED/3k58JAvtULiYqbO8B/0IBAAIE1hj0Svmm58k27TmcigyDI0deMlgG3uw=="], + "tar": ["tar@7.5.13", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng=="], "temp": ["temp@0.9.4", "", { "dependencies": { "mkdirp": "^0.5.1", "rimraf": "~2.6.2" } }, "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA=="], @@ -1198,7 +1198,7 @@ "type-fest": ["type-fest@0.13.1", "", {}, "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="], - "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], + "typescript": ["typescript@6.0.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ=="], "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="], @@ -1386,7 +1386,7 @@ "lru-cache/yallist": ["yallist@4.0.0", "", {}, "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="], - "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "minipass-flush/minipass": ["minipass@3.3.6", "", { "dependencies": { "yallist": "^4.0.0" } }, "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw=="], diff --git a/package.json b/package.json index ca22e935..b2bb456c 100644 --- a/package.json +++ b/package.json @@ -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" }, @@ -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": { @@ -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", @@ -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" diff --git a/src/main/MainMenu.ts b/src/main/MainMenu.ts index 52b2662f..eae76978 100644 --- a/src/main/MainMenu.ts +++ b/src/main/MainMenu.ts @@ -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; diff --git a/src/main/MainWindow.ts b/src/main/MainWindow.ts index 4c190a5f..d2748b82 100644 --- a/src/main/MainWindow.ts +++ b/src/main/MainWindow.ts @@ -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; diff --git a/src/main/SplashScreenWindow.ts b/src/main/SplashScreenWindow.ts index ed66aaeb..468972a5 100644 --- a/src/main/SplashScreenWindow.ts +++ b/src/main/SplashScreenWindow.ts @@ -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() { diff --git a/src/main/index.ts b/src/main/index.ts index 65ca43cf..c196e055 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -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, @@ -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, @@ -34,8 +34,8 @@ import { MainWindow, resetAll, saveSettings -} from './MainWindow.ts'; -import { SplashScreenWindow } from './SplashScreenWindow.ts'; +} from './MainWindow'; +import { SplashScreenWindow } from './SplashScreenWindow'; // Electron store. diff --git a/src/preload/index.ts b/src/preload/index.ts index ed47d184..48022867 100644 --- a/src/preload/index.ts +++ b/src/preload/index.ts @@ -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); diff --git a/src/renderer/bun.lock b/src/renderer/bun.lock index 431fb0fb..03837f52 100644 --- a/src/renderer/bun.lock +++ b/src/renderer/bun.lock @@ -21,7 +21,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", @@ -30,7 +30,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", @@ -323,7 +323,7 @@ "@vue/shared": ["@vue/shared@3.4.21", "", {}, "sha512-PuJe7vDIi6VYSinuEbUIQgMIRZGgM8e4R+G+/dQTk0X1NEdvgvvgv7m+rfmDH1gZzyA1OjjoWskvHlfRNfQf3g=="], - "@vue/tsconfig": ["@vue/tsconfig@0.9.0", "", { "peerDependencies": { "typescript": "5.x", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-RP+v9Cpbsk1ZVXltCHHkYBr7+624x6gcijJXVjIcsYk7JXqvIpRtMwU2ARLvWDhmy9ffdFYxhsfJnPztADBohQ=="], + "@vue/tsconfig": ["@vue/tsconfig@0.9.1", "", { "peerDependencies": { "typescript": ">= 5.8", "vue": "^3.4.0" }, "optionalPeers": ["typescript", "vue"] }, "sha512-buvjm+9NzLCJL29KY1j1991YYJ5e6275OiK+G4jtmfIb+z4POywbdm0wXusT9adVWqe0xqg70TbI7+mRx4uU9w=="], "@vueuse/core": ["@vueuse/core@14.2.1", "", { "dependencies": { "@types/web-bluetooth": "^0.0.21", "@vueuse/metadata": "14.2.1", "@vueuse/shared": "14.2.1" }, "peerDependencies": { "vue": "^3.5.0" } }, "sha512-3vwDzV+GDUNpdegRY6kzpLm4Igptq+GA0QkJ3W61Iv27YWwW/ufSlOfgQIpN6FZRMG0mkaz4gglJRtq5SeJyIQ=="], @@ -393,7 +393,7 @@ "detect-libc": ["detect-libc@2.1.2", "", {}, "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ=="], - "electron-to-chromium": ["electron-to-chromium@1.5.321", "", {}, "sha512-L2C7Q279W2D/J4PLZLk7sebOILDSWos7bMsMNN06rK482umHUrh/3lM8G7IlHFOYip2oAg5nha1rCMxr/rs6ZQ=="], + "electron-to-chromium": ["electron-to-chromium@1.5.322", "", {}, "sha512-vFU34OcrvMcH66T+dYC3G4nURmgfDVewMIu6Q2urXpumAPSMmzvcn04KVVV8Opikq8Vs5nUbO/8laNhNRqSzYw=="], "emoji-regex": ["emoji-regex@10.6.0", "", {}, "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A=="], @@ -577,7 +577,7 @@ "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="], - "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="], + "picomatch": ["picomatch@4.0.4", "", {}, "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A=="], "pkg-types": ["pkg-types@2.3.0", "", { "dependencies": { "confbox": "^0.2.2", "exsolve": "^1.0.7", "pathe": "^2.0.3" } }, "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig=="], @@ -649,13 +649,13 @@ "tailwindcss-primeui": ["tailwindcss-primeui@0.6.1", "", { "peerDependencies": { "tailwindcss": ">=3.1.0" } }, "sha512-T69Rylcrmnt8zy9ik+qZvsLuRIrS9/k6rYJSIgZ1trnbEzGDDQSCIdmfyZknevqiHwpSJHSmQ9XT2C+S/hJY4A=="], - "tapable": ["tapable@2.3.0", "", {}, "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg=="], + "tapable": ["tapable@2.3.2", "", {}, "sha512-1MOpMXuhGzGL5TTCZFItxCc0AARf1EZFQkGqMm7ERKj8+Hgr5oLvJOVFcC+lRmR8hCe2S3jC4T5D7Vg/d7/fhA=="], "tinyglobby": ["tinyglobby@0.2.15", "", { "dependencies": { "fdir": "^6.5.0", "picomatch": "^4.0.3" } }, "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ=="], "to-regex-range": ["to-regex-range@5.0.1", "", { "dependencies": { "is-number": "^7.0.0" } }, "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="], - "typescript": ["typescript@5.9.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw=="], + "typescript": ["typescript@6.0.2", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ=="], "ufo": ["ufo@1.6.3", "", {}, "sha512-yDJTmhydvl5lJzBmy/hyOAA0d+aqCBuwl818haVdYCRrWV84o7YyeVm4QlVHStqNrrJSTb6jKuFAVqAFsr+K3Q=="], @@ -721,7 +721,7 @@ "cliui/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="], - "micromatch/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="], + "micromatch/picomatch": ["picomatch@2.3.2", "", {}, "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA=="], "mlly/pkg-types": ["pkg-types@1.3.1", "", { "dependencies": { "confbox": "^0.1.8", "mlly": "^1.7.4", "pathe": "^2.0.1" } }, "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ=="], diff --git a/src/renderer/index.d.ts b/src/renderer/index.d.ts deleted file mode 100644 index 91d1ccc2..00000000 --- a/src/renderer/index.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -export { - IOpenCOREmits, - IOpenCORExpose, - IOpenCORProps, - IOpenCORSimulationDataEvent, - IOpenCORSimulationDataValue, - OpenCORSimulationData, - OpenCORTheme -} from './index.ts'; - -export declare const OpenCOR: import('vue').Component; -export default OpenCOR; diff --git a/src/renderer/package.json b/src/renderer/package.json index 29f00fa6..5edb37aa 100644 --- a/src/renderer/package.json +++ b/src/renderer/package.json @@ -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", @@ -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", @@ -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" diff --git a/src/renderer/scripts/copy.indexdts.js b/src/renderer/scripts/copy.indexdts.js deleted file mode 100644 index 187c75b8..00000000 --- a/src/renderer/scripts/copy.indexdts.js +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bun - -import fs from 'node:fs'; -import path from 'node:path'; -import { fileURLToPath } from 'node:url'; - -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const srcPath = path.join(__dirname, '../index.d.ts'); -const destDir = path.join(__dirname, '../dist'); -const destPath = path.join(destDir, 'index.d.ts'); - -if (!fs.existsSync(destDir)) { - fs.mkdirSync(destDir, { recursive: true }); -} - -fs.copyFileSync(srcPath, destPath); diff --git a/src/renderer/src/AppWithSimulationData.vue b/src/renderer/src/AppWithSimulationData.vue index 75ec90b8..1f812fb7 100644 --- a/src/renderer/src/AppWithSimulationData.vue +++ b/src/renderer/src/AppWithSimulationData.vue @@ -21,7 +21,7 @@ diff --git a/src/renderer/src/components/ContentsComponent.vue b/src/renderer/src/components/ContentsComponent.vue index 9d2e87ce..fe1f6216 100644 --- a/src/renderer/src/components/ContentsComponent.vue +++ b/src/renderer/src/components/ContentsComponent.vue @@ -66,12 +66,12 @@ import * as vueusecore from '@vueuse/core'; import * as vue from 'vue'; -import * as common from '../common/common.ts'; -import { electronApi } from '../common/electronApi.ts'; -import * as locApi from '../libopencor/locApi.ts'; +import * as common from '../common/common'; +import { electronApi } from '../common/electronApi'; +import * as locApi from '../libopencor/locApi'; import SimulationExperimentView from './views/SimulationExperimentView.vue'; -import type { IOpenCORSimulationDataEvent } from '../../index.ts'; +import type { IOpenCORSimulationDataEvent } from '../../index'; interface IFileTab { file: locApi.File; diff --git a/src/renderer/src/components/MainMenu.vue b/src/renderer/src/components/MainMenu.vue index 50ab2d4a..38725590 100644 --- a/src/renderer/src/components/MainMenu.vue +++ b/src/renderer/src/components/MainMenu.vue @@ -37,8 +37,8 @@ import * as vueusecore from '@vueuse/core'; import type Menubar from 'primevue/menubar'; import * as vue from 'vue'; -import * as common from '../common/common.ts'; -import * as version from '../common/version.ts'; +import * as common from '../common/common'; +import * as version from '../common/version'; const props = defineProps<{ id?: string; diff --git a/src/renderer/src/components/OpenCOR.vue b/src/renderer/src/components/OpenCOR.vue index 300675eb..20e6d030 100644 --- a/src/renderer/src/components/OpenCOR.vue +++ b/src/renderer/src/components/OpenCOR.vue @@ -124,23 +124,23 @@ import primeVueToastService from 'primevue/toastservice'; import { useToast } from 'primevue/usetoast'; import * as vue from 'vue'; -import type { IOpenCOREmits, IOpenCORProps } from '../../index.ts'; +import type { IOpenCOREmits, IOpenCORProps } from '../../index'; import '../assets/app.css'; -import '../assets/primeicons-assets.ts'; -import * as common from '../common/common.ts'; -import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY, TOAST_LIFE } from '../common/constants.ts'; -import * as dependencies from '../common/dependencies.ts'; -import { electronApi } from '../common/electronApi.ts'; +import '../assets/primeicons-assets'; +import * as common from '../common/common'; +import { FULL_URI_SCHEME, LONG_DELAY, SHORT_DELAY, TOAST_LIFE } from '../common/constants'; +import * as dependencies from '../common/dependencies'; +import { electronApi } from '../common/electronApi'; /* TODO: enable once our GitHub integration is fully ready. import firebaseConfig, { missingFirebaseKeys } from '../common/firebaseConfig'; */ -import * as initialisation from '../common/initialisation.ts'; -import * as locCommon from '../common/locCommon.ts'; -import * as version from '../common/version.ts'; -import * as vueCommon from '../common/vueCommon.ts'; +import * as initialisation from '../common/initialisation'; +import * as locCommon from '../common/locCommon'; +import * as version from '../common/version'; +import * as vueCommon from '../common/vueCommon'; import ContentsComponent from '../components/ContentsComponent.vue'; -import * as locApi from '../libopencor/locApi.ts'; +import * as locApi from '../libopencor/locApi'; import { provideDialogState } from './dialogs/BaseDialog.vue'; import SafeBlockUI from './widgets/SafeBlockUI.vue'; diff --git a/src/renderer/src/components/dialogs/AboutDialog.vue b/src/renderer/src/components/dialogs/AboutDialog.vue index 6a37f765..88f72069 100644 --- a/src/renderer/src/components/dialogs/AboutDialog.vue +++ b/src/renderer/src/components/dialogs/AboutDialog.vue @@ -41,12 +41,12 @@ diff --git a/src/renderer/src/components/dialogs/BaseDialog.vue b/src/renderer/src/components/dialogs/BaseDialog.vue index 79753555..1459ba23 100644 --- a/src/renderer/src/components/dialogs/BaseDialog.vue +++ b/src/renderer/src/components/dialogs/BaseDialog.vue @@ -22,7 +22,7 @@ diff --git a/src/renderer/src/components/propertyEditors/SimulationPropertyEditor.vue b/src/renderer/src/components/propertyEditors/SimulationPropertyEditor.vue index b0f1395c..b908ab67 100644 --- a/src/renderer/src/components/propertyEditors/SimulationPropertyEditor.vue +++ b/src/renderer/src/components/propertyEditors/SimulationPropertyEditor.vue @@ -5,7 +5,7 @@