浏览代码

update third party dependencies

MaysWind 3 年之前
父节点
当前提交
9f0235c818
共有 4 个文件被更改,包括 326 次插入314 次删除
  1. 1 1
      app/scripts/services/ariaNgNativeElectronService.js
  2. 3 0
      main/main.js
  3. 311 304
      package-lock.json
  4. 11 9
      package.json

+ 1 - 1
app/scripts/services/ariaNgNativeElectronService.js

@@ -3,7 +3,7 @@
 
     angular.module('ariaNg').factory('ariaNgNativeElectronService', ['ariaNgLogService', 'ariaNgLocalizationService', function (ariaNgLogService, ariaNgLocalizationService) {
         var electron = angular.isFunction(window.nodeRequire) ? nodeRequire('electron') : {};
-        var remote = electron.remote || {
+        var remote = angular.isFunction(window.nodeRequire) ? nodeRequire('@electron/remote') : {
             require: function () {
                 return {};
             }

+ 3 - 0
main/main.js

@@ -2,6 +2,7 @@
 
 const os = require('os');
 const electron = require('electron');
+const remote = require('@electron/remote/main');
 const electronLocalshortcut = require('electron-localshortcut');
 
 const pkgfile = require('../package');
@@ -39,6 +40,7 @@ if (!app.isPackaged) {
 }
 
 app.setAppUserModelId(pkgfile.appId);
+remote.initialize();
 
 if (os.platform() === 'win32' && !cmd.argv.classic) {
     global.settings.useCustomAppTitle = true;
@@ -101,6 +103,7 @@ app.on('ready', () => {
             enableRemoteModule: true
         }
     });
+    remote.enable(core.mainWindow.webContents);
 
     let displays = electron.screen.getAllDisplays();
     let isLastPositionInScreen = false;

文件差异内容过多而无法显示
+ 311 - 304
package-lock.json


+ 11 - 9
package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
   "engines": {
-    "node": ">=8"
+    "node": ">=14"
   },
   "name": "ariang-native",
   "appId": "net.mayswind.ariang",
@@ -14,8 +14,8 @@
     "postinstall": "install-app-deps",
     "clean": "rimraf dist",
     "start": "electron .",
-    "copy-main-dependencies": "node copy-main-modules.js -s node_modules -d dist -v",
-    "copy-app-dependencies": "node copy-app-modules.js -d dist -v",
+    "copy-main-dependencies": "node copy-main-modules.js -s node_modules -d dist -V",
+    "copy-app-dependencies": "node copy-app-modules.js -d dist -V",
     "publish:win": "npm run clean && npm run copy-main-dependencies && npm run copy-app-dependencies && electron-builder --win",
     "publish:osx": "npm run clean && npm run copy-main-dependencies && npm run copy-app-dependencies && electron-builder --mac"
   },
@@ -38,13 +38,14 @@
   },
   "homepage": "http://ariang.mayswind.net/",
   "devDependencies": {
-    "electron": "^13.6.0",
-    "electron-builder": "^22.13.1",
-    "fs-extra": "^8.1.0",
-    "jsonfile": "^6.0.1",
+    "electron": "^20.3.0",
+    "electron-builder": "^23.3.3",
+    "fs-extra": "^10.1.0",
+    "jsonfile": "^6.1.0",
     "rimraf": "^3.0.2"
   },
   "dependencies": {
+    "@electron/remote": "^2.0.8",
     "admin-lte": "2.4.18",
     "angular": "1.6.10",
     "angular-animate": "1.6.10",
@@ -71,7 +72,7 @@
     "bootstrap-contextmenu": "^1.0.0",
     "echarts": "3.8.5",
     "electron-localshortcut": "^3.2.1",
-    "electron-store": "^3.3.0",
+    "electron-store": "^8.1.0",
     "font-awesome": "^4.7.0",
     "jquery": "3.4.1",
     "jquery-slimscroll": "^1.3.8",
@@ -79,9 +80,10 @@
     "natural-compare": "1.4.0",
     "parse-torrent": "9.1.5",
     "sweetalert": "^1.1.3",
-    "yargs": "^15.3.1"
+    "yargs": "^15.4.1"
   },
   "mainDependencies": [
+    "@electron/remote",
     "electron-localshortcut",
     "electron-store",
     "yargs",

部分文件因为文件数量过多而无法显示