kittyfangs
/
fchat-rising
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Electron 13

This commit is contained in:
Mr. Stallion 2021-09-10 21:20:31 -05:00
parent 4321f76b0f
commit a3fffd9876
8 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
electron/Window.vue
View File

@ -300,7 +300,8 @@
nodeIntegration: true, nodeIntegration: true,
nodeIntegrationInWorker: true, nodeIntegrationInWorker: true,
spellcheck: true, spellcheck: true,
enableRemoteModule: true enableRemoteModule: true,
contextIsolation: false
} }
} }
); );

3
electron/chat.ts
View File

@ -30,9 +30,6 @@
* @see {@link https://github.com/f-list/exported|GitHub repo} * @see {@link https://github.com/f-list/exported|GitHub repo}
*/ */
// tslint:disable-next-line:no-submodule-imports no-import-side-effect
import 'core-js/es7/global';
// import { DebugLogger } from './debug-logger'; // import { DebugLogger } from './debug-logger';
// // @ts-ignore // // @ts-ignore
// const dl = new DebugLogger('chat'); // const dl = new DebugLogger('chat');

3
electron/common.ts
View File

@ -1,6 +1,3 @@
// tslint:disable-next-line:no-submodule-imports no-import-side-effect
import 'core-js/es7/global';
import * as electron from 'electron'; import * as electron from 'electron';
import * as path from 'path'; import * as path from 'path';

2
electron/main.ts
View File

@ -178,6 +178,8 @@ function setUpWebContents(webContents: electron.WebContents): void {
webContents.on('will-navigate', openLinkExternally); webContents.on('will-navigate', openLinkExternally);
// webContents.setWindowOpenHandler(openLinkExternally);
webContents.on('new-window', openLinkExternally); webContents.on('new-window', openLinkExternally);
} }

5
electron/webpack.config.js
View File

@ -11,8 +11,7 @@ const mainConfig = {
entry: [path.join(__dirname, 'main.ts'), path.join(__dirname, 'package.json')], entry: [path.join(__dirname, 'main.ts'), path.join(__dirname, 'package.json')],
output: { output: {
path: __dirname + '/app', path: __dirname + '/app',
filename: 'main.js', filename: 'main.js'
globalObject: 'global'
}, },
context: __dirname, context: __dirname,
target: 'electron-main', target: 'electron-main',
@ -32,7 +31,6 @@ const mainConfig = {
] ]
}, },
node: { node: {
global: true,
__dirname: false, __dirname: false,
__filename: false __filename: false
}, },
@ -106,7 +104,6 @@ const mainConfig = {
] ]
}, },
node: { node: {
global: true,
__dirname: false, __dirname: false,
__filename: false __filename: false
}, },

3
electron/window.ts
View File

@ -1,6 +1,3 @@
// tslint:disable-next-line:no-submodule-imports no-import-side-effect
import 'core-js/es7/global';
import * as qs from 'querystring'; import * as qs from 'querystring';
import log from 'electron-log'; //tslint:disable-line:match-default-export-name import log from 'electron-log'; //tslint:disable-line:match-default-export-name

2
package.json
View File

@ -25,7 +25,7 @@
"copy-webpack-plugin": "^6.2.1", "copy-webpack-plugin": "^6.2.1",
"css-loader": "^5.0.0", "css-loader": "^5.0.0",
"date-fns": "^2.16.1", "date-fns": "^2.16.1",
"electron": "^11.5.0", "electron": "^13.3.0",
"electron-log": "^4.4.1", "electron-log": "^4.4.1",
"electron-packager": "~15.1.0", "electron-packager": "~15.1.0",
"electron-rebuild": "^3.2.3", "electron-rebuild": "^3.2.3",

12
yarn.lock
View File

@ -355,7 +355,7 @@
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.24.tgz#c37ac69cb2948afb4cef95f424fa0037971a9a5c" resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.24.tgz#c37ac69cb2948afb4cef95f424fa0037971a9a5c"
integrity sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ== integrity sha512-yxDeaQIAJlMav7fH5AQqPH1u8YIuhYJXYBzxaQ4PifsU0GDO38MSdmEDeRlIxrKbC6NbEaaEHDanWb+y30U8SQ==
"@types/node@^14.17.0": "@types/node@^14.17.0", "@types/node@^14.6.2":
version "14.17.15" version "14.17.15"
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz#d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.15.tgz#d5ebfb62a69074ebb85cbe0529ad917bb8f2bae8"
integrity sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA== integrity sha512-D1sdW0EcSCmNdLKBGMYb38YsHUS6JcM7yQ6sLQ9KuZ35ck7LYCKE7kYFHOO59ayFOY3zobWVZxf4KXhYHcHYFA==
@ -2661,13 +2661,13 @@ electron-winstaller@^5.0.0:
lodash.template "^4.2.2" lodash.template "^4.2.2"
temp "^0.9.0" temp "^0.9.0"
electron@^11.5.0: electron@^13.3.0:
version "11.5.0" version "13.3.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f" resolved "https://registry.yarnpkg.com/electron/-/electron-13.3.0.tgz#5f4f245723dd50fcd2c3d386a1d66fe748af404f"
integrity sha512-WjNDd6lGpxyiNjE3LhnFCAk/D9GIj1rU3GSDealVShhkkkPR3Vh4q8ErXGDl1OAO/faomVa10KoFPUN/pLbNxg== integrity sha512-d/BvOLDjI4i7yf9tqCuLL2fFGA2TrM/D9PyRpua+rJolG0qrwp/FohP02L0m+44kmPpofIo4l3NPwLmzyKKimA==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^12.0.12" "@types/node" "^14.6.2"
extract-zip "^1.0.3" extract-zip "^1.0.3"
electron@^7.0.0: electron@^7.0.0: