diff --git a/README.md b/README.md index 4b4936e..a97fef4 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ - 🍩 **为什么使用?** 桌面软件(办公方向、 个人工具),仍然是未来十几年PC端需求之一,提高工作效率 - 🍉 **简单:** 只需懂 JavaScript - 🍑 **愿景:** 所有开发者都能学会桌面软件研发 -- 🍰 **gitee:** https://gitee.com/dromara/electron-egg **3300+** +- 🍰 **gitee:** https://gitee.com/dromara/electron-egg **3400+** - 🍨 **github:** https://github.com/dromara/electron-egg **900+** - 🏆 码云最有价值开源项目 ![](https://wallace5303.gitee.io/ee/images/electron-egg/ee-zs.png) diff --git a/README.zh-CN.md b/README.zh-CN.md index 4b4936e..a97fef4 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -21,7 +21,7 @@ - 🍩 **为什么使用?** 桌面软件(办公方向、 个人工具),仍然是未来十几年PC端需求之一,提高工作效率 - 🍉 **简单:** 只需懂 JavaScript - 🍑 **愿景:** 所有开发者都能学会桌面软件研发 -- 🍰 **gitee:** https://gitee.com/dromara/electron-egg **3300+** +- 🍰 **gitee:** https://gitee.com/dromara/electron-egg **3400+** - 🍨 **github:** https://github.com/dromara/electron-egg **900+** - 🏆 码云最有价值开源项目 ![](https://wallace5303.gitee.io/ee/images/electron-egg/ee-zs.png) diff --git a/electron/config/builder.json b/electron/config/builder.json new file mode 100644 index 0000000..0d9e76d --- /dev/null +++ b/electron/config/builder.json @@ -0,0 +1,54 @@ +{ + "productName": "ee", + "appId": "com.electron.ee", + "copyright": "© 2023 哆啦好梦 Technology Co., Ltd.", + "directories": { + "output": "out" + }, + "asar": true, + "files": [ + "**/*", + "!frontend/", + "!run/", + "!logs/", + "!data/" + ], + "extraResources": { + "from": "build/extraResources/", + "to": "extraResources" + }, + "nsis": { + "oneClick": false, + "allowElevation": true, + "allowToChangeInstallationDirectory": true, + "installerIcon": "build/icons/icon.ico", + "uninstallerIcon": "build/icons/icon.ico", + "installerHeaderIcon": "build/icons/icon.ico", + "createDesktopShortcut": true, + "createStartMenuShortcut": true, + "shortcutName": "EE框架" + }, + "mac": { + "icon": "build/icons/icon.icns", + "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", + "darkModeSupport": true, + "hardenedRuntime": false + }, + "win": { + "icon": "build/icons/icon.ico", + "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", + "target": [ + { + "target": "nsis" + } + ] + }, + "linux": { + "icon": "build/icons/icon.icns", + "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", + "target": [ + "deb" + ], + "category": "Utility" + } +} \ No newline at end of file diff --git a/package.json b/package.json index 8257e14..a959c56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ee", - "version": "3.3.1", + "version": "3.4.0", "description": "A fast, desktop software development framework", "main": "main.js", "scripts": { @@ -8,113 +8,48 @@ "dev": "electron . --env=local", "reload": "nodemon --config ./electron/config/nodemon.json", "test": "set DEBUG=* && electron . --env=local", - "build-w": "electron-builder -w=nsis --x64", - "build-w-32": "electron-builder -w=nsis --ia32", - "build-w-64": "electron-builder -w=nsis --x64", - "build-w-arm64": "electron-builder -w=nsis --arm64", - "build-wz": "electron-builder -w=7z --x64", - "build-wz-32": "electron-builder -w=7z --ia32", - "build-wz-64": "electron-builder -w=7z --x64", - "build-wz-arm64": "electron-builder -w=7z --arm64", - "build-m": "electron-builder -m", - "build-m-arm64": "electron-builder -m --arm64", - "build-l": "electron-builder -l=deb --x64", - "build-l-32": "electron-builder -l=deb --ia32", - "build-l-64": "electron-builder -l=deb --x64", - "build-l-arm64": "electron-builder -l=deb --arm64", - "build-l-armv7l": "electron-builder -l=deb --armv7l", - "build-lr-64": "electron-builder -l=rpm --x64", - "build-lp-64": "electron-builder -l=pacman --x64", + "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-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-lp-64": "electron-builder --config=./electron/config/builder.json -l=pacman --x64", "rd": "ee-core rd --dist_dir=./frontend/dist", "encrypt": "ee-core encrypt", "clean": "ee-core clean", "rebuild": "electron-rebuild", "re-sqlite": "electron-rebuild -f -w better-sqlite3" }, - "build": { - "productName": "ee", - "appId": "com.electron.ee", - "copyright": "wallace5303", - "directories": { - "output": "out" - }, - "asar": true, - "files": [ - "**/*", - "!frontend/", - "!run/", - "!logs/", - "!data/" - ], - "extraResources": { - "from": "./build/extraResources/", - "to": "extraResources" - }, - "electronDownload": { - "mirror": "https://npmmirror.com/mirrors/electron/" - }, - "nsis": { - "oneClick": false, - "allowElevation": true, - "allowToChangeInstallationDirectory": true, - "installerIcon": "./build/icons/icon.ico", - "uninstallerIcon": "./build/icons/icon.ico", - "installerHeaderIcon": "./build/icons/icon.ico", - "createDesktopShortcut": true, - "createStartMenuShortcut": true, - "shortcutName": "EE框架" - }, - "publish": [ - { - "provider": "generic", - "url": "https://github.com/wallace5303/electron-egg" - } - ], - "mac": { - "icon": "./build/icons/icon.icns", - "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", - "target": [ - "dmg", - "zip" - ] - }, - "win": { - "icon": "./build/icons/icon.ico", - "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", - "target": [ - { - "target": "nsis" - } - ] - }, - "linux": { - "icon": "./build/icons/icon.icns", - "artifactName": "${productName}-${os}-${version}-${arch}.${ext}", - "target": [ - "deb" - ], - "category": "Utility" - } - }, - "repository": "https://github.com/wallace5303/ee.git", + "repository": "https://github.com/dromara/electron-egg.git", "keywords": [ - "Electron" + "Electron", + "electron-egg" ], - "author": "wallace5303, Inc <530353222@qq.com>", + "author": "哆啦好梦, Inc <530353222@qq.com>", "license": "Apache", "devDependencies": { "debug": "^4.3.3", - "electron": "^13.6.9", + "electron": "^21.4.4", "electron-builder": "^23.6.0", - "electron-rebuild": "^3.2.8", + "@electron/rebuild": "^3.2.13", "eslint": "^5.13.0", "eslint-plugin-prettier": "^3.0.1", "nodemon": "^2.0.16" }, "dependencies": { - "better-sqlite3": "^7.6.2", "dayjs": "^1.10.7", - "ee-core": "^2.2.2", + "ee-core": "^2.2.3", "electron-updater": "^5.3.0", "lodash": "^4.17.21" }