From a045a2196e203c08672b805fba4c896e72f5457d Mon Sep 17 00:00:00 2001 From: Nich87 Date: Tue, 15 Feb 2022 14:52:14 +0900 Subject: [PATCH] update app.js --- .gitignore | 2 + package-lock.json | 4586 ++++++++++++++++++++++++++++++++++++++++++++- src/config.json | 2 +- src/css/index.css | 11 +- src/index.html | 25 +- src/js/app.js | 165 +- src/js/preload.js | 8 +- 7 files changed, 4653 insertions(+), 146 deletions(-) diff --git a/.gitignore b/.gitignore index 8e3a106..1d5ec64 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,5 @@ typings/ # Electron-Forge out/ + +dist/ diff --git a/package-lock.json b/package-lock.json index 25641e2..2d8b053 100644 --- a/package-lock.json +++ b/package-lock.json @@ -46,7 +46,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/async-ora/-/async-ora-6.0.0-beta.63.tgz", "integrity": "sha512-e1BbeUV20yWZWeRJ3LDLcloPPgHwTXV1wAJXpAdDbmTmcRyAGx9iVx2Qyh6t878c7zX36XXlqfCIOvODsgiuOQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "chalk": "^4.0.0", "debug": "^4.3.1", @@ -73,7 +76,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-.electron-forge-cli?utm_medium=referral&utm_source=npm_fund" } ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/core": "6.0.0-beta.63", @@ -110,7 +116,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-.electron-forge-core?utm_medium=referral&utm_source=npm_fund" } ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/installer-base": "6.0.0-beta.63", @@ -151,6 +160,7 @@ "node": ">= 12.13.0" } }, +<<<<<<< Updated upstream "node_modules/@electron-forge/core/node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -216,12 +226,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +======= +>>>>>>> Stashed changes "node_modules/@electron-forge/installer-base": { "version": "6.0.0-beta.63", "resolved": "https://registry.npmjs.org/@electron-forge/installer-base/-/installer-base-6.0.0-beta.63.tgz", "integrity": "sha512-y4SKJZaxE8lnfwicWuAiUZBpBY6UB/mE/dA+w6uigKEffZzRPbrbBUIuknII6wEaFnnScmCrQaBRjxy+zsEihQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63" }, @@ -234,7 +249,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.63.tgz", "integrity": "sha512-LQE6UKPP7tJ+Ki3tPzYUIBRAAzEpalqkz8zYUh+2pS/nk9w2BgQeOJ84NzWUfoeLWZnsWtjp8kox8xTS8/BsSQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/installer-base": "6.0.0-beta.63", @@ -250,7 +268,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.63.tgz", "integrity": "sha512-gvjCXdGXBxC/O8QuwNHKsLIlfOwVc9y/e5pURcuFRvPf7Ibw7e53w3pfR2pquWHNzAccrw8P5WBEuPSeDPBlLw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-linux": "6.0.0-beta.63" }, @@ -263,7 +284,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.63.tgz", "integrity": "sha512-o+Zd2CmpoMQOk9SfuUPIoQ4GONVNHdlmI4mMIJ22OrLQnZJYAdsQUFO87jtxmJuippTpEbnqaKc9yl6mLh89TQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-darwin": "6.0.0-beta.63", "@malept/cross-spawn-promise": "^2.0.0", @@ -279,7 +303,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.63.tgz", "integrity": "sha512-HhogUMTTgOXTEMQE+A20USamuAcnClSSWzlInzVQ2cGT5AdZio6zqNJ/et7zPx7Jz71gmJ/cfhNstzc/ew1IAA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-base": "6.0.0-beta.63", "open": "^8.1.0" @@ -293,7 +320,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.63.tgz", "integrity": "sha512-yC2wYQ3uXGnvWEG4AdjSmas5qaXXtXIoxO6/cXJrywMT9ujWlp2GB1i+I5xrFCusgbjdvdzJ3JhLRmIAKpW6ZA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-base": "6.0.0-beta.63", "sudo-prompt": "^9.1.1" @@ -307,7 +337,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.63.tgz", "integrity": "sha512-4p+zDInl6sMnx1jdIcRSXgRAGFSwtcBPBStAlVuxPMefM8ElBPhskUyHrk33TqMZUdzbr+vYA+pQGj/6jlET4A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-linux": "6.0.0-beta.63" }, @@ -320,7 +353,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.63.tgz", "integrity": "sha512-ZORm3jVvswvKSv+iuufTVXwIM/OOtBSQPeAay8hVubf6MudWBdntWv1Xg/BAUAcdRbAH/EIbMv83LZvmt7cufw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/installer-darwin": "6.0.0-beta.63", "@malept/cross-spawn-promise": "^2.0.0", @@ -335,7 +371,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-6.0.0-beta.63.tgz", "integrity": "sha512-0Fh6OOjS/1sXIGReKgU5NCMf8ZUyaCUSjd190oUNaX8OSxGDbHrbWO3CgIbsAOsxRnxzhYY1UtPo6VkexjCQBA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/shared-types": "6.0.0-beta.63", "fs-extra": "^10.0.0", @@ -350,7 +389,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.63.tgz", "integrity": "sha512-6U4SQ9qFqd0UPCTfJU6358ifxnLvMxJmwyy3Z/4lZlYIfL2112gsQRyvlv7UcFXamw+1CZ9n9SY3f/K50susEQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/maker-base": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63" @@ -367,7 +409,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.63.tgz", "integrity": "sha512-htKNsA3/7nOd5PL6jjdrYCcSXrrIj43aJyOfIuFHswFpjFFmYEgsDCrN8lKZH5y1qdXQefaGOc9MapuBC0GO+w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/maker-base": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63" @@ -384,7 +429,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.63.tgz", "integrity": "sha512-18eLRQmMZ6zBcI1Jhuqvhm50bmmatRCbyOUHTaIbhVf1M6ksq34xXXVWKUGlqDiCNLLLNzVw5MIb9O04eUdfIg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/maker-base": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -402,7 +450,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.63.tgz", "integrity": "sha512-tXNX58ly2TYj0Z7G9bKP3FbEHLfeNv+lJgmlDBwP5Uh4yG0d/dxIBUzP5Dv+pIjsH/l3K3dVfCCM3fc4q+u3Mg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/maker-base": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -418,7 +469,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.63.tgz", "integrity": "sha512-K9nyGRI9NY2kax7aS/1eWxGrOSwNO3JnmbfvFQf5I0Yl/HKClrfGJq4o3q4N9lf55arPRJBROP8+rHJ115VCrA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/shared-types": "6.0.0-beta.63" }, @@ -431,7 +485,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.63.tgz", "integrity": "sha512-ag+/e6eqM6k1jxUhXg8618IbUa1IsF8OcbZtjcLSZSp/ZEGLAlZ3IpfIrk5C9cRUdibhDJyT6oFLfbG7KUhpRg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/shared-types": "6.0.0-beta.63" }, @@ -444,7 +501,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-6.0.0-beta.63.tgz", "integrity": "sha512-ayw8IBtHKZ1oIN3y3t3Jm80TTvstvKrPASCXMEJ/fh4gHah8pUmDFZEvyAsGgy/XFHqsjlpTmD2hdOtQqCRpMQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "electron-packager": "^15.4.0", @@ -460,7 +520,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-6.0.0-beta.63.tgz", "integrity": "sha512-u1rPlrc8bqajkiKe2tmGROL9/o0xx8OzMBHsT7i2+oAFPicSZoyrELCxx9htCeLgUf0iR0K0EzLsFjdyRjTBkg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -478,7 +541,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript/-/template-typescript-6.0.0-beta.63.tgz", "integrity": "sha512-npFOyak+F+p086GoSifCWwhBxRSJqzzvEwztnONpbjp7BasvtWUyOVpXyyzvt7GaawjRg5Gx/NUgVi5Oi9BIfg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -494,7 +560,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.63.tgz", "integrity": "sha512-8S3GW2MRmYF6BsgozCm0CPqAuqaK48MZvJJ3v3XbO1tWPtz4vvw21XxQeOqRMpECdNbqnRBtil4QxVditEx3Kw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -510,7 +579,10 @@ "resolved": "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.63.tgz", "integrity": "sha512-CE5zjnyfmHlapwQSJ54kUeTNsvhx/7HAjvfMXpE689LxlFnr0VhiTxuc5kwEetPcxsXhei7IBy/PdJ41v4dswA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron-forge/async-ora": "6.0.0-beta.63", "@electron-forge/shared-types": "6.0.0-beta.63", @@ -526,7 +598,10 @@ "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.13.1.tgz", "integrity": "sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^4.1.1", "env-paths": "^2.2.0", @@ -549,7 +624,10 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^4.0.0", @@ -559,16 +637,43 @@ "node": ">=6 <7 || >=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/@electron/get/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, +>>>>>>> Stashed changes "node_modules/@electron/get/node_modules/semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "bin": { "semver": "bin/semver.js" } }, +<<<<<<< Updated upstream +======= + "node_modules/@electron/get/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, +>>>>>>> Stashed changes "node_modules/@electron/universal": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.0.5.tgz", @@ -607,6 +712,7 @@ "node": ">= 10" } }, +<<<<<<< Updated upstream "node_modules/@electron/universal/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -621,6 +727,8 @@ "node": ">= 8" } }, +======= +>>>>>>> Stashed changes "node_modules/@electron/universal/node_modules/fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -636,6 +744,7 @@ "node": ">=10" } }, +<<<<<<< Updated upstream "node_modules/@electron/universal/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -687,12 +796,18 @@ "node": ">= 10.0.0" } }, +======= +>>>>>>> Stashed changes "node_modules/@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", "integrity": "sha512-82cpyJyKRoQoRi+14ibCeGPu0CwypgtBAdBhq1WfvagpCZNKqwXbKwXllYSMG91DhmG4jt9gN8eP6lGOtozuaw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/@malept/cross-spawn-promise": { "version": "2.0.0", @@ -709,7 +824,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" } ], +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "cross-spawn": "^7.0.1" }, @@ -717,6 +835,7 @@ "node": ">= 12.13.0" } }, +<<<<<<< Updated upstream "node_modules/@malept/cross-spawn-promise/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -765,6 +884,8 @@ "node": ">=8" } }, +======= +>>>>>>> Stashed changes "node_modules/@malept/flatpak-bundler": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz", @@ -795,6 +916,7 @@ "node": ">=10" } }, +<<<<<<< Updated upstream "node_modules/@malept/flatpak-bundler/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -837,12 +959,17 @@ "node": ">= 10.0.0" } }, +======= +>>>>>>> Stashed changes "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -856,7 +983,10 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 8" } @@ -866,7 +996,10 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -876,6 +1009,7 @@ } }, "node_modules/@npmcli/fs": { +<<<<<<< Updated upstream "version": "1.1.0", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.0.tgz", "integrity": "sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==", @@ -887,6 +1021,15 @@ }, "engines": { "node": "^12.13.0 || ^14.15.0 || >=16" +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", + "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", + "dev": true, + "dependencies": { + "@gar/promisify": "^1.0.1", + "semver": "^7.3.5" +>>>>>>> Stashed changes } }, "node_modules/@npmcli/move-file": { @@ -894,7 +1037,10 @@ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mkdirp": "^1.0.4", "rimraf": "^3.0.2" @@ -908,7 +1054,10 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "bin": { "mkdirp": "bin/cmd.js" }, @@ -921,7 +1070,10 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz", "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -931,7 +1083,10 @@ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "defer-to-connect": "^1.0.1" }, @@ -940,6 +1095,7 @@ } }, "node_modules/@tootallnate/once": { +<<<<<<< Updated upstream "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", @@ -947,6 +1103,14 @@ "license": "MIT", "engines": { "node": ">= 6" +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", + "dev": true, + "engines": { + "node": ">= 10" +>>>>>>> Stashed changes } }, "node_modules/@types/cacheable-request": { @@ -954,7 +1118,10 @@ "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.2.tgz", "integrity": "sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@types/http-cache-semantics": "*", "@types/keyv": "*", @@ -985,7 +1152,10 @@ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz", "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "@types/minimatch": "*", @@ -996,15 +1166,22 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz", "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/@types/keyv": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.3.tgz", "integrity": "sha512-FXCJgyyN3ivVgRoml4h94G/p3kY+u/B86La+QptcqJaWtBWtmc6TtkNfS40n9bIvyLteHh7zXOtgbobORKPbDg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@types/node": "*" } @@ -1014,7 +1191,10 @@ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/@types/ms": { @@ -1024,11 +1204,18 @@ "dev": true }, "node_modules/@types/node": { +<<<<<<< Updated upstream "version": "17.0.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz", "integrity": "sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==", "dev": true, "license": "MIT" +======= + "version": "14.18.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.11.tgz", + "integrity": "sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg==", + "dev": true +>>>>>>> Stashed changes }, "node_modules/@types/plist": { "version": "3.0.2", @@ -1041,6 +1228,7 @@ "xmlbuilder": ">=11.0.1" } }, +<<<<<<< Updated upstream "node_modules/@types/plist/node_modules/xmlbuilder": { "version": "15.1.1", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", @@ -1051,12 +1239,17 @@ "node": ">=8.0" } }, +======= +>>>>>>> Stashed changes "node_modules/@types/responselike": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz", "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@types/node": "*" } @@ -1088,7 +1281,10 @@ "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz", "integrity": "sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "@types/node": "*" @@ -1104,8 +1300,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/about-window": { "version": "1.15.2", @@ -1117,7 +1317,10 @@ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "4" }, @@ -1130,7 +1333,10 @@ "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.2.0.tgz", "integrity": "sha512-0PhAp58jZNw13UJv7NVdTGb0ZcghHUb3DrZ046JiiJY/BOaTTpbwdHq2VObPCBV8M2GPh7sgrJ3AQ8Ey468LJw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^4.1.0", "depd": "^1.1.2", @@ -1145,7 +1351,10 @@ "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -1154,6 +1363,7 @@ "node": ">=8" } }, +<<<<<<< Updated upstream "node_modules/aggregate-error/node_modules/indent-string": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", @@ -1164,12 +1374,17 @@ "node": ">=8" } }, +======= +>>>>>>> Stashed changes "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -1204,7 +1419,10 @@ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "type-fest": "^0.21.3" }, @@ -1220,7 +1438,10 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -1230,7 +1451,10 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "color-convert": "^2.0.1" }, @@ -1248,9 +1472,15 @@ "dev": true }, "node_modules/app-builder-lib": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz", "integrity": "sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz", + "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==", +>>>>>>> Stashed changes "dev": true, "dependencies": { "@develar/schema-utils": "~2.6.5", @@ -1259,13 +1489,22 @@ "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", +<<<<<<< Updated upstream "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", "electron-osx-sign": "^0.5.0", +<<<<<<< Updated upstream "electron-publish": "22.14.5", +======= + "electron-publish": "22.14.13", +>>>>>>> Stashed changes "form-data": "^4.0.0", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", @@ -1283,6 +1522,7 @@ "node": ">=14.0.0" } }, +<<<<<<< Updated upstream "node_modules/app-builder-lib/node_modules/form-data": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", @@ -1321,10 +1561,13 @@ "url": "https://github.com/sponsors/gjtorikian/" } }, +======= +>>>>>>> Stashed changes "node_modules/aproba": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz", "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" }, @@ -1334,12 +1577,39 @@ "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", "dev": true, "license": "ISC", +======= + "dev": true + }, + "node_modules/are-we-there-yet": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz", + "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" }, "engines": { +<<<<<<< Updated upstream "node": ">=10" +======= + "node": "^12.13.0 || ^14.15.0 || >=16" + } + }, + "node_modules/are-we-there-yet/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" +>>>>>>> Stashed changes } }, "node_modules/argparse": { @@ -1353,7 +1623,10 @@ "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -1363,7 +1636,10 @@ "resolved": "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz", "integrity": "sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "chromium-pickle-js": "^0.2.0", "commander": "^5.0.0", @@ -1385,7 +1661,10 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 6" } @@ -1395,7 +1674,10 @@ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz", "integrity": "sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "safer-buffer": "~2.1.0" } @@ -1405,7 +1687,10 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.8" } @@ -1420,6 +1705,15 @@ "node": ">=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + }, +>>>>>>> Stashed changes "node_modules/async-exit-hook": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", @@ -1433,15 +1727,22 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/at-least-node": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 4.0.0" } @@ -1451,7 +1752,10 @@ "resolved": "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz", "integrity": "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.8" } @@ -1461,7 +1765,10 @@ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "engines": { "node": "*" } @@ -1470,15 +1777,23 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/base64-js": { "version": "1.5.1", @@ -1498,15 +1813,22 @@ "type": "consulting", "url": "https://feross.org/support" } +<<<<<<< Updated upstream ], "license": "MIT" +======= + ] +>>>>>>> Stashed changes }, "node_modules/bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "tweetnacl": "^0.14.3" } @@ -1516,19 +1838,43 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/bl/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, +>>>>>>> Stashed changes "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/bluebird-lst": { "version": "1.0.9", @@ -1544,7 +1890,10 @@ "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz", "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/boxen": { @@ -1569,6 +1918,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, +<<<<<<< Updated upstream +======= + "node_modules/boxen/node_modules/camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, +>>>>>>> Stashed changes "node_modules/boxen/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -1586,7 +1950,10 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1597,7 +1964,10 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "fill-range": "^7.0.1" }, @@ -1624,7 +1994,10 @@ "url": "https://feross.org/support" } ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -1635,7 +2008,10 @@ "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "buffer-alloc-unsafe": "^1.1.0", "buffer-fill": "^1.0.0" @@ -1645,15 +2021,22 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/buffer-crc32": { "version": "0.2.13", "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": "*" } @@ -1671,13 +2054,18 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/buffer-from": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" }, @@ -1685,6 +2073,14 @@ "version": "22.14.5", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz", "integrity": "sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==", +======= + "dev": true + }, + "node_modules/builder-util": { + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz", + "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==", +>>>>>>> Stashed changes "dev": true, "dependencies": { "@types/debug": "^4.1.6", @@ -1692,11 +2088,20 @@ "7zip-bin": "~5.1.1", "app-builder-bin": "3.7.1", "bluebird-lst": "^1.0.9", +<<<<<<< Updated upstream "builder-util-runtime": "8.9.1", +======= + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chalk": "^4.1.1", "cross-spawn": "^7.0.3", "debug": "^4.3.2", "fs-extra": "^10.0.0", +<<<<<<< Updated upstream +======= + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", +>>>>>>> Stashed changes "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", @@ -1705,9 +2110,15 @@ } }, "node_modules/builder-util-runtime": { +<<<<<<< Updated upstream "version": "8.9.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz", "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==", +======= + "version": "8.9.2", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", + "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", +>>>>>>> Stashed changes "dev": true, "dependencies": { "debug": "^4.3.2", @@ -1717,6 +2128,7 @@ "node": ">=12.0.0" } }, +<<<<<<< Updated upstream "node_modules/builder-util/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -1761,12 +2173,17 @@ "node": ">=8" } }, +======= +>>>>>>> Stashed changes "node_modules/cacache": { "version": "15.3.0", "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz", "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "@npmcli/fs": "^1.0.0", "@npmcli/move-file": "^1.0.1", @@ -1796,7 +2213,10 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "bin": { "mkdirp": "bin/cmd.js" }, @@ -1809,7 +2229,10 @@ "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz", "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10.6.0" } @@ -1819,7 +2242,10 @@ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -1833,6 +2259,7 @@ "node": ">=8" } }, +<<<<<<< Updated upstream "node_modules/cacheable-request/node_modules/responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -1863,6 +2290,39 @@ }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= + "node_modules/cacheable-request/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cacheable-request/node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", + "dev": true, + "engines": { + "node": ">=0.10.0" +>>>>>>> Stashed changes } }, "node_modules/camelcase-keys": { @@ -1870,7 +2330,10 @@ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "camelcase": "^2.0.0", "map-obj": "^1.0.0" @@ -1879,6 +2342,7 @@ "node": ">=0.10.0" } }, +<<<<<<< Updated upstream "node_modules/camelcase-keys/node_modules/camelcase": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", @@ -1889,19 +2353,28 @@ "node": ">=0.10.0" } }, +======= +>>>>>>> Stashed changes "node_modules/caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", +<<<<<<< Updated upstream "dev": true, "license": "Apache-2.0" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1917,15 +2390,22 @@ "version": "0.7.0", "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/chownr": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" } @@ -1934,8 +2414,12 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/ci-info": { "version": "3.3.0", @@ -1948,7 +2432,10 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -1970,7 +2457,10 @@ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "restore-cursor": "^3.1.0" }, @@ -1983,7 +2473,10 @@ "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" }, @@ -2013,7 +2506,10 @@ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 10" } @@ -2023,7 +2519,10 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -2035,7 +2534,10 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.8" } @@ -2045,7 +2547,10 @@ "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mimic-response": "^1.0.0" } @@ -2055,7 +2560,10 @@ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -2065,7 +2573,10 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "color-name": "~1.1.4" }, @@ -2077,15 +2588,22 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "bin": { "color-support": "bin.js" } @@ -2104,7 +2622,10 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "delayed-stream": "~1.0.0" }, @@ -2117,7 +2638,10 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 6" } @@ -2127,7 +2651,10 @@ "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -2136,8 +2663,12 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/concat-stream": { "version": "1.6.2", @@ -2147,7 +2678,10 @@ "engines": [ "node >= 0.8" ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "buffer-from": "^1.0.0", "inherits": "^2.0.3", @@ -2155,6 +2689,7 @@ "typedarray": "^0.0.6" } }, +<<<<<<< Updated upstream "node_modules/concat-stream/node_modules/readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -2188,12 +2723,17 @@ "safe-buffer": "~5.1.0" } }, +======= +>>>>>>> Stashed changes "node_modules/config-chain": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "ini": "^1.3.4", @@ -2217,6 +2757,7 @@ "node": ">=8" } }, +<<<<<<< Updated upstream "node_modules/configstore/node_modules/write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", @@ -2229,19 +2770,29 @@ "typedarray-to-buffer": "^3.1.5" } }, +======= +>>>>>>> Stashed changes "node_modules/console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/crc": { "version": "3.8.0", @@ -2254,6 +2805,7 @@ } }, "node_modules/cross-spawn": { +<<<<<<< Updated upstream "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", @@ -2268,6 +2820,19 @@ }, "engines": { "node": ">=4.8" +======= + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "dependencies": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + }, + "engines": { + "node": ">= 8" +>>>>>>> Stashed changes } }, "node_modules/cross-spawn-windows-exe": { @@ -2285,7 +2850,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-cross-spawn-windows-exe?utm_medium=referral&utm_source=npm_fund" } ], +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "@malept/cross-spawn-promise": "^1.1.0", "is-wsl": "^2.2.0", @@ -2310,7 +2878,10 @@ "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" } ], +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "cross-spawn": "^7.0.1" }, @@ -2318,6 +2889,7 @@ "node": ">= 10" } }, +<<<<<<< Updated upstream "node_modules/cross-spawn-windows-exe/node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -2389,6 +2961,8 @@ "which": "bin/which" } }, +======= +>>>>>>> Stashed changes "node_modules/cross-zip": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/cross-zip/-/cross-zip-4.0.0.tgz", @@ -2408,7 +2982,10 @@ "url": "https://feross.org/support" } ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=12.10" } @@ -2427,7 +3004,10 @@ "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/currently-unhandled": { @@ -2435,7 +3015,10 @@ "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "array-find-index": "^1.0.1" }, @@ -2448,7 +3031,10 @@ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "assert-plus": "^1.0.0" }, @@ -2461,7 +3047,10 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz", "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "2.1.2" }, @@ -2474,6 +3063,7 @@ } } }, +<<<<<<< Updated upstream "node_modules/debug/node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -2481,12 +3071,17 @@ "dev": true, "license": "MIT" }, +======= +>>>>>>> Stashed changes "node_modules/decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -2496,7 +3091,10 @@ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mimic-response": "^1.0.0" }, @@ -2523,7 +3121,10 @@ "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "clone": "^1.0.2" } @@ -2532,15 +3133,22 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -2550,7 +3158,10 @@ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "object-keys": "^1.0.12" @@ -2564,7 +3175,10 @@ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.4.0" } @@ -2573,15 +3187,22 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/depd": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 0.6" } @@ -2591,7 +3212,10 @@ "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -2604,7 +3228,10 @@ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/dir-compare": { @@ -2634,6 +3261,7 @@ "node": ">= 0.6.x" } }, +<<<<<<< Updated upstream "node_modules/dmg-builder": { "version": "22.14.5", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.5.tgz", @@ -2643,6 +3271,29 @@ "app-builder-lib": "22.14.5", "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "node_modules/dir-compare/node_modules/minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/dmg-builder": { + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz", + "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==", + "dev": true, + "dependencies": { + "app-builder-lib": "22.14.13", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", "js-yaml": "^4.1.0" @@ -2708,15 +3359,22 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", +<<<<<<< Updated upstream "dev": true, "license": "BSD-3-Clause" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/ecc-jsbn": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -2743,7 +3401,10 @@ "integrity": "sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg==", "dev": true, "hasInstallScript": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@electron/get": "^1.13.0", "@types/node": "^14.6.2", @@ -2757,6 +3418,7 @@ } }, "node_modules/electron-builder": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.5.tgz", "integrity": "sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==", @@ -2768,6 +3430,19 @@ "builder-util-runtime": "8.9.1", "chalk": "^4.1.1", "dmg-builder": "22.14.5", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz", + "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==", + "dev": true, + "dependencies": { + "@types/yargs": "^17.0.1", + "app-builder-lib": "22.14.13", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", + "chalk": "^4.1.1", + "dmg-builder": "22.14.13", +>>>>>>> Stashed changes "fs-extra": "^10.0.0", "is-ci": "^3.0.0", "lazy-val": "^1.0.5", @@ -2783,6 +3458,7 @@ "node": ">=14.0.0" } }, +<<<<<<< Updated upstream "node_modules/electron-notarize": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz", @@ -2798,11 +3474,68 @@ } }, "node_modules/electron-notarize/node_modules/fs-extra": { +======= + "node_modules/electron-installer-common": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/electron-installer-common/-/electron-installer-common-0.10.3.tgz", + "integrity": "sha512-mYbP+6i+nHMIm0WZHXgGdmmXMe+KXncl6jZYQNcCF9C1WsNA9C5SZ2VP4TLQMSIoFO+X4ugkMEA5uld1bmyEvA==", + "dev": true, + "optional": true, + "dependencies": { + "@malept/cross-spawn-promise": "^1.0.0", + "asar": "^3.0.0", + "debug": "^4.1.1", + "fs-extra": "^9.0.0", + "glob": "^7.1.4", + "lodash": "^4.17.15", + "parse-author": "^2.0.0", + "semver": "^7.1.1", + "tmp-promise": "^3.0.2" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "url": "https://github.com/electron-userland/electron-installer-common?sponsor=1" + }, + "optionalDependencies": { + "@types/fs-extra": "^9.0.1" + } + }, + "node_modules/electron-installer-common/node_modules/@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/malept" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" + } + ], + "optional": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/electron-installer-common/node_modules/fs-extra": { +>>>>>>> Stashed changes "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= + "optional": true, +>>>>>>> Stashed changes "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -2813,6 +3546,7 @@ "node": ">=10" } }, +<<<<<<< Updated upstream "node_modules/electron-notarize/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -2832,10 +3566,36 @@ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true, "license": "MIT", +======= + "node_modules/electron-installer-debian": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/electron-installer-debian/-/electron-installer-debian-3.1.0.tgz", + "integrity": "sha512-k6KChvx0Fw8XTlCqwwbBfh19yGQaKjGdbugokmr1IpzINOm4QFyACKMTHAYFHW5LCBUZQShZD96hwxUZ+8Kx+w==", + "dev": true, + "optional": true, + "os": [ + "darwin", + "linux" + ], + "dependencies": { + "@malept/cross-spawn-promise": "^1.0.0", + "debug": "^4.1.1", + "electron-installer-common": "^0.10.2", + "fs-extra": "^9.0.0", + "get-folder-size": "^2.0.1", + "lodash": "^4.17.4", + "word-wrap": "^1.2.3", + "yargs": "^15.0.1" + }, + "bin": { + "electron-installer-debian": "src/cli.js" + }, +>>>>>>> Stashed changes "engines": { "node": ">= 10.0.0" } }, +<<<<<<< Updated upstream "node_modules/electron-osx-sign": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", @@ -2845,42 +3605,365 @@ "dependencies": { "bluebird": "^3.5.0", "compare-version": "^0.1.2", - "debug": "^2.6.8", - "isbinaryfile": "^3.0.2", - "minimist": "^1.2.0", - "plist": "^3.0.1" - }, - "bin": { - "electron-osx-flat": "bin/electron-osx-flat.js", - "electron-osx-sign": "bin/electron-osx-sign.js" +======= + "node_modules/electron-installer-debian/node_modules/@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/malept" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" + } + ], + "optional": true, + "dependencies": { + "cross-spawn": "^7.0.1" }, "engines": { - "node": ">=4.0.0" + "node": ">= 10" } }, - "node_modules/electron-osx-sign/node_modules/debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "node_modules/electron-installer-debian/node_modules/camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, - "license": "MIT", - "dependencies": { - "ms": "2.0.0" + "optional": true, + "engines": { + "node": ">=6" } }, - "node_modules/electron-osx-sign/node_modules/ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "node_modules/electron-installer-debian/node_modules/cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, - "license": "MIT" + "optional": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } }, - "node_modules/electron-packager": { + "node_modules/electron-installer-debian/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "optional": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-installer-debian/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "optional": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/electron-installer-debian/node_modules/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, + "optional": true, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-installer-debian/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "optional": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/electron-installer-debian/node_modules/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, + "optional": true, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-installer-debian/node_modules/wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "optional": true, + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-installer-debian/node_modules/y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true, + "optional": true + }, + "node_modules/electron-installer-debian/node_modules/yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "optional": true, + "dependencies": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/electron-installer-debian/node_modules/yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "optional": true, + "dependencies": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/electron-installer-redhat": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/electron-installer-redhat/-/electron-installer-redhat-3.3.0.tgz", + "integrity": "sha512-hXIXB3uQXmXZy/v3MpbwWN4Of28ALpPt9ZyUDNEoSe0w7QZceL9IqI2K6Q6imiBJCLRC0hmT94WhlKj1RyGOWg==", + "dev": true, + "optional": true, + "os": [ + "darwin", + "linux" + ], + "dependencies": { + "@malept/cross-spawn-promise": "^1.0.0", + "debug": "^4.1.1", + "electron-installer-common": "^0.10.2", + "fs-extra": "^9.0.0", + "lodash": "^4.17.15", + "word-wrap": "^1.2.3", + "yargs": "^16.0.2" + }, + "bin": { + "electron-installer-redhat": "src/cli.js" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/electron-installer-redhat/node_modules/@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/malept" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund" + } + ], + "optional": true, + "dependencies": { + "cross-spawn": "^7.0.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/electron-installer-redhat/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "optional": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/electron-installer-redhat/node_modules/yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "optional": true, + "dependencies": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/electron-notarize": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz", + "integrity": "sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==", + "dev": true, + "dependencies": { + "debug": "^4.1.1", + "fs-extra": "^9.0.1" + }, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/electron-notarize/node_modules/fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "dependencies": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/electron-osx-sign": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.5.0.tgz", + "integrity": "sha512-icoRLHzFz/qxzDh/N4Pi2z4yVHurlsCAYQvsCSG7fCedJ4UJXBS6PoQyGH71IfcqKupcKeK7HX/NkyfG+v6vlQ==", + "dev": true, + "dependencies": { + "bluebird": "^3.5.0", + "compare-version": "^0.1.2", +>>>>>>> Stashed changes + "debug": "^2.6.8", + "isbinaryfile": "^3.0.2", + "minimist": "^1.2.0", + "plist": "^3.0.1" + }, + "bin": { + "electron-osx-flat": "bin/electron-osx-flat.js", + "electron-osx-sign": "bin/electron-osx-sign.js" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/electron-osx-sign/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, +<<<<<<< Updated upstream + "license": "MIT", +======= +>>>>>>> Stashed changes + "dependencies": { + "ms": "2.0.0" + } + }, +<<<<<<< Updated upstream +======= + "node_modules/electron-osx-sign/node_modules/isbinaryfile": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "dev": true, + "dependencies": { + "buffer-alloc": "^1.2.0" + }, + "engines": { + "node": ">=0.6.0" + } + }, +>>>>>>> Stashed changes + "node_modules/electron-osx-sign/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +<<<<<<< Updated upstream + "dev": true, + "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes + }, + "node_modules/electron-packager": { "version": "15.4.0", "resolved": "https://registry.npmjs.org/electron-packager/-/electron-packager-15.4.0.tgz", "integrity": "sha512-JrrLcBP15KGrPj0cZ/ALKGmaQ4gJkn3mocf0E3bRKdR3kxKWYcDRpCvdhksYDXw/r3I6tMEcZ7XzyApWFXdVpw==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "@electron/get": "^1.6.0", "asar": "^3.1.0", @@ -2916,7 +3999,10 @@ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^4.1.1", "get-stream": "^5.1.0", @@ -2937,7 +4023,10 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "at-least-node": "^1.0.0", "graceful-fs": "^4.2.0", @@ -2948,6 +4037,7 @@ "node": ">=10" } }, +<<<<<<< Updated upstream "node_modules/electron-packager/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -2980,6 +4070,32 @@ "@types/fs-extra": "^9.0.11", "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "node_modules/electron-packager/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/electron-publish": { + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz", + "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==", + "dev": true, + "dependencies": { + "@types/fs-extra": "^9.0.11", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -2991,7 +4107,10 @@ "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-3.2.7.tgz", "integrity": "sha512-WvaW1EgRinDQ61khHFZfx30rkPQG5ItaOT0wrI7iJv9A3SbghriQGfZQfHZs25fWLBe6/vkv05LOqg6aDw6Wzw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@malept/cross-spawn-promise": "^2.0.0", "chalk": "^4.0.0", @@ -3020,7 +4139,10 @@ "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.4.0.tgz", "integrity": "sha512-QppPM/8l3Mawvh4rn9CNEYIU9bxpXUCRMaX9yUpvBk1nMKusLKpfXGDEKExKaPhLzcn3lzil7pR6rnJ11HgeRQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -3033,7 +4155,10 @@ "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz", "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "defer-to-connect": "^2.0.0" }, @@ -3046,7 +4171,10 @@ "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz", "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "clone-response": "^1.0.2", "get-stream": "^5.1.0", @@ -3065,33 +4193,60 @@ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mimic-response": "^3.1.0" }, "engines": { - "node": ">=10" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/electron-rebuild/node_modules/defer-to-connect": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", + "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", + "dev": true, +<<<<<<< Updated upstream + "license": "MIT", +======= +>>>>>>> Stashed changes + "engines": { + "node": ">=10" + } + }, +<<<<<<< Updated upstream +======= + "node_modules/electron-rebuild/node_modules/get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/electron-rebuild/node_modules/defer-to-connect": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz", - "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, +>>>>>>> Stashed changes "node_modules/electron-rebuild/node_modules/got": { "version": "11.8.3", "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", "integrity": "sha512-7gtQ5KiPh1RtGS9/Jbv1ofDpBFuq42gyfEib+ejaRBJuj/3tQFeR5+gw57e4ipaU8c/rCjvX6fkQz2lyDlGAOg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@sindresorhus/is": "^4.0.0", "@szmarczak/http-timer": "^4.0.5", @@ -3116,6 +4271,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" }, @@ -3125,16 +4281,40 @@ "integrity": "sha512-531pkGLqV3BMg0eDqqJFI0R1mkK1Nm5xIP2mM6keP5P8WfFtCkg2IOwplTUmlGoTgIg9yQYZ/kdihhz89XH3vA==", "dev": true, "license": "MIT", +======= + "dev": true + }, + "node_modules/electron-rebuild/node_modules/keyv": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz", + "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "json-buffer": "3.0.1" } }, +<<<<<<< Updated upstream +======= + "node_modules/electron-rebuild/node_modules/lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true, + "engines": { + "node": ">=8" + } + }, +>>>>>>> Stashed changes "node_modules/electron-rebuild/node_modules/mimic-response": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -3147,7 +4327,10 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -3160,16 +4343,34 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/electron-rebuild/node_modules/responselike": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", + "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", + "dev": true, + "dependencies": { + "lowercase-keys": "^2.0.0" + } + }, +>>>>>>> Stashed changes "node_modules/electron-squirrel-startup": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz", "integrity": "sha1-GbTlWTP6Dvj1VnhLnGYPdyVGoLg=", +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^2.2.0" } @@ -3178,7 +4379,10 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "2.0.0" } @@ -3186,8 +4390,12 @@ "node_modules/electron-squirrel-startup/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", +<<<<<<< Updated upstream "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "license": "MIT" +======= + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" +>>>>>>> Stashed changes }, "node_modules/electron-winstaller": { "version": "5.0.0", @@ -3195,7 +4403,10 @@ "integrity": "sha512-V+jFda7aVAm0htCG8Q95buPUpmXZW9ujh1HdhSlWY6y4QnJnw4TfrmxTlQWV4p2ioF/71JMI/1YF+/qbSICogA==", "dev": true, "hasInstallScript": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "asar": "^2.0.1", @@ -3213,7 +4424,10 @@ "resolved": "https://registry.npmjs.org/asar/-/asar-2.1.0.tgz", "integrity": "sha512-d2Ovma+bfqNpvBzY/KU8oPY67ZworixTpkjSx0PCXnQi67c2cXmssaTxpFDUM0ttopXoGx/KRxNg/GDThYbXQA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "chromium-pickle-js": "^0.2.0", @@ -3239,7 +4453,10 @@ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/electron-winstaller/node_modules/fs-extra": { @@ -3247,7 +4464,10 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "graceful-fs": "^4.1.2", @@ -3258,26 +4478,92 @@ "node": ">=6 <7 || >=8" } }, +<<<<<<< Updated upstream "node_modules/electron/node_modules/@types/node": { "version": "14.18.10", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz", "integrity": "sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ==", "dev": true, "license": "MIT" +======= + "node_modules/electron-winstaller/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "optional": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/electron-winstaller/node_modules/rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "optional": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + } + }, + "node_modules/electron-winstaller/node_modules/tmp": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", + "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "dev": true, + "optional": true, + "dependencies": { + "rimraf": "^2.6.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/electron-winstaller/node_modules/tmp-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz", + "integrity": "sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==", + "dev": true, + "optional": true, + "dependencies": { + "bluebird": "^3.5.0", + "tmp": "0.1.0" + } + }, + "node_modules/electron-winstaller/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "optional": true, + "engines": { + "node": ">= 4.0.0" + } +>>>>>>> Stashed changes }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "engines": { "node": ">= 0.8" @@ -3288,7 +4574,10 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "iconv-lite": "^0.6.2" @@ -3299,7 +4588,10 @@ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "once": "^1.4.0" } @@ -3309,7 +4601,10 @@ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -3318,15 +4613,22 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/error-ex": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-arrayish": "^0.2.1" } @@ -3336,7 +4638,10 @@ "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/escalade": { @@ -3344,7 +4649,10 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -3363,7 +4671,10 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.8.0" } @@ -3373,7 +4684,10 @@ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "cross-spawn": "^6.0.0", "get-stream": "^4.0.0", @@ -3387,6 +4701,7 @@ "node": ">=6" } }, +<<<<<<< Updated upstream "node_modules/execa/node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -3398,6 +4713,73 @@ }, "engines": { "node": ">=6" +======= + "node_modules/execa/node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/execa/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/execa/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/execa/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/execa/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" +>>>>>>> Stashed changes } }, "node_modules/expand-tilde": { @@ -3405,7 +4787,10 @@ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "homedir-polyfill": "^1.0.1" }, @@ -3417,15 +4802,22 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/external-editor": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -3452,7 +4844,10 @@ "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "concat-stream": "^1.6.2", "debug": "^2.6.9", @@ -3468,7 +4863,10 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "2.0.0" } @@ -3477,8 +4875,12 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/extsprintf": { "version": "1.3.0", @@ -3487,22 +4889,33 @@ "dev": true, "engines": [ "node >=0.6.0" +<<<<<<< Updated upstream ], "license": "MIT" +======= + ] +>>>>>>> Stashed changes }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/fast-glob": { "version": "3.2.11", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz", "integrity": "sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -3518,15 +4931,22 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/fastq": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "reusify": "^1.0.4" } @@ -3536,7 +4956,10 @@ "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", "integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "pend": "~1.2.0" } @@ -3546,7 +4969,10 @@ "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -3571,7 +4997,10 @@ "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", "integrity": "sha1-q/c9+rc10EVECr/qLZHzieu/oik=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -3581,7 +5010,10 @@ "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz", "integrity": "sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "filename-reserved-regex": "^2.0.0", "strip-outer": "^1.0.1", @@ -3615,7 +5047,10 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3624,6 +5059,7 @@ } }, "node_modules/find-up": { +<<<<<<< Updated upstream "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", @@ -3635,6 +5071,21 @@ }, "engines": { "node": ">=8" +======= + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "dependencies": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +>>>>>>> Stashed changes } }, "node_modules/flora-colossus": { @@ -3642,7 +5093,10 @@ "resolved": "https://registry.npmjs.org/flora-colossus/-/flora-colossus-1.0.1.tgz", "integrity": "sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^4.1.1", "fs-extra": "^7.0.0" @@ -3656,7 +5110,10 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", @@ -3666,17 +5123,42 @@ "node": ">=6 <7 || >=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/flora-colossus/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/flora-colossus/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, +>>>>>>> Stashed changes "node_modules/forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "engines": { "node": "*" } }, "node_modules/form-data": { +<<<<<<< Updated upstream "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", @@ -3689,6 +5171,19 @@ }, "engines": { "node": ">= 0.12" +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" +>>>>>>> Stashed changes } }, "node_modules/fs-extra": { @@ -3696,7 +5191,10 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", @@ -3706,6 +5204,7 @@ "node": ">=12" } }, +<<<<<<< Updated upstream "node_modules/fs-extra/node_modules/jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -3729,12 +5228,17 @@ "node": ">= 10.0.0" } }, +======= +>>>>>>> Stashed changes "node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0" }, @@ -3746,22 +5250,33 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/galactus": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/galactus/-/galactus-0.2.1.tgz", "integrity": "sha1-y+0tIKQMH1Z5o1kI4rlBVzPnjbk=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^3.1.0", "flora-colossus": "^1.0.0", @@ -3773,7 +5288,10 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "^2.1.1" } @@ -3783,19 +5301,53 @@ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/galactus/node_modules/jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/galactus/node_modules/universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/gar": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz", + "integrity": "sha512-w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w==", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "node_modules/gauge": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", "integrity": "sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-regex": "^5.0.1", "aproba": "^1.0.3 || ^2.0.0", @@ -3816,17 +5368,40 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": "6.* || 8.* || >= 10.*" } }, +<<<<<<< Updated upstream +======= + "node_modules/get-folder-size": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz", + "integrity": "sha512-+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==", + "dev": true, + "optional": true, + "dependencies": { + "gar": "^1.0.4", + "tiny-each-async": "2.0.3" + }, + "bin": { + "get-folder-size": "bin/get-folder-size" + } + }, +>>>>>>> Stashed changes "node_modules/get-installed-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz", "integrity": "sha512-Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "global-modules": "1.0.0" } @@ -3836,7 +5411,10 @@ "resolved": "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz", "integrity": "sha1-ZDJ5ZWPigRPNlHTbvQAFKYWkmZw=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "bluebird": "^3.1.1", "debug": "^2.2.0", @@ -3852,7 +5430,10 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "2.0.0" } @@ -3861,33 +5442,51 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/get-stdin": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } }, "node_modules/get-stream": { +<<<<<<< Updated upstream "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", "dev": true, "license": "MIT", +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "pump": "^3.0.0" }, "engines": { +<<<<<<< Updated upstream "node": ">=8" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" +======= + "node": ">=6" +>>>>>>> Stashed changes } }, "node_modules/getpass": { @@ -3895,7 +5494,10 @@ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "assert-plus": "^1.0.0" } @@ -3905,7 +5507,10 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -3926,7 +5531,10 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "is-glob": "^4.0.1" }, @@ -3939,7 +5547,10 @@ "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz", "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "boolean": "^3.0.1", @@ -3982,7 +5593,10 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "global-prefix": "^1.0.1", "is-windows": "^1.0.1", @@ -3997,7 +5611,10 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", @@ -4014,7 +5631,10 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "isexe": "^2.0.0" }, @@ -4027,7 +5647,10 @@ "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz", "integrity": "sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "encodeurl": "^1.0.2", @@ -4044,7 +5667,10 @@ "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz", "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "define-properties": "^1.1.3" @@ -4061,7 +5687,10 @@ "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "@sindresorhus/is": "^0.14.0", "@szmarczak/http-timer": "^1.1.2", @@ -4079,6 +5708,7 @@ "node": ">=8.6" } }, +<<<<<<< Updated upstream "node_modules/got/node_modules/get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -4102,12 +5732,18 @@ "node": ">=0.10.0" } }, +======= +>>>>>>> Stashed changes "node_modules/graceful-fs": { "version": "4.2.9", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz", "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/graceful-readlink": { "version": "1.0.1", @@ -4120,7 +5756,10 @@ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -4129,8 +5768,13 @@ "version": "5.1.5", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", +<<<<<<< Updated upstream "dev": true, "license": "MIT", +======= + "deprecated": "this library is no longer supported", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "ajv": "^6.12.3", "har-schema": "^2.0.0" @@ -4144,7 +5788,10 @@ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "function-bind": "^1.1.1" }, @@ -4157,7 +5804,10 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -4166,8 +5816,12 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/has-yarn": { "version": "2.1.0", @@ -4183,7 +5837,10 @@ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "parse-passwd": "^1.0.0" }, @@ -4192,11 +5849,24 @@ } }, "node_modules/hosted-git-info": { +<<<<<<< Updated upstream "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true, "license": "ISC" +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "engines": { + "node": ">=10" + } +>>>>>>> Stashed changes }, "node_modules/howler": { "version": "2.2.3", @@ -4207,6 +5877,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", +<<<<<<< Updated upstream "dev": true, "license": "BSD-2-Clause" }, @@ -4218,6 +5889,17 @@ "license": "MIT", "dependencies": { "@tootallnate/once": "1", +======= + "dev": true + }, + "node_modules/http-proxy-agent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "dependencies": { + "@tootallnate/once": "2", +>>>>>>> Stashed changes "agent-base": "6", "debug": "4" }, @@ -4230,7 +5912,10 @@ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -4246,7 +5931,10 @@ "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz", "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "quick-lru": "^5.1.1", "resolve-alpn": "^1.0.0" @@ -4260,7 +5948,10 @@ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz", "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "agent-base": "6", "debug": "4" @@ -4274,7 +5965,10 @@ "resolved": "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz", "integrity": "sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "^2.0.0" } @@ -4296,6 +5990,7 @@ "node": "^8.11.2 || >=10" } }, +<<<<<<< Updated upstream "node_modules/iconv-corefoundation/node_modules/node-addon-api": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", @@ -4303,6 +5998,8 @@ "dev": true, "optional": true }, +======= +>>>>>>> Stashed changes "node_modules/iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", @@ -4333,8 +6030,12 @@ "type": "consulting", "url": "https://feross.org/support" } +<<<<<<< Updated upstream ], "license": "BSD-3-Clause" +======= + ] +>>>>>>> Stashed changes }, "node_modules/import-lazy": { "version": "2.1.0", @@ -4350,12 +6051,16 @@ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.8.19" } }, "node_modules/indent-string": { +<<<<<<< Updated upstream "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", @@ -4366,21 +6071,36 @@ }, "engines": { "node": ">=0.10.0" +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true, + "engines": { + "node": ">=8" +>>>>>>> Stashed changes } }, "node_modules/infer-owner": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz", "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4390,22 +6110,33 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/inquirer": { "version": "8.2.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.0.tgz", "integrity": "sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -4430,15 +6161,23 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/is-ci": { "version": "3.0.1", @@ -4457,7 +6196,10 @@ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz", "integrity": "sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "has": "^1.0.3" }, @@ -4470,7 +6212,10 @@ "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "bin": { "is-docker": "cli.js" }, @@ -4486,7 +6231,10 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -4496,7 +6244,10 @@ "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" }, @@ -4509,7 +6260,10 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -4519,7 +6273,10 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-extglob": "^2.1.1" }, @@ -4548,7 +6305,10 @@ "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -4557,8 +6317,12 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", "integrity": "sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/is-npm": { "version": "5.0.0", @@ -4577,7 +6341,10 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.12.0" } @@ -4604,7 +6371,10 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -4613,15 +6383,22 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -4633,15 +6410,22 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -4651,7 +6435,10 @@ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-docker": "^2.0.0" }, @@ -4669,6 +6456,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" }, @@ -4683,21 +6471,43 @@ }, "engines": { "node": ">=0.6.0" +======= + "dev": true + }, + "node_modules/isbinaryfile": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", + "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", + "dev": true, + "engines": { + "node": ">= 8.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/gjtorikian/" +>>>>>>> Stashed changes } }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/jake": { "version": "10.8.2", @@ -4729,12 +6539,15 @@ "node": ">=4" } }, +<<<<<<< Updated upstream "node_modules/jake/node_modules/async": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", "dev": true }, +======= +>>>>>>> Stashed changes "node_modules/jake/node_modules/chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -4801,36 +6614,56 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/json-schema": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz", "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==", +<<<<<<< Updated upstream "dev": true, "license": "(AFL-2.1 OR BSD-3-Clause)" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/json5": { "version": "2.2.0", @@ -4848,11 +6681,21 @@ } }, "node_modules/jsonfile": { +<<<<<<< Updated upstream "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "license": "MIT", +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, +>>>>>>> Stashed changes "optionalDependencies": { "graceful-fs": "^4.1.6" } @@ -4862,7 +6705,10 @@ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz", "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -4873,12 +6719,38 @@ "node": ">=0.6.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/jsprim/node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "node_modules/jsprim/node_modules/verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "engines": [ + "node >=0.6.0" + ], + "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + }, +>>>>>>> Stashed changes "node_modules/junk": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz", "integrity": "sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -4888,7 +6760,10 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz", "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "json-buffer": "3.0.0" } @@ -4916,7 +6791,10 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -4927,6 +6805,7 @@ "node": ">=4" } }, +<<<<<<< Updated upstream "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -4938,36 +6817,74 @@ }, "engines": { "node": ">=8" +======= + "node_modules/load-json-file/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "dependencies": { + "p-locate": "^5.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +>>>>>>> Stashed changes } }, "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/lodash._reinterpolate": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/lodash.get": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz", "integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/lodash.template": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz", "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "lodash._reinterpolate": "^3.0.0", @@ -4979,7 +6896,10 @@ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz", "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "lodash._reinterpolate": "^3.0.0" @@ -4990,7 +6910,10 @@ "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -5007,7 +6930,10 @@ "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "currently-unhandled": "^0.4.1", "signal-exit": "^3.0.0" @@ -5017,6 +6943,7 @@ } }, "node_modules/lowercase-keys": { +<<<<<<< Updated upstream "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", @@ -5024,6 +6951,14 @@ "license": "MIT", "engines": { "node": ">=8" +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", + "dev": true, + "engines": { + "node": ">=0.10.0" +>>>>>>> Stashed changes } }, "node_modules/lru-cache": { @@ -5031,7 +6966,10 @@ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "yallist": "^4.0.0" }, @@ -5045,7 +6983,10 @@ "integrity": "sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA==", "dev": true, "hasInstallScript": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "node-addon-api": "^3.1.0", "node-gyp-build": "^4.2.1", @@ -5058,6 +6999,29 @@ "node": ">=10.0.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/lzma-native/node_modules/node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "dev": true + }, + "node_modules/lzma-native/node_modules/readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, +>>>>>>> Stashed changes "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -5087,7 +7051,10 @@ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz", "integrity": "sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "agentkeepalive": "^4.1.3", "cacache": "^15.2.0", @@ -5110,12 +7077,41 @@ "node": ">= 10" } }, +<<<<<<< Updated upstream +======= + "node_modules/make-fetch-happen/node_modules/@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true, + "engines": { + "node": ">= 6" + } + }, + "node_modules/make-fetch-happen/node_modules/http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "dependencies": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, +>>>>>>> Stashed changes "node_modules/map-age-cleaner": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz", "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "p-defer": "^1.0.0" }, @@ -5128,7 +7124,10 @@ "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -5138,7 +7137,10 @@ "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz", "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "escape-string-regexp": "^4.0.0" @@ -5152,7 +7154,10 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "engines": { "node": ">=10" @@ -5166,7 +7171,10 @@ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz", "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "map-age-cleaner": "^0.1.1", "mimic-fn": "^2.0.0", @@ -5181,7 +7189,10 @@ "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "camelcase-keys": "^2.0.0", "decamelize": "^1.1.2", @@ -5203,7 +7214,10 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -5217,7 +7231,10 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -5234,7 +7251,10 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "pinkie-promise": "^2.0.0" }, @@ -5247,7 +7267,10 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -5257,12 +7280,27 @@ "node": ">=0.10.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/meow/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, +>>>>>>> Stashed changes "node_modules/meow/node_modules/read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -5277,7 +7315,10 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" @@ -5291,7 +7332,10 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-utf8": "^0.2.0" }, @@ -5304,7 +7348,10 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 8" } @@ -5314,7 +7361,10 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "braces": "^3.0.1", "picomatch": "^2.2.3" @@ -5340,7 +7390,10 @@ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz", "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 0.6" } @@ -5350,7 +7403,10 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz", "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mime-db": "1.51.0" }, @@ -5363,7 +7419,10 @@ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -5373,17 +7432,27 @@ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } }, "node_modules/minimatch": { +<<<<<<< Updated upstream "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "license": "ISC", +======= + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5395,15 +7464,22 @@ "version": "1.2.5", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/minipass": { "version": "3.1.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz", "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "yallist": "^4.0.0" }, @@ -5416,7 +7492,10 @@ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz", "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0" }, @@ -5429,7 +7508,10 @@ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz", "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.1.0", "minipass-sized": "^1.0.3", @@ -5447,7 +7529,10 @@ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0" }, @@ -5460,7 +7545,10 @@ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0" }, @@ -5473,7 +7561,10 @@ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0" }, @@ -5486,7 +7577,10 @@ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.0.0", "yallist": "^4.0.0" @@ -5500,7 +7594,10 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "minimist": "^1.2.5" }, @@ -5509,11 +7606,18 @@ } }, "node_modules/ms": { +<<<<<<< Updated upstream "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" +======= + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true +>>>>>>> Stashed changes }, "node_modules/musicmetadata": { "version": "2.0.5", @@ -5534,15 +7638,22 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 0.6" } @@ -5551,6 +7662,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" }, @@ -5560,6 +7672,15 @@ "integrity": "sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ==", "dev": true, "license": "MIT", +======= + "dev": true + }, + "node_modules/node-abi": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz", + "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "semver": "^7.3.5" }, @@ -5568,18 +7689,29 @@ } }, "node_modules/node-addon-api": { +<<<<<<< Updated upstream "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", "dev": true, "license": "MIT" +======= + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", + "dev": true, + "optional": true +>>>>>>> Stashed changes }, "node_modules/node-api-version": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/node-api-version/-/node-api-version-0.1.4.tgz", "integrity": "sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "semver": "^7.3.5" } @@ -5589,7 +7721,10 @@ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "whatwg-url": "^5.0.0" }, @@ -5610,7 +7745,10 @@ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz", "integrity": "sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "env-paths": "^2.2.0", "glob": "^7.1.4", @@ -5635,7 +7773,10 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.3.0.tgz", "integrity": "sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", @@ -5647,7 +7788,10 @@ "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz", "integrity": "sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "abbrev": "1" }, @@ -5663,7 +7807,10 @@ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "hosted-git-info": "^2.1.4", "resolve": "^1.10.0", @@ -5671,12 +7818,24 @@ "validate-npm-package-license": "^3.0.1" } }, +<<<<<<< Updated upstream +======= + "node_modules/normalize-package-data/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, +>>>>>>> Stashed changes "node_modules/normalize-package-data/node_modules/semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "bin": { "semver": "bin/semver" } @@ -5686,7 +7845,10 @@ "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz", "integrity": "sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -5696,7 +7858,10 @@ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "config-chain": "^1.1.11", @@ -5706,6 +7871,7 @@ "node": ">=4" } }, +<<<<<<< Updated upstream "node_modules/npm-conf/node_modules/pify": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", @@ -5717,12 +7883,17 @@ "node": ">=4" } }, +======= +>>>>>>> Stashed changes "node_modules/npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "path-key": "^2.0.0" }, @@ -5730,6 +7901,7 @@ "node": ">=4" } }, +<<<<<<< Updated upstream "node_modules/npmlog": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.0.tgz", @@ -5738,6 +7910,24 @@ "license": "ISC", "dependencies": { "are-we-there-yet": "^2.0.0", +======= + "node_modules/npm-run-path/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/npmlog": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz", + "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==", + "dev": true, + "dependencies": { + "are-we-there-yet": "^3.0.0", +>>>>>>> Stashed changes "console-control-strings": "^1.1.0", "gauge": "^4.0.0", "set-blocking": "^2.0.0" @@ -5751,7 +7941,10 @@ "resolved": "https://registry.npmjs.org/nugget/-/nugget-2.0.1.tgz", "integrity": "sha1-IBCVpIfhrTYIGzQy+jytpPjQcbA=", "dev": true, +<<<<<<< Updated upstream "license": "BSD", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^2.1.3", "minimist": "^1.1.0", @@ -5770,7 +7963,10 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ms": "2.0.0" } @@ -5779,15 +7975,22 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -5797,7 +8000,10 @@ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "engines": { "node": "*" } @@ -5807,7 +8013,10 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -5817,7 +8026,10 @@ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "engines": { "node": ">= 0.4" @@ -5828,7 +8040,10 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "wrappy": "1" } @@ -5838,7 +8053,10 @@ "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "mimic-fn": "^2.1.0" }, @@ -5854,7 +8072,10 @@ "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz", "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -5872,7 +8093,10 @@ "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -5896,7 +8120,10 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -5906,7 +8133,10 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -5916,7 +8146,10 @@ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz", "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -5926,7 +8159,10 @@ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -5936,12 +8172,16 @@ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz", "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } }, "node_modules/p-limit": { +<<<<<<< Updated upstream "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", @@ -5952,12 +8192,24 @@ }, "engines": { "node": ">=6" +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" +>>>>>>> Stashed changes }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { +<<<<<<< Updated upstream "version": "4.1.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", @@ -5968,6 +8220,20 @@ }, "engines": { "node": ">=8" +======= + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "dependencies": { + "p-limit": "^3.0.2" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" +>>>>>>> Stashed changes } }, "node_modules/p-map": { @@ -5975,7 +8241,10 @@ "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "aggregate-error": "^3.0.0" }, @@ -5991,7 +8260,10 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -6025,7 +8297,10 @@ "resolved": "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz", "integrity": "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "author-regex": "^1.0.0" }, @@ -6038,7 +8313,10 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "error-ex": "^1.2.0" }, @@ -6051,7 +8329,10 @@ "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -6061,7 +8342,10 @@ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -6071,7 +8355,10 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8" } @@ -6081,12 +8368,16 @@ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { +<<<<<<< Updated upstream "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", @@ -6094,21 +8385,36 @@ "license": "MIT", "engines": { "node": ">=4" +======= + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true, + "engines": { + "node": ">=8" +>>>>>>> Stashed changes } }, "node_modules/path-parse": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/path-type": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "pify": "^2.0.0" }, @@ -6116,26 +8422,49 @@ "node": ">=4" } }, +<<<<<<< Updated upstream +======= + "node_modules/path-type/node_modules/pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, +>>>>>>> Stashed changes "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=8.6" }, @@ -6144,6 +8473,7 @@ } }, "node_modules/pify": { +<<<<<<< Updated upstream "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", @@ -6151,6 +8481,15 @@ "license": "MIT", "engines": { "node": ">=0.10.0" +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "optional": true, + "engines": { + "node": ">=4" +>>>>>>> Stashed changes } }, "node_modules/pinkie": { @@ -6158,7 +8497,10 @@ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -6168,7 +8510,10 @@ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "pinkie": "^2.0.0" }, @@ -6181,7 +8526,10 @@ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "find-up": "^4.0.0" }, @@ -6189,26 +8537,99 @@ "node": ">=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/pkg-dir/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/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, + "dependencies": { + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/pkg-dir/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/pkg-dir/node_modules/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, + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, +>>>>>>> Stashed changes "node_modules/plist": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.4.tgz", "integrity": "sha512-ksrr8y9+nXOxQB2osVNqrgvX/XQPOXaU4BQMKjYq8PvaY1U18mo+fKgBSwzK+luSyinOuPae956lSVcBwxlAMg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" }, "engines": { - "node": ">=6" + "node": ">=6" + } + }, +<<<<<<< Updated upstream +======= + "node_modules/plist/node_modules/xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "dev": true, + "engines": { + "node": ">=4.0" } }, +>>>>>>> Stashed changes "node_modules/prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -6218,7 +8639,10 @@ "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz", "integrity": "sha1-CiLoIQYJrTVUL4yNXSFZr/B1HIQ=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "get-stdin": "^4.0.1", "meow": "^3.1.0" @@ -6235,7 +8659,10 @@ "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.1.tgz", "integrity": "sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "parse-ms": "^2.1.0" }, @@ -6250,15 +8677,22 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/progress": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.4.0" } @@ -6268,7 +8702,10 @@ "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-1.2.0.tgz", "integrity": "sha1-LNPP6jO6OonJwSHsM0er6asSX3c=", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "speedometer": "~0.1.2", "through2": "~0.2.3" @@ -6278,15 +8715,22 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/promise-retry": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" @@ -6300,22 +8744,32 @@ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/psl": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz", "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/pump": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -6326,7 +8780,10 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -6348,7 +8805,10 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz", "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.6" } @@ -6371,15 +8831,22 @@ "type": "consulting", "url": "https://feross.org/support" } +<<<<<<< Updated upstream ], "license": "MIT" +======= + ] +>>>>>>> Stashed changes }, "node_modules/quick-lru": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz", "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -6407,7 +8874,10 @@ "resolved": "https://registry.npmjs.org/rcedit/-/rcedit-3.0.1.tgz", "integrity": "sha512-XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "cross-spawn-windows-exe": "^1.1.0" }, @@ -6436,7 +8906,10 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "load-json-file": "^2.0.0", "normalize-package-data": "^2.3.2", @@ -6451,7 +8924,10 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "find-up": "^2.0.0", "read-pkg": "^2.0.0" @@ -6465,7 +8941,10 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "locate-path": "^2.0.0" }, @@ -6478,7 +8957,10 @@ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "p-locate": "^2.0.0", "path-exists": "^3.0.0" @@ -6492,7 +8974,10 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "p-try": "^1.0.0" }, @@ -6505,7 +8990,10 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "p-limit": "^1.1.0" }, @@ -6518,7 +9006,10 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -6528,12 +9019,16 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } }, "node_modules/readable-stream": { +<<<<<<< Updated upstream "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", @@ -6546,6 +9041,20 @@ }, "engines": { "node": ">= 6" +======= + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" +>>>>>>> Stashed changes } }, "node_modules/redent": { @@ -6553,7 +9062,10 @@ "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "indent-string": "^2.1.0", "strip-indent": "^1.0.1" @@ -6562,6 +9074,21 @@ "node": ">=0.10.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/redent/node_modules/indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "dependencies": { + "repeating": "^2.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, +>>>>>>> Stashed changes "node_modules/registry-auth-token": { "version": "4.2.1", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz", @@ -6591,7 +9118,10 @@ "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-finite": "^1.0.0" }, @@ -6603,8 +9133,13 @@ "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", +<<<<<<< Updated upstream "dev": true, "license": "Apache-2.0", +======= + "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -6631,22 +9166,55 @@ "node": ">= 6" } }, +<<<<<<< Updated upstream +======= + "node_modules/request/node_modules/form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 0.12" + } + }, +>>>>>>> Stashed changes "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/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 + }, +>>>>>>> Stashed changes "node_modules/resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-core-module": "^2.8.1", "path-parse": "^1.0.7", @@ -6663,15 +9231,22 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz", "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" @@ -6685,7 +9260,10 @@ "resolved": "https://registry.npmjs.org/resolve-package/-/resolve-package-1.0.1.tgz", "integrity": "sha1-aG9wsYi9fWdfW7xCgszaBgq7nSc=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "get-installed-path": "^2.0.3" }, @@ -6695,6 +9273,7 @@ } }, "node_modules/responselike": { +<<<<<<< Updated upstream "version": "2.0.0", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", @@ -6702,6 +9281,14 @@ "license": "MIT", "dependencies": { "lowercase-keys": "^2.0.0" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, + "dependencies": { + "lowercase-keys": "^1.0.0" +>>>>>>> Stashed changes } }, "node_modules/restore-cursor": { @@ -6709,7 +9296,10 @@ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -6723,7 +9313,10 @@ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 4" } @@ -6733,7 +9326,10 @@ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -6744,7 +9340,10 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "glob": "^7.1.3" }, @@ -6760,7 +9359,10 @@ "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz", "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "boolean": "^3.0.1", @@ -6779,7 +9381,10 @@ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.12.0" } @@ -6803,22 +9408,33 @@ "url": "https://feross.org/support" } ], +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/rxjs": { +<<<<<<< Updated upstream "version": "7.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.2.tgz", "integrity": "sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==", "dev": true, "license": "Apache-2.0", +======= + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz", + "integrity": "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==", + "dev": true, +>>>>>>> Stashed changes "dependencies": { "tslib": "^2.1.0" } }, "node_modules/safe-buffer": { +<<<<<<< Updated upstream "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", @@ -6838,13 +9454,23 @@ } ], "license": "MIT" +======= + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true +>>>>>>> Stashed changes }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/sanitize-filename": { "version": "1.6.3", @@ -6866,7 +9492,10 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "lru-cache": "^6.0.0" }, @@ -6882,7 +9511,10 @@ "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/semver-diff": { @@ -6911,7 +9543,10 @@ "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "type-fest": "^0.13.1" @@ -6928,7 +9563,10 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", "dev": true, +<<<<<<< Updated upstream "license": "(MIT OR CC0-1.0)", +======= +>>>>>>> Stashed changes "optional": true, "engines": { "node": ">=10" @@ -6941,6 +9579,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" }, @@ -6973,13 +9612,46 @@ "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", "dev": true, "license": "ISC" +======= + "dev": true + }, + "node_modules/shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "dependencies": { + "shebang-regex": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true +>>>>>>> Stashed changes }, "node_modules/single-line-log": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz", "integrity": "sha1-wvg/Jzo+GhbtsJlWYdoO1e8DM2Q=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "string-width": "^1.0.1" } @@ -6989,7 +9661,10 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -6999,7 +9674,10 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "number-is-nan": "^1.0.0" }, @@ -7012,7 +9690,10 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7027,7 +9708,10 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-regex": "^2.0.0" }, @@ -7055,13 +9739,17 @@ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 6.0.0", "npm": ">= 3.0.0" } }, "node_modules/socks": { +<<<<<<< Updated upstream "version": "2.6.1", "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz", "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==", @@ -7070,6 +9758,15 @@ "dependencies": { "ip": "^1.1.5", "smart-buffer": "^4.1.0" +======= + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz", + "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==", + "dev": true, + "dependencies": { + "ip": "^1.1.5", + "smart-buffer": "^4.2.0" +>>>>>>> Stashed changes }, "engines": { "node": ">= 10.13.0", @@ -7081,7 +9778,10 @@ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz", "integrity": "sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "agent-base": "^6.0.2", "debug": "^4.3.1", @@ -7096,7 +9796,10 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -7106,7 +9809,10 @@ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "buffer-from": "^1.0.0", "source-map": "^0.6.0" @@ -7117,7 +9823,10 @@ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -7127,15 +9836,22 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", +<<<<<<< Updated upstream "dev": true, "license": "CC-BY-3.0" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -7145,8 +9861,12 @@ "version": "3.0.11", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz", "integrity": "sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==", +<<<<<<< Updated upstream "dev": true, "license": "CC0-1.0" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/speedometer": { "version": "0.1.4", @@ -7159,7 +9879,10 @@ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "optional": true }, "node_modules/sshpk": { @@ -7167,7 +9890,10 @@ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz", "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -7193,7 +9919,10 @@ "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "minipass": "^3.1.1" }, @@ -7211,6 +9940,7 @@ } }, "node_modules/string_decoder": { +<<<<<<< Updated upstream "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", @@ -7218,6 +9948,14 @@ "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "dependencies": { + "safe-buffer": "~5.1.0" +>>>>>>> Stashed changes } }, "node_modules/string-width": { @@ -7225,7 +9963,10 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -7240,7 +9981,10 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-regex": "^5.0.1" }, @@ -7253,7 +9997,10 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=4" } @@ -7263,7 +10010,10 @@ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -7273,7 +10023,10 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "get-stdin": "^4.0.1" }, @@ -7298,7 +10051,10 @@ "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.1.tgz", "integrity": "sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -7319,15 +10075,22 @@ "version": "9.2.1", "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz", "integrity": "sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/sumchecker": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz", "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "debug": "^4.1.0" }, @@ -7340,7 +10103,10 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "has-flag": "^4.0.0" }, @@ -7353,7 +10119,10 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">= 0.4" }, @@ -7366,7 +10135,10 @@ "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz", "integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "chownr": "^2.0.0", "fs-minipass": "^2.0.0", @@ -7384,7 +10156,10 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "bin": { "mkdirp": "bin/cmd.js" }, @@ -7397,7 +10172,10 @@ "resolved": "https://registry.npmjs.org/temp/-/temp-0.9.4.tgz", "integrity": "sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "mkdirp": "^0.5.1", @@ -7422,7 +10200,10 @@ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "optional": true, "dependencies": { "glob": "^7.1.3" @@ -7435,21 +10216,32 @@ "version": "0.0.2", "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz", "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", +<<<<<<< Updated upstream "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", "license": "MIT" +======= + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" +>>>>>>> Stashed changes }, "node_modules/through2": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz", "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "readable-stream": "~1.1.9", "xtend": "~2.1.1" @@ -7459,15 +10251,22 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/through2/node_modules/readable-stream": { "version": "1.1.14", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.1", @@ -7479,15 +10278,29 @@ "version": "0.10.31", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true + }, + "node_modules/tiny-each-async": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz", + "integrity": "sha1-jru/1tYpXxNwAD+7NxYq/loKUdE=", + "dev": true, + "optional": true +>>>>>>> Stashed changes }, "node_modules/tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -7496,6 +10309,7 @@ } }, "node_modules/tmp-promise": { +<<<<<<< Updated upstream "version": "1.1.0", "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz", "integrity": "sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==", @@ -7533,6 +10347,26 @@ }, "engines": { "node": ">=6" +======= + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", + "dev": true, + "dependencies": { + "tmp": "^0.2.0" + } + }, + "node_modules/tmp-promise/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" +>>>>>>> Stashed changes } }, "node_modules/to-readable-stream": { @@ -7540,7 +10374,10 @@ "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=6" } @@ -7550,7 +10387,10 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "is-number": "^7.0.0" }, @@ -7563,7 +10403,10 @@ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-3-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "psl": "^1.1.28", "punycode": "^2.1.1" @@ -7576,15 +10419,22 @@ "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/trim-newlines": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=0.10.0" } @@ -7594,7 +10444,10 @@ "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "escape-string-regexp": "^1.0.2" }, @@ -7615,15 +10468,22 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==", +<<<<<<< Updated upstream "dev": true, "license": "0BSD" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/tunnel": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz", "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "optional": true, "engines": { "node": ">=0.6.11 <=0.7.0 || >=0.7.3" @@ -7634,7 +10494,10 @@ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "safe-buffer": "^5.0.1" }, @@ -7646,15 +10509,22 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", +<<<<<<< Updated upstream "dev": true, "license": "Unlicense" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/type-fest": { "version": "0.21.3", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, +<<<<<<< Updated upstream "license": "(MIT OR CC0-1.0)", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -7666,8 +10536,12 @@ "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", @@ -7683,7 +10557,10 @@ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "unique-slug": "^2.0.0" } @@ -7693,7 +10570,10 @@ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "imurmurhash": "^0.1.4" } @@ -7711,6 +10591,7 @@ } }, "node_modules/universalify": { +<<<<<<< Updated upstream "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", @@ -7718,6 +10599,14 @@ "license": "MIT", "engines": { "node": ">= 4.0.0" +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true, + "engines": { + "node": ">= 10.0.0" +>>>>>>> Stashed changes } }, "node_modules/update-notifier": { @@ -7771,7 +10660,10 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, +<<<<<<< Updated upstream "license": "BSD-2-Clause", +======= +>>>>>>> Stashed changes "dependencies": { "punycode": "^2.1.0" } @@ -7781,7 +10673,10 @@ "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "prepend-http": "^2.0.0" }, @@ -7794,7 +10689,10 @@ "resolved": "https://registry.npmjs.org/username/-/username-5.1.0.tgz", "integrity": "sha512-PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "execa": "^1.0.0", "mem": "^4.3.0" @@ -7813,15 +10711,24 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/uuid": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", +<<<<<<< Updated upstream "dev": true, "license": "MIT", +======= + "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", + "dev": true, +>>>>>>> Stashed changes "bin": { "uuid": "bin/uuid" } @@ -7831,13 +10738,17 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, +<<<<<<< Updated upstream "license": "Apache-2.0", +======= +>>>>>>> Stashed changes "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "node_modules/verror": { +<<<<<<< Updated upstream "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", @@ -7846,10 +10757,23 @@ "node >=0.6.0" ], "license": "MIT", +======= + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", + "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", + "dev": true, + "optional": true, +>>>>>>> Stashed changes "dependencies": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" +<<<<<<< Updated upstream +======= + }, + "engines": { + "node": ">=0.6.0" +>>>>>>> Stashed changes } }, "node_modules/verror/node_modules/core-util-is": { @@ -7857,6 +10781,7 @@ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, +<<<<<<< Updated upstream "license": "MIT" }, "node_modules/verror/node_modules/extsprintf": { @@ -7868,13 +10793,19 @@ "node >=0.6.0" ], "license": "MIT" +======= + "optional": true +>>>>>>> Stashed changes }, "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "defaults": "^1.0.3" } @@ -7883,15 +10814,22 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", +<<<<<<< Updated upstream "dev": true, "license": "BSD-2-Clause" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha1-lmRU6HZUYuN2RNNib2dCzotwll0=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -7902,7 +10840,10 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "isexe": "^2.0.0" }, @@ -7913,12 +10854,25 @@ "node": ">= 8" } }, +<<<<<<< Updated upstream +======= + "node_modules/which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "node_modules/wide-align": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "dependencies": { "string-width": "^1.0.2 || 2 || 3 || 4" } @@ -7935,12 +10889,28 @@ "node": ">=8" } }, +<<<<<<< Updated upstream +======= + "node_modules/word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "optional": true, + "engines": { + "node": ">=0.10.0" + } + }, +>>>>>>> Stashed changes "node_modules/wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -7957,8 +10927,24 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true + }, + "node_modules/write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "dependencies": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } +>>>>>>> Stashed changes }, "node_modules/xdg-basedir": { "version": "4.0.0", @@ -7970,6 +10956,7 @@ } }, "node_modules/xmlbuilder": { +<<<<<<< Updated upstream "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", @@ -7977,6 +10964,15 @@ "license": "MIT", "engines": { "node": ">=4.0" +======= + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true, + "optional": true, + "engines": { + "node": ">=8.0" +>>>>>>> Stashed changes } }, "node_modules/xtend": { @@ -7995,15 +10991,22 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz", "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=", +<<<<<<< Updated upstream "dev": true, "license": "MIT" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" } @@ -8012,8 +11015,12 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", +<<<<<<< Updated upstream "dev": true, "license": "ISC" +======= + "dev": true +>>>>>>> Stashed changes }, "node_modules/yargs": { "version": "17.3.1", @@ -8038,7 +11045,10 @@ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, +<<<<<<< Updated upstream "license": "ISC", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" } @@ -8057,7 +11067,10 @@ "resolved": "https://registry.npmjs.org/yarn-or-npm/-/yarn-or-npm-3.0.1.tgz", "integrity": "sha512-fTiQP6WbDAh5QZAVdbMQkecZoahnbOjClTQhzv74WX5h2Uaidj1isf9FDes11TKtsZ0/ZVfZsqZ+O3x6aLERHQ==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "cross-spawn": "^6.0.5", "pkg-dir": "^4.2.0" @@ -8070,12 +11083,85 @@ "node": ">=8.6.0" } }, +<<<<<<< Updated upstream +======= + "node_modules/yarn-or-npm/node_modules/cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "dependencies": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + }, + "engines": { + "node": ">=4.8" + } + }, + "node_modules/yarn-or-npm/node_modules/path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/yarn-or-npm/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, + "node_modules/yarn-or-npm/node_modules/shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "dependencies": { + "shebang-regex": "^1.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yarn-or-npm/node_modules/shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/yarn-or-npm/node_modules/which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "dependencies": { + "isexe": "^2.0.0" + }, + "bin": { + "which": "bin/which" + } + }, +>>>>>>> Stashed changes "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", "integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "dependencies": { "buffer-crc32": "~0.2.3", "fd-slicer": "~1.1.0" @@ -8086,7 +11172,10 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, +<<<<<<< Updated upstream "license": "MIT", +======= +>>>>>>> Stashed changes "engines": { "node": ">=10" }, @@ -8177,6 +11266,7 @@ "sudo-prompt": "^9.1.1", "username": "^5.1.0", "yarn-or-npm": "^3.0.1" +<<<<<<< Updated upstream }, "dependencies": { "find-up": { @@ -8216,6 +11306,8 @@ "p-limit": "^3.0.2" } } +======= +>>>>>>> Stashed changes } }, "@electron-forge/installer-base": { @@ -8465,11 +11557,32 @@ "universalify": "^0.1.0" } }, +<<<<<<< Updated upstream +======= + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, +>>>>>>> Stashed changes "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true +<<<<<<< Updated upstream +======= + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true +>>>>>>> Stashed changes } } }, @@ -8495,6 +11608,7 @@ "cross-spawn": "^7.0.1" } }, +<<<<<<< Updated upstream "cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -8506,6 +11620,8 @@ "which": "^2.0.1" } }, +======= +>>>>>>> Stashed changes "fs-extra": { "version": "9.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", @@ -8517,6 +11633,7 @@ "jsonfile": "^6.0.1", "universalify": "^2.0.0" } +<<<<<<< Updated upstream }, "jsonfile": { "version": "6.1.0", @@ -8554,6 +11671,8 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true +======= +>>>>>>> Stashed changes } } }, @@ -8570,6 +11689,7 @@ "dev": true, "requires": { "cross-spawn": "^7.0.1" +<<<<<<< Updated upstream }, "dependencies": { "cross-spawn": { @@ -8604,6 +11724,8 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true } +======= +>>>>>>> Stashed changes } }, "@malept/flatpak-bundler": { @@ -8629,6 +11751,7 @@ "jsonfile": "^6.0.1", "universalify": "^2.0.0" } +<<<<<<< Updated upstream }, "jsonfile": { "version": "6.1.0", @@ -8663,6 +11786,8 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true +======= +>>>>>>> Stashed changes } } }, @@ -8693,9 +11818,15 @@ } }, "@npmcli/fs": { +<<<<<<< Updated upstream "version": "1.1.0", "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.0.tgz", "integrity": "sha512-VhP1qZLXcrXRIaPoqb4YA55JQxLNF3jNR4T55IdOJa3+IFJKNYHtPvtXx8slmeMavj37vCzCfrqQM1vWLsYKLA==", +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", + "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", +>>>>>>> Stashed changes "dev": true, "requires": { "@gar/promisify": "^1.0.1", @@ -8736,9 +11867,15 @@ } }, "@tootallnate/once": { +<<<<<<< Updated upstream "version": "1.1.2", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", + "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", +>>>>>>> Stashed changes "dev": true }, "@types/cacheable-request": { @@ -8811,9 +11948,15 @@ "dev": true }, "@types/node": { +<<<<<<< Updated upstream "version": "17.0.14", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz", "integrity": "sha512-SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng==", +======= + "version": "14.18.11", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.11.tgz", + "integrity": "sha512-zCoCEMA+IPpsRkyCFBqew5vGb7r8RSiB3uwdu/map7uwLAfu1MTazW26/pUDWoNnF88vJz4W3U56i5gtXNqxGg==", +>>>>>>> Stashed changes "dev": true }, "@types/plist": { @@ -8825,6 +11968,7 @@ "requires": { "@types/node": "*", "xmlbuilder": ">=11.0.1" +<<<<<<< Updated upstream }, "dependencies": { "xmlbuilder": { @@ -8834,6 +11978,8 @@ "dev": true, "optional": true } +======= +>>>>>>> Stashed changes } }, "@types/responselike": { @@ -8922,6 +12068,7 @@ "requires": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" +<<<<<<< Updated upstream }, "dependencies": { "indent-string": { @@ -8930,6 +12077,8 @@ "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true } +======= +>>>>>>> Stashed changes } }, "ajv": { @@ -8991,9 +12140,15 @@ "dev": true }, "app-builder-lib": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.5.tgz", "integrity": "sha512-k3VwKP4kpsnUaXoUkm1s4zaSHPHIMFnN4kPMU9yXaKmE1LfHHqBaEah5bXeTAX5V/BC41wFdg8CF5vOjvgy8Rg==", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.14.13.tgz", + "integrity": "sha512-SufmrtxU+D0Tn948fjEwAOlCN9757UXLkzzTWXMwZKR/5hisvgqeeBepWfphMIE6OkDGz0fbzEhL1P2Pty4XMg==", +>>>>>>> Stashed changes "dev": true, "requires": { "@develar/schema-utils": "~2.6.5", @@ -9002,13 +12157,22 @@ "7zip-bin": "~5.1.1", "async-exit-hook": "^2.0.1", "bluebird-lst": "^1.0.9", +<<<<<<< Updated upstream "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chromium-pickle-js": "^0.2.0", "debug": "^4.3.2", "ejs": "^3.1.6", "electron-osx-sign": "^0.5.0", +<<<<<<< Updated upstream "electron-publish": "22.14.5", +======= + "electron-publish": "22.14.13", +>>>>>>> Stashed changes "form-data": "^4.0.0", "fs-extra": "^10.0.0", "hosted-git-info": "^4.0.2", @@ -9021,6 +12185,7 @@ "sanitize-filename": "^1.6.3", "semver": "^7.3.5", "temp-file": "^3.4.0" +<<<<<<< Updated upstream }, "dependencies": { "form-data": { @@ -9049,6 +12214,8 @@ "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", "dev": true } +======= +>>>>>>> Stashed changes } }, "aproba": { @@ -9058,13 +12225,35 @@ "dev": true }, "are-we-there-yet": { +<<<<<<< Updated upstream "version": "2.0.0", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz", "integrity": "sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==", +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz", + "integrity": "sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==", +>>>>>>> Stashed changes "dev": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^3.6.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } +>>>>>>> Stashed changes } }, "argparse": { @@ -9122,6 +12311,15 @@ "dev": true, "optional": true }, +<<<<<<< Updated upstream +======= + "async": { + "version": "0.9.2", + "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", + "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", + "dev": true + }, +>>>>>>> Stashed changes "async-exit-hook": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", @@ -9188,6 +12386,22 @@ "buffer": "^5.5.0", "inherits": "^2.0.4", "readable-stream": "^3.4.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } +>>>>>>> Stashed changes } }, "bluebird": { @@ -9228,6 +12442,15 @@ "wrap-ansi": "^7.0.0" }, "dependencies": { +<<<<<<< Updated upstream +======= + "camelcase": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", + "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", + "dev": true + }, +>>>>>>> Stashed changes "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -9306,9 +12529,15 @@ "dev": true }, "builder-util": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.5.tgz", "integrity": "sha512-zqIHDFJwmA7jV7SC9aI+33MWwT2mWoijH+Ol9IntNAwuuRXoS+7XeJwnhLBXOhcDBzXT4kDzHnRk4JKeaygEYA==", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-22.14.13.tgz", + "integrity": "sha512-oePC/qrrUuerhmH5iaCJzPRAKlSBylrhzuAJmRQClTyWnZUv6jbaHh+VoHMbEiE661wrj2S2aV7/bQh12cj1OA==", +>>>>>>> Stashed changes "dev": true, "requires": { "@types/debug": "^4.1.6", @@ -9316,16 +12545,26 @@ "7zip-bin": "~5.1.1", "app-builder-bin": "3.7.1", "bluebird-lst": "^1.0.9", +<<<<<<< Updated upstream "builder-util-runtime": "8.9.1", +======= + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chalk": "^4.1.1", "cross-spawn": "^7.0.3", "debug": "^4.3.2", "fs-extra": "^10.0.0", +<<<<<<< Updated upstream +======= + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", +>>>>>>> Stashed changes "is-ci": "^3.0.0", "js-yaml": "^4.1.0", "source-map-support": "^0.5.19", "stat-mode": "^1.0.0", "temp-file": "^3.4.0" +<<<<<<< Updated upstream }, "dependencies": { "cross-spawn": { @@ -9366,6 +12605,14 @@ "version": "8.9.1", "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.1.tgz", "integrity": "sha512-c8a8J3wK6BIVLW7ls+7TRK9igspTbzWmUqxFbgK0m40Ggm6efUbxtWVCGIjc+dtchyr5qAMAUL6iEGRdS/6vwg==", +======= + } + }, + "builder-util-runtime": { + "version": "8.9.2", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.9.2.tgz", + "integrity": "sha512-rhuKm5vh7E0aAmT6i8aoSfEjxzdYEFX7zDApK+eNgOhjofnWb74d9SRJv0H/8nsgOkos0TZ4zxW0P8J4N7xQ2A==", +>>>>>>> Stashed changes "dev": true, "requires": { "debug": "^4.3.2", @@ -9427,6 +12674,7 @@ "responselike": "^1.0.2" }, "dependencies": { +<<<<<<< Updated upstream "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -9443,13 +12691,35 @@ "dev": true } } +======= + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true +>>>>>>> Stashed changes } } }, "camelcase": { +<<<<<<< Updated upstream "version": "6.3.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", +======= + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", +>>>>>>> Stashed changes "dev": true }, "camelcase-keys": { @@ -9460,6 +12730,7 @@ "requires": { "camelcase": "^2.0.0", "map-obj": "^1.0.0" +<<<<<<< Updated upstream }, "dependencies": { "camelcase": { @@ -9468,6 +12739,8 @@ "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", "dev": true } +======= +>>>>>>> Stashed changes } }, "caseless": { @@ -9650,6 +12923,7 @@ "inherits": "^2.0.3", "readable-stream": "^2.2.2", "typedarray": "^0.0.6" +<<<<<<< Updated upstream }, "dependencies": { "readable-stream": { @@ -9682,6 +12956,8 @@ "safe-buffer": "~5.1.0" } } +======= +>>>>>>> Stashed changes } }, "config-chain": { @@ -9707,6 +12983,7 @@ "unique-string": "^2.0.0", "write-file-atomic": "^3.0.0", "xdg-basedir": "^4.0.0" +<<<<<<< Updated upstream }, "dependencies": { "write-file-atomic": { @@ -9721,6 +12998,8 @@ "typedarray-to-buffer": "^3.1.5" } } +======= +>>>>>>> Stashed changes } }, "console-control-strings": { @@ -9746,6 +13025,7 @@ } }, "cross-spawn": { +<<<<<<< Updated upstream "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", @@ -9773,6 +13053,16 @@ "isexe": "^2.0.0" } } +======= + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" +>>>>>>> Stashed changes } }, "cross-spawn-windows-exe": { @@ -9791,6 +13081,7 @@ "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", "dev": true, +<<<<<<< Updated upstream "requires": { "cross-spawn": "^7.0.1" } @@ -9826,6 +13117,11 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true +======= + "requires": { + "cross-spawn": "^7.0.1" + } +>>>>>>> Stashed changes } } }, @@ -9873,6 +13169,7 @@ "dev": true, "requires": { "ms": "2.1.2" +<<<<<<< Updated upstream }, "dependencies": { "ms": { @@ -9881,6 +13178,8 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } +======= +>>>>>>> Stashed changes } }, "decamelize": { @@ -9991,10 +13290,23 @@ "requires": { "graceful-readlink": ">= 1.0.0" } +<<<<<<< Updated upstream +======= + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } +>>>>>>> Stashed changes } } }, "dmg-builder": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.5.tgz", "integrity": "sha512-1GvFGQE332bvPamcMwZDqWqfWfJTyyDLOsHMcGi0zs+Jh7JOn6/zuBkHJIWHdsj2QJbhzLVyd2/ZqttOKv7I8w==", @@ -10003,6 +13315,16 @@ "app-builder-lib": "22.14.5", "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.14.13.tgz", + "integrity": "sha512-xNOugB6AbIRETeU2uID15sUfjdZZcKdxK8xkFnwIggsM00PJ12JxpLNPTjcRoUnfwj3WrPjilrO64vRMwNItQg==", + "dev": true, + "requires": { + "app-builder-lib": "22.14.13", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "dmg-license": "^1.0.9", "fs-extra": "^10.0.0", "iconv-lite": "^0.6.2", @@ -10081,6 +13403,7 @@ "@electron/get": "^1.13.0", "@types/node": "^14.6.2", "extract-zip": "^1.0.3" +<<<<<<< Updated upstream }, "dependencies": { "@types/node": { @@ -10091,26 +13414,329 @@ } } }, - "electron-builder": { - "version": "22.14.5", - "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.5.tgz", - "integrity": "sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==", - "dev": true, - "requires": { - "@types/yargs": "^17.0.1", - "app-builder-lib": "22.14.5", - "builder-util": "22.14.5", - "builder-util-runtime": "8.9.1", - "chalk": "^4.1.1", - "dmg-builder": "22.14.5", - "fs-extra": "^10.0.0", - "is-ci": "^3.0.0", - "lazy-val": "^1.0.5", - "read-config-file": "6.2.0", - "update-notifier": "^5.1.0", - "yargs": "^17.0.1" - } - }, + "electron-builder": { + "version": "22.14.5", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.5.tgz", + "integrity": "sha512-N73hSbXFz6Mz5Z6h6C5ly6CB+dUN6k1LuCDJjI8VF47bMXv/QE0HE+Kkb0GPKqTqM7Hsk/yIYX+kHCfSkR5FGg==", + "dev": true, + "requires": { + "@types/yargs": "^17.0.1", + "app-builder-lib": "22.14.5", + "builder-util": "22.14.5", + "builder-util-runtime": "8.9.1", + "chalk": "^4.1.1", + "dmg-builder": "22.14.5", +======= + } + }, + "electron-builder": { + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-22.14.13.tgz", + "integrity": "sha512-3fgLxqF2TXVKiUPeg74O4V3l0l3j7ERLazo8sUbRkApw0+4iVAf2BJkHsHMaXiigsgCoEzK/F4/rB5rne/VAnw==", + "dev": true, + "requires": { + "@types/yargs": "^17.0.1", + "app-builder-lib": "22.14.13", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", + "chalk": "^4.1.1", + "dmg-builder": "22.14.13", +>>>>>>> Stashed changes + "fs-extra": "^10.0.0", + "is-ci": "^3.0.0", + "lazy-val": "^1.0.5", + "read-config-file": "6.2.0", + "update-notifier": "^5.1.0", + "yargs": "^17.0.1" + } + }, +<<<<<<< Updated upstream + "electron-notarize": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz", + "integrity": "sha512-kufsnqh86CTX89AYNG3NCPoboqnku/+32RxeJ2+7A4Rbm4bbOx0Nc7XTy3/gAlBfpj9xPAxHfhZLOHgfi6cJVw==", + "dev": true, + "requires": { + "debug": "^4.1.1", + "fs-extra": "^9.0.1" + }, + "dependencies": { +======= + "electron-installer-common": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/electron-installer-common/-/electron-installer-common-0.10.3.tgz", + "integrity": "sha512-mYbP+6i+nHMIm0WZHXgGdmmXMe+KXncl6jZYQNcCF9C1WsNA9C5SZ2VP4TLQMSIoFO+X4ugkMEA5uld1bmyEvA==", + "dev": true, + "optional": true, + "requires": { + "@malept/cross-spawn-promise": "^1.0.0", + "@types/fs-extra": "^9.0.1", + "asar": "^3.0.0", + "debug": "^4.1.1", + "fs-extra": "^9.0.0", + "glob": "^7.1.4", + "lodash": "^4.17.15", + "parse-author": "^2.0.0", + "semver": "^7.1.1", + "tmp-promise": "^3.0.2" + }, + "dependencies": { + "@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "optional": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, +>>>>>>> Stashed changes + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, +<<<<<<< Updated upstream +======= + "optional": true, +>>>>>>> Stashed changes + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } +<<<<<<< Updated upstream + }, + "jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" + } + }, + "universalify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", + "dev": true +======= + } + } + }, + "electron-installer-debian": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/electron-installer-debian/-/electron-installer-debian-3.1.0.tgz", + "integrity": "sha512-k6KChvx0Fw8XTlCqwwbBfh19yGQaKjGdbugokmr1IpzINOm4QFyACKMTHAYFHW5LCBUZQShZD96hwxUZ+8Kx+w==", + "dev": true, + "optional": true, + "requires": { + "@malept/cross-spawn-promise": "^1.0.0", + "debug": "^4.1.1", + "electron-installer-common": "^0.10.2", + "fs-extra": "^9.0.0", + "get-folder-size": "^2.0.1", + "lodash": "^4.17.4", + "word-wrap": "^1.2.3", + "yargs": "^15.0.1" + }, + "dependencies": { + "@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "optional": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", + "dev": true, + "optional": true + }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "dev": true, + "optional": true, + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "optional": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "optional": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.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, + "optional": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "optional": true, + "requires": { + "p-try": "^2.0.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, + "optional": true, + "requires": { + "p-limit": "^2.2.0" + } + }, + "wrap-ansi": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true, + "optional": true + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "dev": true, + "optional": true, + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "dev": true, + "optional": true, + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "electron-installer-redhat": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/electron-installer-redhat/-/electron-installer-redhat-3.3.0.tgz", + "integrity": "sha512-hXIXB3uQXmXZy/v3MpbwWN4Of28ALpPt9ZyUDNEoSe0w7QZceL9IqI2K6Q6imiBJCLRC0hmT94WhlKj1RyGOWg==", + "dev": true, + "optional": true, + "requires": { + "@malept/cross-spawn-promise": "^1.0.0", + "debug": "^4.1.1", + "electron-installer-common": "^0.10.2", + "fs-extra": "^9.0.0", + "lodash": "^4.17.15", + "word-wrap": "^1.2.3", + "yargs": "^16.0.2" + }, + "dependencies": { + "@malept/cross-spawn-promise": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz", + "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==", + "dev": true, + "optional": true, + "requires": { + "cross-spawn": "^7.0.1" + } + }, + "fs-extra": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz", + "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==", + "dev": true, + "optional": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + } + }, + "yargs": { + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "dev": true, + "optional": true, + "requires": { + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" + } + } + } + }, "electron-notarize": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/electron-notarize/-/electron-notarize-1.1.1.tgz", @@ -10132,22 +13758,7 @@ "jsonfile": "^6.0.1", "universalify": "^2.0.0" } - }, - "jsonfile": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", - "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", - "dev": true, - "requires": { - "graceful-fs": "^4.1.6", - "universalify": "^2.0.0" - } - }, - "universalify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", - "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", - "dev": true +>>>>>>> Stashed changes } } }, @@ -10174,6 +13785,18 @@ "ms": "2.0.0" } }, +<<<<<<< Updated upstream +======= + "isbinaryfile": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", + "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", + "dev": true, + "requires": { + "buffer-alloc": "^1.2.0" + } + }, +>>>>>>> Stashed changes "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -10232,6 +13855,7 @@ "universalify": "^2.0.0" } }, +<<<<<<< Updated upstream "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -10247,10 +13871,21 @@ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true +======= + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } +>>>>>>> Stashed changes } } }, "electron-publish": { +<<<<<<< Updated upstream "version": "22.14.5", "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.5.tgz", "integrity": "sha512-h+NANRdaA0PqGF15GKvorseWPzh1PXa/zx4I37//PIokW8eKIov8ky23foUSb55ZFWUHGpxQJux7y2NCfBtQeg==", @@ -10259,6 +13894,16 @@ "@types/fs-extra": "^9.0.11", "builder-util": "22.14.5", "builder-util-runtime": "8.9.1", +======= + "version": "22.14.13", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-22.14.13.tgz", + "integrity": "sha512-0oP3QiNj3e8ewOaEpEJV/o6Zrmy2VarVvZ/bH7kyO/S/aJf9x8vQsKVWpsdmSiZ5DJEHgarFIXrnO0ZQf0P9iQ==", + "dev": true, + "requires": { + "@types/fs-extra": "^9.0.11", + "builder-util": "22.14.13", + "builder-util-runtime": "8.9.2", +>>>>>>> Stashed changes "chalk": "^4.1.1", "fs-extra": "^10.0.0", "lazy-val": "^1.0.5", @@ -10332,6 +13977,18 @@ "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==", "dev": true }, +<<<<<<< Updated upstream +======= + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, +>>>>>>> Stashed changes "got": { "version": "11.8.3", "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz", @@ -10358,14 +14015,29 @@ "dev": true }, "keyv": { +<<<<<<< Updated upstream "version": "4.0.5", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.5.tgz", "integrity": "sha512-531pkGLqV3BMg0eDqqJFI0R1mkK1Nm5xIP2mM6keP5P8WfFtCkg2IOwplTUmlGoTgIg9yQYZ/kdihhz89XH3vA==", +======= + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.1.1.tgz", + "integrity": "sha512-tGv1yP6snQVDSM4X6yxrv2zzq/EvpW+oYiUz6aueW1u9CtS8RzUQYxxmFwgZlO2jSgCxQbchhxaqXXp2hnKGpQ==", +>>>>>>> Stashed changes "dev": true, "requires": { "json-buffer": "3.0.1" } }, +<<<<<<< Updated upstream +======= + "lowercase-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", + "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", + "dev": true + }, +>>>>>>> Stashed changes "mimic-response": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", @@ -10383,6 +14055,18 @@ "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz", "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==", "dev": true +<<<<<<< Updated upstream +======= + }, + "responselike": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", + "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", + "dev": true, + "requires": { + "lowercase-keys": "^2.0.0" + } +>>>>>>> Stashed changes } } }, @@ -10454,10 +14138,65 @@ "dev": true, "optional": true, "requires": { +<<<<<<< Updated upstream + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } +======= "graceful-fs": "^4.1.2", "jsonfile": "^4.0.0", "universalify": "^0.1.0" } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "optional": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "tmp": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz", + "integrity": "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==", + "dev": true, + "optional": true, + "requires": { + "rimraf": "^2.6.3" + } + }, + "tmp-promise": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz", + "integrity": "sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==", + "dev": true, + "optional": true, + "requires": { + "bluebird": "^3.5.0", + "tmp": "0.1.0" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true, + "optional": true +>>>>>>> Stashed changes } } }, @@ -10554,6 +14293,7 @@ "strip-eof": "^1.0.0" }, "dependencies": { +<<<<<<< Updated upstream "get-stream": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -10561,6 +14301,55 @@ "dev": true, "requires": { "pump": "^3.0.0" +======= + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" +>>>>>>> Stashed changes } } } @@ -10740,12 +14529,21 @@ } }, "find-up": { +<<<<<<< Updated upstream "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "requires": { "locate-path": "^5.0.0", +======= + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", +>>>>>>> Stashed changes "path-exists": "^4.0.0" } }, @@ -10769,6 +14567,24 @@ "jsonfile": "^4.0.0", "universalify": "^0.1.0" } +<<<<<<< Updated upstream +======= + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true +>>>>>>> Stashed changes } } }, @@ -10779,6 +14595,7 @@ "dev": true }, "form-data": { +<<<<<<< Updated upstream "version": "2.3.3", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", @@ -10786,6 +14603,15 @@ "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", +>>>>>>> Stashed changes "mime-types": "^2.1.12" } }, @@ -10798,6 +14624,7 @@ "graceful-fs": "^4.2.0", "jsonfile": "^6.0.1", "universalify": "^2.0.0" +<<<<<<< Updated upstream }, "dependencies": { "jsonfile": { @@ -10816,6 +14643,8 @@ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", "dev": true } +======= +>>>>>>> Stashed changes } }, "fs-minipass": { @@ -10869,9 +14698,37 @@ "jsonfile": "^4.0.0", "universalify": "^0.1.0" } +<<<<<<< Updated upstream + } + } + }, +======= + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true } } }, + "gar": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/gar/-/gar-1.0.4.tgz", + "integrity": "sha512-w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w==", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "gauge": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.0.tgz", @@ -10895,6 +14752,20 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true }, +<<<<<<< Updated upstream +======= + "get-folder-size": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/get-folder-size/-/get-folder-size-2.0.1.tgz", + "integrity": "sha512-+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA==", + "dev": true, + "optional": true, + "requires": { + "gar": "^1.0.4", + "tiny-each-async": "2.0.3" + } + }, +>>>>>>> Stashed changes "get-installed-path": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/get-installed-path/-/get-installed-path-2.1.1.tgz", @@ -10940,9 +14811,15 @@ "dev": true }, "get-stream": { +<<<<<<< Updated upstream "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", + "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", +>>>>>>> Stashed changes "dev": true, "requires": { "pump": "^3.0.0" @@ -11087,6 +14964,7 @@ "p-cancelable": "^1.0.0", "to-readable-stream": "^1.0.0", "url-parse-lax": "^3.0.0" +<<<<<<< Updated upstream }, "dependencies": { "get-stream": { @@ -11104,6 +14982,8 @@ "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", "dev": true } +======= +>>>>>>> Stashed changes } }, "graceful-fs": { @@ -11171,10 +15051,20 @@ } }, "hosted-git-info": { +<<<<<<< Updated upstream "version": "2.8.9", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", "dev": true +======= + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", + "dev": true, + "requires": { + "lru-cache": "^6.0.0" + } +>>>>>>> Stashed changes }, "howler": { "version": "2.2.3", @@ -11188,12 +15078,21 @@ "dev": true }, "http-proxy-agent": { +<<<<<<< Updated upstream "version": "4.0.1", "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", "dev": true, "requires": { "@tootallnate/once": "1", +======= + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", + "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", + "dev": true, + "requires": { + "@tootallnate/once": "2", +>>>>>>> Stashed changes "agent-base": "6", "debug": "4" } @@ -11247,6 +15146,7 @@ "requires": { "cli-truncate": "^2.1.0", "node-addon-api": "^1.6.3" +<<<<<<< Updated upstream }, "dependencies": { "node-addon-api": { @@ -11256,6 +15156,8 @@ "dev": true, "optional": true } +======= +>>>>>>> Stashed changes } }, "iconv-lite": { @@ -11286,6 +15188,7 @@ "dev": true }, "indent-string": { +<<<<<<< Updated upstream "version": "2.1.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", @@ -11293,6 +15196,12 @@ "requires": { "repeating": "^2.0.0" } +======= + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", + "dev": true +>>>>>>> Stashed changes }, "infer-owner": { "version": "1.0.4", @@ -11504,6 +15413,7 @@ "dev": true }, "isbinaryfile": { +<<<<<<< Updated upstream "version": "3.0.3", "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz", "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==", @@ -11511,6 +15421,12 @@ "requires": { "buffer-alloc": "^1.2.0" } +======= + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.8.tgz", + "integrity": "sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==", + "dev": true +>>>>>>> Stashed changes }, "isexe": { "version": "2.0.0", @@ -11545,12 +15461,15 @@ "color-convert": "^1.9.0" } }, +<<<<<<< Updated upstream "async": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz", "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=", "dev": true }, +======= +>>>>>>> Stashed changes "chalk": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", @@ -11643,12 +15562,22 @@ } }, "jsonfile": { +<<<<<<< Updated upstream "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", "dev": true, "requires": { "graceful-fs": "^4.1.6" +======= + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^2.0.0" +>>>>>>> Stashed changes } }, "jsprim": { @@ -11661,6 +15590,28 @@ "extsprintf": "1.3.0", "json-schema": "0.4.0", "verror": "1.10.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" + } + } +>>>>>>> Stashed changes } }, "junk": { @@ -11703,6 +15654,7 @@ "parse-json": "^2.2.0", "pify": "^2.0.0", "strip-bom": "^3.0.0" +<<<<<<< Updated upstream } }, "locate-path": { @@ -11712,6 +15664,25 @@ "dev": true, "requires": { "p-locate": "^4.1.0" +======= + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" +>>>>>>> Stashed changes } }, "lodash": { @@ -11775,9 +15746,15 @@ } }, "lowercase-keys": { +<<<<<<< Updated upstream "version": "2.0.0", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz", "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==", +======= + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==", +>>>>>>> Stashed changes "dev": true }, "lru-cache": { @@ -11798,6 +15775,28 @@ "node-addon-api": "^3.1.0", "node-gyp-build": "^4.2.1", "readable-stream": "^3.6.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "node-addon-api": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", + "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", + "dev": true + }, + "readable-stream": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", + "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } +>>>>>>> Stashed changes } }, "make-dir": { @@ -11839,6 +15838,28 @@ "promise-retry": "^2.0.1", "socks-proxy-agent": "^6.0.0", "ssri": "^8.0.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "@tootallnate/once": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz", + "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==", + "dev": true + }, + "http-proxy-agent": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz", + "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==", + "dev": true, + "requires": { + "@tootallnate/once": "1", + "agent-base": "6", + "debug": "4" + } + } +>>>>>>> Stashed changes } }, "map-age-cleaner": { @@ -11947,6 +15968,15 @@ "pinkie-promise": "^2.0.0" } }, +<<<<<<< Updated upstream +======= + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, +>>>>>>> Stashed changes "read-pkg": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", @@ -12029,9 +16059,15 @@ "dev": true }, "minimatch": { +<<<<<<< Updated upstream "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", +======= + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", +>>>>>>> Stashed changes "dev": true, "requires": { "brace-expansion": "^1.1.7" @@ -12120,9 +16156,15 @@ } }, "ms": { +<<<<<<< Updated upstream "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", +======= + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", +>>>>>>> Stashed changes "dev": true }, "musicmetadata": { @@ -12156,19 +16198,33 @@ "dev": true }, "node-abi": { +<<<<<<< Updated upstream "version": "3.7.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.7.0.tgz", "integrity": "sha512-3J+U4CvxVNEk9+lGdJkmYbN8cIN0HMTDT9R0ezX7pmp7aD6BaKsfAHwVn3IvVg6pYIRUuQ+gHW1eawrvywnSQQ==", +======= + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz", + "integrity": "sha512-tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw==", +>>>>>>> Stashed changes "dev": true, "requires": { "semver": "^7.3.5" } }, "node-addon-api": { +<<<<<<< Updated upstream "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", "dev": true +======= + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz", + "integrity": "sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==", + "dev": true, + "optional": true +>>>>>>> Stashed changes }, "node-api-version": { "version": "0.1.4", @@ -12233,6 +16289,15 @@ "validate-npm-package-license": "^3.0.1" }, "dependencies": { +<<<<<<< Updated upstream +======= + "hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true + }, +>>>>>>> Stashed changes "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -12254,6 +16319,7 @@ "dev": true, "optional": true, "requires": { +<<<<<<< Updated upstream "config-chain": "^1.1.11", "pify": "^3.0.0" }, @@ -12265,6 +16331,10 @@ "dev": true, "optional": true } +======= + "config-chain": "^1.1.11", + "pify": "^3.0.0" +>>>>>>> Stashed changes } }, "npm-run-path": { @@ -12274,6 +16344,7 @@ "dev": true, "requires": { "path-key": "^2.0.0" +<<<<<<< Updated upstream } }, "npmlog": { @@ -12283,6 +16354,25 @@ "dev": true, "requires": { "are-we-there-yet": "^2.0.0", +======= + }, + "dependencies": { + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + } + } + }, + "npmlog": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.1.tgz", + "integrity": "sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==", + "dev": true, + "requires": { + "are-we-there-yet": "^3.0.0", +>>>>>>> Stashed changes "console-control-strings": "^1.1.0", "gauge": "^4.0.0", "set-blocking": "^2.0.0" @@ -12422,6 +16512,7 @@ "dev": true }, "p-limit": { +<<<<<<< Updated upstream "version": "2.3.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", @@ -12437,6 +16528,23 @@ "dev": true, "requires": { "p-limit": "^2.2.0" +======= + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" +>>>>>>> Stashed changes } }, "p-map": { @@ -12517,9 +16625,15 @@ "dev": true }, "path-key": { +<<<<<<< Updated upstream "version": "2.0.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", +======= + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", +>>>>>>> Stashed changes "dev": true }, "path-parse": { @@ -12535,6 +16649,17 @@ "dev": true, "requires": { "pify": "^2.0.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } +>>>>>>> Stashed changes } }, "pend": { @@ -12556,10 +16681,18 @@ "dev": true }, "pify": { +<<<<<<< Updated upstream "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true +======= + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "optional": true +>>>>>>> Stashed changes }, "pinkie": { "version": "2.0.4", @@ -12583,6 +16716,48 @@ "dev": true, "requires": { "find-up": "^4.0.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.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-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.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" + } + } +>>>>>>> Stashed changes } }, "plist": { @@ -12593,6 +16768,17 @@ "requires": { "base64-js": "^1.5.1", "xmlbuilder": "^9.0.7" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "xmlbuilder": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", + "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", + "dev": true + } +>>>>>>> Stashed changes } }, "prepend-http": { @@ -12821,6 +17007,7 @@ } }, "readable-stream": { +<<<<<<< Updated upstream "version": "3.6.0", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz", "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==", @@ -12829,6 +17016,20 @@ "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" +======= + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" +>>>>>>> Stashed changes } }, "redent": { @@ -12839,6 +17040,20 @@ "requires": { "indent-string": "^2.1.0", "strip-indent": "^1.0.1" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "dev": true, + "requires": { + "repeating": "^2.0.0" + } + } +>>>>>>> Stashed changes } }, "registry-auth-token": { @@ -12894,6 +17109,22 @@ "tough-cookie": "~2.5.0", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + } +>>>>>>> Stashed changes } }, "require-directory": { @@ -12902,6 +17133,16 @@ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", "dev": true }, +<<<<<<< Updated upstream +======= + "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 + }, +>>>>>>> Stashed changes "resolve": { "version": "1.22.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz", @@ -12939,12 +17180,21 @@ } }, "responselike": { +<<<<<<< Updated upstream "version": "2.0.0", "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz", "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==", "dev": true, "requires": { "lowercase-keys": "^2.0.0" +======= + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", + "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", + "dev": true, + "requires": { + "lowercase-keys": "^1.0.0" +>>>>>>> Stashed changes } }, "restore-cursor": { @@ -13009,18 +17259,30 @@ } }, "rxjs": { +<<<<<<< Updated upstream "version": "7.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.2.tgz", "integrity": "sha512-PwDt186XaL3QN5qXj/H9DGyHhP3/RYYgZZwqBv9Tv8rsAaiwFH1IsJJlcgD37J7UW5a6O67qX0KWKS3/pu0m4w==", +======= + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.4.tgz", + "integrity": "sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==", +>>>>>>> Stashed changes "dev": true, "requires": { "tslib": "^2.1.0" } }, "safe-buffer": { +<<<<<<< Updated upstream "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +======= + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", +>>>>>>> Stashed changes "dev": true }, "safer-buffer": { @@ -13103,6 +17365,7 @@ "dev": true }, "shebang-command": { +<<<<<<< Updated upstream "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", @@ -13121,6 +17384,26 @@ "version": "3.0.6", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz", "integrity": "sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", +>>>>>>> Stashed changes "dev": true }, "single-line-log": { @@ -13188,6 +17471,7 @@ "dev": true }, "socks": { +<<<<<<< Updated upstream "version": "2.6.1", "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.1.tgz", "integrity": "sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==", @@ -13195,6 +17479,15 @@ "requires": { "ip": "^1.1.5", "smart-buffer": "^4.1.0" +======= + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.6.2.tgz", + "integrity": "sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==", + "dev": true, + "requires": { + "ip": "^1.1.5", + "smart-buffer": "^4.2.0" +>>>>>>> Stashed changes } }, "socks-proxy-agent": { @@ -13302,12 +17595,21 @@ "dev": true }, "string_decoder": { +<<<<<<< Updated upstream "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, "requires": { "safe-buffer": "~5.2.0" +======= + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" +>>>>>>> Stashed changes } }, "string-width": { @@ -13503,6 +17805,16 @@ } } }, +<<<<<<< Updated upstream +======= + "tiny-each-async": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/tiny-each-async/-/tiny-each-async-2.0.3.tgz", + "integrity": "sha1-jru/1tYpXxNwAD+7NxYq/loKUdE=", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", @@ -13513,6 +17825,7 @@ } }, "tmp-promise": { +<<<<<<< Updated upstream "version": "1.1.0", "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-1.1.0.tgz", "integrity": "sha512-8+Ah9aB1IRXCnIOxXZ0uFozV1nMU5xiu7hhFVUSxZ3bYu+psD4TzagCzVbexUCgNNGJnsmNDQlS4nG3mTyoNkw==", @@ -13541,6 +17854,23 @@ "optional": true, "requires": { "rimraf": "^2.6.3" +======= + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz", + "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==", + "dev": true, + "requires": { + "tmp": "^0.2.0" + }, + "dependencies": { + "tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "requires": { + "rimraf": "^3.0.0" +>>>>>>> Stashed changes } } } @@ -13677,9 +18007,15 @@ } }, "universalify": { +<<<<<<< Updated upstream "version": "0.1.2", "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", +======= + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", + "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==", +>>>>>>> Stashed changes "dev": true }, "update-notifier": { @@ -13778,10 +18114,18 @@ } }, "verror": { +<<<<<<< Updated upstream "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, +======= + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", + "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==", + "dev": true, + "optional": true, +>>>>>>> Stashed changes "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -13792,6 +18136,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", +<<<<<<< Updated upstream "dev": true }, "extsprintf": { @@ -13799,6 +18144,10 @@ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", "integrity": "sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==", "dev": true +======= + "dev": true, + "optional": true +>>>>>>> Stashed changes } } }, @@ -13836,6 +18185,16 @@ "isexe": "^2.0.0" } }, +<<<<<<< Updated upstream +======= + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "wide-align": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", @@ -13854,6 +18213,16 @@ "string-width": "^4.0.0" } }, +<<<<<<< Updated upstream +======= + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", + "dev": true, + "optional": true + }, +>>>>>>> Stashed changes "wrap-ansi": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", @@ -13871,6 +18240,21 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true }, +<<<<<<< Updated upstream +======= + "write-file-atomic": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", + "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", + "dev": true, + "requires": { + "imurmurhash": "^0.1.4", + "is-typedarray": "^1.0.0", + "signal-exit": "^3.0.2", + "typedarray-to-buffer": "^3.1.5" + } + }, +>>>>>>> Stashed changes "xdg-basedir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", @@ -13878,10 +18262,18 @@ "dev": true }, "xmlbuilder": { +<<<<<<< Updated upstream "version": "9.0.7", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz", "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=", "dev": true +======= + "version": "15.1.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", + "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", + "dev": true, + "optional": true +>>>>>>> Stashed changes }, "xtend": { "version": "2.1.2", @@ -13949,6 +18341,60 @@ "requires": { "cross-spawn": "^6.0.5", "pkg-dir": "^4.2.0" +<<<<<<< Updated upstream +======= + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "which": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } +>>>>>>> Stashed changes } }, "yauzl": { diff --git a/src/config.json b/src/config.json index 0b9cea8..9a41be6 100644 --- a/src/config.json +++ b/src/config.json @@ -1,3 +1,3 @@ { - "debug": true + "debug": false } \ No newline at end of file diff --git a/src/css/index.css b/src/css/index.css index fb8d094..0ceca3a 100644 --- a/src/css/index.css +++ b/src/css/index.css @@ -25,6 +25,7 @@ body { transform: translate(-50%, -50%); left: 50%; top: 85%; + height: 50px; display: flex; } @@ -34,12 +35,20 @@ body { } #artwork { + margin-top: 70px; margin-left: 70px; width: 600px; height: 600px; } #Music_list { - width: 50%; + position:fixed; + width: 30%; + left: 70%; margin: 0 0 0 auto; +} + +#metadata { + margin-left: 70px; + width: 600px; } \ No newline at end of file diff --git a/src/index.html b/src/index.html index 1840dfb..dbc1550 100644 --- a/src/index.html +++ b/src/index.html @@ -11,16 +11,12 @@
- - - - - - -
曲名アーティスト長さ
+ +
replay_10 - skip_previous + skip_previous play_arrow skip_next @@ -35,7 +31,15 @@
- + +
00:00 @@ -53,5 +57,4 @@ - - + \ No newline at end of file diff --git a/src/js/app.js b/src/js/app.js index be8538f..50e571e 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1,76 +1,123 @@ -let player, list; -M.AutoInit(); - -ipcRenderer.on('start', (args, filelist) => { - filelist = Object.values(filelist); - console.log(filelist); - list = filelist; - Maker(list); -}); - -function Maker(list) { - player = new Howl({ - src: list[0], - loop: true, - autoplay: true, - html5:true, - loop: true, - onload: () => play(player), - onend: () => { - player.unload(); - list.push(list.shift()); - Maker(list); - } - }); -} +(() => { // Wrap with a function to avoid global pollution + -function play(player) { - const player_bt = document.getElementById('btn_play'); + // HTML elements + const play_btn = document.getElementById('btn_play'); const skip = document.getElementById('btn_skip'); const previous = document.getElementById('btn_previous'); - setInterval("nowplaying(player)", 1000); - meta_parse(); - setTimeout(() => { - setInterval("seek()", 430); - }, 3000); - - player_bt.addEventListener('click', (e) => { - e.target.innerHTML = player.playing() ? 'play_arrow' : 'pause'; - e.target.innerHTML === 'pause' ? player.play() : player.pause(); + const player_progress = document.getElementById('player-progress'); + const artwork = document.getElementById('artwork'); + const current_time_text = document.getElementById('current'); + const play_btn_inner = play_btn.getElementsByTagName('i')[0]; + const title = document.getElementById('title'); + const artist = document.getElementById('artist'); + const album = document.getElementById('album'); + const volume = document.getElementById('volume'); + const collection = document.getElementById('Music_list'); + //const collection_Top = document.getElementById('NowPlaying'); + + // Local variables + let current_song, list; + + + + // Initialization + M.AutoInit(); + ipcRenderer.on('start', (_args, filelist) => { + filelist = Object.values(filelist); + console.log(filelist); + list = filelist; + collection_init(); + play_next_song(); + }); + + // Register event listeners + play_btn.addEventListener('click', () => { + if (current_song.playing()) current_song.pause(); + else current_song.play(); }); skip.addEventListener('click', () => { list.push(list.shift()); - player.unload(); - Maker(list); + current_song.unload(); + play_next_song(); console.log('skip'); }); previous.addEventListener('click', () => { list.unshift(list.pop()); - player.unload(); - Maker(list); + current_song.unload(); + play_next_song(); console.log('previous'); }); -} -function nowplaying(player) { - const current = convert(Math.trunc(player.seek())); - const currentTime = document.getElementById('current').innerHTML = current; - const progress = document.getElementById('player-progress'); - progress.max = player.duration(); - progress.value = player.seek(); -} + player_progress.addEventListener('input', () => current_song.seek(player_progress.value / 200)); + volume.addEventListener('input', () => current_song.volume(volume.value / 100)); -function meta_parse() { - mm(fs.createReadStream(list[0]), function (err, metadata) { - if (err) throw err; - console.log(metadata.picture[0].data); - document.getElementById('artwork').src = 'data:image/png;base64,' + metadata.picture[0].data.toString('base64'); - }); -} -function seek() { - const p = document.getElementById('player-progress').value; - if(convert(Math.trunc(player.seek())) !== convert(Math.trunc(p))) player.seek(p); -} \ No newline at end of file + + // Register interval + setInterval(() => { + if (!current_song?.playing()) return; + const current_time = current_song.seek(); + player_progress.value = current_time * 200; + const current = seconds_to_time(Math.trunc(current_time)); + current_time_text.textContent = current; + }, 16); + + + + // Functions + function play_next_song() { + current_song = new Howl({ + src: list[0], + loop: true, + autoplay: true, + html5: true, + onload: () => { + meta_parse(); + collection_init(); + const duration = current_song.duration(); + player_progress.max = duration * 200; + }, + onend: () => { + current_song.unload(); + list.push(list.shift()); + play_next_song(); + }, + onplay: () => play_btn_inner.textContent = 'pause', + onpause: () => play_btn_inner.textContent = 'play_arrow', + }); + } + + function meta_parse() { + musicmetadata(fs.createReadStream(list[0]), (err, metadata) => { + if (err) return console.log(`${err}\n${err.stack.split('\n')[1]}`); + console.log(metadata) + title.textContent = metadata.title || '曲名が設定されていません'; + artist.textContent = metadata.artist[0] || 'Unknown'; + album.textContent = metadata.album || 'Single'; + const base64Data = metadata?.picture?.[0]?.data?.toString('base64'); + if (base64Data) artwork.src = 'data:image/png;base64,' + base64Data; + else artwork.src = "https://1.bp.blogspot.com/-D2I7Z7-HLGU/Xlyf7OYUi8I/AAAAAAABXq4/jZ0035aDGiE5dP3WiYhlSqhhMgGy8p7zACNcBGAsYHQ/s1600/no_image_square.jpg"; + }); + } + + function collection_init() { + collection.innerHTML=""; + for(let i = 0; i<10; i++){ + musicmetadata(fs.createReadStream(list[i]), (err, metadata) => { + if (err) return console.log(`${err}\n${err.stack.split('\n')[1]}`); + let listCode = ` +
  • + audiotrack + ${metadata.title || '曲名が設定されていません'} +

    ${metadata.artist[0] || 'Unknown'}

    +

    ${metadata.album || 'Single'}

    +
    • + `; + collection.insertAdjacentHTML('beforeend',listCode); + }); + } +} +})(); \ No newline at end of file diff --git a/src/js/preload.js b/src/js/preload.js index d3f9d2c..2b87610 100644 --- a/src/js/preload.js +++ b/src/js/preload.js @@ -1,11 +1,11 @@ const { ipcRenderer } = require('electron'); const { Howl } = require('howler'); -const m = require('musicmetadata'); -const {seconds_to_time} = require('../../Util/convert'); +const musicmetadata = require('musicmetadata'); +const { seconds_to_time } = require('../../Util/convert'); const fs = require('fs'); global.ipcRenderer = ipcRenderer; global.Howl = Howl; -global.mm = m; -global.convert = seconds_to_time; +global.musicmetadata = musicmetadata; +global.seconds_to_time = seconds_to_time; global.fs = fs; \ No newline at end of file