From 87352988552133f55b8b8b94da4293d328527faa Mon Sep 17 00:00:00 2001 From: life Date: Fri, 26 Mar 2021 17:39:55 +0800 Subject: [PATCH] support electron 12.0.2 --- docs/version.md | 3 +- main.js | 16 +++-- package-lock.json | 128 +++++++++++++++++++++++++++++++++ package.json | 11 +-- public/js/app/service.js | 2 +- public/js/app/service_login.js | 2 +- public/js/common.js | 4 +- 7 files changed, 151 insertions(+), 15 deletions(-) create mode 100644 package-lock.json diff --git a/docs/version.md b/docs/version.md index e0361110..aac027e1 100644 --- a/docs/version.md +++ b/docs/version.md @@ -6,4 +6,5 @@ /Users/life/app/electron-v4.1.4-darwin-x64/Electron.app/Contents/MacOS/Electron . -/Users/life/app/electron-v9.0.0-beta.9-darwin-x64/Electron.app/Contents/MacOS/Electron . +/Users/life/app/electron-v9.0.0-darwin-x64/Electron.app/Contents/MacOS/Electron . +/Users/life/app/electron-v12.0.2-darwin-x64/Electron.app/Contents/MacOS/Electron . \ No newline at end of file diff --git a/main.js b/main.js index 21fa54d5..b3fe7b6c 100644 --- a/main.js +++ b/main.js @@ -1,9 +1,5 @@ // var app = require('electron').app; // Module to control application life. -const {app, BrowserWindow, crashReporter} = require('electron'); -var ipc = require('electron').ipcMain; -const electron = require('electron'); -const Menu = electron.Menu -const Tray = electron.Tray +const {app, BrowserWindow, crashReporter, Tray, Menu, ipcMain: ipc} = require('electron'); var pdfMain = require('pdf_main'); var appIcon; @@ -15,6 +11,7 @@ crashReporter.start({ autoSubmit: true }); +require('@electron/remote/main').initialize() // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the javascript object is GCed. @@ -206,7 +203,9 @@ function openIt() { transparent: false, autoHideMenuBar: true, webPreferences: { - nodeIntegration: true + nodeIntegration: true, + contextIsolation: false, // https://github.com/electron/electron/issues/27961 + enableRemoteModule: true } } ); @@ -235,9 +234,14 @@ function openIt() { arg.webPreferences = arg.webPreferences === undefined ? {} : arg.webPreferences; arg.webPreferences.nodeIntegration = true; + arg.webPreferences.contextIsolation = false; + arg.webPreferences.enableRemoteModule = false; var html = arg.html; var everWindow = mainWindow; + if (arg.icon) { + arg.icon = new Tray(__dirname + arg.icon) + } var win2 = new BrowserWindow(arg); win2.loadURL('file://' + __dirname + '/' + html); mainWindow = win2; diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..9f79e9d9 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,128 @@ +{ + "name": "Leanote", + "version": "0.7", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@electron/remote": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@electron/remote/-/remote-1.0.4.tgz", + "integrity": "sha512-kguDJRhL3ZynHrkbX8Tr7xoAzGsNgh4eqXkycXb6cgXbOgehGqkBVe+MnjSVMXz3QJykerGKPy28gqcM7AFGYw==" + }, + "adm-zip": { + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz", + "integrity": "sha1-hgbCy/HEJs6MjsABdER/1Jtur8E=" + }, + "async": { + "version": "0.9.0" + }, + "iconv-lite": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz", + "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=" + }, + "mkdirp": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz", + "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=" + }, + "nedb": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/nedb/-/nedb-1.1.1.tgz", + "integrity": "sha1-rhccePrZGcCqr9CHbbwrTdKinsk=", + "requires": { + "async": "0.2.10", + "binary-search-tree": "0.2.4", + "mkdirp": "~0.3.5", + "underscore": "~1.4.4" + }, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=" + }, + "binary-search-tree": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.4.tgz", + "integrity": "sha1-FP4QY2alnKjvtowK4ww2qv8M1RA=", + "requires": { + "underscore": "~1.4.4" + } + } + } + }, + "needle": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/needle/-/needle-0.7.10.tgz", + "integrity": "sha1-4cLbkgufr95GcJzF6fSqh8JZZW0=", + "requires": { + "iconv-lite": "^0.4.4" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz", + "integrity": "sha1-45xoJhCnkfPu3Cc4L/SeJj+R+gk=" + } + } + }, + "node-getmac": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/node-getmac/-/node-getmac-1.0.3.tgz", + "integrity": "sha1-0qol5A+uEXYjAjgbAw1YsON9aGo=" + }, + "resanitize": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz", + "integrity": "sha1-38sr8q4d8oOEOe1s0Ex4hFxTI1M=", + "requires": { + "validator": "~1.5.1" + }, + "dependencies": { + "validator": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/validator/-/validator-1.5.1.tgz", + "integrity": "sha1-erNWy7y7sACrhcQ7jNoSYhsTRMA=" + } + } + }, + "underscore": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz", + "integrity": "sha1-YaajIBBiKvoHljvzJSA88SI51gQ=" + }, + "xml2js": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.6.tgz", + "integrity": "sha1-oEFsbwxSRhE/RwZVegu2T/83hus=", + "requires": { + "sax": "0.6.x", + "xmlbuilder": ">=2.4.6" + }, + "dependencies": { + "sax": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz", + "integrity": "sha1-VjsZx8HeiS4Jv8Ty/DDjwn8JUrk=" + }, + "xmlbuilder": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz", + "integrity": "sha1-+Rb20Q1F3BcbG+Lm5nP7bgzDXQo=", + "requires": { + "lodash": "~3.5.0" + }, + "dependencies": { + "lodash": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz", + "integrity": "sha1-Gbs/TVEnjwuMgY7RRcdOz5/kDm0=" + } + } + } + } + } + } +} diff --git a/package.json b/package.json index fa2fe287..708dc620 100755 --- a/package.json +++ b/package.json @@ -1,5 +1,8 @@ { - "name" : "Leanote", - "version" : "0.7", - "main" : "main.js" -} \ No newline at end of file + "name": "Leanote", + "version": "0.7", + "main": "main.js", + "dependencies": { + "@electron/remote": "^1.0.4" + } +} diff --git a/public/js/app/service.js b/public/js/app/service.js index 7fe51a6d..5a54042d 100644 --- a/public/js/app/service.js +++ b/public/js/app/service.js @@ -1,7 +1,7 @@ var Common = require('common'); var Evt = require('evt'); -var app = require('electron').remote.app; // .require('app'); +var app = require('@electron/remote').app; // .require('app'); var basePath = app.getPath('appData') + '/leanote'; // /Users/life/Library/Application Support/Leanote'; // require('nw.gui').App.dataPath; Evt.setDataBasePath(basePath); var protocol = require('electron').protocol; // .require('protocol'); diff --git a/public/js/app/service_login.js b/public/js/app/service_login.js index e5e87370..41e485b9 100644 --- a/public/js/app/service_login.js +++ b/public/js/app/service_login.js @@ -1,7 +1,7 @@ var Common = require('common'); var Evt = require('evt'); -var app = require('electron').remote.app; // .require('app'); +var app = require('@electron/remote').app; // .require('app'); var basePath = app.getPath('appData') + '/leanote'; // /Users/life/Library/Application Support/Leanote'; // require('nw.gui').App.dataPath; Evt.setDataBasePath(basePath); diff --git a/public/js/common.js b/public/js/common.js index ca9ad38f..379d5126 100644 --- a/public/js/common.js +++ b/public/js/common.js @@ -1579,7 +1579,7 @@ function isMac() { function getMainWinParams() { if(isMac()) { return { - "icon": "public/images/logo/leanote_icon_blue.png", + "icon": "/public/images/logo/leanote.png", frame: false, transparent: false, width: 258, @@ -1589,7 +1589,7 @@ function getMainWinParams() { }; } return { - "icon": "public/images/logo/leanote_icon_blue.png", + "icon": "/public/images/logo/leanote.png", frame: true, transparent: false, width: 1100,