refactor: move wails generated code to ui src

mishamyrt · Mar 23, 2024 · 0b78d29 · 0b78d29
1 parent 5359b7f
commit 0b78d29
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 24 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "eslint.workingDirectories": [
-    "./frontend/"
+    "./ui/"
 ],
 "cSpell.words": [
     "DOCKERHUB"

diff --git a/ui/src/entities/app/api/browser.ts b/ui/src/entities/app/api/browser.ts
@@ -1,4 +1,4 @@
-import { BrowserOpenURL } from '$wailsjs/runtime'
+import { BrowserOpenURL } from '$wails/runtime'
 
 export function openBrowser (url: string) {
   BrowserOpenURL(url)

diff --git a/ui/src/entities/app/api/settings.ts b/ui/src/entities/app/api/settings.ts
@@ -1,4 +1,4 @@
-import { GetAppSettings, SetAppSettings } from '$wailsjs/go/usecase/SettingsUsecase'
+import { GetAppSettings, SetAppSettings } from '$wails/go/usecase/SettingsUsecase'
 
 import type { AppSettings } from '../model/types'
 

diff --git a/ui/src/entities/app/api/version.ts b/ui/src/entities/app/api/version.ts
@@ -1,4 +1,4 @@
-import { CheckUpdates, GetVersion } from '$wailsjs/go/usecase/EnvironmentUsecase'
+import { CheckUpdates, GetVersion } from '$wails/go/usecase/EnvironmentUsecase'
 
 export async function getVersion () {
   const version = await GetVersion()

diff --git a/ui/src/entities/device/api/firmware.ts b/ui/src/entities/device/api/firmware.ts
@@ -1,4 +1,4 @@
-import { GetFirmware } from '$wailsjs/go/usecase/DeviceUsecase'
+import { GetFirmware } from '$wails/go/usecase/DeviceUsecase'
 
 export async function getFirmware (): Promise<string> {
   const version = await GetFirmware()

diff --git a/ui/src/entities/device/api/state.ts b/ui/src/entities/device/api/state.ts
@@ -1,4 +1,4 @@
-import { RestoreDefaultState, RestoreState, SaveState } from '$wailsjs/go/usecase/DeviceUsecase'
+import { RestoreDefaultState, RestoreState, SaveState } from '$wails/go/usecase/DeviceUsecase'
 
 export async function saveState (): Promise<void> {
   return await SaveState()

diff --git a/ui/src/entities/device/api/supports.ts b/ui/src/entities/device/api/supports.ts
@@ -1,4 +1,4 @@
-import { GetSupports } from '$wailsjs/go/usecase/DeviceUsecase'
+import { GetSupports } from '$wails/go/usecase/DeviceUsecase'
 
 import type { Supports } from '../model/types'
 

diff --git a/ui/src/entities/keys/api/groups.ts b/ui/src/entities/keys/api/groups.ts
@@ -1,4 +1,4 @@
-import { GetKeyGroups } from '$wailsjs/go/usecase/KeysUsecase'
+import { GetKeyGroups } from '$wails/go/usecase/KeysUsecase'
 
 import type { KeyGroup } from '../model'
 

diff --git a/ui/src/entities/keys/api/layout.ts b/ui/src/entities/keys/api/layout.ts
@@ -1,4 +1,4 @@
-import { GetDefaultKeys, GetKeys, SetKeys } from '$wailsjs/go/usecase/KeysUsecase'
+import { GetDefaultKeys, GetKeys, SetKeys } from '$wails/go/usecase/KeysUsecase'
 
 import type { KeyMap } from '../model'
 

diff --git a/ui/src/entities/lights/api/color.ts b/ui/src/entities/lights/api/color.ts
@@ -1,4 +1,4 @@
-import { GetBacklightColors, SetBacklightColor } from '$wailsjs/go/usecase/LightsUsecase'
+import { GetBacklightColors, SetBacklightColor } from '$wails/go/usecase/LightsUsecase'
 
 import type { LightBacklightColors, SetBacklightColorParams } from '../model/types'
 import { rgbToHex } from '../utils/hex'

diff --git a/ui/src/entities/lights/api/mode.ts b/ui/src/entities/lights/api/mode.ts
@@ -1,5 +1,5 @@
-import type { light } from '$wailsjs/go/models'
-import { GetLightModes } from '$wailsjs/go/usecase/LightsUsecase'
+import type { light } from '$wails/go/models'
+import { GetLightModes } from '$wails/go/usecase/LightsUsecase'
 
 import type { LightModes } from '../model/types'
 import { parseModes } from '../utils'

diff --git a/ui/src/entities/lights/api/state.ts b/ui/src/entities/lights/api/state.ts
@@ -1,5 +1,5 @@
-import { dto } from '$wailsjs/go/models'
-import { GetLightState, SetLightState } from '$wailsjs/go/usecase/LightsUsecase'
+import { dto } from '$wails/go/models'
+import { GetLightState, SetLightState } from '$wails/go/usecase/LightsUsecase'
 
 import { defaultDomainState } from '../model/const'
 import type { LightState } from '../model/types'

diff --git a/ui/src/entities/lights/utils/parse.ts b/ui/src/entities/lights/utils/parse.ts
@@ -1,5 +1,5 @@
 import { capitalize } from '$shared/lib'
-import type { light } from '$wailsjs/go/models'
+import type { light } from '$wails/go/models'
 
 import type { LightColorIndex, LightDomainMode, LightDomainState, LightEffectParams, LightStateValue } from '../model/types'
 

diff --git a/ui/src/shared/api/app.ts b/ui/src/shared/api/app.ts
@@ -1,4 +1,4 @@
-import { Restart } from '$wailsjs/go/usecase/EnvironmentUsecase'
+import { Restart } from '$wails/go/usecase/EnvironmentUsecase'
 
 export async function restartApp () {
   await Restart()

diff --git a/ui/src/shared/api/connection.ts b/ui/src/shared/api/connection.ts
@@ -1,4 +1,4 @@
-import { Connect, Disconnect, GetPath, SimulateConnection } from '$wailsjs/go/usecase/DeviceUsecase'
+import { Connect, Disconnect, GetPath, SimulateConnection } from '$wails/go/usecase/DeviceUsecase'
 
 import type { ConnectionDescription } from '../model'
 

diff --git a/ui/src/shared/api/settings.ts b/ui/src/shared/api/settings.ts
@@ -1,4 +1,4 @@
-import { GetMode, SetMode } from '$wailsjs/go/usecase/SettingsUsecase'
+import { GetMode, SetMode } from '$wails/go/usecase/SettingsUsecase'
 
 import type { OSMode } from '../model/types'
 

diff --git a/ui/src/shared/lib/from-wails-event.ts b/ui/src/shared/lib/from-wails-event.ts
@@ -1,6 +1,6 @@
 import { createEvent, type Event } from 'effector'
 
-import { EventsOn } from '$wailsjs/runtime'
+import { EventsOn } from '$wails/runtime'
 
 type WailsEventHandlerFn<T> = (...params: any[]) => T
 

diff --git a/ui/tsconfig.json b/ui/tsconfig.json
@@ -17,8 +17,8 @@
       "$widgets": ["src/widgets"],
       "$entities/*": ["src/entities/*"],
       "$pages": ["src/pages"],
-      "$wailsjs/runtime": ["wailsjs/runtime/runtime"],
-      "$wailsjs/go/*": ["wailsjs/go/*"]
+      "$wails/runtime": ["src/wailsjs/runtime/runtime"],
+      "$wails/go/*": ["src/wailsjs/go/*"]
     },
     "outDir": "dist"
   },

diff --git a/ui/vite.config.ts b/ui/vite.config.ts
@@ -11,8 +11,8 @@ export default defineConfig({
       $entities: resolve(__dirname, './src/entities'),
       $widgets: resolve(__dirname, './src/widgets'),
       $pages: resolve(__dirname, './src/pages'),
-      '$wailsjs/runtime': resolve(__dirname, './wailsjs/runtime/runtime'),
-      '$wailsjs/go': resolve(__dirname, './wailsjs/go')
+      '$wails/runtime': resolve(__dirname, './src/wailsjs/runtime/runtime'),
+      '$wails/go': resolve(__dirname, './src/wailsjs/go')
     }
   },
   plugins: [svelte()]

diff --git a/wails.json b/wails.json
@@ -7,13 +7,14 @@
   "frontend:build": "pnpm run build",
   "frontend:dev:watcher": "pnpm run dev",
   "frontend:dev:serverUrl": "auto",
+  "wailsjsdir": "ui/src",
   "author": {
     "name": "mishamyrt",
     "email": "[email protected]"
   },
   "info": {
     "productVersion": "2.1.0",
     "comments": "NuPhy(R) keyboard configurator",
-    "copyright": "Copyright 2023 The Nuga Project Authors (https://github.com/mishamyrt/Nuga/blob/master/AUTHORS)"
+    "copyright": "Copyright 2024 The Nuga Project Authors (https://github.com/mishamyrt/Nuga/blob/master/AUTHORS)"
   }
 }