chore： del vite

cmd/bin.js

@@ -105,10 +105,7 @@ module.exports = {
     type: 'confusion',
     files: [
       'electron/**/*.(js|json)',
-      '!electron/config/encrypt.js',
       '!electron/config/nodemon.json',
-      '!electron/config/builder.json',
-      '!electron/config/bin.js',
     ],
     fileExt: ['.js'],
     cleanFiles: ['./public/electron'],

electron.vite.config.ts

@@ -1,10 +0,0 @@
-import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
-
-export default defineConfig({
-  main: {
-    plugins: [externalizeDepsPlugin()]
-  },
-  // preload: {
-  //   plugins: [externalizeDepsPlugin()]
-  // },
-})

electronts/tsconfig.json

@@ -3,7 +3,6 @@
     "target": "esnext",
     "module": "esnext",
     "useDefineForClassFields": true,
-    // "sourceMap": true,
     "skipLibCheck": true,
     "types": ["node"],
     "esModuleInterop": true,
@@ -23,10 +22,14 @@
     "noUnusedParameters": true,
     "noImplicitAny": false,
     "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true
+    "noFallthroughCasesInSwitch": true,
+    "outDir": "../public/electron"
   },
   "include": [
-    "src/**/*"
-  ]
+    "**/*"
+  ],
+  "exclude": [
+    "tsconfig.json"
+  ],
 }
   

package.json

@@ -6,9 +6,8 @@
   "scripts": {
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "vue-tsc --noEmit -p tsconfig.web.json --composite false",
-    "typecheck": "npm run typecheck:node && npm run typecheck:web",
-    "vite-dev": "electron-vite dev",
-    "vite-build": "npm run typecheck && electron-vite build",
+    "typecheck": "npm run typecheck:node",
+    "ts-dev": "tsc --watch -p ./ts/tsconfig.json",
     "dev": "ee-bin dev",
     "dev-frontend": "ee-bin dev --serve=frontend",
     "dev-electron": "ee-bin dev --serve=electron",
@@ -26,25 +25,25 @@
     "icon": "ee-bin icon",
     "move": "ee-bin move --flag=frontend_dist",
     "re-sqlite": "electron-rebuild -f -w better-sqlite3",
-    "build-w": "electron-builder --config=./electron/config/builder.json -w=nsis --x64",
-    "build-w-32": "electron-builder --config=./electron/config/builder.json -w=nsis --ia32",
-    "build-w-64": "electron-builder --config=./electron/config/builder.json -w=nsis --x64",
-    "build-w-arm64": "electron-builder --config=./electron/config/builder.json -w=nsis --arm64",
-    "build-we": "electron-builder --config=./electron/config/builder.json -w=portable --x64",
-    "build-wz": "electron-builder --config=./electron/config/builder.json -w=7z --x64",
-    "build-wz-32": "electron-builder --config=./electron/config/builder.json -w=7z --ia32",
-    "build-wz-64": "electron-builder --config=./electron/config/builder.json -w=7z --x64",
-    "build-wz-arm64": "electron-builder --config=./electron/config/builder.json -w=7z --arm64",
-    "build-m": "electron-builder --config=./electron/config/builder.json -m",
-    "build-m-arm64": "electron-builder --config=./electron/config/builder.json -m --arm64",
-    "build-l": "electron-builder --config=./electron/config/builder.json -l=deb --x64",
-    "build-l-32": "electron-builder --config=./electron/config/builder.json -l=deb --ia32",
-    "build-l-64": "electron-builder --config=./electron/config/builder.json -l=deb --x64",
-    "build-l-arm64": "electron-builder --config=./electron/config/builder.json -l=deb --arm64",
-    "build-l-armv7l": "electron-builder --config=./electron/config/builder.json -l=deb --armv7l",
-    "build-lr-64": "electron-builder --config=./electron/config/builder.json -l=rpm --x64",
-    "build-lr-arm64": "electron-builder --config=./electron/config/builder.json -l=rpm --arm64",
-    "build-lp-64": "electron-builder --config=./electron/config/builder.json -l=pacman --x64",
+    "build-w": "electron-builder --config=./cmd/builder.json -w=nsis --x64",
+    "build-w-32": "electron-builder --config=./cmd/builder.json -w=nsis --ia32",
+    "build-w-64": "electron-builder --config=./cmd/builder.json -w=nsis --x64",
+    "build-w-arm64": "electron-builder --config=./cmd/builder.json -w=nsis --arm64",
+    "build-we": "electron-builder --config=./cmd/builder.json -w=portable --x64",
+    "build-wz": "electron-builder --config=./cmd/builder.json -w=7z --x64",
+    "build-wz-32": "electron-builder --config=./cmd/builder.json -w=7z --ia32",
+    "build-wz-64": "electron-builder --config=./cmd/builder.json -w=7z --x64",
+    "build-wz-arm64": "electron-builder --config=./cmd/builder.json -w=7z --arm64",
+    "build-m": "electron-builder --config=./cmd/builder.json -m",
+    "build-m-arm64": "electron-builder --config=./cmd/builder.json -m --arm64",
+    "build-l": "electron-builder --config=./cmd/builder.json -l=deb --x64",
+    "build-l-32": "electron-builder --config=./cmd/builder.json -l=deb --ia32",
+    "build-l-64": "electron-builder --config=./cmd/builder.json -l=deb --x64",
+    "build-l-arm64": "electron-builder --config=./cmd/builder.json -l=deb --arm64",
+    "build-l-armv7l": "electron-builder --config=./cmd/builder.json -l=deb --armv7l",
+    "build-lr-64": "electron-builder --config=./cmd/builder.json -l=rpm --x64",
+    "build-lr-arm64": "electron-builder --config=./cmd/builder.json -l=rpm --arm64",
+    "build-lp-64": "electron-builder --config=./cmd/builder.json -l=pacman --x64",
     "test-move": "ee-bin move --flag=go_static,go_config,go_package,go_images",
     "debug": "cross-env DEBUG=ee-core* ee-bin dev --serve=electron"
   },
@@ -65,7 +64,6 @@
     "ee-bin": "file:.yalc/ee-bin",
     "electron": "^31.7.6",
     "electron-builder": "^25.1.8",
-    "electron-vite": "file:.yalc/electron-vite",
     "typescript": "^5.4.2",
     "vite": "^6.0.6",
     "vite-plugin-dts": "^4.4.0"

tsconfig.json

@@ -1,5 +0,0 @@
-{
-  "files": [],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}
-  

tsconfig.node.json

@@ -1,9 +0,0 @@
-{
-  "extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
-  "include": ["electron.vite.config.*", "src/electron/**/*"],
-  "compilerOptions": {
-    "composite": true,
-    "types": ["electron-vite/node"]
-  }
-}
-  

vite.config.ts.bak

@@ -1,17 +0,0 @@
-import {defineConfig} from 'vite'
-import {resolve} from 'path';
-import dts from 'vite-plugin-dts'
-
-export default defineConfig({
-  define: {'process.env': {}},
-  build: {
-    minify: "esbuild",
-    lib: {
-      entry: resolve(__dirname, './src/electron/main.ts'),
-      formats: ['cjs']
-    },
-    outDir: "elets",
-  },
-  plugins: [dts({rollupTypes: true}),
-  ],
-})