Merge pull request #1072 from chat2db/refactor-electron

Refactor electron
CodePhiliaX · Jan 8, 2024 · 7fcf5f3 · 7fcf5f3
2 parents 38cf952 + 50a76d1
commit 7fcf5f3
Show file tree

Hide file tree

Showing 8 changed files with 816 additions and 40 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -143,6 +143,7 @@ jobs:
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
           cd src/main
           yarn
+          yarn run build
 
       # 编译服务端java版本
       - name: Build Java

diff --git a/.github/workflows/release_test.yml b/.github/workflows/release_test.yml
@@ -106,6 +106,7 @@ jobs:
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
           cd src/main
           yarn
+          yarn run build
 
 
       # 打包后端工程 & 发送到前端

diff --git a/.github/workflows/release_test_2.yml b/.github/workflows/release_test_2.yml
@@ -106,6 +106,7 @@ jobs:
           cp -r dist/index.html ../chat2db-server/chat2db-server-start/src/main/resources/thymeleaf/
           cd src/main
           yarn
+          yarn run build
 
       # 打包后端工程 & 发送到前端
       - name: Build BE Static

diff --git a/chat2db-client/.gitignore b/chat2db-client/.gitignore
@@ -6,6 +6,7 @@
 /src/.umi-production
 /src/.umi-test
 /src/main/node_modules
+/src/main/dist
 /dist
 .swc
 ./yarn-error.log

diff --git a/chat2db-client/package.json b/chat2db-client/package.json
@@ -7,7 +7,7 @@
     "url": "https://github.com/chat2db/Chat2DB"
   },
   "author": "fjy, hexi",
-  "main": "src/main/index.js",
+  "main": "src/main/dist/index.js",
   "scripts": {
     "build": "npm run build:web && npm run build:main",
     "build:desktop": "npm run build:web:desktop && npm run build:main:prod",
@@ -33,15 +33,13 @@
     "copy-to-clipboard": "^3.3.3",
     "echarts": "^5.4.2",
     "echarts-for-react": "^3.0.2",
-    "electron-log": "^4.4.8",
     "event-source-polyfill": "^1.0.31",
     "highlight.js": "^11.9.0",
     "lodash": "^4.17.21",
     "markdown-it-link-attributes": "^4.0.1",
     "monaco-editor": "^0.44.0",
     "monaco-editor-esm-webpack-plugin": "^2.1.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
-    "node-machine-id": "^1.1.12",
     "react-monaco-editor": "^0.54.0",
     "react-sortablejs": "^6.1.4",
     "sql-formatter": "^13.0.4",
@@ -98,12 +96,10 @@
     "asar": false,
     "files": [
       "dist/**/*",
-      "static/",
       "src/main",
-      "src/main/node_modules/**/*",
       "versions/**/*",
       "package.json",
-      "!./node_modules/**/*"
+      "!node_modules/**/*"
     ],
     "nsis": {
       "oneClick": false,

diff --git a/chat2db-client/src/main/package.json b/chat2db-client/src/main/package.json
@@ -14,5 +14,9 @@
     "electron-store": "^8.1.0",
     "node-machine-id": "^1.1.12",
     "uuid": "^9.0.1"
+  },
+  "devDependencies": {
+    "webpack": "^5.89.0",
+    "webpack-cli": "^5.1.4"
   }
 }
diff --git a/chat2db-client/src/main/webpack.config.js b/chat2db-client/src/main/webpack.config.js
@@ -3,7 +3,8 @@ const path = require('path');
 module.exports = {
   entry: './index.js',
   output: {
-    filename: 'main.js',
+    filename: 'index.js',
     path: path.resolve(__dirname, 'dist'),
   },
+  target: 'node'
 };