From e9c2c4f895c478c483a6df8fc5f649fd36f4f8b9 Mon Sep 17 00:00:00 2001 From: azivner Date: Wed, 24 Jan 2018 22:20:03 -0500 Subject: [PATCH] electron 1.8.2-beta.4 upgrade --- package-lock.json | 204 +++++++++++++++++++--------------------------- package.json | 4 +- 2 files changed, 84 insertions(+), 124 deletions(-) diff --git a/package-lock.json b/package-lock.json index 575e80216..c410a2b25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "trilium", - "version": "0.3.2", + "version": "0.4.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -33,8 +33,8 @@ "object-assign": "4.1.1", "source-map": "0.5.7", "through": "2.3.8", - "vue-hot-reload-api": "2.2.0", - "vue-template-compiler": "2.5.3", + "vue-hot-reload-api": "2.2.4", + "vue-template-compiler": "2.5.13", "vue-template-es2015-compiler": "1.6.0" } }, @@ -375,6 +375,12 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, "async-each-series": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz", @@ -402,7 +408,7 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000758", + "caniuse-db": "1.0.30000794", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "5.2.18", @@ -1076,19 +1082,19 @@ "babel-plugin-transform-es2015-unicode-regex": "6.24.1", "babel-plugin-transform-exponentiation-operator": "6.24.1", "babel-plugin-transform-regenerator": "6.26.0", - "browserslist": "2.7.0", + "browserslist": "2.11.3", "invariant": "2.2.2", "semver": "5.4.1" }, "dependencies": { "browserslist": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.7.0.tgz", - "integrity": "sha512-s34mrlczJsfbJu//mz/m9zlOy/S6tiP6El1u8iC1gTfEnzKXvxo8RAoCxS/MmojB7rd7bnfYzvKQNHykWaUWWw==", + "version": "2.11.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz", + "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000758", - "electron-to-chromium": "1.3.27" + "caniuse-lite": "1.0.30000792", + "electron-to-chromium": "1.3.31" } } } @@ -1155,7 +1161,7 @@ "dev": true, "requires": { "core-js": "2.5.1", - "regenerator-runtime": "0.11.0" + "regenerator-runtime": "0.11.1" } }, "babel-template": { @@ -1504,8 +1510,8 @@ "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", "dev": true, "requires": { - "caniuse-db": "1.0.30000758", - "electron-to-chromium": "1.3.27" + "caniuse-db": "1.0.30000794", + "electron-to-chromium": "1.3.31" } }, "btoa": { @@ -1656,21 +1662,21 @@ "dev": true, "requires": { "browserslist": "1.7.7", - "caniuse-db": "1.0.30000758", + "caniuse-db": "1.0.30000794", "lodash.memoize": "4.1.2", "lodash.uniq": "4.5.0" } }, "caniuse-db": { - "version": "1.0.30000758", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000758.tgz", - "integrity": "sha1-ojViexki6Hi2MWSULJkbhN6SyBA=", + "version": "1.0.30000794", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000794.tgz", + "integrity": "sha1-u+cRBPonfOSzYjh9VJBei4jlLzU=", "dev": true }, "caniuse-lite": { - "version": "1.0.30000758", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000758.tgz", - "integrity": "sha1-4mEUAHZlEEnPaJHtS8ZJtcjCbGk=", + "version": "1.0.30000792", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000792.tgz", + "integrity": "sha1-0M6pgfgRjzlhRxr7tDyaHlu/AzI=", "dev": true }, "capture-stack-trace": { @@ -2756,31 +2762,14 @@ "dev": true }, "detective-less": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.0.tgz", - "integrity": "sha1-Qmx4yatuMnW/ZsyRq6wAU7tFLX0=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/detective-less/-/detective-less-1.0.1.tgz", + "integrity": "sha512-xeFzlSFHChKSvDGBg/gL5K7RHB4x/xXk5PmVuOek3tIYi4tZaVpUKIkCDTY1ndOt4FVcgGd51DSn7Y/DYvCqDw==", "dev": true, "requires": { - "debug": "2.2.0", + "debug": "3.1.0", "gonzales-pe": "3.4.7", "node-source-walk": "3.3.0" - }, - "dependencies": { - "debug": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", - "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", - "dev": true, - "requires": { - "ms": "0.7.1" - } - }, - "ms": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", - "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", - "dev": true - } } }, "detective-sass": { @@ -3063,19 +3052,19 @@ "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=" }, "electron": { - "version": "1.8.2-beta.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.3.tgz", - "integrity": "sha1-Ljkcy9YnaKOzsmC48uPxZHNWeuw=", + "version": "1.8.2-beta.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.4.tgz", + "integrity": "sha1-GDayBO6s6dx3Bi7Ugg/bxsvZoZU=", "requires": { - "@types/node": "8.0.56", + "@types/node": "8.5.9", "electron-download": "3.3.0", "extract-zip": "1.6.5" }, "dependencies": { "@types/node": { - "version": "8.0.56", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz", - "integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA==" + "version": "8.5.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.5.9.tgz", + "integrity": "sha512-s+c3AjymyAccTI4hcgNFK4mToH8l+hyPDhu4LIkn71lRy56FLijGu00fyLgldjM/846Pmk9N4KFUs2P8GDs0pA==" } } }, @@ -3165,12 +3154,12 @@ "coffee-script": "1.12.7", "cson": "3.0.2", "debug": "2.6.9", - "detective-less": "1.0.0", + "detective-less": "1.0.1", "detective-sass": "2.0.1", "detective-scss": "1.0.1", "detective-stylus": "1.0.0", "graphql": "0.9.6", - "graphql-tag": "2.5.0", + "graphql-tag": "2.6.1", "istanbul": "0.4.5", "jade": "1.11.0", "js-string-escape": "1.0.1", @@ -3180,12 +3169,12 @@ "resolve": "1.4.0", "rimraf": "2.6.2", "sass-lookup": "1.1.0", - "sass.js": "0.10.6", + "sass.js": "0.10.8", "sorcery": "0.10.0", "stylus": "0.54.5", "stylus-lookup": "1.0.2", "toutsuite": "0.6.0", - "typescript": "2.6.1" + "typescript": "2.6.2" }, "dependencies": { "debug": { @@ -3441,38 +3430,21 @@ } }, "electron-prebuilt-compile": { - "version": "1.8.2-beta.2", - "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2-beta.2.tgz", - "integrity": "sha512-hXOHt+WOLnFPeU3MhRJgP+6QRQbht6MxltTPTurc5539REsvoau455rSXU16SfA/e8BVBUZ9h8NN6dkFwxuowQ==", + "version": "1.8.2-beta.4", + "resolved": "https://registry.npmjs.org/electron-prebuilt-compile/-/electron-prebuilt-compile-1.8.2-beta.4.tgz", + "integrity": "sha512-whVdRgFEDovWSFrAsbMXIiush6RQ8IV3XhYdL59zShck4U1eXGmdkaBCy+2tlkGmUGr0fRu+S4FpUx2ebBkRhQ==", "dev": true, "requires": { "babel-plugin-array-includes": "2.0.3", "babel-plugin-transform-async-to-generator": "6.24.1", "babel-preset-es2016-node5": "1.1.2", "babel-preset-react": "6.24.1", - "electron": "1.8.2-beta.2", + "electron": "1.8.2-beta.4", "electron-compile": "6.4.2", "electron-compilers": "5.9.0", "yargs": "6.6.0" }, "dependencies": { - "@types/node": { - "version": "8.0.56", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.56.tgz", - "integrity": "sha512-JAlQv3hUWbrnruuTiLDf1scd4F/TBT0LgGEe+BBeF3p/Rc3yL6RV57WJN2nK5i+BshEz1sDllwH0Fzbuo7G4QA==", - "dev": true - }, - "electron": { - "version": "1.8.2-beta.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2-beta.2.tgz", - "integrity": "sha1-tTLHEFDd0tSwDi4NNV3k51vB5f0=", - "dev": true, - "requires": { - "@types/node": "8.0.56", - "electron-download": "3.3.0", - "extract-zip": "1.6.5" - } - }, "yargs": { "version": "6.6.0", "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", @@ -3554,9 +3526,9 @@ } }, "electron-to-chromium": { - "version": "1.3.27", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz", - "integrity": "sha1-eOy4o5kGYYe7N07t412ccFZagD0=", + "version": "1.3.31", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.31.tgz", + "integrity": "sha512-XE4CLbswkZgZFn34cKFy1xaX+F5LHxeDLjY1+rsK9asDzknhbrd9g/n/01/acbU25KTsUSiLKwvlLyA+6XLUOA==", "dev": true }, "encodeurl": { @@ -3594,13 +3566,13 @@ "dev": true }, "errno": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", - "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.6.tgz", + "integrity": "sha512-IsORQDpaaSwcDP4ZZnHxgE85werpo34VYn1Ud3mq+eUsF593faR8oCZNXrROVkpFu2TsbrNhHin0aUrTsQ9vNw==", "dev": true, "optional": true, "requires": { - "prr": "0.0.0" + "prr": "1.0.1" } }, "error-ex": { @@ -5071,9 +5043,9 @@ } }, "graphql-tag": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.5.0.tgz", - "integrity": "sha1-tDv9i1urzSwgWtaAwD6YsjiTTg8=", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.6.1.tgz", + "integrity": "sha1-R4jVCfbilgfZR/xHpAxOGPc200o=", "dev": true }, "gulp-decompress": { @@ -5206,12 +5178,6 @@ "uglify-js": "2.8.29" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, "source-map": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", @@ -6101,12 +6067,6 @@ "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", "dev": true }, - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, "escodegen": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", @@ -6246,9 +6206,9 @@ "integrity": "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII=" }, "js-base64": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.3.2.tgz", - "integrity": "sha512-Y2/+DnfJJXT1/FCwUebUhLWb3QihxiSC42+ctHLGogmW2jPY6LCapMdFZXRvVP2z6qyKW7s6qncE/9gSqZiArw==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.2.tgz", + "integrity": "sha512-lLkz3IRPTNeATsKQGeltbzRK/5+bWsXBHfpZrxJAi4N30RtCtNA+rJznp4uR2+4OgkBsoeeFwONVLr4gzIVErQ==", "dev": true }, "js-string-escape": { @@ -6462,7 +6422,7 @@ "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==", "dev": true, "requires": { - "errno": "0.1.4", + "errno": "0.1.6", "graceful-fs": "4.1.11", "image-size": "0.5.5", "mime": "1.4.1", @@ -7940,7 +7900,7 @@ "dev": true, "requires": { "chalk": "1.1.3", - "js-base64": "2.3.2", + "js-base64": "2.4.2", "source-map": "0.5.7", "supports-color": "3.2.3" }, @@ -8327,9 +8287,9 @@ } }, "prr": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", - "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", + "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", "dev": true, "optional": true }, @@ -8575,9 +8535,9 @@ "dev": true }, "regenerator-runtime": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", - "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, "regenerator-transform": { @@ -8911,9 +8871,9 @@ } }, "sass.js": { - "version": "0.10.6", - "resolved": "https://registry.npmjs.org/sass.js/-/sass.js-0.10.6.tgz", - "integrity": "sha512-Yfw6VBfWYg3A9PT7OKnEoNm+E4iBUgQWjiYTwzNvXRkVkVnQEIkUAuzrttZpjgwwCE52wreZwb8rsGioy7t2xw==", + "version": "0.10.8", + "resolved": "https://registry.npmjs.org/sass.js/-/sass.js-0.10.8.tgz", + "integrity": "sha512-HK8+oaOfb5fDpILmKeSG6Cl1Uk7zujsessffLGjSEuzXfM2WCpOxUjfnVu9MuYhPlzYg10Xxv2XXaJyp/y+yug==", "dev": true }, "sax": { @@ -10225,7 +10185,7 @@ "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", "requires": { "debug": "2.6.9", - "es6-promise": "4.1.1" + "es6-promise": "4.2.4" }, "dependencies": { "debug": { @@ -10237,9 +10197,9 @@ } }, "es6-promise": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", - "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" + "version": "4.2.4", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz", + "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==" } } }, @@ -10773,9 +10733,9 @@ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, "typescript": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.1.tgz", - "integrity": "sha1-7znN6ierrAtQAkLWcmq5DgyEZjE=", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", + "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", "dev": true }, "uglify-js": { @@ -11122,15 +11082,15 @@ "dev": true }, "vue-hot-reload-api": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.0.tgz", - "integrity": "sha512-Hn0jdFiNfNx4+Nxz1vokYUsP3mwpn9r/XomLrXA+KafYaiR7LNQG1fxtpVklD4KxD5GluXRiSoWNDf0H9BdsJw==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.2.4.tgz", + "integrity": "sha512-e+ThJMYmZg4D9UnrLcr6LQxGu6YlcxkrmZGPCyIN4malcNhdeGGKxmFuM5y6ICMJJxQywLfT8MM1rYZr4LpeLw==", "dev": true }, "vue-template-compiler": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.3.tgz", - "integrity": "sha512-C7yWPyT8ZPyXv9AL1eZEZSp72qDHGSgfD80Rf2A9s2vKmMbUuRInfsDsOfYtoiN2hK4hMGMQ71xaZs2e8RnucQ==", + "version": "2.5.13", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.13.tgz", + "integrity": "sha512-15HWSgIxrGUcV0v7QRen2Y3fQsbgxXwMvjT/5XKMO0ANmaCcNh7y2OeIDTAuSGeosjb9+E1Pn2PHZ61VQWEgBQ==", "dev": true, "requires": { "de-indent": "1.0.2", diff --git a/package.json b/package.json index 7514bf72c..9f5af86f5 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "debug": "~3.1.0", "devtron": "^1.4.0", "ejs": "~2.5.7", - "electron": "^1.8.2-beta.3", + "electron": "^1.8.2-beta.4", "electron-debug": "^1.0.0", "electron-in-page-search": "^1.2.4", "express": "~4.16.2", @@ -60,7 +60,7 @@ "devDependencies": { "electron-compile": "^6.4.2", "electron-packager": "^8.0.0", - "electron-prebuilt-compile": "1.8.2-beta.2", + "electron-prebuilt-compile": "1.8.2-beta.4", "electron-rebuild": "^1.6.0", "tape": "^4.8.0", "xo": "^0.18.0"