diff --git a/electron/addon/autoUpdater/index.js b/electron/addon/autoUpdater/index.js index 868dfa9..f5fddd8 100644 --- a/electron/addon/autoUpdater/index.js +++ b/electron/addon/autoUpdater/index.js @@ -1,6 +1,6 @@ const { app: electronApp } = require('electron'); const { autoUpdater } = require("electron-updater"); -const is = require('electron-is'); +const is = require('ee-core/utils/is'); const Log = require('ee-core/log'); const Conf = require('ee-core/config'); const Electron = require('ee-core/electron'); diff --git a/electron/addon/javaServer/server.js b/electron/addon/javaServer/server.js index 74b0838..6f2d97c 100644 --- a/electron/addon/javaServer/server.js +++ b/electron/addon/javaServer/server.js @@ -1,12 +1,11 @@ const _ = require("lodash"); const assert = require("assert"); const fs = require("fs"); -const is = require('electron-is'); const path = require("path"); const { exec, execSync } = require("child_process"); const ps = require("./ps"); const Log = require('ee-core/log'); -const Conf = require('ee-core/config'); +const is = require('ee-core/utils/is'); const UtilsPs = require('ee-core/ps'); /** diff --git a/electron/config/encrypt.js b/electron/config/encrypt.js index c170fa6..52dd86f 100644 --- a/electron/config/encrypt.js +++ b/electron/config/encrypt.js @@ -10,7 +10,7 @@ module.exports = { confusionOptions: { compact: true, stringArray: true, - stringArrayEncoding: ['base64'], + stringArrayEncoding: ['none'], deadCodeInjection: false, } }; \ No newline at end of file diff --git a/package.json b/package.json index 598217a..e6844e7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ee", - "version": "2.5.0", + "version": "3.0.0", "description": "A fast, desktop software development framework", "main": "main.js", "scripts": { @@ -112,7 +112,6 @@ "better-sqlite3": "^7.6.0", "dayjs": "^1.10.7", "ee-core": "^2.0.0", - "electron-is": "^3.0.0", "electron-updater": "^5.3.0", "lodash": "^4.17.21" }