From 9ec9db530b2ab45d1aabc8af3f66003eb6c8e27a Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 18:22:58 -0300 Subject: [PATCH 01/10] frontend: add vue-tsc --- core/frontend/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/frontend/package.json b/core/frontend/package.json index c74dd58817..bdc57a6911 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -57,6 +57,7 @@ "vue-router": "^3.6.5", "vue-tooltip-directive": "^1.0.2", "vue-tour": "^2.0.0", + "vue-tsc": "^2.1.6", "vuedraggable": "^2.24.3", "vuetify": "2.7.1", "vuex": "^3.4.0", @@ -79,7 +80,7 @@ "eslint-plugin-simple-import-sort": "^10.0.0", "eslint-plugin-vue": "^9.9.0", "sass": "~1.32.0", - "typescript": "~4.9.5", + "typescript": "^5.6.2", "unplugin-vue-components": "^0.25.2", "vite": "3", "vite-plugin-pwa": "^0.16.5", From 722ba2746aa14a656a7461863cbf7d7a0bb2d69b Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 18:23:56 -0300 Subject: [PATCH 02/10] frontend: add proper type-checking --- core/frontend/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/frontend/package.json b/core/frontend/package.json index bdc57a6911..d89cce1a70 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -11,7 +11,8 @@ "dev": "vite --host", "build": "NODE_ENV=production vite build", "serve": "echo 'This is a preview server for testing the built website. Please use `dev` command over `serve`.\nStarting preview server in 5 seconds..\n';sleep 5; vite preview", - "lint": "eslint --max-warnings=0 --ext .js,.vue --ignore-path .gitignore --ignore-pattern src/components/vue-tour src" + "lint": "eslint --max-warnings=0 --ext .js,.vue --ignore-path .gitignore --ignore-pattern src/components/vue-tour src", + "type-check": "vue-tsc --noEmit" }, "dependencies": { "@google/model-viewer": "^3.0.0", From 2ce050d6731c3d87b1dbe2eede653c7b5e38635e Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 18:30:03 -0300 Subject: [PATCH 03/10] Ci: run type-checking for frontend --- .github/workflows/test-and-deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml index d42741e274..30e8fa3a3b 100644 --- a/.github/workflows/test-and-deploy.yml +++ b/.github/workflows/test-and-deploy.yml @@ -62,6 +62,9 @@ jobs: - name: Bun lint run: bun --cwd ./core/frontend lint + - name: Bun type-check + run: bun --cwd ./core/frontend type-check + - name: Bun build run: bun run --cwd ./core/frontend build From 2bd0da24d5692bf1b0d04d9f3c7f512cd88d1e66 Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 18:41:36 -0300 Subject: [PATCH 04/10] frontend: tsconfig.json: remove stale reference to webpack --- core/frontend/tsconfig.json | 1 - 1 file changed, 1 deletion(-) diff --git a/core/frontend/tsconfig.json b/core/frontend/tsconfig.json index 2d1ac1dabe..10cf69c0c4 100644 --- a/core/frontend/tsconfig.json +++ b/core/frontend/tsconfig.json @@ -15,7 +15,6 @@ "baseUrl": ".", "experimentalDecorators": true, "types": [ - "webpack-env", "vite/client" ], "paths": { From aae86c023fc75226ef2eabceae648a1025c04e8b Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 15:49:27 -0300 Subject: [PATCH 05/10] frontend: calibrations.ts: make it ts-friendly --- .../components/vehiclesetup/calibration.ts | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/core/frontend/src/components/vehiclesetup/calibration.ts b/core/frontend/src/components/vehiclesetup/calibration.ts index 369b067c4f..9ee27a4fc6 100644 --- a/core/frontend/src/components/vehiclesetup/calibration.ts +++ b/core/frontend/src/components/vehiclesetup/calibration.ts @@ -57,6 +57,10 @@ class Calibrator { * @param {PreflightCalibration} type */ private static start(type: PreflightCalibration): void { + const getParamValue = (mapping: Partial>): number => { + return mapping[type] ?? 0; + }; + mavlink2rest.sendMessage({ header: { system_id: 255, @@ -65,30 +69,30 @@ class Calibrator { }, message: { type: MAVLinkType.COMMAND_LONG, - param1: { + param1: getParamValue({ [PreflightCalibration.GYROSCOPE]: 1, [PreflightCalibration.GYROSCOPE_TEMPERATURE]: 3, - }[type] || 0, + }), param2: type === PreflightCalibration.MAGNETOMETER ? 1 : 0, param3: type === PreflightCalibration.PRESSURE ? 1 : 0, - param4: { + param4: getParamValue({ [PreflightCalibration.RC]: 1, [PreflightCalibration.RC_TRIM]: 2, - }[type] || 0, - param5: { + }), + param5: getParamValue({ [PreflightCalibration.ACCELEROMETER]: 1, [PreflightCalibration.BOARD_LEVEL]: 2, [PreflightCalibration.ACCELEROMETER_TEMPERATURE]: 3, [PreflightCalibration.SIMPLE_ACCELEROMETER]: 4, - }[type] || 0, - param6: { + }), + param6: getParamValue({ [PreflightCalibration.COMPASS_MOTOR_INTERFERENCE]: 1, [PreflightCalibration.AIRPSEED]: 2, - }[type] || 0, - param7: { + }), + param7: getParamValue({ [PreflightCalibration.ESC]: 1, [PreflightCalibration.BAROMETER_TEMPERATURE]: 3, - }[type] || 0, + }), command: { type: MavCmd.MAV_CMD_PREFLIGHT_CALIBRATION, }, @@ -96,7 +100,7 @@ class Calibrator { target_component: 1, confirmation: 0, }, - }) + }); } /** From df1735eeeb38987fbe091fb43c5e631101c3d213 Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Wed, 18 Sep 2024 17:19:42 -0300 Subject: [PATCH 06/10] Frontend: make tsc type-check happy --- core/frontend/src/one-more-time.ts | 4 ++-- .../colors/{blue_robotics.js => blue_robotics.ts} | 0 .../src/style/colors/{default.js => default.ts} | 0 core/frontend/src/style/colors/vuetify.js | 10 ---------- .../src/types/autopilot/parameter-table.ts | 2 +- core/frontend/src/types/shims-general.ts | 14 +------------- core/frontend/src/utils/ardupilot_mavlink.ts | 3 +-- 7 files changed, 5 insertions(+), 28 deletions(-) rename core/frontend/src/style/colors/{blue_robotics.js => blue_robotics.ts} (100%) rename core/frontend/src/style/colors/{default.js => default.ts} (100%) delete mode 100644 core/frontend/src/style/colors/vuetify.js diff --git a/core/frontend/src/one-more-time.ts b/core/frontend/src/one-more-time.ts index 915652cb0e..ec79c144e8 100644 --- a/core/frontend/src/one-more-time.ts +++ b/core/frontend/src/one-more-time.ts @@ -72,7 +72,7 @@ export class OneMoreTime { const id = setInterval(() => { // Check if object does not exist anymore or if it was destroyed by vue // eslint-disable-next-line - if (!ref.deref() || ref.deref()._isDestroyed) { + if (!ref.deref() || (ref.deref() as any)._isDestroyed) { this.stop() clearInterval(id) } @@ -133,7 +133,7 @@ export class OneMoreTime { } // Celebrate and dance so free - [Symbol.dispose](): void { + [(Symbol as any).dispose](): void { this.isDisposed = true } diff --git a/core/frontend/src/style/colors/blue_robotics.js b/core/frontend/src/style/colors/blue_robotics.ts similarity index 100% rename from core/frontend/src/style/colors/blue_robotics.js rename to core/frontend/src/style/colors/blue_robotics.ts diff --git a/core/frontend/src/style/colors/default.js b/core/frontend/src/style/colors/default.ts similarity index 100% rename from core/frontend/src/style/colors/default.js rename to core/frontend/src/style/colors/default.ts diff --git a/core/frontend/src/style/colors/vuetify.js b/core/frontend/src/style/colors/vuetify.js deleted file mode 100644 index f4246e35b7..0000000000 --- a/core/frontend/src/style/colors/vuetify.js +++ /dev/null @@ -1,10 +0,0 @@ -/* eslint-disable */ -module.exports = { - VUETIFY_PRIMARY: '#1976D2', - VUETIFY_SECONDARY: '#424242', - VUETIFY_ACCENT: '#82B1FF', - VUETIFY_SUCCESS: '#4CAF50', - VUETIFY_ERROR: '#FF5252', - VUETIFY_INFO: '#2196F3', - VUETIFY_WARNING: '#e0a600', -} diff --git a/core/frontend/src/types/autopilot/parameter-table.ts b/core/frontend/src/types/autopilot/parameter-table.ts index 0ac3d47c60..c86ffc5e13 100644 --- a/core/frontend/src/types/autopilot/parameter-table.ts +++ b/core/frontend/src/types/autopilot/parameter-table.ts @@ -148,7 +148,7 @@ export default class ParametersTable { console.log(`ignoring ${name} : ${parameter}`) continue } - this.metadata[name] = parameter + this.metadata[name] = (parameter as Metadata) } } } diff --git a/core/frontend/src/types/shims-general.ts b/core/frontend/src/types/shims-general.ts index 984a241bb5..94d6cc10ce 100644 --- a/core/frontend/src/types/shims-general.ts +++ b/core/frontend/src/types/shims-general.ts @@ -1,25 +1,13 @@ declare module '*.svg' { const value: string - export default value } declare module '*.jpg' { const value: string - export default value } declare module '*.png' { const value: string - export default value } -declare module '*.glb' { - const value: string - export default value -} - -declare module 'vue-tooltip-directive' - -declare module '@/assets/colors/default' -declare module '@/assets/colors/blue_robotics' -declare module '@/assets/colors/vuetify' +declare module 'vue-tooltip-directive' \ No newline at end of file diff --git a/core/frontend/src/utils/ardupilot_mavlink.ts b/core/frontend/src/utils/ardupilot_mavlink.ts index 9d35e2a401..7fee10040c 100644 --- a/core/frontend/src/utils/ardupilot_mavlink.ts +++ b/core/frontend/src/utils/ardupilot_mavlink.ts @@ -81,10 +81,9 @@ export function getMode(): number { } export async function setMode(mode: number, tries?: number): Promise { - tries = tries || 5 let current_try = 0 return new Promise(async (resolve, reject) => { - while (getMode() !== mode && current_try < tries) { + while (getMode() !== mode && current_try < (tries ?? 5)) { current_try += 1 mavlink2rest.sendCommandLong( MavCmd.MAV_CMD_DO_SET_MODE, From 0262793c871ce9f8f3f977e3c97730340dabe82a Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Tue, 24 Sep 2024 09:11:20 -0300 Subject: [PATCH 07/10] wip --- core/frontend/src/store/wifi.ts | 1 - core/frontend/src/types/shims-general.ts | 2 -- core/frontend/src/types/shims-vue.d.ts | 5 ----- core/frontend/src/views/Autopilot.vue | 14 +++++++++----- core/frontend/src/views/ExtensionView.vue | 12 ++++++++---- core/frontend/src/views/FileBrowserView.vue | 8 ++++++-- core/frontend/src/views/VehicleSetupView.vue | 9 +++++++-- core/frontend/tsconfig.json | 1 + 8 files changed, 31 insertions(+), 21 deletions(-) delete mode 100644 core/frontend/src/types/shims-vue.d.ts diff --git a/core/frontend/src/store/wifi.ts b/core/frontend/src/store/wifi.ts index 1d0d2277de..ae0ab341b3 100644 --- a/core/frontend/src/store/wifi.ts +++ b/core/frontend/src/store/wifi.ts @@ -13,7 +13,6 @@ import { sorted_networks } from '@/utils/wifi' store, name: 'wifi', }) - class WifiStore extends VuexModule { API_URL = '/wifi-manager/v1.0' diff --git a/core/frontend/src/types/shims-general.ts b/core/frontend/src/types/shims-general.ts index 94d6cc10ce..b369ad3346 100644 --- a/core/frontend/src/types/shims-general.ts +++ b/core/frontend/src/types/shims-general.ts @@ -9,5 +9,3 @@ declare module '*.jpg' { declare module '*.png' { const value: string } - -declare module 'vue-tooltip-directive' \ No newline at end of file diff --git a/core/frontend/src/types/shims-vue.d.ts b/core/frontend/src/types/shims-vue.d.ts deleted file mode 100644 index 5596f90ef3..0000000000 --- a/core/frontend/src/types/shims-vue.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -declare module '*.vue' { - import Vue from 'vue' - - export default Vue -} diff --git a/core/frontend/src/views/Autopilot.vue b/core/frontend/src/views/Autopilot.vue index 7aa4bd8eaf..f0ac760c39 100644 --- a/core/frontend/src/views/Autopilot.vue +++ b/core/frontend/src/views/Autopilot.vue @@ -55,7 +55,7 @@ @@ -122,6 +122,7 @@ import autopilot from '@/store/autopilot_manager' import { FirmwareInfo, FlightController } from '@/types/autopilot' import { autopilot_service } from '@/types/frontend_services' import back_axios from '@/utils/api' +import Vuetify from 'vuetify/lib' const notifier = new Notifier(autopilot_service) @@ -144,6 +145,9 @@ export default Vue.extend({ } }, computed: { + vuetify(): any { + return (this as any).$route as any + }, autopilot_info(): Record { let version = 'Unknown' if (this.firmware_info) { @@ -164,7 +168,7 @@ export default Vue.extend({ return record }, - banner(): string { + banner(): string | undefined { switch (autopilot_data.autopilot_type) { case MavAutopilot.MAV_AUTOPILOT_ARDUPILOTMEGA: return ArduPilotBanner diff --git a/core/frontend/src/views/ExtensionView.vue b/core/frontend/src/views/ExtensionView.vue index f95e3fd559..2876fe6602 100644 --- a/core/frontend/src/views/ExtensionView.vue +++ b/core/frontend/src/views/ExtensionView.vue @@ -17,6 +17,7 @@ import helper from '@/store/helper' import { Service } from '@/types/helper' import PageNotFound from './PageNotFound.vue' +import { Route } from 'vue-router' export default Vue.extend({ name: 'ExtensionView', @@ -33,12 +34,15 @@ export default Vue.extend({ } }, computed: { + route(): Route { + return (this as any).$route as Route + }, fullpage(): boolean { - return this.$route.query.full_page === 'true' + return this.route.query.full_page === 'true' }, service(): Service | undefined { return helper.services.filter( - (service) => service?.metadata?.sanitized_name === this.$route.params.name, + (service) => service?.metadata?.sanitized_name === this.route.params.name, )[0] ?? undefined }, port(): number | undefined | null { @@ -46,7 +50,7 @@ export default Vue.extend({ return undefined } return helper.services.filter( - (service) => service?.metadata?.sanitized_name === this.$route.params.name, + (service) => service?.metadata?.sanitized_name === this.route.params.name, )[0]?.port ?? null }, service_path(): string { @@ -73,7 +77,7 @@ export default Vue.extend({ this.detected_port = this.port } // eslint-disable-next-line - this.remaining_path = this.$route.params.pathMatch + this.remaining_path = this.route.params.pathMatch }, }) diff --git a/core/frontend/src/views/FileBrowserView.vue b/core/frontend/src/views/FileBrowserView.vue index 4d90d5b9ad..cf5f390209 100644 --- a/core/frontend/src/views/FileBrowserView.vue +++ b/core/frontend/src/views/FileBrowserView.vue @@ -8,6 +8,7 @@ import Vue from 'vue' import BrIframe from '@/components/utils/BrIframe.vue' +import { Route } from 'vue-router'; export default Vue.extend({ name: 'FileBrowserView', @@ -20,8 +21,11 @@ export default Vue.extend({ } }, computed: { - full_path() { - return `${this.service_path}${this.$route.params.path ?? ''}` + route(): Route { + return (this as any).$route as Route + }, + full_path() : string { + return `${this.service_path}${this.route.params.path ?? ''}` }, }, }) diff --git a/core/frontend/src/views/VehicleSetupView.vue b/core/frontend/src/views/VehicleSetupView.vue index f5a15f9f38..c080388359 100644 --- a/core/frontend/src/views/VehicleSetupView.vue +++ b/core/frontend/src/views/VehicleSetupView.vue @@ -23,7 +23,7 @@ :value="page.value" > - + @@ -39,6 +39,8 @@ import Configure from '@/components/vehiclesetup/Configure.vue' import PwmSetup from '@/components/vehiclesetup/PwmSetup.vue' import setupOverview from '@/components/vehiclesetup/SetupOverview.vue' import { OneMoreTime } from '@/one-more-time' +import router from '@/router' +import VueRouter, { Route } from 'vue-router' export interface Item { title: string, @@ -73,8 +75,11 @@ export default Vue.extend({ } }, computed: { + route(): Route { + return (this as any).$route as Route + }, currentTab(): string { - return this.$route.params.tab || 'overview' + return this.route.params.tab || 'overview' }, }, mounted() { diff --git a/core/frontend/tsconfig.json b/core/frontend/tsconfig.json index 10cf69c0c4..0221bf3f31 100644 --- a/core/frontend/tsconfig.json +++ b/core/frontend/tsconfig.json @@ -14,6 +14,7 @@ "sourceMap": true, "baseUrl": ".", "experimentalDecorators": true, + "emitDecoratorMetadata": true, "types": [ "vite/client" ], From 48fb554697032ccf79192756b4e144bc15a5b54d Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Mon, 7 Oct 2024 13:47:37 -0300 Subject: [PATCH 08/10] frontend: ignore module decorator on type-checking --- core/frontend/src/store/autopilot.ts | 1 + core/frontend/src/store/autopilot_manager.ts | 1 + core/frontend/src/store/beacon.ts | 1 + core/frontend/src/store/bridget.ts | 1 + core/frontend/src/store/ethernet.ts | 1 + core/frontend/src/store/frontend.ts | 1 + core/frontend/src/store/helper.ts | 1 + core/frontend/src/store/mavlink.ts | 1 + core/frontend/src/store/nmea-injector.ts | 1 + core/frontend/src/store/notifications.ts | 1 + core/frontend/src/store/ping.ts | 1 + core/frontend/src/store/settings.ts | 1 + core/frontend/src/store/system-information.ts | 1 + core/frontend/src/store/video.ts | 1 + core/frontend/src/store/wifi.ts | 1 + 15 files changed, 15 insertions(+) diff --git a/core/frontend/src/store/autopilot.ts b/core/frontend/src/store/autopilot.ts index 9e22a8fa40..dbe82950ce 100644 --- a/core/frontend/src/store/autopilot.ts +++ b/core/frontend/src/store/autopilot.ts @@ -11,6 +11,7 @@ import ParameterFetcher from '@/types/autopilot/parameter-fetcher' const parameterFetcher = new ParameterFetcher() +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/autopilot_manager.ts b/core/frontend/src/store/autopilot_manager.ts index 2c5c994403..a6cee3dfe9 100644 --- a/core/frontend/src/store/autopilot_manager.ts +++ b/core/frontend/src/store/autopilot_manager.ts @@ -8,6 +8,7 @@ import { FlightController, SerialEndpoint, } from '@/types/autopilot' +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/beacon.ts b/core/frontend/src/store/beacon.ts index 9f0c23cf67..74aee27d11 100644 --- a/core/frontend/src/store/beacon.ts +++ b/core/frontend/src/store/beacon.ts @@ -16,6 +16,7 @@ let prefetched_domains = false let prefetched_ips = false let prefetched_names = false +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/bridget.ts b/core/frontend/src/store/bridget.ts index 2d33721df8..70d73f7568 100644 --- a/core/frontend/src/store/bridget.ts +++ b/core/frontend/src/store/bridget.ts @@ -15,6 +15,7 @@ const notifier = new Notifier(bridget_service) let prefetched_bridges = false let prefetched_serial = false +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/ethernet.ts b/core/frontend/src/store/ethernet.ts index 387473617e..cd62588531 100644 --- a/core/frontend/src/store/ethernet.ts +++ b/core/frontend/src/store/ethernet.ts @@ -5,6 +5,7 @@ import { import store from '@/store' import { EthernetInterface } from '@/types/ethernet' +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/frontend.ts b/core/frontend/src/store/frontend.ts index 5187514272..aed06096ad 100644 --- a/core/frontend/src/store/frontend.ts +++ b/core/frontend/src/store/frontend.ts @@ -5,6 +5,7 @@ import { import store from '@/store' +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/helper.ts b/core/frontend/src/store/helper.ts index 873f12a114..9762c8d9b9 100644 --- a/core/frontend/src/store/helper.ts +++ b/core/frontend/src/store/helper.ts @@ -20,6 +20,7 @@ type CheckSiteStatus = { type SiteStatus = Record +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/mavlink.ts b/core/frontend/src/store/mavlink.ts index 1dbd909354..0e737b5c2b 100644 --- a/core/frontend/src/store/mavlink.ts +++ b/core/frontend/src/store/mavlink.ts @@ -16,6 +16,7 @@ interface messsageRefreshRate { refreshRate: number } +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/nmea-injector.ts b/core/frontend/src/store/nmea-injector.ts index 106de037f4..74ebf3705a 100644 --- a/core/frontend/src/store/nmea-injector.ts +++ b/core/frontend/src/store/nmea-injector.ts @@ -10,6 +10,7 @@ import back_axios from '@/utils/api' const notifier = new Notifier(nmea_injector_service) +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/notifications.ts b/core/frontend/src/store/notifications.ts index 67da42abf7..345cf5ec84 100644 --- a/core/frontend/src/store/notifications.ts +++ b/core/frontend/src/store/notifications.ts @@ -7,6 +7,7 @@ import { CumulatedNotification, Notification, NotificationLevel, } from '@/types/notifications' +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/ping.ts b/core/frontend/src/store/ping.ts index 7def6f310a..65a162ca8a 100644 --- a/core/frontend/src/store/ping.ts +++ b/core/frontend/src/store/ping.ts @@ -14,6 +14,7 @@ const notifier = new Notifier(ping_service) let prefecthed_pings = false +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/settings.ts b/core/frontend/src/store/settings.ts index bd76145c55..98b768eec1 100644 --- a/core/frontend/src/store/settings.ts +++ b/core/frontend/src/store/settings.ts @@ -7,6 +7,7 @@ import store from '@/store' import beacon from '@/store/beacon' import { castString } from '@/utils/helper_functions' +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/system-information.ts b/core/frontend/src/store/system-information.ts index 02c591b513..891afd6bd6 100644 --- a/core/frontend/src/store/system-information.ts +++ b/core/frontend/src/store/system-information.ts @@ -37,6 +37,7 @@ export enum FetchType { const notifier = new Notifier(system_information_service) +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/video.ts b/core/frontend/src/store/video.ts index 5e73b7d1a5..3ac52aba26 100644 --- a/core/frontend/src/store/video.ts +++ b/core/frontend/src/store/video.ts @@ -20,6 +20,7 @@ export interface Thumbnail { const notifier = new Notifier(video_manager_service) +// @ts-ignore @Module({ dynamic: true, store, diff --git a/core/frontend/src/store/wifi.ts b/core/frontend/src/store/wifi.ts index ae0ab341b3..d349baa47b 100644 --- a/core/frontend/src/store/wifi.ts +++ b/core/frontend/src/store/wifi.ts @@ -8,6 +8,7 @@ import { } from '@/types/wifi' import { sorted_networks } from '@/utils/wifi' +// @ts-ignore @Module({ dynamic: true, store, From c1cef9a338137599ed7ae03e7f59a8659b64e8ac Mon Sep 17 00:00:00 2001 From: Willian Galvani Date: Mon, 7 Oct 2024 15:27:56 -0300 Subject: [PATCH 09/10] wip --- core/frontend/package.json | 2 +- .../src/components/common/DefaultTooltip.vue | 2 +- core/frontend/src/components/common/JsonEditor.vue | 2 +- core/frontend/src/components/wifi/WifiManager.vue | 4 ++-- .../src/components/wizard/DefaultParamLoader.vue | 4 ++-- core/frontend/src/components/wizard/Wizard.vue | 14 +++++++++++--- core/frontend/src/main.ts | 1 + core/frontend/src/views/BagEditorView.vue | 8 ++++---- 8 files changed, 23 insertions(+), 14 deletions(-) diff --git a/core/frontend/package.json b/core/frontend/package.json index d89cce1a70..4a6c074b9d 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -61,7 +61,7 @@ "vue-tsc": "^2.1.6", "vuedraggable": "^2.24.3", "vuetify": "2.7.1", - "vuex": "^3.4.0", + "vuex": "^3.6.2", "vuex-module-decorators": "^1.0.1", "webpack": "^5.74.0", "wifi-qr-code-generator": "^1.1.1" diff --git a/core/frontend/src/components/common/DefaultTooltip.vue b/core/frontend/src/components/common/DefaultTooltip.vue index 0bf25bace1..1bcc407569 100644 --- a/core/frontend/src/components/common/DefaultTooltip.vue +++ b/core/frontend/src/components/common/DefaultTooltip.vue @@ -10,7 +10,7 @@ -