diff --git a/package-lock.json b/package-lock.json index fef15942343cc594ac95c27fbb1f1b3f5953ded6..1b97895f19920900410b451f99bd2781fece9709 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "Parity", - "version": "1.10.0", + "name": "parity-wallet", + "version": "0.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -112,10 +112,10 @@ "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==", "dev": true, "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/etherscan": "2.1.3", "@parity/mobx": "1.1.2", - "@parity/shared": "2.2.24", + "@parity/shared": "2.2.25", "babel-runtime": "6.26.0", "bignumber.js": "4.1.0", "brace": "0.11.0", @@ -266,10 +266,10 @@ "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==", "dev": true, "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/etherscan": "2.1.3", "@parity/mobx": "1.1.2", - "@parity/shared": "2.2.24", + "@parity/shared": "2.2.25", "babel-runtime": "6.26.0", "bignumber.js": "4.1.0", "brace": "0.11.0", @@ -18675,4 +18675,4 @@ "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=" } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 416abf24698c2f28c80631ad42a9543f89b16d27..6bebe03aff634ace50b9fdf3fdcc63dcac06b891 100644 --- a/package.json +++ b/package.json @@ -179,4 +179,4 @@ "solc": "ngotchac/solc-js", "store": "1.3.20" } -} \ No newline at end of file +} diff --git a/src/Dapp/dapp.js b/src/Dapp/dapp.js index 18c18231d0b132d07475d212580d4073931a414a..ccd7fcc3d87bae02558f70665e70049e4ae28376 100644 --- a/src/Dapp/dapp.js +++ b/src/Dapp/dapp.js @@ -29,12 +29,6 @@ import HistoryStore from '@parity/shared/lib/mobx/historyStore'; import RequestsStore from '../DappRequests/store'; import styles from './dapp.css'; -let remote; - -if (isElectron()) { - remote = window.require('electron').remote; -} - const internalDapps = [].concat(viewsDapps, builtinDapps); @observer @@ -129,19 +123,30 @@ export default class Dapp extends Component { /> ) - renderWebview = (src, hash) => ( - { + const remote = window.require('electron').remote; + // Replace all backslashes by front-slashes (happens in Windows) + // Note: `dirName` contains backslashes in Windows. One would assume that + // path.join in Windows would handle everything for us, but after some time + // I realized that even in Windows path.join here bahaves like POSIX (maybe + // it's electron, maybe browser env?). Switching to '/'. -Amaury 12.03.2018 + const posixDirName = remote.getGlobal('dirName').replace(/\\/g, '/'); + const preload = `file://${path.join( + posixDirName, + '..', + '.build', + 'inject.js' + )}`; + + return - ); + />; + } render () { const { dappsUrl } = this.context.api;