From 723d4d861f22358fb12ac0f0ab8db7362b3cb129 Mon Sep 17 00:00:00 2001
From: he wei <858544502@qq.com>
Date: 星期一, 16 三月 2026 11:21:18 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whychw/electron-fg2
---
package.json | 57 ++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/package.json b/package.json
index 8614477..0310dbe 100644
--- a/package.json
+++ b/package.json
@@ -1,34 +1,65 @@
{
"name": "electron-fg",
"version": "1.0.0",
- "description": "",
+ "description": "electron-fg",
"main": "main.js",
"scripts": {
"start": "electron .",
- "electron:build": "electron-builder build --linux",
- "electron:serve": "vue-cli-service electron:serve --mode development",
+ "electron:build": "electron-builder --win --ia32",
+ "electron:serve": "electron:serve --mode development",
"electron:generate-icons": "electron-icon-builder --input=./icon.png --output=build --flatten",
"test": "echo \"Error: no test specified\" && exit 1"
},
"build": {
- "productName": "test",
- "appId": "com.testyx.text",
+ "productName": "electron-fg",
+ "appId": "com.whyc.fg",
+ "asar": true,
+ "files": [
+ "!dependent/**",
+ "getConfig.js",
+ "config.json",
+ "main.js",
+ "preload.js",
+ "loading.html"
+ ],
+ "directories": {
+ "output": "./release"
+ },
+ "win": {
+ "target": ["dir"],
+ "icon": "build/icons/icon.ico"
+ },
+ "nsis": {
+ "script": "setup.nsi",
+ "oneClick": false,
+ "perMachine": true,
+ "allowToChangeInstallationDirectory": true,
+ "createDesktopShortcut": true,
+ "createStartMenuShortcut": true,
+ "shortcutName": "electronFg"
+ },
"linux": {
"icon": "build/icons"
},
- "extraResources": {
- "from": "./config.json",
- "to": "."
- }
+ "extraResources": [
+ {
+ "from": "./dependent",
+ "to": "../"
+ },
+ {
+ "from": "./dependent/elevate.exe",
+ "to": "../resources/elevate.exe"
+ }
+ ]
},
"author": "",
"license": "ISC",
"devDependencies": {
- "electron-builder": "^24.12.0",
- "electron": "^29.0.0"
+ "electron": "^34.1.1",
+ "electron-builder": "^26.8.1"
},
"dependencies": {
- "@vue/cli-plugin-babel": "^5.0.8",
- "@vue/cli-service": "^5.0.8"
+ "electron-log": "^5.4.3",
+ "minimal-request-promise": "^1.5.0"
}
}
--
Gitblit v1.9.1