diff --git a/.nvmrc b/.nvmrc index 26ee5b05..72587022 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -10.2.1 +10.11.0 diff --git a/.travis.yml b/.travis.yml index 54474185..53fc8c48 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,6 @@ addons: install: - nvm install - - npm install -g npm@6.4.0 - npm install before_script: diff --git a/appveyor.yml b/appveyor.yml index 4ea1e40b..79c901d1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ environment: secure: 3IebpEKmC39codi1wT6dXx8mql4/mCL1JzZ7lir7GQ5MWRnCxlED2OXbiKHHigDV CSC_LINK: c:\projects\uhk-agent\scripts\certs\windows-cert.p12 matrix: - - nodejs_version: "10.2.1" + - nodejs_version: "10.11.0" cache: - node_modules -> package.json @@ -24,7 +24,6 @@ install: - choco install chromium - set CI=true - set PATH=%APPDATA%\npm;%PATH% - - npm install -g npm@6.4.0 - node -v - npm -v - appveyor-retry npm install diff --git a/package-lock.json b/package-lock.json index 01718398..09fcb577 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7114,14 +7114,22 @@ "dev": true }, "electron": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/electron/-/electron-3.1.10.tgz", - "integrity": "sha512-IORdmdD5gWHmp3ffa+ZRD9kESJwdmQz8carDTeza6+W76dG447AUn7GmKk4cun31bLYTKb56D8pPhxa9S7kOZQ==", + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/electron/-/electron-4.2.8.tgz", + "integrity": "sha512-/D9zfs+EWLN4yLV7tu2kWyXUnZQ3CKG1cmWbXeSFXF+0dNXQ8iFpY49dqZRoHGIBImFfp2x4N3Zc5Tu7rw3PJw==", "dev": true, "requires": { - "@types/node": "^8.0.24", + "@types/node": "^10.12.18", "electron-download": "^4.1.0", "extract-zip": "^1.0.3" + }, + "dependencies": { + "@types/node": { + "version": "10.14.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.13.tgz", + "integrity": "sha512-yN/FNNW1UYsRR1wwAoyOwqvDuLDtVXnaJTZ898XIw/Q5cCaeVAlVwvsmXLX5PuiScBYwZsZU4JYSHB3TvfdwvQ==", + "dev": true + } } }, "electron-builder": { @@ -7520,9 +7528,9 @@ } }, "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, "path-exists": { diff --git a/package.json b/package.json index 94832d9f..0de33aed 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "decompress": "4.2.0", "decompress-tarbz2": "4.1.1", "devtron": "1.4.0", - "electron": "3.1.10", + "electron": "4.2.8", "electron-builder": "20.34.0", "electron-debug": "1.5.0", "electron-devtools-installer": "2.2.3",