From 8c99f71dfd5b6ddab7298c8638ec906eb76e6607 Mon Sep 17 00:00:00 2001 From: TheNerdicCoder Date: Wed, 5 Jun 2019 21:53:50 +0300 Subject: [PATCH 1/4] Updating blockstack.js library to version 19.2.1 --- CHANGELOG.md | 5 + android/app/build.gradle | 4 +- package-lock.json | 1441 +++++++++-------- package.json | 8 +- ...19.1.0.min.js => blockstack-19.2.1.min.js} | 1233 +++++++------- src/index.html | 2 +- src/pages/app-photo/app-photo.tsx | 28 +- src/pages/app-root/app-root.tsx | 4 +- src/pages/app-settings/app-settings.tsx | 2 +- src/services/albums-service.ts | 5 +- src/services/photos-service.ts | 23 +- src/services/storage-service.ts | 4 +- 12 files changed, 1453 insertions(+), 1306 deletions(-) rename src/assets/{blockstack-19.1.0.min.js => blockstack-19.2.1.min.js} (99%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2200a07..1df83f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## v4.2.0 (05/06/2019) + +- [**enhancement**] Updating blockstack.js library to version 19.2.1 +- [**bug**] Fix deletion of photos from the photo viewer getting stuck on black page + ## v4.1.0 (01/06/2019) - [**enhancement**] New setting for clearing photos cache diff --git a/android/app/build.gradle b/android/app/build.gradle index ddfc0a4..639fe7e 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "com.nerdiccoder.blockphotos" minSdkVersion 21 targetSdkVersion 28 - versionCode 8 - versionName "4.1" + versionCode 9 + versionName "4.2" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/package-lock.json b/package-lock.json index 358eafc..d9529d8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "block-photos", - "version": "4.1.0", + "version": "4.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -14,17 +14,17 @@ } }, "@babel/core": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.4.tgz", - "integrity": "sha512-lQgGX3FPRgbz2SKmhMtYgJvVzGZrmjaF4apZ2bLwofAKiSjxU0drPh4S/VasyYXwaTs+A1gvQ45BN8SQJzHsQQ==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.4.5.tgz", + "integrity": "sha512-OvjIh6aqXtlsA8ujtGKfC7LYWksYSX8yQcM8Ay3LuvVeQ63lcOKgoZWVqcpFwkd29aYU9rVx7jxhfhiEDV9MZA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "@babel/generator": "^7.4.4", "@babel/helpers": "^7.4.4", - "@babel/parser": "^7.4.4", + "@babel/parser": "^7.4.5", "@babel/template": "^7.4.4", - "@babel/traverse": "^7.4.4", + "@babel/traverse": "^7.4.5", "@babel/types": "^7.4.4", "convert-source-map": "^1.1.0", "debug": "^4.1.0", @@ -137,9 +137,9 @@ } }, "@babel/parser": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.4.tgz", - "integrity": "sha512-5pCS4mOsL+ANsFZGdvNLybx4wtqAZJ0MJjMHxvzI3bvIsz6sQvzW8XX92EYIkiPtIvcfG3Aj+Ir5VNyjnZhP7w==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.4.5.tgz", + "integrity": "sha512-9mUqkL1FF5T7f0WDFfAoDdiMVPWsdD1gZYzSnaXsxUCUqzuch/8of9G3VUSNiZmMBoRxT3neyVsqeiL/ZPcjew==", "dev": true }, "@babel/plugin-syntax-object-rest-spread": { @@ -152,9 +152,9 @@ } }, "@babel/runtime": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.4.tgz", - "integrity": "sha512-w0+uT71b6Yi7i5SE0co4NioIpSYS6lLiXvCzWzGSKvpK5vdQtCbICHMj+gbAKAOtxiV6HsVh/MBdaF9EQ6faSg==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", "dev": true, "optional": true, "requires": { @@ -173,16 +173,16 @@ } }, "@babel/traverse": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.4.tgz", - "integrity": "sha512-Gw6qqkw/e6AGzlyj9KnkabJX7VcubqPtkUQVAwkc0wUMldr3A/hezNB3Rc5eIvId95iSGkGIOe5hh1kMKf951A==", + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.4.5.tgz", + "integrity": "sha512-Vc+qjynwkjRmIFGxy0KYoPj4FdVDxLej89kMHFsWScq999uX+pwcX4v9mWRjW0KcAYTPAuVQl2LKP1wEVLsp+A==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", "@babel/generator": "^7.4.4", "@babel/helper-function-name": "^7.1.0", "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.4.4", + "@babel/parser": "^7.4.5", "@babel/types": "^7.4.4", "debug": "^4.1.0", "globals": "^11.1.0", @@ -278,16 +278,16 @@ } }, "@electron-forge/async-ora": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.34.tgz", - "integrity": "sha512-gs0RMuqIbGregjr8LnbYRov/5EsPCeWwFzgbB8QWWcvBTHbzkjWCBw2u/8dhQQ7bvH99IlFVSCMfonI0dXAfDA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.39.tgz", + "integrity": "sha512-cOIFplx+oD4ENxeVQO2AR4OCkJkJBWpZcWMFqQiICoe3X33KdvWs4GuOD3Mkt7SC1mcsB021mku/MDjx1WOywg==", "dev": true, "requires": { "colors": "^1.2.0", "debug": "^4.1.0", - "log-symbols": "^2.0.0", + "log-symbols": "^3.0.0", "ora": "^3.0.0", - "pretty-ms": "^4.0.0" + "pretty-ms": "^5.0.0" }, "dependencies": { "cli-spinners": { @@ -305,6 +305,15 @@ "ms": "^2.1.1" } }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + } + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -323,24 +332,35 @@ "log-symbols": "^2.2.0", "strip-ansi": "^5.2.0", "wcwidth": "^1.0.1" + }, + "dependencies": { + "log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "requires": { + "chalk": "^2.0.1" + } + } } } } }, "@electron-forge/cli": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.34.tgz", - "integrity": "sha512-I7sM3XqERwNyioq6ZhxPOsJZXnK+73GgLSP0E5+hqgktMbfaamB16VPWXwbd2u4cd2/Ch4nyeP8Z2OGVTnFMoA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/cli/-/cli-6.0.0-beta.39.tgz", + "integrity": "sha512-Jk7lWwQrWNV1xJBjlUXgkDGPxwvMIJ/SrnYKvsQqsm9VRGVByPX4cw1qnnATgkX9rXsNi2+PZzM2JrS/7KH5CQ==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34", - "@electron-forge/core": "6.0.0-beta.34", + "@electron-forge/async-ora": "6.0.0-beta.39", + "@electron-forge/core": "6.0.0-beta.39", "colors": "^1.2.0", "commander": "^2.9.0", "debug": "^4.1.0", "fs-extra": "^7.0.0", - "inquirer": "^6.2.0", - "semver": "^5.3.0" + "inquirer": "^6.3.1", + "semver": "^6.1.0" }, "dependencies": { "debug": { @@ -368,44 +388,52 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true + }, + "semver": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", + "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==", + "dev": true } } }, "@electron-forge/core": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.34.tgz", - "integrity": "sha512-Tn4xkYVQybhVdy+/6jNSbnhcJHf3JK436OpQsyEmDfwakYZWHqhSpQzig3XasU4NdG+LyUsO8b4bQRQ3DQdNHw==", - "dev": true, - "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34", - "@electron-forge/installer-base": "6.0.0-beta.34", - "@electron-forge/installer-deb": "6.0.0-beta.34", - "@electron-forge/installer-dmg": "6.0.0-beta.34", - "@electron-forge/installer-exe": "6.0.0-beta.34", - "@electron-forge/installer-rpm": "6.0.0-beta.34", - "@electron-forge/installer-zip": "6.0.0-beta.34", - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/plugin-base": "6.0.0-beta.34", - "@electron-forge/publisher-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/core/-/core-6.0.0-beta.39.tgz", + "integrity": "sha512-+looRIJUlvVreb2kQXeQEnZAqNYnLsDK+FD0BvaBY2JRWYY3DMCQZ9ZE768mNT2eZELihMrQRyeMJNAvsmTNqw==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.39", + "@electron-forge/installer-base": "6.0.0-beta.39", + "@electron-forge/installer-deb": "6.0.0-beta.39", + "@electron-forge/installer-dmg": "6.0.0-beta.39", + "@electron-forge/installer-exe": "6.0.0-beta.39", + "@electron-forge/installer-rpm": "6.0.0-beta.39", + "@electron-forge/installer-zip": "6.0.0-beta.39", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/plugin-base": "6.0.0-beta.39", + "@electron-forge/publisher-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", + "@electron-forge/template-webpack": "6.0.0-beta.39", "colors": "^1.2.0", "cross-spawn-promise": "^0.10.1", "debug": "^4.1.0", + "electron-download": "^4.1.1", "electron-packager": "^13.0.0", "electron-rebuild": "^1.6.0", "fs-extra": "^7.0.0", - "glob": "^7.1.1", + "glob": "^7.1.4", "lodash.merge": "^4.6.0", "lodash.template": "^4.4.0", - "log-symbols": "^2.0.0", - "node-fetch": "^2.0.0", + "log-symbols": "^3.0.0", + "node-fetch": "^2.6.0", "nugget": "^2.0.1", "pify": "^4.0.0", "resolve-package": "^1.0.1", - "semver": "^5.3.0", - "source-map-support": "^0.5.4", + "semver": "^6.1.0", + "source-map-support": "^0.5.12", "sudo-prompt": "^8.0.0", - "username": "^4.0.0", + "username": "^5.0.0", "yarn-or-npm": "^2.0.2" }, "dependencies": { @@ -429,31 +457,52 @@ "universalify": "^0.1.0" } }, + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + } + }, "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==", "dev": true + }, + "node-fetch": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz", + "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==", + "dev": true + }, + "semver": { + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", + "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==", + "dev": true } } }, "@electron-forge/installer-base": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.34.tgz", - "integrity": "sha512-LAblvKIiyewJo8sNpLuXCbrMSMpEJZK6yD/CSI2nE5TvpLXwFM/Tp6emmUiLpVi2qo7+kLCf/WJx4sTcDlVVKg==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.39.tgz", + "integrity": "sha512-yH3w2cEswVZmDFZwaVB1Uac5/Ep3aiTHe1FCDAlEMUEi9X6z81jEW/Anqy5M3EntQmjnGdiSlCy75ilxsqbuSQ==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34" + "@electron-forge/async-ora": "6.0.0-beta.39" } }, "@electron-forge/installer-darwin": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.34.tgz", - "integrity": "sha512-QIFMfNW0F/XJU0Y7cg+gOOMNverymuG7o9xdcQPXPQ6Mu4If8EkNgUtXtrOUvIJoC7wpfpipHDGGYvursT5VyQ==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.39.tgz", + "integrity": "sha512-4IXl+6wz3HSNLOBfF/leffJvEu1nBxUHu1eVNqD71Y925wOHP71a+s03H1j8ec9F/THyOzVdDdGqUmLckzegNQ==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34", - "@electron-forge/installer-base": "6.0.0-beta.34", + "@electron-forge/async-ora": "6.0.0-beta.39", + "@electron-forge/installer-base": "6.0.0-beta.39", "fs-extra": "^7.0.0", "pify": "^4.0.0", "sudo-prompt": "^8.0.0" @@ -473,21 +522,21 @@ } }, "@electron-forge/installer-deb": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.34.tgz", - "integrity": "sha512-YsAFAgsuY6fTi4n8EFmiiG+btf2/RKaEkNS4Yz2UaFBbAnKzHsNTpqQtKG8q7Xz5z6NZbqNklqSYY4ljVpjgow==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.39.tgz", + "integrity": "sha512-mQcPO+ZDHjX2UQ04HMCGHMa1V0i4ZZxmypbFPxQYLRtM4CXJLiMLAXzAJ7yi4IHw9hZCbdP1VzpHOuobs30ssw==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.34" + "@electron-forge/installer-linux": "6.0.0-beta.39" } }, "@electron-forge/installer-dmg": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.34.tgz", - "integrity": "sha512-oINnOUS72VUmAmotZKi/UqllndhBaGC+g/IduMDhpafiB8wef0bQsRT9hYkIIGw77hPT6xtGaTFeAxR888L4kg==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.39.tgz", + "integrity": "sha512-djRHxKNe3j2XfR4hDbb+MYF8wSKXbgytlhJqc6+DrbBVcxbftUfDeHQWDkKXs6kKb2C0HMKNWshbFvbjWCXWLg==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.34", + "@electron-forge/installer-darwin": "6.0.0-beta.39", "cross-spawn-promise": "^0.10.1", "debug": "^4.1.0", "fs-extra": "^7.0.0" @@ -522,42 +571,42 @@ } }, "@electron-forge/installer-exe": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.34.tgz", - "integrity": "sha512-x+RNl2VMHzuZDrCnxmcen3yLxpPXbjNexFNzyzH455+AINkaE+hnZumlJhem0slftQsD5/7pZRzPdRa9SWbPvg==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.39.tgz", + "integrity": "sha512-/f+g/4UFd7xOjdWJfnp6/Uww17CoONVdiOJDWCHHhCZKBGkpC7xCaIqvYb7JUR2B8ku5DGCR9smj1A5rHOTwMA==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.34", - "opn": "^5.0.0" + "@electron-forge/installer-base": "6.0.0-beta.39", + "open": "^6.0.0" } }, "@electron-forge/installer-linux": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.34.tgz", - "integrity": "sha512-DTPIpGlCgw7Ci4gPP5HrrENPt2rHwUFD48heNlousAnHyH3SfqkRCa8zdWL4xPQAfhCWZsO2iifm/2elUfL9Ew==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.39.tgz", + "integrity": "sha512-xqFAse14F6SgZMSiTCwGszsUv2sFaueRdGznoiswwzGtTldwOYmJaQfLL13NOimb9cELRxThN4fDR26BLTbH8A==", "dev": true, "requires": { - "@electron-forge/installer-base": "6.0.0-beta.34", + "@electron-forge/installer-base": "6.0.0-beta.39", "pify": "^4.0.0", "sudo-prompt": "^8.0.0" } }, "@electron-forge/installer-rpm": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.34.tgz", - "integrity": "sha512-AO9np5Ut5ut6nsUtug0mh9e9esh9JZraSQQ2vw/TwsBxPvE+haBmHuOdCraZ0w5Nm0MDSElSGTUEilVGANeKQA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.39.tgz", + "integrity": "sha512-Og7ppjXKUeM6EwrUuWav+ubAOcpEljwMPSy3ptG0356k7xB+zqqZ381NYnlzVnbgmabyo4hAzS8iPEBHZABs8w==", "dev": true, "requires": { - "@electron-forge/installer-linux": "6.0.0-beta.34" + "@electron-forge/installer-linux": "6.0.0-beta.39" } }, "@electron-forge/installer-zip": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.34.tgz", - "integrity": "sha512-UwI91T6PggAVQ7oMBSCi755aQrog4gJOjH9oBe7hnxU1fZslCVhUfw7DCpTFujSi48VTOgZ7dQcgOkZvbG9uCA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.39.tgz", + "integrity": "sha512-Arko/9ZmM2WUINAOB8iu9Uk54ArsqSyNJMIC8dGVTfjNNlC9s7ku0/sLTTk57Sq/uqmP2sbx8rzT1BMeDgRMbw==", "dev": true, "requires": { - "@electron-forge/installer-darwin": "6.0.0-beta.34", + "@electron-forge/installer-darwin": "6.0.0-beta.39", "cross-spawn-promise": "^0.10.1", "fs-extra": "^7.0.0" }, @@ -576,13 +625,13 @@ } }, "@electron-forge/maker-appx": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-appx/-/maker-appx-6.0.0-beta.34.tgz", - "integrity": "sha512-jDwC5ELfPTdoP6RFX7ULUhQqZ9d075uqcYVaT/ifoROtp4Q6lcny8crxcFtDe/soyWJZLf5K2di287RL6sH2/A==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-appx/-/maker-appx-6.0.0-beta.39.tgz", + "integrity": "sha512-PDFcbmhqgjVQ7kN4VsGaTH/ZUbYwJXhCCnNyzWEMzaj+ZTkgs48T/bdsJGLQAHtvliVCa2THROfFVhVIIei3Gg==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", "cross-spawn": "^6.0.4", "electron-windows-store": "^2.1.0", "fs-extra": "^7.0.0", @@ -617,12 +666,12 @@ } }, "@electron-forge/maker-base": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.34.tgz", - "integrity": "sha512-uBIrhQd8THRHQt6yRd/5msSK1fNYQQQn1V6SYV//388U3Emk3YeKD5ICZUoY8dR7RCDEQgRCEwD9wYQxJkfZwQ==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.39.tgz", + "integrity": "sha512-+MncNR5NyioGOmyW9KWeORd9q4xyn2q5VSbiNlCa63C1LJQXSbLfHOaXkDxa0RAdwhzapcL1tPRN0PHPDAAJKQ==", "dev": true, "requires": { - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/shared-types": "6.0.0-beta.39", "fs-extra": "^7.0.0" }, "dependencies": { @@ -640,24 +689,24 @@ } }, "@electron-forge/maker-deb": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.34.tgz", - "integrity": "sha512-dfrbHNghG6bvq/fgcjEmbdnQ9mwvUe14PCxN9nmPOx3iMuHKr5OqXgv3QOpzEWr0arkdgFflkPqAoNzutVdaIw==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.39.tgz", + "integrity": "sha512-o998YYRCwnRsCZDOWGxT2z+Ghe143DqtNvcay448h3KGywA2NGQKaKmDv+E1fTK/bLoYDWjOq+nOXnIWMwM72A==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", - "electron-installer-debian": "^1.1.0" + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", + "electron-installer-debian": "^1.2.0" } }, "@electron-forge/maker-dmg": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-6.0.0-beta.34.tgz", - "integrity": "sha512-i6H+grTMrTDtMqzDWXXf/myEX1HeeNSpBYELVnqI/MqyTetmF8AZMsxGriv5hqJjXAjJu+EVBOaOG3HSkPkOSA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-dmg/-/maker-dmg-6.0.0-beta.39.tgz", + "integrity": "sha512-fr26vVd4se6MxCnXS16tw6ZYmq5Tq1zCwDCh4uVpxrpHrso7N7eUxGESsDad1orCThQdwAsWGJVf0g57Vk5cwA==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", "electron-installer-dmg": "^2.0.0", "fs-extra": "^7.0.0" }, @@ -676,35 +725,35 @@ } }, "@electron-forge/maker-pkg": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-pkg/-/maker-pkg-6.0.0-beta.34.tgz", - "integrity": "sha512-z0ehRcWhi3j/AdnOUgtoVK/B8NUxzJ++99L/ffogq4ddk9qSFs6iGQsJx6cUsKEdiTuqckcqeF4XRIu/iKG9qQ==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-pkg/-/maker-pkg-6.0.0-beta.39.tgz", + "integrity": "sha512-oslwbELQX9+YFLKctO5sAKKDkhS0mH9awOn7uJpsoRthaStdZdJRpwoAUmACW+ZKoPVXltjUbifmZkhhAvyrnA==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", "electron-osx-sign": "^0.4.10" } }, "@electron-forge/maker-rpm": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.34.tgz", - "integrity": "sha512-8DhOX/Bn4Ku899KGmVWNGWegNtocDIPtQfAL3M0sP277B62Pjx6EZx82v9hm5jGAUdiNhEE+25O2bdoLajEOjw==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.39.tgz", + "integrity": "sha512-WeRQIdDb22/wYn1kvpKOejyDUdYS2jctp0/EKq3+3N1LLfgPfE6zyx6H0/pXd0by2FSHvwtMiYmBuMs7VuGfJw==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", - "electron-installer-redhat": "^1.0.0" + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", + "electron-installer-redhat": "^1.1.0" } }, "@electron-forge/maker-squirrel": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.34.tgz", - "integrity": "sha512-7j70q2yGB0X65ToWhLH+OxBMunSW7DaNVRHGV5Ef/fXDiKIeRNcrBD4l/FxtakhEdhHMLjEyAdSA2Is7iTYkzg==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.39.tgz", + "integrity": "sha512-sDx7PKzf+pND3mAQoQ9D0ikkIhxEAr+bFHhi5QFXK55Y1QExKzAFja+3dLKVNwDmmvLcy1BNp/g9f4F7sNCHww==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", "electron-winstaller": "^3.0.4", "fs-extra": "^7.0.0" }, @@ -723,13 +772,13 @@ } }, "@electron-forge/maker-zip": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.34.tgz", - "integrity": "sha512-kDMVcTsMlRN7tSQJYX3lApt08p63zHfkuIcPHBpV9fEOJABZK5iHhwNvx3U3x+Syp2ABRDEpGksjCvmBkyp5fw==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.39.tgz", + "integrity": "sha512-NQ5M6Z2mxlRAbgu/V9BWAjKaow0fYtr9ml3sMfwtidxk8vPYY/KeW/UyT3Uf6Abj7sv8itfHeAyfprvyF4a9dg==", "dev": true, "requires": { - "@electron-forge/maker-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", + "@electron-forge/maker-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", "cross-zip": "^2.1.5", "fs-extra": "^7.0.0", "pify": "^4.0.0" @@ -749,33 +798,33 @@ } }, "@electron-forge/plugin-base": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.34.tgz", - "integrity": "sha512-+mlm7PjwB9ZLzrucDDABPw1DB+efg3MZG3Szvt1T9fr10NdDpZQebBGWjIymoY9ALtFrapv0tdOmjfEDAOm1Zw==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.39.tgz", + "integrity": "sha512-dJHYQsIiNeViIKfxzh1hfJ4EjcqF9Ir1QNJymbCdQxaJJYxMh7aLPs8fK8HwfhNVRgDjT+YvxWF9Ke5ZEST4CA==", "dev": true, "requires": { - "@electron-forge/shared-types": "6.0.0-beta.34" + "@electron-forge/shared-types": "6.0.0-beta.39" } }, "@electron-forge/publisher-base": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.34.tgz", - "integrity": "sha512-XgdQz7p+pp7Lg9OqQxgd+YAVHCBu/BpJOFcu28tHUxMwKoSMgidVDsoFx9v+JdCyzk3/pRzrmvsDwZNhYXtszA==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.39.tgz", + "integrity": "sha512-oHMbyW13KqBQCF2zUto6Za8YBjApzNdDxBsE7h4wj5mPbHE+lNt7mG2uxRuuTOr6jC1c17WUz6/C+D5llZWBAw==", "dev": true }, "@electron-forge/publisher-github": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.34.tgz", - "integrity": "sha512-Io3Pl4tWVjw+7xlogcbSCfZYrsjIJj/KPI3CnVZQxkamxOrnweexdVn432+Qjzk9Ar36NvpTBuuwKxMKcKvs/A==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.39.tgz", + "integrity": "sha512-TIgEqEkUYFDosC/ab3X1RWYF1UK9+tAW1cmBC4aIlqqsus8jNoimPRL2kRDco5sxlE6txwjs9UouXLnR9sawDw==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34", - "@electron-forge/publisher-base": "6.0.0-beta.34", - "@electron-forge/shared-types": "6.0.0-beta.34", - "@octokit/rest": "^16.0.1", + "@electron-forge/async-ora": "6.0.0-beta.39", + "@electron-forge/publisher-base": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", + "@octokit/rest": "^16.26.0", "fs-extra": "^7.0.0", "lodash.merge": "^4.6.0", - "mime-types": "^2.1.22" + "mime-types": "^2.1.24" }, "dependencies": { "fs-extra": { @@ -792,12 +841,12 @@ } }, "@electron-forge/shared-types": { - "version": "6.0.0-beta.34", - "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.34.tgz", - "integrity": "sha512-8KOgoG08nm8Fx2sK+QznsMNwlXcQ5OB+mZZpkn7pRuIQIUGQ+xZ+r90vJ3uKiZQSzHyQXDe1LkldCNL6Hgk0Pw==", + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.39.tgz", + "integrity": "sha512-q7+kjcYKDHgYCuRXHct3wbtlWOAsT6iSOYVSIE1LOBfsVQR616jvJerk/8EqvcBUCyxkQxM+Jcz10jctj1ra6g==", "dev": true, "requires": { - "@electron-forge/async-ora": "6.0.0-beta.34", + "@electron-forge/async-ora": "6.0.0-beta.39", "@types/electron-packager": "^13.0.0", "electron-rebuild": "^1.6.0", "ora": "^3.0.0" @@ -825,6 +874,30 @@ } } }, + "@electron-forge/template-webpack": { + "version": "6.0.0-beta.39", + "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.39.tgz", + "integrity": "sha512-BOKiXbV7g4LEAzOU8PvCeFmNXenhAJYu8EHt4bXEEDEuVOMPjmLjyIvWKiRiDW4zu4RgRliT6MPIv8gBUIQfHQ==", + "dev": true, + "requires": { + "@electron-forge/async-ora": "6.0.0-beta.39", + "@electron-forge/shared-types": "6.0.0-beta.39", + "fs-extra": "^7.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } + } + }, "@ionic/core": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/@ionic/core/-/core-4.4.2.tgz", @@ -852,6 +925,41 @@ } } }, + "@jest/core": { + "version": "24.8.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-24.8.0.tgz", + "integrity": "sha512-R9rhAJwCBQzaRnrRgAdVfnglUuATXdwTRsYqs6NMdVcAl5euG8LtWDe+fVkN27YfKVBW61IojVsXKaOmSnqd/A==", + "dev": true, + "requires": { + "@jest/console": "^24.7.1", + "@jest/reporters": "^24.8.0", + "@jest/test-result": "^24.8.0", + "@jest/transform": "^24.8.0", + "@jest/types": "^24.8.0", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "graceful-fs": "^4.1.15", + "jest-changed-files": "^24.8.0", + "jest-config": "^24.8.0", + "jest-haste-map": "^24.8.0", + "jest-message-util": "^24.8.0", + "jest-regex-util": "^24.3.0", + "jest-resolve-dependencies": "^24.8.0", + "jest-runner": "^24.8.0", + "jest-runtime": "^24.8.0", + "jest-snapshot": "^24.8.0", + "jest-util": "^24.8.0", + "jest-validate": "^24.8.0", + "jest-watcher": "^24.8.0", + "micromatch": "^3.1.10", + "p-each-series": "^1.0.0", + "pirates": "^4.0.1", + "realpath-native": "^1.1.0", + "rimraf": "^2.5.4", + "strip-ansi": "^5.0.0" + } + }, "@jest/environment": { "version": "24.8.0", "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-24.8.0.tgz", @@ -875,6 +983,43 @@ "jest-mock": "^24.8.0" } }, + "@jest/reporters": { + "version": "24.8.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-24.8.0.tgz", + "integrity": "sha512-eZ9TyUYpyIIXfYCrw0UHUWUvE35vx5I92HGMgS93Pv7du+GHIzl+/vh8Qj9MCWFK/4TqyttVBPakWMOfZRIfxw==", + "dev": true, + "requires": { + "@jest/environment": "^24.8.0", + "@jest/test-result": "^24.8.0", + "@jest/transform": "^24.8.0", + "@jest/types": "^24.8.0", + "chalk": "^2.0.1", + "exit": "^0.1.2", + "glob": "^7.1.2", + "istanbul-lib-coverage": "^2.0.2", + "istanbul-lib-instrument": "^3.0.1", + "istanbul-lib-report": "^2.0.4", + "istanbul-lib-source-maps": "^3.0.1", + "istanbul-reports": "^2.1.1", + "jest-haste-map": "^24.8.0", + "jest-resolve": "^24.8.0", + "jest-runtime": "^24.8.0", + "jest-util": "^24.8.0", + "jest-worker": "^24.6.0", + "node-notifier": "^5.2.1", + "slash": "^2.0.0", + "source-map": "^0.6.0", + "string-length": "^2.0.0" + }, + "dependencies": { + "slash": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", + "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "dev": true + } + } + }, "@jest/source-map": { "version": "24.3.0", "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-24.3.0.tgz", @@ -960,9 +1105,9 @@ } }, "@octokit/endpoint": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.2.tgz", - "integrity": "sha512-bBGGmcRFq1x0jrB29G/9KjYmO3cdHfk3476B2JOHRvLsNw1Pn3l+ZvbiqtcO9qAS4Ti+zFedLB84ziHZRZclQA==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-5.1.4.tgz", + "integrity": "sha512-DypS8gbbcc9rlOCDW0wV9a+B18+ylduj6PpxeE+qa3IK1h5b0eW4CKj5pxxXWOZUYhEKwgOnh3+Q+Y/hx/bOPw==", "dev": true, "requires": { "deepmerge": "3.2.0", @@ -1005,9 +1150,9 @@ } }, "@octokit/rest": { - "version": "16.25.6", - "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.25.6.tgz", - "integrity": "sha512-pUM6n8OKo2lyr8zxdgkeWrqRZvnKhor420KrbcrhD7L2tJJ9VEjE/yVGySfswbMjOKJMcIGWDHfA7b3JuuueEw==", + "version": "16.27.3", + "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-16.27.3.tgz", + "integrity": "sha512-WWH/SHF4kus6FG+EAfX7/JYH70EjgFYa4AAd2Lf1hgmgzodhrsoxpXPSZliZ5BdJruZPMP7ZYaPoTrYCCKYzmQ==", "dev": true, "requires": { "@octokit/request": "^4.0.1", @@ -1026,59 +1171,59 @@ } }, "@sentry/browser": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.3.0.tgz", - "integrity": "sha512-MV02kS3Q5hv8/CW0nsjD/bOwWAq75aSFzebidwLfl6fvRSmuDsy5bjufr7a3ZK4SyYEe8GakqfQqqr81Y0vlVw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.4.0.tgz", + "integrity": "sha512-lsGJqryHXrnWRkdahnep0m+m65zyMJGCmB2T8pGS+SFcSXdx94TaK4PiPaCl6XUCT5ejuQUHoXsEBmK/3S6beA==", "requires": { - "@sentry/core": "5.3.0", - "@sentry/types": "5.2.0", - "@sentry/utils": "5.3.0", + "@sentry/core": "5.4.0", + "@sentry/types": "5.4.0", + "@sentry/utils": "5.4.0", "tslib": "^1.9.3" } }, "@sentry/core": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.3.0.tgz", - "integrity": "sha512-m4kB1RB5Ilx7/QTvhfRblyEfyGdV8dDLqE6CS3ftqjbFG0lhkqHjhj3Zai7wphfRnnZsfLGpYT8VJOgS9jUQuQ==", - "requires": { - "@sentry/hub": "5.3.0", - "@sentry/minimal": "5.3.0", - "@sentry/types": "5.2.0", - "@sentry/utils": "5.3.0", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.4.0.tgz", + "integrity": "sha512-luIJPftVnrW0ZKqs9W6YCpzKZVbOgQv8Ae7KB0Acsvqeoqjtx4zHHfVfu5VPkfhrOYN3NsM1IpApXtSdMiJCfg==", + "requires": { + "@sentry/hub": "5.4.0", + "@sentry/minimal": "5.4.0", + "@sentry/types": "5.4.0", + "@sentry/utils": "5.4.0", "tslib": "^1.9.3" } }, "@sentry/hub": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.3.0.tgz", - "integrity": "sha512-FT+V5bScUoKbiMVZGOYcj81A7F7kQGbMXG+/94yO5s/6s/XJw4AbX5asR/N3Y57QNeeUYWQ2O4eDCjMeRdwXLw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.4.0.tgz", + "integrity": "sha512-X0iLNcouXcLWzuOJz2YjTn1E11b7pzcG98/iFTHW3AKPjnJNt92XRpjsDI2iT8+ODUDiFqaFmACSn2oZK80WGQ==", "requires": { - "@sentry/types": "5.2.0", - "@sentry/utils": "5.3.0", + "@sentry/types": "5.4.0", + "@sentry/utils": "5.4.0", "tslib": "^1.9.3" } }, "@sentry/minimal": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.3.0.tgz", - "integrity": "sha512-s1ok1AI7FQZx+zvgFVjcj1on090VSHo6Bf3f8idGRI2EvAB868q8DJoEcMXJGdJE59zZQ6YCEF5PXAmBm/h9Uw==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.4.0.tgz", + "integrity": "sha512-MuOLavHHTXXWKyfTcwqpjhkdYlJDyOfjfcf+b/d38+8cs064rpNScxTZyYj2KKxNGcCqDgUsY175fNp/D1fyMw==", "requires": { - "@sentry/hub": "5.3.0", - "@sentry/types": "5.2.0", + "@sentry/hub": "5.4.0", + "@sentry/types": "5.4.0", "tslib": "^1.9.3" } }, "@sentry/types": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.2.0.tgz", - "integrity": "sha512-QzMVYgONsScAiEGY5XRtSeMwH8464oRdaxCMTtXBuYfF9muvxHqQyF094GVRiconpgKelok5ke9HwrbNUEiE7w==" + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.4.0.tgz", + "integrity": "sha512-R8IFM77rzp0ngR/XQFLsXUK2uE7jLf21MsU9mpUwLtxcJp8rs7I77HgzA5MEerdG9Sbxw5RaLq9wO7noHGfUmQ==" }, "@sentry/utils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.3.0.tgz", - "integrity": "sha512-4nfv6p2/PPWt7jk/AE73K7YydFHiBs3GvJLpO+PHgNyU3GBtQGST5HggdkGy+mCbtoBdkCIf1CRNeabCxTZ92g==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.4.0.tgz", + "integrity": "sha512-NlYMAyiI9iIItLDxJ17tLMtuu7261t93tcOGSMdDQZlmryR6ZAMenbCKTf5MrpA2iHfX84gyfmr67lh8uSHkPg==", "requires": { - "@sentry/types": "5.2.0", + "@sentry/types": "5.4.0", "tslib": "^1.9.3" } }, @@ -1249,9 +1394,9 @@ } }, "@types/jest": { - "version": "24.0.11", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.11.tgz", - "integrity": "sha512-2kLuPC5FDnWIDvaJBzsGTBQaBbnDweznicvK7UGYzlIJP4RJR2a4A/ByLUXEyEgag6jz8eHdlWExGDtH3EYUXQ==", + "version": "24.0.13", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-24.0.13.tgz", + "integrity": "sha512-3m6RPnO35r7Dg+uMLj1+xfZaOgIHHHut61djNjzwExXN4/Pm9has9C6I1KMYSfz7mahDhWUOVg4HW/nZdv5Pww==", "dev": true, "requires": { "@types/jest-diff": "*" @@ -1283,9 +1428,9 @@ "dev": true }, "@types/puppeteer": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-1.12.1.tgz", - "integrity": "sha512-6qpe7XXM93iWh8quEP8Ay516Vmfc2r+ZAxFH3Mt6fx3vzmZz+4Q+hYxc9PxeEIXJhWLAAPYAgAiM/vLHEUwGpw==", + "version": "1.12.4", + "resolved": "https://registry.npmjs.org/@types/puppeteer/-/puppeteer-1.12.4.tgz", + "integrity": "sha512-aaGbJaJ9TuF9vZfTeoh876sBa+rYJWPwtsmHmYr28pGr42ewJnkDTq2aeSKEmS39SqUdkwLj73y/d7rBSp7mDQ==", "dev": true, "requires": { "@types/node": "*" @@ -1474,15 +1619,6 @@ } } }, - "append-transform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true, - "requires": { - "default-require-extensions": "^2.0.0" - } - }, "aproba": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", @@ -1922,6 +2058,7 @@ "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "dev": true, + "optional": true, "requires": { "file-uri-to-path": "1.0.0" } @@ -2027,19 +2164,10 @@ } } }, - "block-stream": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", - "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", - "dev": true, - "requires": { - "inherits": "~2.0.0" - } - }, "blockstack": { - "version": "19.1.0", - "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-19.1.0.tgz", - "integrity": "sha512-ULyPhFLZncIb4Qf+nlBvJ9zH+Ii8xn7DhoXWKBQU959Ur9Xy86cPgKkZ06oFZAGOQjQ2AshMZZ+hnS5TyqAt1g==", + "version": "19.2.1", + "resolved": "https://registry.npmjs.org/blockstack/-/blockstack-19.2.1.tgz", + "integrity": "sha512-gpJtP9481dAx6MR97r+FRDJVuLf+DulBlfyjX4XSh1k4o/X5Kj8hDYRk2V814LfmSwA8cer6a+k16bINuEEy0g==", "dev": true, "requires": { "ajv": "^4.11.5", @@ -2062,9 +2190,9 @@ } }, "bluebird": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.4.tgz", - "integrity": "sha512-FG+nFEZChJrbQ9tIccIfZJBz3J7mLrAhxakAbnrJWn8d7aKOC+LWifa0G+p4ZqKp4y13T7juYvdhq9NzKdsrjw==", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", + "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==", "dev": true }, "blueimp-canvas-to-blob": { @@ -2151,9 +2279,9 @@ "dev": true }, "browser-image-compression": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browser-image-compression/-/browser-image-compression-1.0.2.tgz", - "integrity": "sha512-Wl4E1nF+4eZz/IAhqf+fzYQCiboksTuanepukdsDC0QWeLYAuwpNOZ2b+MENFPXmV6mtL5rtGS5fAUM1tB3uqQ==" + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/browser-image-compression/-/browser-image-compression-1.0.5.tgz", + "integrity": "sha512-bEI+PYMkCPYg86g+gnCVWZfSsHF9Cgb4GvnUrfXv/Akd9t7MkC0OVTWRq589bs/mrQubbeXi/NZ3j5EHy+yR5g==" }, "browser-process-hrtime": { "version": "0.1.3", @@ -2440,9 +2568,9 @@ "dev": true }, "chai-nightwatch": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/chai-nightwatch/-/chai-nightwatch-0.2.1.tgz", - "integrity": "sha512-2lprSMi72sHq2ZGyPTYUDQNsd2O4z81SicascbI4bkU54Xzk5Ofunn2CbrExADGC7jBH2D8r66X/aSEl+/agXQ==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/chai-nightwatch/-/chai-nightwatch-0.3.0.tgz", + "integrity": "sha512-NHpHLKQO0M7uNVJ10qlPIzHN9+6f873kYh6dYAn291a1CVESrrH6crbTJwZ3376trtzb6HPa80QYt3gMTL1o4g==", "dev": true, "requires": { "assertion-error": "1.0.0", @@ -2597,23 +2725,25 @@ "dev": true }, "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "dev": true, "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" }, "dependencies": { - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } } } @@ -3124,23 +3254,6 @@ "integrity": "sha512-6+LuZGU7QCNUnAJyX8cIrlzoEgggTM6B7mm+znKOX4t5ltluT9KLjN6g61ECMS0LTsLW7yDpNoxhix5FZcrIow==", "dev": true }, - "default-require-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", - "dev": true, - "requires": { - "strip-bom": "^3.0.0" - }, - "dependencies": { - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - } - } - }, "defaults": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", @@ -3371,6 +3484,12 @@ "domelementtype": "1" } }, + "dotenv": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-7.0.0.tgz", + "integrity": "sha512-M3NhsLbV1i6HuGzBUH8vXrtxOk+tWmzWKDMbAVSUp3Zsjm7ywFeuwrUXhmhQyRK1q5B5GGy7hcXPbj3bnfZg2g==", + "dev": true + }, "ds-store": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/ds-store/-/ds-store-0.1.6.tgz", @@ -3400,9 +3519,9 @@ "dev": true }, "electron": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.4.tgz", - "integrity": "sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.2.tgz", + "integrity": "sha512-bUHKQhyuOen/q8iHTkrnzqB9CAwBDI+vHbeu21kpq2bqAD+t25yfrmUEcYHaPL4fZOAhk6nnRqskF6/Xd+aZxg==", "dev": true, "requires": { "@types/node": "^10.12.18", @@ -3411,9 +3530,9 @@ }, "dependencies": { "@types/node": { - "version": "10.14.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz", - "integrity": "sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==", + "version": "10.14.8", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.8.tgz", + "integrity": "sha512-I4+DbJEhLEg4/vIy/2gkWDvXBOOtPKV9EnLhYjMoqxcRW+TTZtUftkHktz/a8suoD5mUL7m6ReLrkPvSsCQQmw==", "dev": true } } @@ -3507,9 +3626,9 @@ "optional": true }, "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", + "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==", "dev": true, "optional": true } @@ -3532,18 +3651,6 @@ "yargs": "^13.2.2" }, "dependencies": { - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "optional": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -3566,81 +3673,12 @@ "universalify": "^0.1.0" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "optional": true - }, "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==", "dev": true, "optional": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true, - "optional": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "optional": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "yargs": { - "version": "13.2.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", - "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", - "dev": true, - "optional": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.0" - } - }, - "yargs-parser": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz", - "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -3711,18 +3749,6 @@ "yargs": "^13.2.2" }, "dependencies": { - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", - "dev": true, - "optional": true, - "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" - } - }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -3745,81 +3771,12 @@ "universalify": "^0.1.0" } }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "optional": true - }, "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==", "dev": true, "optional": true - }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true, - "optional": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "dev": true, - "optional": true, - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } - }, - "wrap-ansi": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", - "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^3.2.0", - "string-width": "^3.0.0", - "strip-ansi": "^5.0.0" - } - }, - "yargs": { - "version": "13.2.4", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", - "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", - "dev": true, - "optional": true, - "requires": { - "cliui": "^5.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.1.0" - } - }, - "yargs-parser": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz", - "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==", - "dev": true, - "optional": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, @@ -3938,34 +3895,24 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true - }, - "yargs-parser": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz", - "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, "electron-rebuild": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.4.tgz", - "integrity": "sha512-QBUZg1due+R0bww5rNd4gEcsKczyhxyLrxSFZlKihwHRxaiHrGut532JAUe0fRz+VIU4WNSfNKyZ/ZwSGjaDhA==", + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-1.8.5.tgz", + "integrity": "sha512-gDwRA3utfiPnFwBZ1z8M4SEMwsdsy6Bg4VGO2ohelMOIO0vxiCrDQ/FVdLk3h2g7fLb06QFUsQU+86jiTSmZxw==", "dev": true, "requires": { "colors": "^1.3.3", "debug": "^4.1.1", "detect-libc": "^1.0.3", "fs-extra": "^7.0.1", - "node-abi": "^2.7.0", - "node-gyp": "^3.8.0", - "ora": "^3.0.0", + "node-abi": "^2.8.0", + "node-gyp": "^4.0.0", + "ora": "^3.4.0", "spawn-rx": "^3.0.0", - "yargs": "^12.0.5" + "yargs": "^13.2.2" }, "dependencies": { "cli-spinners": { @@ -4139,8 +4086,7 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true, - "optional": true + "dev": true }, "end-of-stream": { "version": "1.4.1", @@ -4569,16 +4515,6 @@ "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "dev": true }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", - "dev": true, - "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" - } - }, "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", @@ -5302,18 +5238,6 @@ } } }, - "fstream": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", - "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.2", - "inherits": "~2.0.0", - "mkdirp": ">=0.5 0", - "rimraf": "2" - } - }, "ftp": { "version": "0.3.10", "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz", @@ -5500,9 +5424,9 @@ } }, "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, "get-folder-size": { @@ -6055,9 +5979,9 @@ } }, "husky": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-2.3.0.tgz", - "integrity": "sha512-A/ZQSEILoq+mQM3yC3RIBSaw1bYXdkKnyyKVSUiJl+iBjVZc5LQEXdGY1ZjrDxC4IzfRPiJ0IqzEQGCN5TQa/A==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/husky/-/husky-2.4.0.tgz", + "integrity": "sha512-3k1wuZU20gFkphNWMjh2ISCFaqfbaLY7R9FST2Mj9HeRhUK9ydj9qQR8qfXlog3EctVGsyeilcZkIT7uBZDDVA==", "dev": true, "requires": { "cosmiconfig": "^5.2.0", @@ -6621,53 +6545,12 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, - "istanbul-api": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-2.1.6.tgz", - "integrity": "sha512-x0Eicp6KsShG1k1rMgBAi/1GgY7kFGEBwQpw3PXGEmu+rBcBNhqU8g2DgY9mlepAsLPzrzrbqSgCGANnki4POA==", - "dev": true, - "requires": { - "async": "^2.6.2", - "compare-versions": "^3.4.0", - "fileset": "^2.0.3", - "istanbul-lib-coverage": "^2.0.5", - "istanbul-lib-hook": "^2.0.7", - "istanbul-lib-instrument": "^3.3.0", - "istanbul-lib-report": "^2.0.8", - "istanbul-lib-source-maps": "^3.0.6", - "istanbul-reports": "^2.2.4", - "js-yaml": "^3.13.1", - "make-dir": "^2.1.0", - "minimatch": "^3.0.4", - "once": "^1.4.0" - }, - "dependencies": { - "async": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz", - "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==", - "dev": true, - "requires": { - "lodash": "^4.17.11" - } - } - } - }, "istanbul-lib-coverage": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz", "integrity": "sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==", "dev": true }, - "istanbul-lib-hook": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-2.0.7.tgz", - "integrity": "sha512-vrRztU9VRRFDyC+aklfLoeXyNdTfga2EI3udDGn4cZ6fpSXpHLV9X6CHvfoMCPtggg8zvDDmC4b9xfu0z6/llA==", - "dev": true, - "requires": { - "append-transform": "^1.0.0" - } - }, "istanbul-lib-instrument": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-3.3.0.tgz", @@ -6684,9 +6567,9 @@ }, "dependencies": { "semver": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz", - "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz", + "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ==", "dev": true } } @@ -6753,13 +6636,13 @@ } }, "jest": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/jest/-/jest-24.1.0.tgz", - "integrity": "sha512-+q91L65kypqklvlRFfXfdzUKyngQLOcwGhXQaLmVHv+d09LkNXuBuGxlofTFW42XMzu3giIcChchTsCNUjQ78A==", + "version": "24.8.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-24.8.0.tgz", + "integrity": "sha512-o0HM90RKFRNWmAWvlyV8i5jGZ97pFwkeVoGvPW1EtLTgJc2+jcuqcbbqcSZLE/3f2S5pt0y2ZBETuhpWNl1Reg==", "dev": true, "requires": { "import-local": "^2.0.0", - "jest-cli": "^24.1.0" + "jest-cli": "^24.8.0" } }, "jest-changed-files": { @@ -6774,56 +6657,134 @@ } }, "jest-cli": { - "version": "24.1.0", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.1.0.tgz", - "integrity": "sha512-U/iyWPwOI0T1CIxVLtk/2uviOTJ/OiSWJSe8qt6X1VkbbgP+nrtLJlmT9lPBe4lK78VNFJtrJ7pttcNv/s7yCw==", + "version": "24.8.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-24.8.0.tgz", + "integrity": "sha512-+p6J00jSMPQ116ZLlHJJvdf8wbjNbZdeSX9ptfHX06/MSNaXmKihQzx5vQcw0q2G6JsdVkUIdWbOWtSnaYs3yA==", "dev": true, "requires": { - "ansi-escapes": "^3.0.0", + "@jest/core": "^24.8.0", + "@jest/test-result": "^24.8.0", + "@jest/types": "^24.8.0", "chalk": "^2.0.1", "exit": "^0.1.2", - "glob": "^7.1.2", - "graceful-fs": "^4.1.15", "import-local": "^2.0.0", "is-ci": "^2.0.0", - "istanbul-api": "^2.0.8", - "istanbul-lib-coverage": "^2.0.2", - "istanbul-lib-instrument": "^3.0.1", - "istanbul-lib-source-maps": "^3.0.1", - "jest-changed-files": "^24.0.0", - "jest-config": "^24.1.0", - "jest-environment-jsdom": "^24.0.0", - "jest-get-type": "^24.0.0", - "jest-haste-map": "^24.0.0", - "jest-message-util": "^24.0.0", - "jest-regex-util": "^24.0.0", - "jest-resolve-dependencies": "^24.1.0", - "jest-runner": "^24.1.0", - "jest-runtime": "^24.1.0", - "jest-snapshot": "^24.1.0", - "jest-util": "^24.0.0", - "jest-validate": "^24.0.0", - "jest-watcher": "^24.0.0", - "jest-worker": "^24.0.0", - "micromatch": "^3.1.10", - "node-notifier": "^5.2.1", - "p-each-series": "^1.0.0", - "pirates": "^4.0.0", + "jest-config": "^24.8.0", + "jest-util": "^24.8.0", + "jest-validate": "^24.8.0", "prompts": "^2.0.1", - "realpath-native": "^1.0.0", - "rimraf": "^2.5.4", - "slash": "^2.0.0", - "string-length": "^2.0.0", - "strip-ansi": "^5.0.0", - "which": "^1.2.12", + "realpath-native": "^1.1.0", "yargs": "^12.0.2" }, "dependencies": { - "slash": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", - "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + } + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", "dev": true + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -7111,17 +7072,126 @@ "yargs": "^12.0.2" }, "dependencies": { + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", + "dev": true, + "requires": { + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" + } + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true + }, "slash": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz", "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==", "dev": true }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "dev": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } }, @@ -7313,17 +7383,6 @@ "whatwg-url": "^6.4.1", "ws": "^5.2.0", "xml-name-validator": "^3.0.0" - }, - "dependencies": { - "ws": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", - "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0" - } - } } }, "jsesc": { @@ -8551,7 +8610,8 @@ "version": "2.14.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==", - "dev": true + "dev": true, + "optional": true }, "nanomatch": { "version": "1.2.13", @@ -8607,20 +8667,21 @@ "dev": true }, "nightwatch": { - "version": "1.0.19", - "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-1.0.19.tgz", - "integrity": "sha512-Dl+EN4wFp927nn7KRkCIJ7b0Th9PVjiwflzqsoqJOwLPcLuzSBz4FYBvHXQtUkaL4/nELVgXurw/KXqj2gcFSg==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-1.1.11.tgz", + "integrity": "sha512-kPm/4fNybUB4ltoprmnmQ5B/pLZYv/gRKZ3+H+tGMYQiP4ipcHZ/2i9AqsjNUt+Bwy0zFU5aqDa5UZTMK7nbMQ==", "dev": true, "requires": { "assertion-error": "^1.1.0", - "chai-nightwatch": "0.2.1", + "chai-nightwatch": "^0.3.0", + "dotenv": "7.0.0", "ejs": "^2.5.9", "lodash.clone": "3.0.3", "lodash.defaultsdeep": "^4.6.0", "lodash.merge": "^4.6.1", "minimatch": "3.0.4", "mkpath": "1.0.0", - "mocha": "^5.1.1", + "mocha": "^5.2.0", "optimist": "^0.6.1", "proxy-agent": "^3.0.0" }, @@ -8716,12 +8777,11 @@ "dev": true }, "node-gyp": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", - "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-4.0.0.tgz", + "integrity": "sha512-2XiryJ8sICNo6ej8d0idXDEMKfVfFK7kekGCtJAuelGsYHQxhj13KTf95swTCN2dZ/4lTfZ84Fu31jqJEEgjWA==", "dev": true, "requires": { - "fstream": "^1.0.0", "glob": "^7.0.3", "graceful-fs": "^4.1.2", "mkdirp": "^0.5.0", @@ -8731,7 +8791,7 @@ "request": "^2.87.0", "rimraf": "2", "semver": "~5.3.0", - "tar": "^2.0.0", + "tar": "^4.4.8", "which": "1" }, "dependencies": { @@ -8740,17 +8800,6 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=", "dev": true - }, - "tar": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", - "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", - "dev": true, - "requires": { - "block-stream": "*", - "fstream": "^1.0.12", - "inherits": "2" - } } } }, @@ -9025,15 +9074,6 @@ "is-wsl": "^1.1.0" } }, - "opn": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz", - "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } - }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -9422,12 +9462,41 @@ } }, "pkg-dir": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.1.0.tgz", - "integrity": "sha512-55k9QN4saZ8q518lE6EFgYiu95u3BWkSajCifhdQjvLvmr8IpnRbhI+UGpWJQfa0KzDguHeeWT1ccO1PmkOi3A==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "requires": { - "find-up": "^3.0.0" + "find-up": "^4.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.0.0.tgz", + "integrity": "sha512-zoH7ZWPkRdgwYCDVoQTzqjG8JSPANhtvLhh4KVUHyKnaUJJrNeFmWIkTcNuJmR3GLMEmGYEf2S2bjgx26JTF+Q==", + "dev": true, + "requires": { + "locate-path": "^5.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + } } }, "please-upgrade-node": { @@ -9505,18 +9574,18 @@ } }, "pretty-ms": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-4.0.0.tgz", - "integrity": "sha512-qG66ahoLCwpLXD09ZPHSCbUWYTqdosB7SMP4OffgTgL2PBKXMuUsrk5Bwg8q4qPkjTXsKBMr+YK3Ltd/6F9s/Q==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.0.0.tgz", + "integrity": "sha512-94VRYjL9k33RzfKiGokPBPpsmloBYSf5Ri+Pq19zlsEcUKFob+admeXr5eFDRuPjFmEOcjJvPGdillYOJyvZ7Q==", "dev": true, "requires": { - "parse-ms": "^2.0.0" + "parse-ms": "^2.1.0" } }, "pretty-quick": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-1.10.0.tgz", - "integrity": "sha512-uNvm2N3UWmnZRZrClyQI45hIbV20f5BpSyZY51Spbvn4APp9+XLyX4bCjWRGT3fGyVyQ/2/iw7dbQq1UUaq7SQ==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/pretty-quick/-/pretty-quick-1.11.0.tgz", + "integrity": "sha512-hy0yOSnqVykrgoHcCcB72p3B5ERQJcjQI6ExeSGSTFE2cDrPwCQtFb3kXA1F+jUPrbt7orra8U+fjS/Emjgpuw==", "dev": true, "requires": { "chalk": "^2.3.0", @@ -9640,9 +9709,9 @@ } }, "prompts": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.0.4.tgz", - "integrity": "sha512-HTzM3UWp/99A0gk51gAegwo1QRYA7xjcZufMNe33rCclFszUYAuHe1fIN/3ZmiHeGPkUsNaRyQm1hHOfM0PKxA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.1.0.tgz", + "integrity": "sha512-+x5TozgqYdOwWsQFZizE/Tra3fKvAoy037kOyU6cgz84n8f6zxngLOV4O32kTwt9FcLCxAqw0P/c8rOr9y+Gfg==", "dev": true, "requires": { "kleur": "^3.0.2", @@ -9737,9 +9806,9 @@ "dev": true }, "puppeteer": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.12.2.tgz", - "integrity": "sha512-xWSyCeD6EazGlfnQweMpM+Hs6X6PhUYhNTHKFj/axNZDq4OmrVERf70isBf7HsnFgB3zOC1+23/8+wCAZYg+Pg==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-1.17.0.tgz", + "integrity": "sha512-3EXZSximCzxuVKpIHtyec8Wm2dWZn1fc5tQi34qWfiUgubEVYHjUvr0GOJojqf3mifI6oyKnCdrGxaOI+lWReA==", "dev": true, "requires": { "debug": "^4.1.0", @@ -9778,6 +9847,15 @@ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true + }, + "ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0" + } } } }, @@ -9797,9 +9875,9 @@ "dev": true }, "query-string": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.5.0.tgz", - "integrity": "sha512-TYC4hDjZSvVxLMEucDMySkuAS9UIzSbAiYGyA9GWCjLKB8fQpviFbjd20fD7uejCDxZS+ftSdBKE6DS+xucJFg==", + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.6.0.tgz", + "integrity": "sha512-Xhvaa80rZzfvI7gYXF6ism5otKTyea90XROstBTBKiWE/tDfnIDbQwkGLguJaQBNweVCW4T9DoTe5eyox0CbZQ==", "dev": true, "requires": { "decode-uri-component": "^0.2.0", @@ -10089,9 +10167,9 @@ "dev": true }, "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true }, "resolve": { @@ -11229,12 +11307,6 @@ "read-pkg": "^3.0.0" } }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true - }, "strip-bom": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -11311,15 +11383,25 @@ "optional": true }, "tiny-secp256k1": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.1.tgz", - "integrity": "sha512-jA9WalQuhKun1svJrAVi9Vu8aUWKMfR7nMV903kHjrHTTY/IFa0petSq+Jk/Mv447dGD9LC8fGsmGRubBbcNng==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/tiny-secp256k1/-/tiny-secp256k1-1.1.2.tgz", + "integrity": "sha512-InukePecGvfngAEmPR/AIVpAmBTBCdO7tFuMKCpQDE6Zr+lQVT/hDArPkUUolPPpCgwbN/yk2rSAGhJsoIl4hA==", "dev": true, "requires": { - "bindings": "^1.3.0", "bn.js": "^4.11.8", "create-hmac": "^1.1.7", "elliptic": "^6.4.0", + "tiny-secp256k1-native": "1.1.x" + } + }, + "tiny-secp256k1-native": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tiny-secp256k1-native/-/tiny-secp256k1-native-1.1.0.tgz", + "integrity": "sha512-ZEt41e4pvq52Zs6MqNZpbDH3qg5fQkOCH9bzGsVPtlLeo9tdfNFz2XfjiKzo1Rc+Yvv4cb0lzy7ClQ3FbE4kKg==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.3.0", "nan": "^2.13.2" } }, @@ -11500,9 +11582,9 @@ "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" }, "tslint": { - "version": "5.16.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz", - "integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", + "version": "5.17.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.17.0.tgz", + "integrity": "sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -11511,7 +11593,7 @@ "commander": "^2.12.1", "diff": "^3.2.0", "glob": "^7.1.1", - "js-yaml": "^3.13.0", + "js-yaml": "^3.13.1", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "resolve": "^1.3.2", @@ -11808,13 +11890,13 @@ "dev": true }, "username": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/username/-/username-4.1.0.tgz", - "integrity": "sha512-sKh1KCsMfv8jPIC9VdeQhrNAgkl842jS/M74HQv7Byr0AMAwKZt8mLWX9DmtMeD8nQA3eKa10f5LbqlSVmokMg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/username/-/username-5.0.0.tgz", + "integrity": "sha512-iPfqmcRP2FMDeTFumQVCFKwi0L5npM8W/skqusA5okl8YSwAZi0mTNx04zjM14Kx66LG9IsMG4kIjsQvgz4rOQ==", "dev": true, "requires": { "execa": "^1.0.0", - "mem": "^4.0.0" + "mem": "^4.3.0" } }, "utf8-byte-length": { @@ -12161,48 +12243,25 @@ "dev": true }, "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz", + "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==", "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "ansi-styles": "^3.2.0", + "string-width": "^3.0.0", + "strip-ansi": "^5.0.0" }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" } } } @@ -12225,9 +12284,9 @@ } }, "ws": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", - "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ws/-/ws-5.2.2.tgz", + "integrity": "sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==", "dev": true, "requires": { "async-limiter": "~1.0.0" @@ -12289,29 +12348,41 @@ "dev": true }, "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "version": "13.2.4", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz", + "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==", "dev": true, "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", + "cliui": "^5.0.0", "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", + "require-main-filename": "^2.0.0", "set-blocking": "^2.0.0", - "string-width": "^2.0.0", + "string-width": "^3.0.0", "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" + "y18n": "^4.0.0", + "yargs-parser": "^13.1.0" + }, + "dependencies": { + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + } } }, "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.0.tgz", + "integrity": "sha512-Yq+32PrijHRri0vVKQEm+ys8mbqWjLiwQkMFNXEENutzLPP0bE4Lcd4iA3OQY5HF+GD3xXxf0MEHb8E4/SA3AA==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index 32780cb..8dd0cf8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "block-photos", - "version": "4.1.0", + "version": "4.2.0", "private": false, "description": "The app for storing your photos privatly in the cloud!", "repository": { @@ -99,7 +99,7 @@ "@ionic/core": "4.4.2", "@sentry/browser": "5.4.0", "blueimp-load-image": "2.21.0", - "browser-image-compression": "1.0.2", + "browser-image-compression": "1.0.5", "compressorjs": "1.0.5", "cors": "2.8.5", "electron-is-dev": "1.1.0", @@ -126,9 +126,9 @@ "@stencil/core": "0.18.1", "@types/jest": "24.0.13", "@types/puppeteer": "1.12.4", - "blockstack": "19.1.0", + "blockstack": "19.2.1", "electron": "5.0.2", - "husky": "2.3.0", + "husky": "2.4.0", "jest": "24.8.0", "jest-cli": "24.8.0", "nightwatch": "1.1.11", diff --git a/src/assets/blockstack-19.1.0.min.js b/src/assets/blockstack-19.2.1.min.js similarity index 99% rename from src/assets/blockstack-19.1.0.min.js rename to src/assets/blockstack-19.2.1.min.js index 34fb981..e272ea3 100644 --- a/src/assets/blockstack-19.1.0.min.js +++ b/src/assets/blockstack-19.2.1.min.js @@ -60,7 +60,7 @@ return Object.prototype.hasOwnProperty.call(e, t); }), (r.p = ''), - r((r.s = 218)) + r((r.s = 217)) ); })([ function(e, t, r) { @@ -122,8 +122,8 @@ * @author Feross Aboukhadijeh * @license MIT */ - var n = r(220), - i = r(221), + var n = r(219), + i = r(220), o = r(124); function a() { return u.TYPED_ARRAY_SUPPORT ? 2147483647 : 1073741823; @@ -1345,7 +1345,7 @@ (a.BN = a), (a.wordSize = 26); try { - s = r(228).Buffer; + s = r(227).Buffer; } catch (e) {} function u(e, t, r) { for (var n = 0, i = Math.min(e.length, r), o = t; o < i; o++) { @@ -3677,12 +3677,12 @@ var n = r(2).Buffer, i = r(171), o = r(34), - a = r(382), + a = r(381), s = r(10), u = r(19), c = r(173), f = r(6), - l = r(384), + l = r(383), h = f.OP_RESERVED; function d(e) { return ( @@ -3799,7 +3799,7 @@ ); }, number: r(173), - signature: r(385), + signature: r(384), isCanonicalPubKey: function(e) { return o.isPoint(e); }, @@ -4288,13 +4288,13 @@ function(e, t, r) { 'use strict'; var n = t; - (n.version = r(226).version), - (n.utils = r(227)), + (n.version = r(225).version), + (n.utils = r(226)), (n.rand = r(126)), (n.curve = r(59)), - (n.curves = r(234)), - (n.ec = r(242)), - (n.eddsa = r(246)); + (n.curves = r(233)), + (n.ec = r(241)), + (n.eddsa = r(245)); }, function(e, t, r) { var n = r(172), @@ -4517,7 +4517,7 @@ } for (var d in ((f.oneOf = f.anyOf), i)) h[d] = i[d]; for (d in f) h[d] = f[d]; - var p = r(383); + var p = r(382); for (d in p) h[d] = p[d]; (h.compile = l), (h.TfTypeError = a), @@ -4538,7 +4538,7 @@ (function() { var e, n, i, o, a, s; for ( - t.const = r(115), a = 0, s = (i = [r(214), r(498)]).length; + t.const = r(115), a = 0, s = (i = [r(213), r(498)]).length; a < s; a++ ) @@ -4839,10 +4839,10 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const i = n(r(418)), - o = r(23), - a = r(29), - s = r(20); + const i = n(r(417)), + o = r(24), + a = r(25), + s = r(21); (t.BLOCKSTACK_HANDLER = 'blockstack'), (t.nextYear = function() { return new Date( @@ -5196,16 +5196,127 @@ for (var f in n) c[f] = n[f]; e.exports = c; }, + function(e, t, r) { + 'use strict'; + Object.defineProperty(t, '__esModule', { value: !0 }), + (t.ERROR_CODES = { + MISSING_PARAMETER: 'missing_parameter', + REMOTE_SERVICE_ERROR: 'remote_service_error', + INVALID_STATE: 'invalid_state', + NO_SESSION_DATA: 'no_session_data', + UNKNOWN: 'unknown' + }), + Object.freeze(t.ERROR_CODES); + class n extends Error { + constructor(e) { + super(e.message), + (this.message = e.message), + (this.code = e.code), + (this.parameter = e.parameter ? e.parameter : null); + } + toString() { + return `${super.toString()}\n code: ${this.code} param: ${ + this.parameter ? this.parameter : 'n/a' + }`; + } + } + t.BlockstackError = n; + t.FileNotFound = class extends n { + constructor(e) { + super({ message: e, code: 'file_not_found' }), + (this.name = 'FileNotFound'); + } + }; + t.InvalidParameterError = class extends n { + constructor(e, t = '') { + super({ code: 'missing_parameter', message: t, parameter: '' }), + (this.name = 'MissingParametersError'); + } + }; + t.MissingParameterError = class extends n { + constructor(e, r = '') { + super({ + code: t.ERROR_CODES.MISSING_PARAMETER, + message: r, + parameter: e + }), + (this.name = 'MissingParametersError'); + } + }; + t.RemoteServiceError = class extends n { + constructor(e, r = '') { + super({ code: t.ERROR_CODES.REMOTE_SERVICE_ERROR, message: r }), + (this.response = e); + } + }; + t.InvalidDIDError = class extends n { + constructor(e = '') { + super({ code: 'invalid_did_error', message: e }), + (this.name = 'InvalidDIDError'); + } + }; + t.NotEnoughFundsError = class extends n { + constructor(e) { + const t = `Not enough UTXOs to fund. Left to fund: ${e}`; + super({ code: 'not_enough_error', message: t }), + (this.leftToFund = e), + (this.name = 'NotEnoughFundsError'), + (this.message = t); + } + }; + t.InvalidAmountError = class extends n { + constructor(e, t) { + const r = + `Not enough coin to fund fees transaction fees. Fees would be ${e},` + + ` specified spend is ${t}`; + super({ code: 'invalid_amount_error', message: r }), + (this.specifiedAmount = t), + (this.fees = e), + (this.name = 'InvalidAmountError'), + (this.message = r); + } + }; + t.LoginFailedError = class extends n { + constructor(e) { + const t = `Failed to login: ${e}`; + super({ code: 'login_failed', message: t }), + (this.message = t), + (this.name = 'LoginFailedError'); + } + }; + t.SignatureVerificationError = class extends n { + constructor(e) { + const t = `Failed to verify signature: ${e}`; + super({ code: 'signature_verification_failure', message: t }), + (this.message = t), + (this.name = 'SignatureVerificationError'); + } + }; + t.InvalidStateError = class extends n { + constructor(e) { + super({ code: t.ERROR_CODES.INVALID_STATE, message: e }), + (this.message = e), + (this.name = 'InvalidStateError'); + } + }; + t.NoSessionDataError = class extends n { + constructor(e) { + super({ code: t.ERROR_CODES.INVALID_STATE, message: e }), + (this.message = e), + (this.name = 'NoSessionDataError'); + } + }; + }, function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(29); - t.levels = ['debug', 'info', 'warn', 'error', 'none']; - const i = {}, - o = {}; - for (let e = 0; e < t.levels.length; e++) { - const r = t.levels[e]; - (i[r] = e), (o[e] = r); + const n = r(25), + i = ['debug', 'info', 'warn', 'error', 'none'], + o = {}, + a = {}; + for (let e = 0; e < i.length; e++) { + const t = i[e]; + (o[t] = e), (a[e] = t); } t.Logger = class { static error(e) { @@ -5224,7 +5335,7 @@ return `[${e.toUpperCase()}] ${t}`; } static shouldLog(e) { - return i[n.config.logLevel] <= i[e]; + return o[n.config.logLevel] <= o[e]; } }; }, @@ -5393,7 +5504,7 @@ i = r(83), o = r(46), a = r(88), - s = r(27); + s = r(28); function u(e) { s.call(this, 'digest'), (this._hash = e); } @@ -5415,13 +5526,13 @@ function(e, t, r) { var n = r(5); e.exports = { - Block: r(386), + Block: r(385), ECPair: r(175), Transaction: r(99), - TransactionBuilder: r(392), + TransactionBuilder: r(391), address: r(177), bip32: r(180), - crypto: r(28), + crypto: r(29), networks: r(15), opcodes: r(6), payments: r(101), @@ -5430,113 +5541,17 @@ }, function(e, t, r) { 'use strict'; - Object.defineProperty(t, '__esModule', { value: !0 }), - (t.ERROR_CODES = { - MISSING_PARAMETER: 'missing_parameter', - REMOTE_SERVICE_ERROR: 'remote_service_error', - INVALID_STATE: 'invalid_state', - NO_SESSION_DATA: 'no_session_data', - UNKNOWN: 'unknown' - }), - Object.freeze(t.ERROR_CODES); - class n extends Error { - constructor(e) { - super(e.message), - (this.message = e.message), - (this.code = e.code), - (this.parameter = e.parameter ? e.parameter : null); - } - toString() { - return `${super.toString()}\n code: ${this.code} param: ${ - this.parameter ? this.parameter : 'n/a' - }`; - } - } - t.BlockstackError = n; - t.InvalidParameterError = class extends n { - constructor(e, t = '') { - super({ code: 'missing_parameter', message: t, parameter: '' }), - (this.name = 'MissingParametersError'); - } - }; - t.MissingParameterError = class extends n { - constructor(e, r = '') { - super({ - code: t.ERROR_CODES.MISSING_PARAMETER, - message: r, - parameter: e - }), - (this.name = 'MissingParametersError'); - } - }; - t.RemoteServiceError = class extends n { - constructor(e, r = '') { - super({ code: t.ERROR_CODES.REMOTE_SERVICE_ERROR, message: r }), - (this.response = e); - } - }; - t.InvalidDIDError = class extends n { - constructor(e = '') { - super({ code: 'invalid_did_error', message: e }), - (this.name = 'InvalidDIDError'); - } - }; - t.NotEnoughFundsError = class extends n { - constructor(e) { - const t = `Not enough UTXOs to fund. Left to fund: ${e}`; - super({ code: 'not_enough_error', message: t }), - (this.leftToFund = e), - (this.name = 'NotEnoughFundsError'), - (this.message = t); - } - }; - t.InvalidAmountError = class extends n { - constructor(e, t) { - const r = - `Not enough coin to fund fees transaction fees. Fees would be ${e},` + - ` specified spend is ${t}`; - super({ code: 'invalid_amount_error', message: r }), - (this.specifiedAmount = t), - (this.fees = e), - (this.name = 'InvalidAmountError'), - (this.message = r); - } - }; - t.LoginFailedError = class extends n { - constructor(e) { - const t = `Failed to login: ${e}`; - super({ code: 'login_failed', message: t }), - (this.message = t), - (this.name = 'LoginFailedError'); - } - }; - t.SignatureVerificationError = class extends n { - constructor(e) { - const t = `Failed to verify signature: ${e}`; - super({ code: 'signature_verification_failure', message: t }), - (this.message = t), - (this.name = 'SignatureVerificationError'); - } - }; - t.InvalidStateError = class extends n { - constructor(e) { - super({ code: t.ERROR_CODES.INVALID_STATE, message: e }), - (this.message = e), - (this.name = 'InvalidStateError'); - } - }; - t.NoSessionDataError = class extends n { - constructor(e) { - super({ code: t.ERROR_CODES.INVALID_STATE, message: e }), - (this.message = e), - (this.name = 'NoSessionDataError'); - } + Object.defineProperty(t, '__esModule', { value: !0 }); + const n = { + network: r(182).network.defaults.MAINNET_DEFAULT, + logLevel: 'debug' }; + t.config = n; }, function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - var n = r(222); + var n = r(221); Object.defineProperty(t, 'TokenSigner', { enumerable: !0, get: function() { @@ -5549,14 +5564,14 @@ return n.createUnsecuredToken; } }); - var i = r(379); + var i = r(378); Object.defineProperty(t, 'TokenVerifier', { enumerable: !0, get: function() { return i.TokenVerifier; } }); - var o = r(380); + var o = r(379); Object.defineProperty(t, 'decodeToken', { enumerable: !0, get: function() { @@ -5686,7 +5701,7 @@ (e.exports = a); }, function(e, t, r) { - var n = r(22); + var n = r(23); function i(e) { return n('rmd160') .update(e) @@ -5713,21 +5728,12 @@ sha256: o }; }, - function(e, t, r) { - 'use strict'; - Object.defineProperty(t, '__esModule', { value: !0 }); - const n = { - network: r(182).network.defaults.MAINNET_DEFAULT, - logLevel: 'debug' - }; - t.config = n; - }, function(e, t, r) { 'use strict'; (function(e) { Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(23), - i = r(25), + const n = r(24), + i = r(26), o = r(16); function a(t, r) { const a = i.decodeToken(t), @@ -5799,10 +5805,10 @@ }, function(e, t, r) { 'use strict'; - (t.randomBytes = t.rng = t.pseudoRandomBytes = t.prng = r(26)), - (t.createHash = t.Hash = r(22)), + (t.randomBytes = t.rng = t.pseudoRandomBytes = t.prng = r(27)), + (t.createHash = t.Hash = r(23)), (t.createHmac = t.Hmac = r(63)); - var n = r(264), + var n = r(263), i = Object.keys(n), o = [ 'sha1', @@ -5818,7 +5824,7 @@ }; var a = r(89); (t.pbkdf2 = a.pbkdf2), (t.pbkdf2Sync = a.pbkdf2Sync); - var s = r(266); + var s = r(265); (t.Cipher = s.Cipher), (t.createCipher = s.createCipher), (t.Cipheriv = s.Cipheriv), @@ -5829,24 +5835,24 @@ (t.createDecipheriv = s.createDecipheriv), (t.getCiphers = s.getCiphers), (t.listCiphers = s.listCiphers); - var u = r(283); + var u = r(282); (t.DiffieHellmanGroup = u.DiffieHellmanGroup), (t.createDiffieHellmanGroup = u.createDiffieHellmanGroup), (t.getDiffieHellman = u.getDiffieHellman), (t.createDiffieHellman = u.createDiffieHellman), (t.DiffieHellman = u.DiffieHellman); - var c = r(286); + var c = r(285); (t.createSign = c.createSign), (t.Sign = c.Sign), (t.createVerify = c.createVerify), (t.Verify = c.Verify), - (t.createECDH = r(302)); - var f = r(303); + (t.createECDH = r(301)); + var f = r(302); (t.publicEncrypt = f.publicEncrypt), (t.privateEncrypt = f.privateEncrypt), (t.publicDecrypt = f.publicDecrypt), (t.privateDecrypt = f.privateDecrypt); - var l = r(306); + var l = r(305); (t.randomFill = l.randomFill), (t.randomFillSync = l.randomFillSync), (t.createCredentials = function() { @@ -5956,7 +5962,7 @@ (function(t) { var n = r(4), i = new (0, r(9).ec)('secp256k1'), - o = r(381), + o = r(380), a = t.alloc(32, 0), s = t.from( 'fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141', @@ -6186,7 +6192,7 @@ (u = r(8)), (o = u.X64Word), (a = u.X64WordArray), - (n = r(21).Hasher), + (n = r(22).Hasher), (e = (function() { function e() { (this.K = this.convert([ @@ -6713,7 +6719,7 @@ (function(e) { Object.defineProperty(t, '__esModule', { value: !0 }); const n = r(31), - i = r(23); + i = r(24); function o(e) { return e || (e = 32), n.randomBytes(e); } @@ -6751,7 +6757,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }), r(79); - const n = r(207); + const n = r(206); t.Service = class { static validateProof(e, t, r = null) { let i; @@ -7568,41 +7574,41 @@ function(e, t, r) { var n = t; (n.bignum = r(4)), - (n.define = r(289).define), + (n.define = r(288).define), (n.base = r(49)), (n.constants = r(151)), - (n.decoders = r(294)), - (n.encoders = r(296)); + (n.decoders = r(293)), + (n.encoders = r(295)); }, function(e, t, r) { var n = t; - (n.Reporter = r(291).Reporter), + (n.Reporter = r(290).Reporter), (n.DecoderBuffer = r(150).DecoderBuffer), (n.EncoderBuffer = r(150).EncoderBuffer), - (n.Node = r(292)); + (n.Node = r(291)); }, function(e, t, r) { 'use strict'; var n = t; (n.bignum = r(4)), - (n.define = r(309).define), + (n.define = r(308).define), (n.base = r(51)), (n.constants = r(159)), - (n.decoders = r(313)), - (n.encoders = r(315)); + (n.decoders = r(312)), + (n.encoders = r(314)); }, function(e, t, r) { 'use strict'; var n = t; - (n.Reporter = r(310).Reporter), + (n.Reporter = r(309).Reporter), (n.DecoderBuffer = r(158).DecoderBuffer), (n.EncoderBuffer = r(158).EncoderBuffer), - (n.Node = r(311)); + (n.Node = r(310)); }, function(e, t, r) { 'use strict'; - var n = r(22), - i = r(389); + var n = r(23), + i = r(388); e.exports = i(function(e) { var t = n('sha256') .update(e) @@ -7616,14 +7622,14 @@ (e.exports = r(107)).version = r(471).version; }, function(e, t, r) { - var n = r(195), - i = r(199); + var n = r(194), + i = r(198); function o(t, r) { return delete e.exports[t], (e.exports[t] = r), r; } e.exports = { Parser: n, - Tokenizer: r(196), + Tokenizer: r(195), ElementType: r(40), DomHandler: i, get FeedHandler() { @@ -7633,7 +7639,7 @@ return o('Stream', r(447)); }, get WritableStream() { - return o('WritableStream', r(201)); + return o('WritableStream', r(200)); }, get ProxyHandler() { return o('ProxyHandler', r(449)); @@ -7756,7 +7762,7 @@ (c = b.WordArray), (i = r(77).Counter), (h = r(13).fixup_uint32), - (u = r(21).StreamCipher), + (u = r(22).StreamCipher), (p = r(13)), (f = function(e, t) { var r, n, i, o; @@ -8210,12 +8216,12 @@ 'use strict'; (function(e) { Object.defineProperty(t, '__esModule', { value: !0 }), r(79); - const n = r(25), + const n = r(26), i = r(39), o = r(16), a = r(70), s = r(105), - u = r(20), + u = r(21), c = r(43), f = r(71), l = '1.3.1'; @@ -8337,10 +8343,10 @@ function(e, t, r) { 'use strict'; var n = t; - (n.base = r(230)), - (n.short = r(231)), - (n.mont = r(232)), - (n.edwards = r(233)); + (n.base = r(229)), + (n.short = r(230)), + (n.mont = r(231)), + (n.edwards = r(232)); }, function(e, t, r) { 'use strict'; @@ -8904,8 +8910,8 @@ function(e, t, r) { 'use strict'; var n = r(3), - i = r(263), - o = r(27), + i = r(262), + o = r(28), a = r(2).Buffer, s = r(137), u = r(46), @@ -9211,9 +9217,9 @@ : typeof e; })(e); } - var i = r(288), - o = r(299), - a = r(300), + var i = r(287), + o = r(298), + a = r(299), s = r(91), u = r(89), c = r(2).Buffer; @@ -9551,7 +9557,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(24); + const n = r(20); function i(e) { const t = e.split(':'); if (3 !== t.length) @@ -9615,13 +9621,13 @@ }; Object.defineProperty(t, '__esModule', { value: !0 }); const o = r(123), - a = r(425), + a = r(424), s = i(r(183)), u = i(r(58)), c = i(r(187)), f = r(16), - l = r(24), - h = r(20), + l = r(20), + h = r(21), d = r(188), p = r(43); t.UserSession = class { @@ -9721,10 +9727,8 @@ listFiles(e) { return c.listFiles(e, this); } - deleteFile(e) { - Promise.reject( - new Error(`Delete of ${e} not supported by gaia hubs`) - ); + deleteFile(e, t) { + return c.deleteFile(e, t, this); } getOrSetLocalGaiaHubConnection() { const e = this.store.getSessionData().userData; @@ -9740,7 +9744,7 @@ const t = yield d.connectToGaiaHub( e.hubUrl, e.appPrivateKey, - e.associationToken + e.gaiaAssociationToken ); e.gaiaHubConfig = t; const r = this.store.getSessionData(); @@ -9757,7 +9761,7 @@ const n = r(190), i = r(30), o = r(106), - a = r(20); + a = r(21); function s(e) { if (!e.hasOwnProperty('uri')) return null; if (!Array.isArray(e.uri)) return null; @@ -9832,7 +9836,7 @@ }); }, function(e, t, r) { - e.exports = r(432); + e.exports = r(431); }, function(e, t, r) { 'use strict'; @@ -10072,7 +10076,7 @@ c = {}.hasOwnProperty; (u = r(12)), (o = r(8).WordArray), - (i = r(21).StreamCipher), + (i = r(22).StreamCipher), (n = (function() { function e(e) { var t, r; @@ -10776,13 +10780,13 @@ })('undefined' != typeof self ? self : this); }, function(e, t, r) { - (e.exports = r(223).default), (e.exports.default = e.exports); + (e.exports = r(222).default), (e.exports.default = e.exports); }, function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }), (t.cryptoClients = t.SECP256K1Client = void 0); - var n = r(225), + var n = r(224), i = { ES256K: n.SECP256K1Client }; (t.SECP256K1Client = n.SECP256K1Client), (t.cryptoClients = i); }, @@ -10790,9 +10794,9 @@ var n = t; (n.utils = r(18)), (n.common = r(44)), - (n.sha = r(235)), - (n.ripemd = r(239)), - (n.hmac = r(240)), + (n.sha = r(234)), + (n.ripemd = r(238)), + (n.hmac = r(239)), (n.sha1 = n.sha.sha1), (n.sha256 = n.sha.sha256), (n.sha224 = n.sha.sha224), @@ -10955,10 +10959,10 @@ } r(3)(i, n), (i.Readable = r(85)), - (i.Writable = r(255)), - (i.Duplex = r(256)), - (i.Transform = r(257)), - (i.PassThrough = r(258)), + (i.Writable = r(254)), + (i.Duplex = r(255)), + (i.Transform = r(256)), + (i.PassThrough = r(257)), (i.Stream = i), (i.prototype.pipe = function(e, t) { var r = this; @@ -11011,7 +11015,7 @@ (t.Writable = r(86)), (t.Duplex = r(32)), (t.Transform = r(134)), - (t.PassThrough = r(254)); + (t.PassThrough = r(253)); }, function(e, t, r) { 'use strict'; @@ -11044,7 +11048,7 @@ g.WritableState = m; var c = r(45); c.inherits = r(3); - var f = { deprecate: r(253) }, + var f = { deprecate: r(252) }, l = r(132), h = r(2).Buffer, d = i.Uint8Array || function() {}; @@ -11447,7 +11451,7 @@ e._onTimeout && e._onTimeout(); }, t)); }), - r(252), + r(251), (t.setImmediate = ('undefined' != typeof self && self.setImmediate) || (void 0 !== e && e.setImmediate) || @@ -11465,27 +11469,27 @@ if (!r) throw new Error(e + ' is not supported (we accept pull requests)'); return new r(); - }).sha = r(259)), - (t.sha1 = r(260)), - (t.sha224 = r(261)), + }).sha = r(258)), + (t.sha1 = r(259)), + (t.sha224 = r(260)), (t.sha256 = r(135)), - (t.sha384 = r(262)), + (t.sha384 = r(261)), (t.sha512 = r(136)); }, function(e, t, r) { - (t.pbkdf2 = r(265)), (t.pbkdf2Sync = r(141)); + (t.pbkdf2 = r(264)), (t.pbkdf2Sync = r(141)); }, function(e, t, r) { 'use strict'; - (t.utils = r(268)), - (t.Cipher = r(269)), - (t.DES = r(270)), - (t.CBC = r(271)), - (t.EDE = r(272)); + (t.utils = r(267)), + (t.Cipher = r(268)), + (t.DES = r(269)), + (t.CBC = r(270)), + (t.EDE = r(271)); }, function(e, t, r) { - var n = r(273), - i = r(281), + var n = r(272), + i = r(280), o = r(144); (t.createCipher = t.Cipher = n.createCipher), (t.createCipheriv = t.Cipheriv = n.createCipheriv), @@ -11497,12 +11501,12 @@ }, function(e, t, r) { var n = { - ECB: r(274), - CBC: r(275), - CFB: r(276), - CFB8: r(277), - CFB1: r(278), - OFB: r(279), + ECB: r(273), + CBC: r(274), + CFB: r(275), + CFB8: r(276), + CFB1: r(277), + OFB: r(278), CTR: r(142), GCM: r(142) }, @@ -11513,7 +11517,7 @@ function(e, t, r) { (function(t) { var n = r(4), - i = r(26); + i = r(27); function o(e, r) { var i = (function(e) { var t = a(e); @@ -11736,9 +11740,9 @@ }, function(e, t, r) { var n = r(2).Buffer, - i = r(28), + i = r(29), o = r(5), - a = r(388), + a = r(387), s = r(6), u = r(10), c = r(19), @@ -12205,13 +12209,13 @@ }; }, function(e, t, r) { - var n = r(393), - i = r(394), - o = r(395), - a = r(396), - s = r(397), - u = r(398), - c = r(399); + var n = r(392), + i = r(393), + o = r(394), + a = r(395), + s = r(396), + u = r(397), + c = r(398); e.exports = { embed: n, p2ms: i, @@ -12223,13 +12227,13 @@ }; }, function(e, t, r) { - e.exports = { input: r(401), output: r(402) }; + e.exports = { input: r(400), output: r(401) }; }, function(e, t, r) { - e.exports = { input: r(404), output: r(405) }; + e.exports = { input: r(403), output: r(404) }; }, function(e, t, r) { - e.exports = { input: r(406), output: r(407) }; + e.exports = { input: r(405), output: r(406) }; }, function(e, t, r) { 'use strict'; @@ -12347,7 +12351,7 @@ const i = n(r(73)), o = r(74), a = r(30), - s = r(208), + s = r(207), u = r(477), c = { type: 'object', @@ -12510,7 +12514,7 @@ function(e, t, r) { var n = r(75), i = r(55).isHtml, - o = { extend: r(202), bind: r(111), forEach: r(76), defaults: r(203) }, + o = { extend: r(201), bind: r(111), forEach: r(76), defaults: r(202) }, a = [r(451), r(461), r(465), r(467), r(469)], s = (e.exports = function(e, t, r, a) { return this instanceof s @@ -15335,9 +15339,9 @@ }, function(e, t, r) { var n = r(110), - i = r(204), + i = r(203), o = r(75), - a = { merge: r(459), defaults: r(203) }; + a = { merge: r(459), defaults: r(202) }; function s(e, t, r) { if (t) 'string' == typeof t && (t = i(t, e._root, r)); else { @@ -15420,7 +15424,7 @@ f = n.getName, l = n.getAttributeValue, h = r(452), - d = r(205).rules.equals, + d = r(204).rules.equals, p = r(56), b = p.trueFunc, y = p.falseFunc; @@ -15701,10 +15705,10 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const i = n(r(23)), + const i = n(r(24)), o = n(r(46)), a = n(r(4)), - s = r(24); + s = r(20); (t.DUST_MINIMUM = 5500), (t.hash160 = function(e) { const t = i.default.crypto.sha256(e); @@ -15860,7 +15864,7 @@ o, a, s = {}.hasOwnProperty; - (n = r(21).BlockCipher), + (n = r(22).BlockCipher), (a = r(13).scrub_vec), (o = (function() { function e() { @@ -16112,7 +16116,7 @@ i, o, a = {}.hasOwnProperty; - (e = r(21).BlockCipher), + (e = r(22).BlockCipher), (o = r(13).scrub_vec), (i = (function() { return function() { @@ -17063,7 +17067,7 @@ s, u = {}.hasOwnProperty; (o = r(8).WordArray), - (n = r(21).Hasher), + (n = r(22).Hasher), (e = (function() { function e() { (this.H = []), (this.K = []), (this.W = []), this.init(); @@ -17238,7 +17242,7 @@ (o = u.WordArray), (a = u.X64Word), u.X64WordArray, - (n = r(21).Hasher), + (n = r(22).Hasher), (e = (function() { function e() { (this.RHO_OFFSETS = []), @@ -17679,7 +17683,7 @@ `Error performing global protocol echo reply detection: ${e}` ); } - n(r(219)), n(r(479)), n(r(187)); + n(r(218)), n(r(479)), n(r(187)); var o = r(70); (t.makeDIDFromAddress = o.makeDIDFromAddress), (t.makeDIDFromPublicKey = o.makeDIDFromPublicKey), @@ -17711,9 +17715,9 @@ t.BlockstackWallet = c.BlockstackWallet; var f = r(182); t.network = f.network; - var l = r(25); + var l = r(26); t.decodeToken = l.decodeToken; - var h = r(29); + var h = r(25); t.config = h.config; var d = r(511); (t.encryptMnemonic = d.encryptMnemonic), @@ -17884,7 +17888,7 @@ }); else try { - var a = r(229); + var a = r(228); if ('function' != typeof a.randomBytes) throw new Error('Not supported'); o.prototype._rand = function(e) { @@ -18507,11 +18511,11 @@ f = t.Uint8Array || function() {}; var l = r(45); l.inherits = r(3); - var h = r(249), + var h = r(248), d = void 0; d = h && h.debuglog ? h.debuglog('stream') : function() {}; var p, - b = r(250), + b = r(249), y = r(133); l.inherits(v, u); var m = ['error', 'close', 'destroy', 'pause', 'resume']; @@ -20175,9 +20179,9 @@ function(e, t, r) { var n = r(64), i = r(2).Buffer, - o = r(27), + o = r(28), a = r(3), - s = r(280), + s = r(279), u = r(47), c = r(143); function f(e, t, r, a) { @@ -20268,7 +20272,7 @@ function(e, t, r) { var n = r(64), i = r(2).Buffer, - o = r(27); + o = r(28); function a(e, t, r, a) { o.call(this), (this._cipher = new n.AES(t)), @@ -20288,7 +20292,7 @@ (e.exports = a); }, function(e, t, r) { - var n = r(26); + var n = r(27); (e.exports = g), (g.simpleSieve = y), (g.fermatTest = m); var i = r(4), o = new i(24), @@ -20439,7 +20443,7 @@ : typeof e; })(e); } - var indexOf = __webpack_require__(290), + var indexOf = __webpack_require__(289), Object_keys = function(e) { if (Object.keys) return Object.keys(e); var t = []; @@ -20689,7 +20693,7 @@ t ); }), - (n.der = r(293)); + (n.der = r(292)); }, function(e, t, r) { var n = r(3), @@ -21112,7 +21116,7 @@ }; }, function(e, t, r) { - var n = r(22), + var n = r(23), i = r(2).Buffer; function o(e) { var t = i.allocUnsafe(4); @@ -21270,7 +21274,7 @@ t ); }), - (n.der = r(312)); + (n.der = r(311)); }, function(e, t, r) { 'use strict'; @@ -22114,7 +22118,7 @@ }, function(e, t, r) { var n = r(34), - i = r(26), + i = r(27), o = r(10), a = r(19), s = r(176), @@ -22335,7 +22339,7 @@ function(e, t, r) { var n = r(2).Buffer, i = r(52), - o = r(417), + o = r(416), a = r(34), s = r(10), u = r(176), @@ -22544,17 +22548,18 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const i = n(r(23)), - o = n(r(424)), + const i = n(r(24)), + o = n(r(423)), a = n(r(4)), s = n(r(46)), - u = r(24), - c = r(20), - f = 1e8, - l = 'zone-file', - h = 'registration', - d = 'transaction'; - class p { + u = r(20), + c = r(21), + f = r(25), + l = 1e8, + h = 'zone-file', + d = 'registration', + p = 'transaction'; + class b { broadcastTransaction(e) { return Promise.reject( new Error(`Not implemented, broadcastTransaction(${e})`) @@ -22576,8 +22581,8 @@ ); } } - t.BitcoinNetwork = p; - class b { + t.BitcoinNetwork = b; + class y { constructor(e, t, r, n = i.default.networks.bitcoin) { (this.blockstackAPIUrl = e), (this.broadcastServiceUrl = t), @@ -22918,7 +22923,7 @@ } if (null === t) return this.btc.broadcastTransaction(e); { - const n = d, + const n = p, i = { transaction: e, transactionToWatch: t, confirmations: r }; return this.broadcastServiceFetchHelper(n, i); } @@ -22928,7 +22933,7 @@ return Promise.reject(new u.MissingParameterError('zoneFile')); if (t) { const r = { zoneFile: e, transactionToWatch: t }, - n = l; + n = h; return this.broadcastServiceFetchHelper(n, r); } { @@ -22964,7 +22969,7 @@ registerTransaction: t, zoneFile: r }, - i = h; + i = d; return this.broadcastServiceFetchHelper(i, n); } getFeeRate() { @@ -23052,17 +23057,17 @@ return this.btc.getNetworkedUTXOs(e); } } - t.BlockstackNetwork = b; - class y extends b { + t.BlockstackNetwork = y; + class m extends y { constructor(e, t, r) { super(e, t, r, i.default.networks.testnet); } getFeeRate() { - return Promise.resolve(Math.floor(1e-5 * f)); + return Promise.resolve(Math.floor(1e-5 * l)); } } - t.LocalRegtest = y; - class m extends p { + t.LocalRegtest = m; + class g extends b { constructor(e, t) { super(), (this.bitcoindUrl = e), @@ -23186,7 +23191,7 @@ .then(e => e.result) .then(e => e.map(e => ({ - value: Math.round(e.amount * f), + value: Math.round(e.amount * l), confirmations: e.confirmations, tx_hash: e.txid, tx_output_n: e.vout @@ -23194,8 +23199,8 @@ ); } } - t.BitcoindAPI = m; - class g extends p { + t.BitcoindAPI = g; + class v extends b { constructor(e = 'https://utxo.technofractal.com/') { super(), (this.apiUrl = e); } @@ -23236,8 +23241,8 @@ ); } } - t.InsightClient = g; - class v extends p { + t.InsightClient = v; + class _ extends b { constructor(e = 'https://blockchain.info') { super(), (this.utxoProviderUrl = e); } @@ -23309,28 +23314,31 @@ ); } } - t.BlockchainInfoApi = v; - const _ = new y( + t.BlockchainInfoApi = _; + const w = new m( 'http://localhost:16268', 'http://localhost:16269', - new m('http://localhost:18332/', { + new g('http://localhost:18332/', { username: 'blockstack', password: 'blockstacksystem' }) ), - w = new b( + S = new y( 'https://core.blockstack.org', 'https://broadcast.blockstack.org', - new v() + new _() ); - t.network = { - BlockstackNetwork: b, - LocalRegtest: y, - BlockchainInfoApi: v, - BitcoindAPI: m, - InsightClient: g, - defaults: { LOCAL_REGTEST: _, MAINNET_DEFAULT: w } - }; + (t.getNameInfo = function(e) { + return f.config.network.getNameInfo(e); + }), + (t.network = { + BlockstackNetwork: y, + LocalRegtest: m, + BlockchainInfoApi: _, + BitcoindAPI: g, + InsightClient: v, + defaults: { LOCAL_REGTEST: w, MAINNET_DEFAULT: S } + }); }.call(this, r(1).Buffer)); }, function(e, t, r) { @@ -23370,19 +23378,19 @@ }; Object.defineProperty(t, '__esModule', { value: !0 }); const o = i(r(184)), - a = r(25), + a = r(26), s = r(185), u = r(16), c = r(70), - f = r(24), + f = r(20), l = r(58), h = r(43), d = r(30), p = r(71), - b = r(29), - y = r(20), + b = r(25), + y = r(21), m = r(122), - g = r(429), + g = r(428), v = { '@type': 'Person', '@context': 'http://schema.org' }; function _() { u.checkWindowAPI('getAuthResponseToken', 'location'); @@ -23629,8 +23637,8 @@ : typeof e; })(e); } - var o = r(427), - a = r(428); + var o = r(426), + a = r(427); function s(e, t) { return t.encode ? (t.strict ? o(e) : encodeURIComponent(e)) : e; } @@ -23802,7 +23810,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(25), + const n = r(26), i = r(70), o = r(39), a = r(16), @@ -23913,9 +23921,9 @@ }; Object.defineProperty(t, '__esModule', { value: !0 }); const i = n(r(184)), - o = r(25), + o = r(26), a = r(16), - s = r(20); + s = r(21); (t.getAuthRequestFromURL = function() { a.checkWindowAPI('getAuthRequestFromURL', 'location'); const e = i.default.parse(window.location.search); @@ -23933,7 +23941,7 @@ .then(e => e.text()) .then(e => JSON.parse(e)) .then(e => { - t(e); + t(Object.assign({}, e, { manifestURI: n })); }) .catch(e => { s.Logger.debug(e.stack), @@ -23991,8 +23999,8 @@ const o = r(105), a = r(39), s = r(189), - u = r(24), - c = r(20), + u = r(20), + c = r(21), f = r(71), l = '.sig'; function h(e, t, r, i) { @@ -24080,10 +24088,7 @@ : t.arrayBuffer(); }); } - (t.deleteFile = function(e) { - Promise.reject(new Error(`Delete of ${e} not supported by gaia hubs`)); - }), - (t.getUserAppFileUrl = h), + (t.getUserAppFileUrl = h), (t.encryptContent = d), (t.decryptContent = function(e, t, r) { const n = Object.assign({}, t); @@ -24308,45 +24313,74 @@ } }); }), + (t.deleteFile = function(e, t, r) { + return n(this, void 0, void 0, function*() { + r || (r = new f.UserSession()); + const n = yield r.getOrSetLocalGaiaHubConnection(); + if (Object.assign({}, t).wasSigned) + try { + yield i.deleteFromGaiaHub(e, n), + yield i.deleteFromGaiaHub(`${e}${l}`, n); + } catch (t) { + const o = yield r.setLocalGaiaHubConnection(); + yield i.deleteFromGaiaHub(e, o), + yield i.deleteFromGaiaHub(`${e}${l}`, n); + } + else + try { + yield i.deleteFromGaiaHub(e, n); + } catch (t) { + const n = yield r.setLocalGaiaHubConnection(); + yield i.deleteFromGaiaHub(e, n); + } + }); + }), (t.getAppBucketUrl = function(e, t) { return i.getBucketUrl(e, t); }), (t.listFiles = function(e, t) { - return n(this, void 0, void 0, function*() { - const r = t || new f.UserSession(); - return (function e(t, r, n, i, o) { - if (n > 65536) throw new Error('Too many entries to list'); - let a; - const s = JSON.stringify({ page: r }), - u = { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - 'Content-Length': `${s.length}`, - Authorization: `bearer ${t.token}` - }, - body: s - }; - return fetch(`${t.server}/list-files/${t.address}`, u) - .then(e => { - if ((a = e.status) >= 400) - throw new Error(`listFiles failed with HTTP status ${a}`); - return e.text(); - }) - .then(e => JSON.parse(e)) - .then(r => { - const a = r.entries, - s = r.page; - if (null == a) - throw new Error('Bad listFiles response: no entries'); - for (let e = 0; e < a.length; e++) - if (!o(a[e])) return Promise.resolve(i + e); - return s && a.length > 0 - ? e(t, s, n + 1, i + a.length, o) - : Promise.resolve(i + a.length); - }); - })(yield r.getOrSetLocalGaiaHubConnection(), null, 0, 0, e); - }); + return (function e(t, r, i, o, a, s) { + return n(this, void 0, void 0, function*() { + if (o > 65536) throw new Error('Too many entries to list'); + let n; + r = r || (yield t.getOrSetLocalGaiaHubConnection()); + try { + const a = JSON.stringify({ page: i }), + u = { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'Content-Length': `${a.length}`, + Authorization: `bearer ${r.token}` + }, + body: a + }; + if ( + !(n = yield fetch(`${r.server}/list-files/${r.address}`, u)) + .ok + ) + throw new Error( + `listFiles failed with HTTP status ${n.status}` + ); + } catch (r) { + if (0 === o) { + const r = yield t.setLocalGaiaHubConnection(); + return e(t, r, i, o + 1, 0, s); + } + throw r; + } + const u = yield n.text(), + c = JSON.parse(u), + f = c.entries, + l = c.page; + if (null == f) + throw new Error('Bad listFiles response: no entries'); + for (let e = 0; e < f.length; e++) if (!s(f[e])) return a + e; + return l && f.length > 0 + ? e(t, r, l, o + 1, a + f.length, s) + : a + f.length; + }); + })((t = t || new f.UserSession()), null, null, 0, 0, e); }); }, function(e, t, r) { @@ -24386,13 +24420,14 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const o = i(r(23)), + const o = i(r(24)), a = i(r(31)), - s = r(25), + s = r(26), u = r(16), c = r(39), - f = r(20); - function l(t, r, n, i) { + f = r(21), + l = r(20); + function h(t, r, n, i) { const f = t.challenge_text, l = t.latest_auth_version && @@ -24461,6 +24496,30 @@ return JSON.parse(o).publicURL; }); }), + (t.deleteFromGaiaHub = function(e, t) { + return n(this, void 0, void 0, function*() { + f.Logger.debug( + `deleteFromGaiaHub: deleting ${e} from ${t.server}` + ); + const r = yield fetch(`${t.server}/delete/${t.address}/${e}`, { + method: 'DELETE', + headers: { Authorization: `bearer ${t.token}` } + }); + if (!r.ok) { + let e = ''; + try { + e = yield r.text(); + } catch (e) { + f.Logger.debug(`Error getting bad http response text: ${e}`); + } + const t = + 'Error deleting file from Gaia hub: ' + + `${r.status} ${r.statusText}: ${e}`; + throw (f.Logger.error(t), + 404 === r.status ? new l.FileNotFound(t) : new Error(t)); + } + }); + }), (t.getFullReadUrl = function(e, t) { return Promise.resolve(`${t.url_prefix}${t.address}/${e}`); }), @@ -24470,7 +24529,7 @@ const n = yield fetch(`${e}/hub_info`), i = yield n.json(), o = i.read_url_prefix, - a = l(i, t, e, r); + a = h(i, t, e, r); return { url_prefix: o, address: u.ecPairToAddress( @@ -24495,7 +24554,7 @@ 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); const n = r(72), - i = r(29); + i = r(25); t.lookupProfile = function(e, t) { if (!e) return Promise.reject(); let r; @@ -24535,7 +24594,7 @@ }); var n = r(191), i = r(192), - o = r(431); + o = r(430); }, function(e, t, r) { 'use strict'; @@ -24882,7 +24941,7 @@ })(e, t)).replace(/\n{2,}/gim, '\n\n') ); }); - var n = r(430); + var n = r(429); }, function(e, t, r) { 'use strict'; @@ -25097,7 +25156,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(194); + const n = r(433); t.validateProofs = function(e, t, r = null) { if (!e) throw new Error('Profile must not be null'); let i = []; @@ -25128,29 +25187,7 @@ }; }, function(e, t, r) { - 'use strict'; - Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(434), - i = r(472), - o = r(473), - a = r(474), - s = r(475), - u = r(476); - t.profileServices = { - facebook: n.Facebook, - github: i.Github, - twitter: o.Twitter, - instagram: a.Instagram, - hackerNews: s.HackerNews, - linkedIn: u.LinkedIn - }; - var c = r(207); - (t.containsValidProofStatement = c.containsValidProofStatement), - (t.containsValidAddressProofStatement = - c.containsValidAddressProofStatement); - }, - function(e, t, r) { - var n = r(196), + var n = r(195), i = { input: !0, option: !0, @@ -25414,9 +25451,9 @@ }, function(e, t, r) { e.exports = ye; - var n = r(197), + var n = r(196), i = r(108), - o = r(198), + o = r(197), a = r(109), s = 0, u = s++, @@ -26190,7 +26227,7 @@ } var i = r(40), o = /\s+/g, - a = r(200), + a = r(199), s = r(436); function u(e, t, r) { 'object' === n(e) @@ -26352,7 +26389,7 @@ }, function(e, t, r) { e.exports = s; - var n = r(195), + var n = r(194), i = r(448).Writable, o = r(62).StringDecoder, a = r(1).Buffer; @@ -27088,10 +27125,10 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const i = n(r(23)), + const i = n(r(24)), o = n(r(4)), a = r(114), - s = r(29); + s = r(25); function u(e) { return 'number' == typeof e ? { units: 'BTC', amount: new o.default(String(e)) } @@ -27472,9 +27509,9 @@ }, function(e, t, r) { var n = r(2).Buffer, - i = r(22), + i = r(23), o = r(89).pbkdf2Sync, - a = r(26), + a = r(27), s = r(488), u = r(489), c = r(490), @@ -27599,7 +27636,7 @@ }; Object.defineProperty(t, '__esModule', { value: !0 }); const i = n(r(31)), - o = n(r(211)), + o = n(r(210)), a = n(r(497)); t.encryptMnemonic = function(t, r) { return Promise.resolve().then(() => { @@ -27704,10 +27741,10 @@ (o = w.Concat), r(37).SHA512, (u = r(120).PBKDF2), - (c = r(215).Scrypt), + (c = r(214).Scrypt), (_ = r(13)), - (g = r(216)), - (m = r(217).make_esc), + (g = r(215)), + (m = r(216).make_esc), (s = r(42).HMAC_SHA256), (l = { 1: { @@ -29770,7 +29807,7 @@ 'use strict'; (function(e) { Object.defineProperty(t, '__esModule', { value: !0 }); - var n = r(224); + var n = r(223); function i(t, r) { return ( void 0 === r && (r = 'utf8'), @@ -29848,10 +29885,10 @@ })(), o = r(9), a = r(31), - s = r(307), + s = r(306), u = (n = s) && n.__esModule ? n : { default: n }, - c = r(317), - f = r(378), + c = r(316), + f = r(377), l = r(69); var h = (t.SECP256K1Client = (function() { function t() { @@ -31632,7 +31669,7 @@ ] }); try { - n = r(241); + n = r(240); } catch (e) { n = void 0; } @@ -31671,10 +31708,10 @@ }, function(e, t, r) { 'use strict'; - (t.sha1 = r(236)), - (t.sha224 = r(237)), + (t.sha1 = r(235)), + (t.sha224 = r(236)), (t.sha256 = r(128)), - (t.sha384 = r(238)), + (t.sha384 = r(237)), (t.sha512 = r(129)); }, function(e, t, r) { @@ -33060,11 +33097,11 @@ })(e); } var i = r(4), - o = r(243), + o = r(242), a = r(9), s = a.utils.assert, - u = r(244), - c = r(245); + u = r(243), + c = r(244); function f(e) { if (!(this instanceof f)) return new f(e); 'string' == typeof e && @@ -33459,8 +33496,8 @@ o = i.utils, a = o.assert, s = o.parseBytes, - u = r(247), - c = r(248); + u = r(246), + c = r(247); function f(e) { if ( (a('ed25519' === e, 'only tested with ed25519 so far'), @@ -33657,7 +33694,7 @@ function(e, t, r) { 'use strict'; var n = r(2).Buffer, - i = r(251); + i = r(250); (e.exports = (function() { function e() { !(function(e, t) { @@ -34146,7 +34183,7 @@ 'use strict'; var n = r(3), i = r(2).Buffer, - o = r(27), + o = r(28), a = i.alloc(128), s = 64; function u(e, t) { @@ -34265,10 +34302,10 @@ }.call(this, r(7), r(14))); }, function(e, t, r) { - var n = r(267), + var n = r(266), i = r(91), o = r(92), - a = r(282), + a = r(281), s = r(65); function u(e, t, r) { if (((e = e.toLowerCase()), o[e])) return i.createCipheriv(e, t, r); @@ -34307,7 +34344,7 @@ }); }, function(e, t, r) { - var n = r(27), + var n = r(28), i = r(90), o = r(3), a = r(2).Buffer, @@ -35306,7 +35343,7 @@ i = r(145), o = r(2).Buffer, a = r(146), - s = r(27), + s = r(28), u = r(64), c = r(65); function f(e, t, r) { @@ -35563,7 +35600,7 @@ i = r(2).Buffer, o = r(92), a = r(146), - s = r(27), + s = r(28), u = r(64), c = r(65); function f(e, t, r) { @@ -35662,8 +35699,8 @@ function(e, t, r) { (function(e) { var n = r(147), - i = r(284), - o = r(285); + i = r(283), + o = r(284); var a = { binary: !0, hex: !0, base64: !0 }; (t.DiffieHellmanGroup = t.createDiffieHellmanGroup = t.getDiffieHellman = function( t @@ -35739,7 +35776,7 @@ u = new n(3), c = new n(7), f = r(147), - l = r(26); + l = r(27); function h(e, r) { return ( (r = r || 'utf8'), @@ -35860,11 +35897,11 @@ }, function(e, t, r) { (function(t) { - var n = r(22), + var n = r(23), i = r(84), o = r(3), - a = r(287), - s = r(301), + a = r(286), + s = r(300), u = r(138); function c(e) { i.Writable.call(this); @@ -36074,7 +36111,7 @@ function(e, t, r) { 'use strict'; var n = r(48); - t.certificate = r(298); + t.certificate = r(297); var i = n.define('RSAPrivateKey', function() { this.seq().obj( this.key('version').int(), @@ -36891,7 +36928,7 @@ }, function(e, t, r) { var n = t; - (n.der = r(152)), (n.pem = r(295)); + (n.der = r(152)), (n.pem = r(294)); }, function(e, t, r) { var n = r(3), @@ -36934,7 +36971,7 @@ }, function(e, t, r) { var n = t; - (n.der = r(153)), (n.pem = r(297)); + (n.der = r(153)), (n.pem = r(296)); }, function(e, t, r) { var n = r(3), @@ -37253,8 +37290,8 @@ }.call(this, r(1).Buffer)); }, function(e, t, r) { - (t.publicEncrypt = r(304)), - (t.privateDecrypt = r(305)), + (t.publicEncrypt = r(303)), + (t.privateDecrypt = r(304)), (t.privateEncrypt = function(e, r) { return t.publicEncrypt(e, r, !0); }), @@ -37264,8 +37301,8 @@ }, function(e, t, r) { var n = r(66), - i = r(26), - o = r(22), + i = r(27), + o = r(23), a = r(155), s = r(156), u = r(4), @@ -37331,7 +37368,7 @@ o = r(156), a = r(4), s = r(93), - u = r(22), + u = r(23), c = r(157), f = r(2).Buffer; e.exports = function(e, t, r) { @@ -37405,7 +37442,7 @@ ); } var o = r(2), - a = r(26), + a = r(27), s = o.Buffer, u = o.kMaxLength, c = e.crypto || e.msCrypto, @@ -37467,7 +37504,7 @@ }, function(e, t, r) { 'use strict'; - e.exports = r(308); + e.exports = r(307); }, function(e, t, r) { 'use strict'; @@ -38299,7 +38336,7 @@ function(e, t, r) { 'use strict'; var n = t; - (n.der = r(160)), (n.pem = r(314)); + (n.der = r(160)), (n.pem = r(313)); }, function(e, t, r) { 'use strict'; @@ -38344,7 +38381,7 @@ function(e, t, r) { 'use strict'; var n = t; - (n.der = r(161)), (n.pem = r(316)); + (n.der = r(161)), (n.pem = r(315)); }, function(e, t, r) { 'use strict'; @@ -38373,76 +38410,76 @@ (t.default = void 0); var n = ke(r(94)), i = ke(r(162)), - o = ke(r(318)), - a = ke(r(319)), - s = ke(r(320)), - u = ke(r(321)), - c = ke(r(322)), - f = ke(r(323)), - l = ke(r(324)), - h = ke(r(325)), + o = ke(r(317)), + a = ke(r(318)), + s = ke(r(319)), + u = ke(r(320)), + c = ke(r(321)), + f = ke(r(322)), + l = ke(r(323)), + h = ke(r(324)), d = ke(r(67)), - p = ke(r(326)), + p = ke(r(325)), b = ke(r(96)), - y = ke(r(327)), - m = Se(r(328)), - g = Se(r(329)), - v = ke(r(330)), - _ = ke(r(331)), - w = ke(r(332)), - S = ke(r(333)), - k = ke(r(334)), + y = ke(r(326)), + m = Se(r(327)), + g = Se(r(328)), + v = ke(r(329)), + _ = ke(r(330)), + w = ke(r(331)), + S = ke(r(332)), + k = ke(r(333)), x = ke(r(165)), E = ke(r(166)), - A = ke(r(335)), - P = ke(r(336)), - O = ke(r(337)), + A = ke(r(334)), + P = ke(r(335)), + O = ke(r(336)), T = ke(r(164)), - j = Se(r(338)), - M = ke(r(339)), + j = Se(r(337)), + M = ke(r(338)), I = ke(r(167)), - B = ke(r(340)), - D = ke(r(341)), - C = ke(r(342)), - N = ke(r(343)), - U = ke(r(344)), - R = ke(r(345)), - F = ke(r(346)), - z = ke(r(347)), - L = ke(r(348)), + B = ke(r(339)), + D = ke(r(340)), + C = ke(r(341)), + N = ke(r(342)), + U = ke(r(343)), + R = ke(r(344)), + F = ke(r(345)), + z = ke(r(346)), + L = ke(r(347)), q = ke(r(163)), - H = ke(r(349)), - $ = ke(r(350)), - K = ke(r(351)), - V = ke(r(352)), - G = ke(r(353)), - W = ke(r(354)), - X = ke(r(355)), - Z = ke(r(356)), - J = ke(r(357)), - Y = ke(r(358)), - Q = Se(r(359)), - ee = ke(r(360)), - te = ke(r(361)), - re = ke(r(362)), - ne = ke(r(363)), - ie = ke(r(364)), - oe = ke(r(365)), - ae = ke(r(366)), - se = ke(r(367)), - ue = ke(r(368)), - ce = ke(r(369)), - fe = Se(r(370)), + H = ke(r(348)), + $ = ke(r(349)), + K = ke(r(350)), + V = ke(r(351)), + G = ke(r(352)), + W = ke(r(353)), + X = ke(r(354)), + Z = ke(r(355)), + J = ke(r(356)), + Y = ke(r(357)), + Q = Se(r(358)), + ee = ke(r(359)), + te = ke(r(360)), + re = ke(r(361)), + ne = ke(r(362)), + ie = ke(r(363)), + oe = ke(r(364)), + ae = ke(r(365)), + se = ke(r(366)), + ue = ke(r(367)), + ce = ke(r(368)), + fe = Se(r(369)), le = ke(r(168)), he = ke(r(169)), - de = ke(r(371)), - pe = ke(r(372)), - be = ke(r(373)), - ye = ke(r(374)), - me = ke(r(375)), + de = ke(r(370)), + pe = ke(r(371)), + be = ke(r(372)), + ye = ke(r(373)), + me = ke(r(374)), ge = ke(r(170)), - ve = ke(r(376)), - _e = ke(r(377)), + ve = ke(r(375)), + _e = ke(r(376)), we = ke(r(95)); function Se(e) { if (e && e.__esModule) return e; @@ -41195,8 +41232,8 @@ }, function(e, t, r) { var n = r(2).Buffer, - i = r(28), - o = r(387), + i = r(29), + o = r(386), a = r(10), s = r(19), u = r(174), @@ -41378,7 +41415,7 @@ }, function(e, t, r) { 'use strict'; - var n = r(390), + var n = r(389), i = r(2).Buffer; e.exports = function(e) { function t(t) { @@ -41406,7 +41443,7 @@ }; }, function(e, t, r) { - var n = r(391); + var n = r(390); e.exports = n( '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz' ); @@ -41498,14 +41535,14 @@ function(e, t, r) { var n = r(2).Buffer, i = r(177), - o = r(28), + o = r(29), a = r(5), s = r(15), u = r(6), c = r(101), f = r(10), l = r(19), - h = r(400), + h = r(399), d = h.types, p = r(175), b = r(99); @@ -42377,7 +42414,7 @@ i = r(10), o = r(6), a = r(34), - s = r(28), + s = r(29), u = r(5), c = r(15).bitcoin, f = r(52); @@ -42504,7 +42541,7 @@ var n = r(35), i = r(10), o = r(6), - a = r(28), + a = r(29), s = r(5), u = r(15).bitcoin, c = r(52); @@ -42676,7 +42713,7 @@ i = r(10), o = r(6), a = r(34), - s = r(28), + s = r(29), u = r(100), c = r(5), f = r(15).bitcoin, @@ -42794,7 +42831,7 @@ i = r(10), o = r(6), a = r(100), - s = r(28), + s = r(29), u = r(5), c = r(15).bitcoin, f = t.alloc(0); @@ -42954,13 +42991,13 @@ function(e, t, r) { var n = r(5).decompile, i = r(102), - o = r(403), + o = r(402), a = r(103), s = r(104), - u = r(408), - c = r(411), - f = r(413), - l = r(415), + u = r(407), + c = r(410), + f = r(412), + l = r(414), h = { P2MS: 'multisig', NONSTANDARD: 'nonstandard', @@ -43134,7 +43171,7 @@ (e.exports = { check: o }); }, function(e, t, r) { - e.exports = { input: r(409), output: r(410) }; + e.exports = { input: r(408), output: r(409) }; }, function(e, t, r) { var n = r(2).Buffer, @@ -43184,7 +43221,7 @@ (e.exports = { check: o }); }, function(e, t, r) { - e.exports = { input: r(412), output: r(178) }; + e.exports = { input: r(411), output: r(178) }; }, function(e, t, r) { var n = r(5); @@ -43203,7 +43240,7 @@ (e.exports = { check: i }); }, function(e, t, r) { - e.exports = { input: r(414), output: r(179) }; + e.exports = { input: r(413), output: r(179) }; }, function(e, t, r) { (function(t) { @@ -43233,7 +43270,7 @@ }.call(this, r(1).Buffer)); }, function(e, t, r) { - e.exports = { output: r(416) }; + e.exports = { output: r(415) }; }, function(e, t, r) { var n = r(2).Buffer, @@ -43267,7 +43304,7 @@ }); }, function(e, t, r) { - var n = r(22), + var n = r(23), i = r(63); e.exports = { hash160: function(e) { @@ -43303,8 +43340,8 @@ : typeof e; })(e); } - var i = r(419), - o = r(420); + var i = r(418), + o = r(419); function a() { (this.protocol = null), (this.slashes = null), @@ -43363,7 +43400,7 @@ 'gopher:': !0, 'file:': !0 }, - v = r(421); + v = r(420); function _(e, t, r) { if (e && o.isObject(e) && e instanceof a) return e; var n = new a(); @@ -43955,7 +43992,7 @@ }, function(e, t, r) { 'use strict'; - (t.decode = t.parse = r(422)), (t.encode = t.stringify = r(423)); + (t.decode = t.parse = r(421)), (t.encode = t.stringify = r(422)); }, function(e, t, r) { 'use strict'; @@ -44089,9 +44126,9 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(426), + const n = r(425), i = r(43), - o = r(24); + o = r(20); class a { constructor(e) { if (e) { @@ -44167,7 +44204,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(24), + const n = r(20), i = '1.0.0'; class o { constructor(e) { @@ -44295,7 +44332,7 @@ 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); const n = r(16), - i = r(20); + i = r(21); t.launchCustomProtocol = function(e, t, r) { const o = Math.random() .toString(36) @@ -44352,14 +44389,10 @@ }; f(); const l = window.document.createElement('input'); - l.type = 'text'; - const h = l.style; - (h.all = 'initial'), - (h.opacity = '0'), - (h.filter = 'alpha(opacity=0)'), - (h.height = '0'), - (h.width = '0'); - const d = () => { + (l.type = 'text'), + (l.style.cssText = + 'all: initial; position: fixed; top: 0; height: 0; width: 0; opacity: 0;'); + const h = () => { let e = !1; l.addEventListener( 'focus', @@ -44388,11 +44421,11 @@ )); }, 100); }; - l.addEventListener('blur', d, { once: !0, capture: !0 }), - setTimeout(() => l.removeEventListener('blur', d), 200), + l.addEventListener('blur', h, { once: !0, capture: !0 }), + setTimeout(() => l.removeEventListener('blur', h), 200), window.document.body.appendChild(l), l.focus(); - const p = () => { + const d = () => { window.document.hidden && u && (i.Logger.info( @@ -44400,12 +44433,12 @@ ), f(3e3)); }; - window.document.addEventListener('visibilitychange', p, { + window.document.addEventListener('visibilitychange', d, { once: !0, capture: !0 }), setTimeout( - () => window.document.removeEventListener('visibilitychange', p), + () => window.document.removeEventListener('visibilitychange', d), 500 ), window.addEventListener( @@ -44413,7 +44446,7 @@ function e(n) { if (n.key === a && 'success' === window.localStorage.getItem(a)) { c(), - l.removeEventListener('blur', d), + l.removeEventListener('blur', h), i.Logger.info( 'Protocol echo reply detected from localStorage event.' ), @@ -44425,13 +44458,12 @@ !1 ), i.Logger.info('Attempting protocol launch via iframe injection.'); - const b = `${n.BLOCKSTACK_HANDLER}:${e}&echo=${o}`, - y = window.document.createElement('iframe'), - m = y.style; - (m.all = 'initial'), - (m.display = 'none'), - (y.src = b), - window.document.body.appendChild(y); + const p = `${n.BLOCKSTACK_HANDLER}:${e}&echo=${o}`, + b = window.document.createElement('iframe'); + (b.style.cssText = + 'all: initial; display: none; position: fixed; top: 0; height: 0; width: 0; opacity: 0;'), + (b.src = p), + window.document.body.appendChild(b); }; }, function(e, t, r) { @@ -44523,7 +44555,7 @@ } !(function() { var t = {}; - if (((t.async = r(433)), 'object' !== n(t.async))) + if (((t.async = r(432)), 'object' !== n(t.async))) throw new Error( 'Module async is required (https://github.com/caolan/async)' ); @@ -46862,6 +46894,24 @@ })(); }.call(this, r(7), r(87).setImmediate, r(14), r(17)(e))); }, + function(e, t, r) { + 'use strict'; + Object.defineProperty(t, '__esModule', { value: !0 }); + const n = r(434), + i = r(472), + o = r(473), + a = r(474), + s = r(475), + u = r(476); + t.profileServices = { + facebook: n.Facebook, + github: i.Github, + twitter: o.Twitter, + instagram: a.Instagram, + hackerNews: s.HackerNews, + linkedIn: u.LinkedIn + }; + }, function(e, t, r) { 'use strict'; var n = @@ -46941,7 +46991,7 @@ }; }, function(e, t, r) { - var n = r(200), + var n = r(199), i = (e.exports = Object.create(n)), o = { tagName: 'name' }; Object.keys(o).forEach(function(e) { @@ -46957,7 +47007,7 @@ }); }, function(e, t, r) { - var n = r(199), + var n = r(198), i = r(36); function o(e, t) { this.init(e, t); @@ -47151,9 +47201,9 @@ }, function(e, t, r) { var n = r(108), - i = r(198), + i = r(197), o = r(109), - a = r(197), + a = r(196), s = c(o), u = c(n); function c(e) { @@ -47474,7 +47524,7 @@ }, function(e, t, r) { e.exports = i; - var n = r(201); + var n = r(200); function i(e) { n.call(this, new o(this), e); } @@ -47595,7 +47645,7 @@ c = o.camelCase, f = o.cssCase, l = /\s+/, - h = { forEach: r(76), extend: r(202), some: r(460) }, + h = { forEach: r(76), extend: r(201), some: r(460) }, d = { null: null, true: !0, false: !1 }, p = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i, b = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/, @@ -47981,7 +48031,7 @@ u = r(56), c = u.trueFunc, f = u.falseFunc, - l = r(206); + l = r(205); function h(e) { return function(t) { return o(t) && e(t); @@ -48287,7 +48337,7 @@ u = n.getName; e.exports = { __proto__: null, - attribute: r(205).compile, + attribute: r(204).compile, pseudo: r(113).compile, tag: function(e, t) { var r = t.name; @@ -48354,7 +48404,7 @@ } } }; - var n = r(206), + var n = r(205), i = { __proto__: null, exists: 10, @@ -49869,7 +49919,7 @@ }.call(this, r(7), r(17)(e))); }, function(e, t, r) { - var n = r(204), + var n = r(203), i = r(55), o = i.domEach, a = r(54).DomUtils.uniqueSort, @@ -54461,24 +54511,22 @@ return !0; } static getProofIdentity(e) { - const t = i.default - .load(e)('article') - .find('.post-meta__profile-link'); + const t = i.default.load(e)('body > main header a'); return void 0 !== t ? void 0 === t.attr('href') ? '' : t .attr('href') + .split('?') + .shift() .split('/') .pop() : ''; } static getProofStatement(e) { - const t = i.default - .load(e)('article') - .find('.commentary'); + const t = i.default.load(e)('head > meta[property="og:title"]'); let r = ''; - return void 0 !== t && (r = t.text()), r; + return void 0 !== t && (r = t.attr('content')), r; } }; }, @@ -54615,7 +54663,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(25); + const n = r(26); function i(e, t, r, i = null, o = null) { null === o && (o = '.default'); const a = { @@ -54697,9 +54745,8 @@ (t.extractProfile = o.extractProfile); var a = r(193); t.validateProofs = a.validateProofs; - var s = r(194); - (t.profileServices = s.profileServices), - (t.containsValidProofStatement = s.containsValidProofStatement), + var s = r(206); + (t.containsValidProofStatement = s.containsValidProofStatement), (t.containsValidAddressProofStatement = s.containsValidAddressProofStatement); var u = r(72); @@ -54718,7 +54765,7 @@ t.Organization = i.Organization; var o = r(482); t.CreativeWork = o.CreativeWork; - var a = r(208); + var a = r(207); t.getPersonFromLegacyFormat = a.getPersonFromLegacyFormat; var s = r(483); t.resolveZoneFileToPerson = s.resolveZoneFileToPerson; @@ -54846,10 +54893,10 @@ for (var r in e) t.hasOwnProperty(r) || (t[r] = e[r]); } Object.defineProperty(t, '__esModule', { value: !0 }); - var i = r(209); + var i = r(208); t.makePreorderSkeleton = i.makePreorderSkeleton; var o = r(485); - (t.transactions = o.transactions), n(r(114)), n(r(210)); + (t.transactions = o.transactions), n(r(114)), n(r(209)); var a = r(486); t.safety = a.safety; }, @@ -54862,12 +54909,12 @@ return e && e.__esModule ? e : { default: e }; }; Object.defineProperty(t, '__esModule', { value: !0 }); - const i = n(r(23)), + const i = n(r(24)), o = r(114), - a = r(209), - s = r(29), - u = r(24), - c = r(210), + a = r(208), + s = r(25), + u = r(20), + c = r(209), f = 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa', l = 'ffffffffffffffffffffffffffffffffffffffff'; function h(e, t, r, n = !0) { @@ -55367,7 +55414,7 @@ function(e, t, r) { 'use strict'; Object.defineProperty(t, '__esModule', { value: !0 }); - const n = r(29); + const n = r(25); function i(e = '') { const t = /^[a-z0-9\-_+]+$/; if (!e || e.length > 37) return Promise.resolve(!1); @@ -55514,11 +55561,11 @@ }; Object.defineProperty(t, '__esModule', { value: !0 }); const a = i(r(31)), - s = i(r(23)), - u = o(r(211)), + s = i(r(24)), + u = o(r(210)), c = o(r(180)), f = r(16), - l = r(212), + l = r(211), h = 0, d = 888, p = 0, @@ -79907,9 +79954,9 @@ (function(e) { (function() { var n, i, o, a, s; - for (i in (a = r(213))) (o = a[i]), (t[i] = o); + for (i in (a = r(212))) (o = a[i]), (t[i] = o); for (i in (s = r(505))) (o = s[i]), (t[i] = o); - (t.prng = r(216)), + (t.prng = r(215)), (t.Buffer = e), (t.WordArray = r(8).WordArray), (t.util = r(13)), @@ -79929,7 +79976,7 @@ RIPEMD160: r(510).RIPEMD160 }), (t.modes = { CTR: r(77) }), - (t.scrypt = r(215).scrypt), + (t.scrypt = r(214).scrypt), (t.pbkdf2 = r(120).pbkdf2), (t.hmac = n = r(42)), (t.HMAC_SHA256 = n.HMAC_SHA256), @@ -79946,7 +79993,7 @@ a, s = [].slice; (e = r(115)), - (t.iced = n = r(214)), + (t.iced = n = r(213)), (a = function(e, t, r, i) { var o, a, u, c, f; (c = n.findDeferral(arguments)), @@ -81282,9 +81329,9 @@ (i = r(78).Concat), r(37).SHA512, (a = r(57).Salsa20), - (n = (d = r(213)).Base), + (n = (d = r(212)).Base), (u = d.V), - (h = r(217).make_esc), + (h = r(216).make_esc), (o = (function(t) { function r(e) { var t, n; @@ -81691,7 +81738,7 @@ a, s = {}.hasOwnProperty; (o = r(8).WordArray), - (e = r(21).Hasher), + (e = r(22).Hasher), (i = []), (n = (function(t) { function r() { @@ -81939,7 +81986,7 @@ f, l = {}.hasOwnProperty; (c = r(8).WordArray), - (a = r(21).Hasher), + (a = r(22).Hasher), (i = (function() { return function() { var e; @@ -82195,7 +82242,7 @@ (a = p.WordArray), p.X64Word, p.X64WordArray, - (i = r(21).Hasher), + (i = r(22).Hasher), (n = (function() { return function() { (this._zl = new a([ @@ -82735,7 +82782,7 @@ (t.signECDSA = n.signECDSA), (t.verifyECDSA = n.verifyECDSA), (t.getHexFromBN = n.getHexFromBN); - var i = r(212); + var i = r(211); (t.encryptMnemonic = i.encryptMnemonic), (t.decryptMnemonic = i.decryptMnemonic); } diff --git a/src/index.html b/src/index.html index 8b5036c..cb2949d 100644 --- a/src/index.html +++ b/src/index.html @@ -105,7 +105,7 @@ amplitude.getInstance().init("2812157bf3754165ff75f3b61284d857"); - + diff --git a/src/pages/app-photo/app-photo.tsx b/src/pages/app-photo/app-photo.tsx index 986a963..f810b3c 100644 --- a/src/pages/app-photo/app-photo.tsx +++ b/src/pages/app-photo/app-photo.tsx @@ -394,22 +394,30 @@ export class AppPhoto { } async deletePhotoCallback() { - this.deleteInProgress = false; if (this.updateCallback && typeof this.updateCallback === 'function') { // execute the callback, passing parameters as necessary this.updateCallback(); } - const deletedIndex: number = await this.slides.getActiveIndex(); - if (this.nextPhotoId) { - this.photos.splice(deletedIndex, 1); - await this.setNextAndPreviousPhoto(this.nextPhotoId); - } else if (this.previousPhotoId) { - this.photos.splice(deletedIndex, 1); - await this.setNextAndPreviousPhoto(this.previousPhotoId); - } else { + // const deletedIndex: number = await this.slides.getActiveIndex(); + // console.log('deletedIndex', deletedIndex); + // if (this.nextPhotoId) { + // console.log('nextPhotoId', this.nextPhotoId); + // // this.photos.filter(item => item.photoId !== this.photos[deletedIndex].photoId); + // this.photos.splice(deletedIndex, 1); + // await this.setNextAndPreviousPhoto(this.nextPhotoId); + // } else if (this.previousPhotoId) { + // console.log('previousPhotoId', this.previousPhotoId); + // // this.photos.filter(item => item.photoId !== this.photos[deletedIndex].photoId); + // this.photos.splice(deletedIndex, 1); + // // this.garbage += 1; + // await this.setNextAndPreviousPhoto(this.previousPhotoId); + // } else { + setTimeout(() => { + this.deleteInProgress = false; this.modalController.dismiss(); - } + }, 1000); + // } AnalyticsService.logEvent('photo-page-delete'); } diff --git a/src/pages/app-root/app-root.tsx b/src/pages/app-root/app-root.tsx index 5fe073e..8883b56 100644 --- a/src/pages/app-root/app-root.tsx +++ b/src/pages/app-root/app-root.tsx @@ -51,13 +51,13 @@ export class AppRoot { if (await SettingsService.getAnalyticsSetting(true)) { Sentry.init({ dsn: 'https://2b0b525209b646f49e438cff86c3e117@sentry.io/1331915', - release: 'block-photos@4.1' + release: 'block-photos@4.2' }); } } catch (error) { Sentry.init({ dsn: 'https://2b0b525209b646f49e438cff86c3e117@sentry.io/1331915', - release: 'block-photos@4.1' + release: 'block-photos@4.2' }); } diff --git a/src/pages/app-settings/app-settings.tsx b/src/pages/app-settings/app-settings.tsx index b136f0f..69883d1 100644 --- a/src/pages/app-settings/app-settings.tsx +++ b/src/pages/app-settings/app-settings.tsx @@ -231,7 +231,7 @@ export class AppSettings { Read our source code -

Block Photos - Version 4.1

+

Block Photos - Version 4.2

]; } diff --git a/src/services/albums-service.ts b/src/services/albums-service.ts index 7121edf..8a28f5f 100644 --- a/src/services/albums-service.ts +++ b/src/services/albums-service.ts @@ -124,10 +124,7 @@ export default class AlbumsService { static async deleteAlbum(albumId: string): Promise { let returnState = false; try { - // Put empty file, since deleteFile is yet not supported - await StorageService.setItem(albumId, ''); - // TODO: add back when available. - // await deleteFile(albumId); + StorageService.deleteItem(albumId); returnState = true; } catch (error) { returnState = false; diff --git a/src/services/photos-service.ts b/src/services/photos-service.ts index 761e251..1541a8e 100644 --- a/src/services/photos-service.ts +++ b/src/services/photos-service.ts @@ -300,12 +300,33 @@ export default class PhotosService { try { // Delete photo, compressed photos and the photo metadata await StorageService.deleteItem(photoId); + returnState = true; + } catch (error) { + returnState = error.message.includes('DoesNotExist') ? true : false; + } + + try { + // Delete photo, compressed photos and the photo metadata await StorageService.deleteItem(photoId + '-meta'); + returnState = true; + } catch (error) { + returnState = error.message.includes('DoesNotExist') ? true : false; + } + + try { + // Delete photo, compressed photos and the photo metadata await StorageService.deleteItem(photoId + '-thumbnail'); + returnState = true; + } catch (error) { + returnState = error.message.includes('DoesNotExist') ? true : false; + } + + try { + // Delete photo, compressed photos and the photo metadata await StorageService.deleteItem(photoId + '-viewer'); returnState = true; } catch (error) { - returnState = false; + returnState = error.message.includes('DoesNotExist') ? true : false; } if (!returnState) { diff --git a/src/services/storage-service.ts b/src/services/storage-service.ts index 1e6fc05..70d2fbb 100644 --- a/src/services/storage-service.ts +++ b/src/services/storage-service.ts @@ -38,9 +38,7 @@ export default class StorageService { static async deleteItem(itemId: string) { const userSession = new blockstack.UserSession(); - await userSession.putFile(itemId, ''); - // TODO: wait for implementation - // await userSession.deleteFile(itemId); + await userSession.deleteFile(itemId); await CacheService.deleteItem(itemId); } From 3067b99924401c1e1b2bc940f4aa1423cc4cf506 Mon Sep 17 00:00:00 2001 From: TheNerdicCoder Date: Sun, 9 Jun 2019 09:57:58 +0300 Subject: [PATCH 2/4] Test without encryption --- src/components.d.ts | 13 ------------- src/services/storage-service.ts | 8 ++++++-- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/components.d.ts b/src/components.d.ts index 06c73d4..9b3fb09 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -75,9 +75,6 @@ export namespace Components { interface AppSettings {} interface AppSettingsAttributes extends StencilHTMLAttributes {} - - interface AppSignin {} - interface AppSigninAttributes extends StencilHTMLAttributes {} } declare global { @@ -90,7 +87,6 @@ declare global { 'AppPhotos': Components.AppPhotos; 'AppRoot': Components.AppRoot; 'AppSettings': Components.AppSettings; - 'AppSignin': Components.AppSignin; } interface StencilIntrinsicElements { @@ -102,7 +98,6 @@ declare global { 'app-photos': Components.AppPhotosAttributes; 'app-root': Components.AppRootAttributes; 'app-settings': Components.AppSettingsAttributes; - 'app-signin': Components.AppSigninAttributes; } @@ -154,12 +149,6 @@ declare global { new (): HTMLAppSettingsElement; }; - interface HTMLAppSigninElement extends Components.AppSignin, HTMLStencilElement {} - var HTMLAppSigninElement: { - prototype: HTMLAppSigninElement; - new (): HTMLAppSigninElement; - }; - interface HTMLElementTagNameMap { 'block-img': HTMLBlockImgElement 'filter-popover': HTMLFilterPopoverElement @@ -169,7 +158,6 @@ declare global { 'app-photos': HTMLAppPhotosElement 'app-root': HTMLAppRootElement 'app-settings': HTMLAppSettingsElement - 'app-signin': HTMLAppSigninElement } interface ElementTagNameMap { @@ -181,7 +169,6 @@ declare global { 'app-photos': HTMLAppPhotosElement; 'app-root': HTMLAppRootElement; 'app-settings': HTMLAppSettingsElement; - 'app-signin': HTMLAppSigninElement; } diff --git a/src/services/storage-service.ts b/src/services/storage-service.ts index 70d2fbb..5259885 100644 --- a/src/services/storage-service.ts +++ b/src/services/storage-service.ts @@ -11,7 +11,9 @@ export default class StorageService { let item = await CacheService.getItem(itemId); if (!item || forceUpdateCache) { const userSession = new blockstack.UserSession(); - item = await userSession.getFile(itemId); + item = await userSession.getFile(itemId, { + decrypt: false + }); if (updateCache || forceUpdateCache) { CacheService.setItem(itemId, item); } @@ -26,7 +28,9 @@ export default class StorageService { cacheItem = true ): Promise { const userSession = new blockstack.UserSession(); - await userSession.putFile(itemId, itemValue); + await userSession.putFile(itemId, itemValue, { + encrypt: false + }); if (cacheItem) { await CacheService.setItem(itemId, itemValue); } From 5ded66d9b79872fa4bad5a975ad0e0ce7bb0b84c Mon Sep 17 00:00:00 2001 From: TheNerdicCoder Date: Sun, 9 Jun 2019 21:16:41 +0300 Subject: [PATCH 3/4] Add encryption back --- src/services/storage-service.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/services/storage-service.ts b/src/services/storage-service.ts index 5259885..70d2fbb 100644 --- a/src/services/storage-service.ts +++ b/src/services/storage-service.ts @@ -11,9 +11,7 @@ export default class StorageService { let item = await CacheService.getItem(itemId); if (!item || forceUpdateCache) { const userSession = new blockstack.UserSession(); - item = await userSession.getFile(itemId, { - decrypt: false - }); + item = await userSession.getFile(itemId); if (updateCache || forceUpdateCache) { CacheService.setItem(itemId, item); } @@ -28,9 +26,7 @@ export default class StorageService { cacheItem = true ): Promise { const userSession = new blockstack.UserSession(); - await userSession.putFile(itemId, itemValue, { - encrypt: false - }); + await userSession.putFile(itemId, itemValue); if (cacheItem) { await CacheService.setItem(itemId, itemValue); } From 1ce88e5a721cd2cb78eadd3f46379f7882386eb0 Mon Sep 17 00:00:00 2001 From: TheNerdicCoder Date: Sun, 9 Jun 2019 21:17:22 +0300 Subject: [PATCH 4/4] components update --- src/components.d.ts | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/components.d.ts b/src/components.d.ts index 9b3fb09..06c73d4 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -75,6 +75,9 @@ export namespace Components { interface AppSettings {} interface AppSettingsAttributes extends StencilHTMLAttributes {} + + interface AppSignin {} + interface AppSigninAttributes extends StencilHTMLAttributes {} } declare global { @@ -87,6 +90,7 @@ declare global { 'AppPhotos': Components.AppPhotos; 'AppRoot': Components.AppRoot; 'AppSettings': Components.AppSettings; + 'AppSignin': Components.AppSignin; } interface StencilIntrinsicElements { @@ -98,6 +102,7 @@ declare global { 'app-photos': Components.AppPhotosAttributes; 'app-root': Components.AppRootAttributes; 'app-settings': Components.AppSettingsAttributes; + 'app-signin': Components.AppSigninAttributes; } @@ -149,6 +154,12 @@ declare global { new (): HTMLAppSettingsElement; }; + interface HTMLAppSigninElement extends Components.AppSignin, HTMLStencilElement {} + var HTMLAppSigninElement: { + prototype: HTMLAppSigninElement; + new (): HTMLAppSigninElement; + }; + interface HTMLElementTagNameMap { 'block-img': HTMLBlockImgElement 'filter-popover': HTMLFilterPopoverElement @@ -158,6 +169,7 @@ declare global { 'app-photos': HTMLAppPhotosElement 'app-root': HTMLAppRootElement 'app-settings': HTMLAppSettingsElement + 'app-signin': HTMLAppSigninElement } interface ElementTagNameMap { @@ -169,6 +181,7 @@ declare global { 'app-photos': HTMLAppPhotosElement; 'app-root': HTMLAppRootElement; 'app-settings': HTMLAppSettingsElement; + 'app-signin': HTMLAppSigninElement; }