From 88dec430de46ddbbddfb517a0af5d45ee2856f17 Mon Sep 17 00:00:00 2001 From: gaoshuaixing Date: Thu, 2 Jan 2025 19:20:41 +0800 Subject: [PATCH] =?UTF-8?q?chore=EF=BC=9A=20del=20vite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/bin.js | 3 -- electron.vite.config.ts | 10 ----- .../config/config.default.ts | 0 .../config/config.local.ts | 0 .../config/config.prod.ts | 0 {src/electron => electronts}/main.ts | 0 .../electron => electronts}/preload/bridge.ts | 0 {src/electron => electronts}/preload/index.ts | 0 .../preload/lifecycle.ts | 0 tsconfig.json.bak => electronts/tsconfig.json | 11 +++-- package.json | 44 +++++++++---------- tsconfig.json | 5 --- tsconfig.node.json | 9 ---- vite.config.ts.bak | 17 ------- 14 files changed, 28 insertions(+), 71 deletions(-) delete mode 100644 electron.vite.config.ts rename {src/electron => electronts}/config/config.default.ts (100%) rename {src/electron => electronts}/config/config.local.ts (100%) rename {src/electron => electronts}/config/config.prod.ts (100%) rename {src/electron => electronts}/main.ts (100%) rename {src/electron => electronts}/preload/bridge.ts (100%) rename {src/electron => electronts}/preload/index.ts (100%) rename {src/electron => electronts}/preload/lifecycle.ts (100%) rename tsconfig.json.bak => electronts/tsconfig.json (81%) delete mode 100644 tsconfig.json delete mode 100644 tsconfig.node.json delete mode 100644 vite.config.ts.bak diff --git a/cmd/bin.js b/cmd/bin.js index fdb349c..71ab2fe 100644 --- a/cmd/bin.js +++ b/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'], diff --git a/electron.vite.config.ts b/electron.vite.config.ts deleted file mode 100644 index e68c3f2..0000000 --- a/electron.vite.config.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { defineConfig, externalizeDepsPlugin } from 'electron-vite' - -export default defineConfig({ - main: { - plugins: [externalizeDepsPlugin()] - }, - // preload: { - // plugins: [externalizeDepsPlugin()] - // }, -}) diff --git a/src/electron/config/config.default.ts b/electronts/config/config.default.ts similarity index 100% rename from src/electron/config/config.default.ts rename to electronts/config/config.default.ts diff --git a/src/electron/config/config.local.ts b/electronts/config/config.local.ts similarity index 100% rename from src/electron/config/config.local.ts rename to electronts/config/config.local.ts diff --git a/src/electron/config/config.prod.ts b/electronts/config/config.prod.ts similarity index 100% rename from src/electron/config/config.prod.ts rename to electronts/config/config.prod.ts diff --git a/src/electron/main.ts b/electronts/main.ts similarity index 100% rename from src/electron/main.ts rename to electronts/main.ts diff --git a/src/electron/preload/bridge.ts b/electronts/preload/bridge.ts similarity index 100% rename from src/electron/preload/bridge.ts rename to electronts/preload/bridge.ts diff --git a/src/electron/preload/index.ts b/electronts/preload/index.ts similarity index 100% rename from src/electron/preload/index.ts rename to electronts/preload/index.ts diff --git a/src/electron/preload/lifecycle.ts b/electronts/preload/lifecycle.ts similarity index 100% rename from src/electron/preload/lifecycle.ts rename to electronts/preload/lifecycle.ts diff --git a/tsconfig.json.bak b/electronts/tsconfig.json similarity index 81% rename from tsconfig.json.bak rename to electronts/tsconfig.json index b46657e..6eb04f1 100644 --- a/tsconfig.json.bak +++ b/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" + ], } \ No newline at end of file diff --git a/package.json b/package.json index b8835da..6c24de2 100644 --- a/package.json +++ b/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" diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 3d39518..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "files": [], - "references": [{ "path": "./tsconfig.node.json" }] -} - \ No newline at end of file diff --git a/tsconfig.node.json b/tsconfig.node.json deleted file mode 100644 index feeb678..0000000 --- a/tsconfig.node.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "@electron-toolkit/tsconfig/tsconfig.node.json", - "include": ["electron.vite.config.*", "src/electron/**/*"], - "compilerOptions": { - "composite": true, - "types": ["electron-vite/node"] - } -} - \ No newline at end of file diff --git a/vite.config.ts.bak b/vite.config.ts.bak deleted file mode 100644 index 6bedc9a..0000000 --- a/vite.config.ts.bak +++ /dev/null @@ -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}), - ], -})