mirror of
https://github.com/Myxelium/Bridge-Multi.git
synced 2026-04-11 14:19:38 +00:00
Complete upgrade to electron14 and apply migrations
-- remove path-browserify
This commit is contained in:
11
package-lock.json
generated
11
package-lock.json
generated
@@ -33,7 +33,6 @@
|
|||||||
"needle": "^2.6.0",
|
"needle": "^2.6.0",
|
||||||
"node-7z": "^2.0.5",
|
"node-7z": "^2.0.5",
|
||||||
"node-unrar-js": "^0.8.1",
|
"node-unrar-js": "^0.8.1",
|
||||||
"path-browserify": "^1.0.1",
|
|
||||||
"randombytes": "^2.1.0",
|
"randombytes": "^2.1.0",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"rxjs": "~6.5.5",
|
"rxjs": "~6.5.5",
|
||||||
@@ -18899,11 +18898,6 @@
|
|||||||
"node": ">=0.10.0"
|
"node": ">=0.10.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/path-browserify": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
|
|
||||||
},
|
|
||||||
"node_modules/path-dirname": {
|
"node_modules/path-dirname": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
|
||||||
@@ -38085,11 +38079,6 @@
|
|||||||
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
|
||||||
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
|
"integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ="
|
||||||
},
|
},
|
||||||
"path-browserify": {
|
|
||||||
"version": "1.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
|
|
||||||
"integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g=="
|
|
||||||
},
|
|
||||||
"path-dirname": {
|
"path-dirname": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
|
||||||
|
|||||||
@@ -50,7 +50,6 @@
|
|||||||
"needle": "^2.6.0",
|
"needle": "^2.6.0",
|
||||||
"node-7z": "^2.0.5",
|
"node-7z": "^2.0.5",
|
||||||
"node-unrar-js": "^0.8.1",
|
"node-unrar-js": "^0.8.1",
|
||||||
"path-browserify": "^1.0.1",
|
|
||||||
"randombytes": "^2.1.0",
|
"randombytes": "^2.1.0",
|
||||||
"rimraf": "^3.0.2",
|
"rimraf": "^3.0.2",
|
||||||
"rxjs": "~6.5.5",
|
"rxjs": "~6.5.5",
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core'
|
|||||||
import * as electron from 'electron'
|
import * as electron from 'electron'
|
||||||
import { IPCInvokeEvents, IPCEmitEvents } from '../../../electron/shared/IPCHandler'
|
import { IPCInvokeEvents, IPCEmitEvents } from '../../../electron/shared/IPCHandler'
|
||||||
|
|
||||||
import { app, getCurrentWindow, dialog, session } from '@electron/remote'
|
const { app, getCurrentWindow, dialog, session } = window.require('@electron/remote')
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
providedIn: 'root'
|
providedIn: 'root'
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import * as windowStateKeeper from 'electron-window-state'
|
|||||||
import * as path from 'path'
|
import * as path from 'path'
|
||||||
import * as url from 'url'
|
import * as url from 'url'
|
||||||
require('electron-unhandled')({ showDialog: true })
|
require('electron-unhandled')({ showDialog: true })
|
||||||
require('@electron/remote/main').initialize()
|
|
||||||
|
|
||||||
// IPC Handlers
|
// IPC Handlers
|
||||||
import { getIPCInvokeHandlers, getIPCEmitHandlers, IPCEmitEvents } from './shared/IPCHandler'
|
import { getIPCInvokeHandlers, getIPCEmitHandlers, IPCEmitEvents } from './shared/IPCHandler'
|
||||||
@@ -14,7 +14,10 @@ import { dataPath } from './shared/Paths'
|
|||||||
export let mainWindow: BrowserWindow
|
export let mainWindow: BrowserWindow
|
||||||
const args = process.argv.slice(1)
|
const args = process.argv.slice(1)
|
||||||
const isDevBuild = args.some(val => val == '--dev')
|
const isDevBuild = args.some(val => val == '--dev')
|
||||||
|
const remote = require('@electron/remote/main')
|
||||||
|
|
||||||
|
|
||||||
|
remote.initialize()
|
||||||
restrictToSingleInstance()
|
restrictToSingleInstance()
|
||||||
handleOSXWindowClosed()
|
handleOSXWindowClosed()
|
||||||
app.on('ready', () => {
|
app.on('ready', () => {
|
||||||
@@ -97,7 +100,7 @@ function createBridgeWindow() {
|
|||||||
})
|
})
|
||||||
|
|
||||||
// enable the remote webcontents
|
// enable the remote webcontents
|
||||||
require("@electron/remote/main").enable(mainWindow.webContents)
|
remote.enable(mainWindow.webContents)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,8 +18,5 @@
|
|||||||
"dom"
|
"dom"
|
||||||
],
|
],
|
||||||
"module": "commonjs",
|
"module": "commonjs",
|
||||||
},
|
}
|
||||||
"paths": {
|
|
||||||
"path": ["./node_modules/path-browserify"]
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user