diff --git a/package-lock.json b/package-lock.json index 0a7eb17..a1209b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33,7 +33,6 @@ "needle": "^2.6.0", "node-7z": "^2.0.5", "node-unrar-js": "^0.8.1", - "path-browserify": "^1.0.1", "randombytes": "^2.1.0", "rimraf": "^3.0.2", "rxjs": "~6.5.5", @@ -18899,11 +18898,6 @@ "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": { "version": "1.0.2", "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", "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": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", diff --git a/package.json b/package.json index c6778d9..a85c2e2 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ "needle": "^2.6.0", "node-7z": "^2.0.5", "node-unrar-js": "^0.8.1", - "path-browserify": "^1.0.1", "randombytes": "^2.1.0", "rimraf": "^3.0.2", "rxjs": "~6.5.5", diff --git a/src/app/core/services/electron.service.ts b/src/app/core/services/electron.service.ts index 2cb6213..7c073f2 100644 --- a/src/app/core/services/electron.service.ts +++ b/src/app/core/services/electron.service.ts @@ -5,7 +5,7 @@ import { Injectable } from '@angular/core' import * as electron from 'electron' 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({ providedIn: 'root' diff --git a/src/electron/main.ts b/src/electron/main.ts index 0ae0b4f..4dd63b0 100644 --- a/src/electron/main.ts +++ b/src/electron/main.ts @@ -4,7 +4,7 @@ import * as windowStateKeeper from 'electron-window-state' import * as path from 'path' import * as url from 'url' require('electron-unhandled')({ showDialog: true }) -require('@electron/remote/main').initialize() + // IPC Handlers import { getIPCInvokeHandlers, getIPCEmitHandlers, IPCEmitEvents } from './shared/IPCHandler' @@ -14,7 +14,10 @@ import { dataPath } from './shared/Paths' export let mainWindow: BrowserWindow const args = process.argv.slice(1) const isDevBuild = args.some(val => val == '--dev') +const remote = require('@electron/remote/main') + +remote.initialize() restrictToSingleInstance() handleOSXWindowClosed() app.on('ready', () => { @@ -97,7 +100,7 @@ function createBridgeWindow() { }) // enable the remote webcontents - require("@electron/remote/main").enable(mainWindow.webContents) + remote.enable(mainWindow.webContents) } /** diff --git a/tsconfig.json b/tsconfig.json index d0b4bf7..83919fe 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,8 +18,5 @@ "dom" ], "module": "commonjs", - }, - "paths": { - "path": ["./node_modules/path-browserify"] - }, + } } \ No newline at end of file