From e4462068c4f4b636646c60fb45c0679c8d751dae Mon Sep 17 00:00:00 2001 From: Matt Huggins Date: Sat, 29 Sep 2018 19:15:40 -0500 Subject: [PATCH] =?UTF-8?q?Revert=20"Update=20electron=20to=20the=20latest?= =?UTF-8?q?=20version=20=F0=9F=9A=80=20(#556)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8624d3465977b2460f99157287f3c9c652bdb175. --- .circleci/config.yml | 2 - .../AuthenticatedLayout/Tab/index.test.js | 3 +- __tests__/setupTests.js | 5 - package.json | 4 +- .../components/DAppContainer/DAppContainer.js | 7 +- yarn.lock | 105 ++++++++++-------- 6 files changed, 61 insertions(+), 65 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b1e73051..3c9f51ce5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,8 +32,6 @@ jobs: keys: - v1-dependencies-{{ checksum "package.json" }} - v1-dependencies- - - run: sudo apt-get -y update - - run: sudo apt-get -y install libudev-dev libusb-1.0-0-dev - run: sudo yarn global add yarn@1.9.4 greenkeeper-lockfile@1 - run: yarn install - run: greenkeeper-lockfile-update diff --git a/__tests__/renderer/root/components/AuthenticatedLayout/Tab/index.test.js b/__tests__/renderer/root/components/AuthenticatedLayout/Tab/index.test.js index 09c59b276..64bfb81da 100644 --- a/__tests__/renderer/root/components/AuthenticatedLayout/Tab/index.test.js +++ b/__tests__/renderer/root/components/AuthenticatedLayout/Tab/index.test.js @@ -3,10 +3,9 @@ import { mount } from 'enzyme'; import Tab from 'root/components/AuthenticatedLayout/Tab'; import FavIcon from 'shared/images/browser/favicon.svg'; -import { EXTERNAL } from 'browser/values/browserValues'; describe('', () => { - const props = { title: 'nOS', type: EXTERNAL }; + const props = { title: 'nOS' }; describe('active prop', () => { it('renders active class', () => { diff --git a/__tests__/setupTests.js b/__tests__/setupTests.js index 6668f84df..7ba341658 100644 --- a/__tests__/setupTests.js +++ b/__tests__/setupTests.js @@ -22,8 +22,3 @@ const getSelection = () => ({ window.getSelection = getSelection; document.getSelection = getSelection; - -process.on('unhandledRejection', (error) => { - // eslint-disable-next-line no-console - console.error('Unhandled promise rejection:', error.stack); -}); diff --git a/package.json b/package.json index 57fab37ed..5c8a43706 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "classnames": "2.2.6", "connected-react-router": "4.5.0", "electron-context-menu": "0.10.0", - "electron-is-dev": "1.0.1", + "electron-is-dev": "0.3.0", "electron-json-storage": "4.1.2", "electron-localshortcut": "3.1.0", "es6-promisify": "6.0.0", @@ -87,7 +87,7 @@ "cross-env": "5.2.0", "css-loader": "1.0.0", "cssnano": "4.1.4", - "electron": "3.0.2", + "electron": "2.0.9", "electron-builder": "20.28.4", "electron-devtools-installer": "2.2.4", "electron-rebuild": "1.8.2", diff --git a/src/renderer/browser/components/DAppContainer/DAppContainer.js b/src/renderer/browser/components/DAppContainer/DAppContainer.js index 310486918..167cbdbec 100644 --- a/src/renderer/browser/components/DAppContainer/DAppContainer.js +++ b/src/renderer/browser/components/DAppContainer/DAppContainer.js @@ -227,11 +227,6 @@ export default class DAppContainer extends React.PureComponent { focusAndNotify = () => { this.webview.focus(); - - const webContents = this.webview.getWebContents && this.webview.getWebContents(); - - if (webContents) { - this.props.onFocus(webContents.getId()); - } + this.props.onFocus(this.webview.getWebContents().getId()); } } diff --git a/yarn.lock b/yarn.lock index 879ba192a..a89bb54ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2861,12 +2861,6 @@ debug@2.6.9, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.5. dependencies: ms "2.0.0" -debug@^3.0.0: - version "3.2.5" - resolved "https://registry.npmjs.org/debug/-/debug-3.2.5.tgz#c2418fbfd7a29f4d4f70ff4cea604d4b64c46407" - dependencies: - ms "^2.1.1" - debug@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" @@ -3260,29 +3254,25 @@ electron-dl@^1.2.0: pupa "^1.0.0" unused-filename "^1.0.0" -electron-download@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/electron-download/-/electron-download-4.1.1.tgz#02e69556705cc456e520f9e035556ed5a015ebe8" +electron-download@^3.0.1: + version "3.3.0" + resolved "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz#2cfd54d6966c019c4d49ad65fbe65cc9cdef68c8" dependencies: - debug "^3.0.0" - env-paths "^1.0.0" - fs-extra "^4.0.1" + debug "^2.2.0" + fs-extra "^0.30.0" + home-path "^1.0.1" minimist "^1.2.0" - nugget "^2.0.1" - path-exists "^3.0.0" - rc "^1.2.1" - semver "^5.4.1" - sumchecker "^2.0.2" + nugget "^2.0.0" + path-exists "^2.1.0" + rc "^1.1.2" + semver "^5.3.0" + sumchecker "^1.2.0" electron-is-accelerator@^0.1.0: version "0.1.2" resolved "https://registry.npmjs.org/electron-is-accelerator/-/electron-is-accelerator-0.1.2.tgz#509e510c26a56b55e17f863a4b04e111846ab27b" -electron-is-dev@1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc" - -electron-is-dev@^0.3.0: +electron-is-dev@0.3.0, electron-is-dev@^0.3.0: version "0.3.0" resolved "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-0.3.0.tgz#14e6fda5c68e9e4ecbeff9ccf037cbd7c05c5afe" @@ -3397,12 +3387,12 @@ electron-webpack@1.13.0: webpack-merge "^4.1.1" yargs "^11.0.0" -electron@3.0.2: - version "3.0.2" - resolved "https://registry.npmjs.org/electron/-/electron-3.0.2.tgz#0aed43a331b43dfe671ddb54d75fc4102d362959" +electron@2.0.9: + version "2.0.9" + resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.9.tgz#dfc863d653fa3a2dd4fea0c63303df9c0e33c602" dependencies: "@types/node" "^8.0.24" - electron-download "^4.1.0" + electron-download "^3.0.1" extract-zip "^1.0.3" elliptic@^6.0.0, elliptic@^6.4.0: @@ -3462,10 +3452,6 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -env-paths@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-1.0.0.tgz#4168133b42bb05c38a35b1ae4397c8298ab369e0" - enzyme-adapter-react-16@1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.5.0.tgz#50af8d76a45fe0915de932bd95d34cdca75c0be3" @@ -3573,6 +3559,10 @@ es6-map@^0.1.3: es6-symbol "~3.1.1" event-emitter "~0.3.5" +es6-promise@^4.0.5: + version "4.2.4" + resolved "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" + es6-promisify@6.0.0: version "6.0.0" resolved "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.0.0.tgz#b526a75eaa5ca600e960bf3d5ad98c40d75c7203" @@ -4363,6 +4353,16 @@ fs-extra-p@^4.5.2, fs-extra-p@^4.6.1: bluebird-lst "^1.0.5" fs-extra "^6.0.1" +fs-extra@^0.30.0: + version "0.30.0" + resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz#f233ffcc08d4da7d432daa449776989db1df93f0" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^2.1.0" + klaw "^1.0.0" + path-is-absolute "^1.0.0" + rimraf "^2.2.8" + fs-extra@^3.0.1: version "3.0.1" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" @@ -4371,14 +4371,6 @@ fs-extra@^3.0.1: jsonfile "^3.0.0" universalify "^0.1.0" -fs-extra@^4.0.1: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - fs-extra@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz#8abc128f7946e310135ddc93b98bddb410e7a34b" @@ -4636,7 +4628,7 @@ got@^6.7.1: unzip-response "^2.0.1" url-parse-lax "^1.0.0" -graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6: +graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9: version "4.1.11" resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" @@ -4822,6 +4814,10 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" +home-path@^1.0.1: + version "1.0.6" + resolved "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz#d549dc2465388a7f8667242c5b31588d29af29fc" + hosted-git-info@^2.1.4: version "2.6.0" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" @@ -6094,6 +6090,12 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" +jsonfile@^2.1.0: + version "2.4.0" + resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8" + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^3.0.0: version "3.0.1" resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" @@ -6157,6 +6159,12 @@ kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" +klaw@^1.0.0: + version "1.3.1" + resolved "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" + optionalDependencies: + graceful-fs "^4.1.9" + kleur@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/kleur/-/kleur-1.0.1.tgz#6b64a4a42c7226fc0319fec35904f824ad945f7e" @@ -6870,8 +6878,8 @@ nock@10.0.0: semver "^5.5.0" node-abi@^2.0.0, node-abi@^2.2.0: - version "2.4.4" - resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.4.4.tgz#410d8968809fe616dc078a181c44a370912f12fd" + version "2.4.1" + resolved "https://registry.npmjs.org/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923" dependencies: semver "^5.4.1" @@ -7134,9 +7142,9 @@ nth-check@^1.0.1, nth-check@~1.0.1: dependencies: boolbase "~1.0.0" -nugget@^2.0.1: +nugget@^2.0.0: version "2.0.1" - resolved "https://registry.yarnpkg.com/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" + resolved "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz#201095a487e1ad36081b3432fa3cada4f8d071b0" dependencies: debug "^2.1.3" minimist "^1.1.0" @@ -7507,7 +7515,7 @@ path-dirname@^1.0.0: version "1.0.2" resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" -path-exists@^2.0.0: +path-exists@^2.0.0, path-exists@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b" dependencies: @@ -8609,7 +8617,7 @@ rc-util@^4.0.4, rc-util@^4.4.0: prop-types "^15.5.10" shallowequal "^0.2.2" -rc@^1.0.1, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1: +rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7: version "1.2.8" resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: @@ -10234,11 +10242,12 @@ sugarss@^2.0.0: dependencies: postcss "^7.0.2" -sumchecker@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-2.0.2.tgz#0f42c10e5d05da5d42eea3e56c3399a37d6c5b3e" +sumchecker@^1.2.0: + version "1.3.1" + resolved "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz#79bb3b4456dd04f18ebdbc0d703a1d1daec5105d" dependencies: debug "^2.2.0" + es6-promise "^4.0.5" supports-color@^2.0.0: version "2.0.0"