From 1f7dd932cfa9baca695f84cc59ac9f5b326c45e7 Mon Sep 17 00:00:00 2001 From: Hans Otto Wirtz Date: Thu, 9 Feb 2023 18:55:21 +0100 Subject: [PATCH 1/5] Fix some stuff --- package.json | 4 - packages/uxp-devtools-cli/package.json | 6 +- packages/uxp-devtools-core/package.json | 2 +- .../client/connection/CliClientController.js | 2 +- .../src/core/client/connection/Connection.js | 1 + .../src/core/service/Server.js | 7 +- .../core/service/clients/BrowserCDTClient.js | 2 +- packages/uxp-devtools-helper/package.json | 4 +- .../scripts/devtools_setup.js | 2 +- packages/uxp-inspect-frontend/package.json | 4 +- yarn.lock | 780 +++++++++--------- 11 files changed, 421 insertions(+), 393 deletions(-) diff --git a/package.json b/package.json index ab7612f..41a036b 100644 --- a/package.json +++ b/package.json @@ -12,12 +12,8 @@ "scripts": { "lint": "eslint --ext \".js,.js6,.jsx,.ts,.tsx\" ./", "lint-fix": "eslint --ext \".js,.js6,.jsx,.ts,.tsx\" ./ --fix", - "postinstall": "node scripts/installScript.js", "cleanup": "node scripts/cleanup.js" }, - "cpu": [ - "!arm64" - ], "jest": { "transform": { "^.+\\.jsx?$": "babel-jest" diff --git a/packages/uxp-devtools-cli/package.json b/packages/uxp-devtools-cli/package.json index 443c219..3b4d5a4 100644 --- a/packages/uxp-devtools-cli/package.json +++ b/packages/uxp-devtools-cli/package.json @@ -1,13 +1,11 @@ { - "name": "@adobe/uxp-devtools-cli", + "name": "uxp-devtools-cli-fixed", "version": "1.5.1", "description": "Command line interface for rapid UXP plugin development", "main": "src/uxp.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "uxp": "src/uxp.js", - "postinstall": "node scripts/setupInspectApp.js" - + "uxp": "src/uxp.js" }, "bin": { "uxp": "src/uxp.js" diff --git a/packages/uxp-devtools-core/package.json b/packages/uxp-devtools-core/package.json index bd316a7..88da235 100644 --- a/packages/uxp-devtools-core/package.json +++ b/packages/uxp-devtools-core/package.json @@ -29,7 +29,7 @@ "fs-extra": "^9.0.0", "lodash": "^4.17.20", "isomorphic-ws": "^4.0.1", - "ws": "^7.2.3", + "ws": "^8.12.0", "archiver": "5.3.0", "ignore-walk": "^3.0.3", "shell-exec": "^1.0.2" diff --git a/packages/uxp-devtools-core/src/core/client/connection/CliClientController.js b/packages/uxp-devtools-core/src/core/client/connection/CliClientController.js index 41f48c6..5b518cb 100644 --- a/packages/uxp-devtools-core/src/core/client/connection/CliClientController.js +++ b/packages/uxp-devtools-core/src/core/client/connection/CliClientController.js @@ -102,7 +102,7 @@ class CliClientController { _connectToServiceAtPort(port) { this._createConnection(); this._port = port; - const url = `ws://localhost:${port}/socket/cli`; + const url = `ws://127.0.0.1:${port}/socket/cli`; this._callerPromise = createDeferredPromise(); this._connection.connect(this, url); return this._callerPromise.promise; diff --git a/packages/uxp-devtools-core/src/core/client/connection/Connection.js b/packages/uxp-devtools-core/src/core/client/connection/Connection.js index 9e4772b..9d4455b 100644 --- a/packages/uxp-devtools-core/src/core/client/connection/Connection.js +++ b/packages/uxp-devtools-core/src/core/client/connection/Connection.js @@ -55,6 +55,7 @@ class Connection extends EventEmitter { } onError(evt) { + console.error(evt) UxpLogger.error(`Websocket error ${evt}`); this.emit("error", evt); } diff --git a/packages/uxp-devtools-core/src/core/service/Server.js b/packages/uxp-devtools-core/src/core/service/Server.js index e785834..fcbff09 100644 --- a/packages/uxp-devtools-core/src/core/service/Server.js +++ b/packages/uxp-devtools-core/src/core/service/Server.js @@ -47,11 +47,14 @@ class Server extends EventEmitter { this._io = new WebSocket.Server({ server: this._httpServer }); this._io.on("connection", this._handleSocketConnection.bind(this)); + console.log("LISTENING") + // Make sure to listen for error messages on _io to avoid crashes when some error // is dispatched and we don't have a listener. this._io.on("error", (err) => { if (err.code !== "EADDRINUSE") { - UxpLogger.error("WebSocket error:", err); + UxpLogger.error("WebSocket error:", err.name, err.message, err); + console.error(err); } }); } @@ -65,6 +68,7 @@ class Server extends EventEmitter { } _getClientClassForUrl(url) { + console.log("HI", url) if (url === "/socket/cli") { return require("./clients/UxpCliClient"); } @@ -78,6 +82,7 @@ class Server extends EventEmitter { } _handleSocketConnection(socket, req) { + console.log("SOCKET") // WS changed the way it sends the initial upgrade request. // Newer versions pass it dirrectly to the connection event handler. const url = req ? req.url : socket.upgradeReq.url; diff --git a/packages/uxp-devtools-core/src/core/service/clients/BrowserCDTClient.js b/packages/uxp-devtools-core/src/core/service/clients/BrowserCDTClient.js index acf3421..98e3f3c 100644 --- a/packages/uxp-devtools-core/src/core/service/clients/BrowserCDTClient.js +++ b/packages/uxp-devtools-core/src/core/service/clients/BrowserCDTClient.js @@ -30,7 +30,7 @@ class BrowserCDTClient extends Client { static create(server, socket, url) { // url is of form "/socket/browser_cdt/?uxp-app-id=PS" hence added a baseURL - let cliUrl = new URL(url, "http://localhost:14001"); + let cliUrl = new URL(url, "http://127.0.0.1:14001"); const searchParams = cliUrl.searchParams; const uxpAppID = searchParams.get("adobe-uxp-app-id"); let browserCDTClient = new BrowserCDTClient(server, socket, uxpAppID); diff --git a/packages/uxp-devtools-helper/package.json b/packages/uxp-devtools-helper/package.json index c2244da..fa1504c 100644 --- a/packages/uxp-devtools-helper/package.json +++ b/packages/uxp-devtools-helper/package.json @@ -20,9 +20,7 @@ "dependencies": { "fs-extra": "^9.0.0", "node-gyp-build": "^4.2.3", - "@adobe/uxp-devtools-feature": "^1.0.0" - }, - "devDependencies": { + "@adobe/uxp-devtools-feature": "^1.0.0", "tar": "^6.0.1" } } diff --git a/packages/uxp-devtools-helper/scripts/devtools_setup.js b/packages/uxp-devtools-helper/scripts/devtools_setup.js index faa7189..663e96b 100644 --- a/packages/uxp-devtools-helper/scripts/devtools_setup.js +++ b/packages/uxp-devtools-helper/scripts/devtools_setup.js @@ -74,7 +74,7 @@ function postSetupInstallStep() { function setupDevtoolsNativeAddOn() { console.log("Setting up Adobe devTools node native add-on library... "); - const arch = process.env.build_arch; + const arch = process.env.build_arch || process.arch; const targetFolder = setupTargetFolder(); const fileName = arch !== "arm64" ? `DevtoolsHelper-v1.0.0-node-${process.platform}.tar.gz` : `DevtoolsHelper-v1.0.0-node-${process.platform}-arm64.tar.gz`; const devToolsTarPath = path.resolve(__dirname, `./native-libs/${fileName}`); diff --git a/packages/uxp-inspect-frontend/package.json b/packages/uxp-inspect-frontend/package.json index 24bbfa5..f38abfd 100644 --- a/packages/uxp-inspect-frontend/package.json +++ b/packages/uxp-inspect-frontend/package.json @@ -44,8 +44,8 @@ }, "devDependencies": { "tar": "^6.0.1", - "electron": "11.2.0", - "electron-builder": "22.10.5", + "electron": "^23.0.0", + "electron-builder": "^23.6.0", "rimraf": "^3.0.2" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 9cfa2e1..3c3c9c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"7zip-bin@~5.0.3": - version "5.0.3" - resolved "https://registry.npmjs.org/7zip-bin/-/7zip-bin-5.0.3.tgz#bc5b5532ecafd923a61f2fb097e3b108c0106a3f" - integrity sha512-GLyWIFBbGvpKPGo55JyRZAo4lVbnBiD52cKlw/0Vt+wnmKvWJkpZvsjVoaIolyBXDeAQKSicRtqFNPem9w0WYA== +"7zip-bin@~5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.1.1.tgz#9274ec7460652f9c632c59addf24efb1684ef876" + integrity sha512-sAP4LldeWNz0lNzmTird3uWfFDWWTeg6V/MsmyyLR9X1idwKBWIgt/ZvinqQldJm3LecKEs1emkbquO6PCiLVQ== "@ampproject/remapping@^2.0.0": version "2.1.0" @@ -1032,16 +1032,33 @@ global-agent "^3.0.0" global-tunnel-ng "^2.7.1" -"@electron/universal@1.0.4": - version "1.0.4" - resolved "https://registry.npmjs.org/@electron/universal/-/universal-1.0.4.tgz#231ac246c39d45b80e159bd21c3f9027dcaa10f5" - integrity sha512-ajZoumi4XwqwmZe8YVhu4XGkZBCPyWZsVCQONPTIe9TUlleSN+dic3YpXlaWcilx/HOzTdldTKtabNTeI0gDoA== +"@electron/get@^2.0.0": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" + integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + +"@electron/universal@1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.2.1.tgz#3c2c4ff37063a4e9ab1e6ff57db0bc619bc82339" + integrity sha512-7323HyMh7KBAl/nPDppdLsC87G6RwRU02dy5FPeGB1eS7rUePh55+WNWiDPLhFQqqVPHzh77M69uhmoT8XnwMQ== dependencies: "@malept/cross-spawn-promise" "^1.1.0" - asar "^3.0.3" + asar "^3.1.0" debug "^4.3.1" dir-compare "^2.4.0" fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" @@ -1964,6 +1981,16 @@ dependencies: cross-spawn "^7.0.1" +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@sindresorhus/is@^0.14.0": version "0.14.0" resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" @@ -2021,6 +2048,11 @@ resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + "@types/aria-query@^4.2.1": version "4.2.2" resolved "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" @@ -2079,9 +2111,9 @@ resolved "https://registry.npmjs.org/@types/dateformat/-/dateformat-3.0.1.tgz#98d747a2e5e9a56070c6bf14e27bff56204e34cc" integrity sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g== -"@types/debug@^4.1.5": +"@types/debug@^4.1.6": version "4.1.7" - resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82" integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg== dependencies: "@types/ms" "*" @@ -2101,7 +2133,7 @@ resolved "https://registry.npmjs.org/@types/ejs/-/ejs-3.1.0.tgz#ab8109208106b5e764e5a6c92b2ba1c625b73020" integrity sha512-DCg+Ka+uDQ31lJ/UtEXVlaeV3d6t81gifaVWKJy4MYVVgvJttyX/viREy+If7fz+tK/gVxTGMtyrFPnm4gjrVA== -"@types/fs-extra@^9.0.4", "@types/fs-extra@^9.0.7": +"@types/fs-extra@^9.0.11", "@types/fs-extra@^9.0.4": version "9.0.13" resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== @@ -2246,6 +2278,11 @@ resolved "https://registry.npmjs.org/@types/node/-/node-14.18.10.tgz#774f43868964f3cfe4ced1f5417fe15818a4eaea" integrity sha512-6iihJ/Pp5fsFJ/aEDGyvT4pHGmCpq7ToQ/yf4bl5SbVAvwpspYJ+v3jO7n8UyjhQVHTy+KNszOozDdv+O6sovQ== +"@types/node@^16.11.26": + version "16.18.12" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.12.tgz#e3bfea80e31523fde4292a6118f19ffa24fd6f65" + integrity sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw== + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -2363,7 +2400,7 @@ dependencies: "@types/yargs-parser" "*" -"@types/yargs@^15.0.0", "@types/yargs@^15.0.13": +"@types/yargs@^15.0.0": version "15.0.14" resolved "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== @@ -2377,6 +2414,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yargs@^17.0.1": + version "17.0.8" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.8.tgz#d23a3476fd3da8a0ea44b5494ca7fa677b9dad4c" + integrity sha512-wDeUwiUmem9FzsyysEwRukaEdDNcwbROvQ9QGRKaLI6t+IltNzbn4/i4asmB10auvZGQCzSQ6t0GSczEThlUXw== + dependencies: + "@types/yargs-parser" "*" + "@types/yauzl@^2.9.1": version "2.9.2" resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a" @@ -2724,13 +2768,6 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.0, ajv@^6.12.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ansi-align@^3.0.0: - version "3.0.1" - resolved "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59" - integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w== - dependencies: - string-width "^4.1.0" - ansi-colors@4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" @@ -2820,39 +2857,42 @@ anymatch@^3.0.3, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -app-builder-bin@3.5.12: - version "3.5.12" - resolved "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-3.5.12.tgz#bbe174972cc1f481f73d6d92ad47a8b4c7eb4530" - integrity sha512-lQARM2AielmFoBeIo6LZigAe+58Wwe07ZWkt+wVeDxzyieNmeWjlvz/V5dKzinydwdHd+CNswN86sww46yijjA== +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@22.10.5: - version "22.10.5" - resolved "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-22.10.5.tgz#24a88581c891e5b187a0d569aa44e7c4a0dc8de2" - integrity sha512-/W8nlGamJCtKlQtsMWwU9vb+cX4pTNY+rJWCuc7oXUykVSMS50W7LhQusIjCelNfymUQ1XCu6cXEY/ylqhX12A== +app-builder-lib@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-23.6.0.tgz#03cade02838c077db99d86212d61c5fc1d6da1a8" + integrity sha512-dQYDuqm/rmy8GSCE6Xl/3ShJg6Ab4bZJMT8KaTKGzT436gl1DN4REP3FCWfXoh75qGTJ+u+WsdnnpO9Jl8nyMA== dependencies: - "7zip-bin" "~5.0.3" + "7zip-bin" "~5.1.1" "@develar/schema-utils" "~2.6.5" - "@electron/universal" "1.0.4" + "@electron/universal" "1.2.1" + "@malept/flatpak-bundler" "^0.4.0" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" + builder-util "23.6.0" + builder-util-runtime "9.1.1" chromium-pickle-js "^0.2.0" - debug "^4.3.2" - ejs "^3.1.6" - electron-publish "22.10.5" - fs-extra "^9.1.0" - hosted-git-info "^3.0.8" - is-ci "^2.0.0" - istextorbinary "^5.12.0" - js-yaml "^4.0.0" - lazy-val "^1.0.4" - minimatch "^3.0.4" - normalize-package-data "^3.0.0" - read-config-file "6.0.0" + debug "^4.3.4" + ejs "^3.1.7" + electron-osx-sign "^0.6.0" + electron-publish "23.6.0" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^4.0.10" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^3.1.2" + read-config-file "6.2.0" sanitize-filename "^1.6.3" - semver "^7.3.4" - temp-file "^3.3.7" + semver "^7.3.7" + tar "^6.1.11" + temp-file "^3.4.0" append-transform@^2.0.0: version "2.0.0" @@ -3071,10 +3111,10 @@ array.prototype.flatmap@^1.2.5: define-properties "^1.1.3" es-abstract "^1.19.0" -asar@^3.0.3: - version "3.1.0" - resolved "https://registry.npmjs.org/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473" - integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ== +asar@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" + integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== dependencies: chromium-pickle-js "^0.2.0" commander "^5.0.0" @@ -3135,6 +3175,11 @@ async@^3.2.0: resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9" integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g== +async@^3.2.3: + version "3.2.4" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" + integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ== + asyncbox@^2.3.1: version "2.9.2" resolved "https://registry.npmjs.org/asyncbox/-/asyncbox-2.9.2.tgz#6af359a9667ff3d0e7ddfbd500e097d7346a2d9b" @@ -3513,11 +3558,6 @@ binary-extensions@^2.0.0: resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== -binaryextensions@^4.18.0: - version "4.18.0" - resolved "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.18.0.tgz#22aeada2d14de062c60e8ca59a504a5636a76ceb" - integrity sha512-PQu3Kyv9dM4FnwB7XGj1+HucW+ShvJzJqjuw1JkKVs1mWdwOKVcRjOi+pV9X52A0tNvrPCsPkbFFQb+wE1EAXw== - bindings@^1.5.0: version "1.5.0" resolved "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" @@ -3572,20 +3612,6 @@ boolean@^3.0.1: resolved "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz#f51a2fb5838a99e06f9b6ec1edb674de67026435" integrity sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w== -boxen@^5.0.0: - version "5.1.2" - resolved "https://registry.npmjs.org/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50" - integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ== - dependencies: - ansi-align "^3.0.0" - camelcase "^6.2.0" - chalk "^4.1.0" - cli-boxes "^2.2.1" - string-width "^4.2.2" - type-fest "^0.20.2" - widest-line "^3.1.0" - wrap-ansi "^7.0.0" - bplist-creator@^0: version "0.1.0" resolved "https://registry.npmjs.org/bplist-creator/-/bplist-creator-0.1.0.tgz#018a2d1b587f769e379ef5519103730f8963ba1e" @@ -3666,6 +3692,19 @@ bser@2.1.1: dependencies: node-int64 "^0.4.0" +buffer-alloc-unsafe@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" + integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + +buffer-alloc@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" + integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== + dependencies: + buffer-alloc-unsafe "^1.1.0" + buffer-fill "^1.0.0" + buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3: version "0.2.13" resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" @@ -3681,6 +3720,11 @@ buffer-equal@1.0.0: resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74= +buffer-fill@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c" + integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -3694,33 +3738,36 @@ buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.5.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@8.7.3: - version "8.7.3" - resolved "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.7.3.tgz#0aaafa52d25295c939496f62231ca9ff06c30e40" - integrity sha512-1Q2ReBqFblimF5g/TLg2+0M5Xzv0Ih5LxJ/BMWXvEy/e6pQKeeEpbkPMGsN6OiQgkygaZo5VXCXIjOkOQG5EoQ== +builder-util-runtime@9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz#2da7b34e78a64ad14ccd070d6eed4662d893bd60" + integrity sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw== dependencies: - debug "^4.3.2" + debug "^4.3.4" sax "^1.2.4" -builder-util@22.10.5: - version "22.10.5" - resolved "https://registry.npmjs.org/builder-util/-/builder-util-22.10.5.tgz#8d0b04a3be6acc74938679aa90dcb3181b1ae86b" - integrity sha512-/MkLhmyo1gU3xMwXJxccQaRj/9tm5eTd6ZyebTf8SYouY4r3hRser+LxhOm/f8Z9W6oJvfPe0jc9TFsxYfMcsg== +builder-util@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-23.6.0.tgz#1880ec6da7da3fd6fa19b8bd71df7f39e8d17dd9" + integrity sha512-QiQHweYsh8o+U/KNCZFSvISRnvRctb8m/2rB2I1JdByzvNKxPeFLlHFRPQRXab6aYeXc18j9LpsDLJ3sGQmWTQ== dependencies: - "7zip-bin" "~5.0.3" - "@types/debug" "^4.1.5" - "@types/fs-extra" "^9.0.7" - app-builder-bin "3.5.12" + "7zip-bin" "~5.1.1" + "@types/debug" "^4.1.6" + "@types/fs-extra" "^9.0.11" + app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - debug "^4.3.2" - fs-extra "^9.1.0" - is-ci "^2.0.0" - js-yaml "^4.0.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.0.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.0" + is-ci "^3.0.0" + js-yaml "^4.1.0" source-map-support "^0.5.19" stat-mode "^1.0.0" - temp-file "^3.3.7" + temp-file "^3.4.0" bytes@3.1.1: version "3.1.1" @@ -3827,7 +3874,7 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -camelcase@^6.0.0, camelcase@^6.2.0: +camelcase@^6.0.0: version "6.3.0" resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a" integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== @@ -3877,7 +3924,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3957,6 +4004,11 @@ ci-info@^2.0.0: resolved "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +ci-info@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2" + integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw== + cjs-module-lexer@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" @@ -3977,11 +4029,6 @@ clean-stack@^2.0.0: resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -cli-boxes@^2.2.1: - version "2.2.1" - resolved "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f" - integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw== - cli-cursor@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" @@ -4052,6 +4099,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-response@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" @@ -4150,6 +4206,11 @@ commondir@^1.0.1: resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs= +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA= + component-emitter@^1.2.1: version "1.3.0" resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -4188,18 +4249,6 @@ config-chain@^1.1.11: ini "^1.3.4" proto-list "~1.2.1" -configstore@^5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96" - integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA== - dependencies: - dot-prop "^5.2.0" - graceful-fs "^4.1.2" - make-dir "^3.0.0" - unique-string "^2.0.0" - write-file-atomic "^3.0.0" - xdg-basedir "^4.0.0" - confusing-browser-globals@^1.0.10: version "1.0.11" resolved "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81" @@ -4314,7 +4363,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0, cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4323,11 +4372,6 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1: shebang-command "^2.0.0" which "^2.0.1" -crypto-random-string@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5" - integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA== - css-shorthand-properties@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/css-shorthand-properties/-/css-shorthand-properties-1.1.1.tgz#1c808e63553c283f289f2dd56fcee8f3337bd935" @@ -4406,7 +4450,7 @@ debug@3.1.0, debug@=3.1.0: dependencies: ms "2.0.0" -debug@4, debug@4.3.3, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: +debug@4, debug@4.3.3, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.3" resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== @@ -4427,6 +4471,13 @@ debug@^3.1.0, debug@^3.2.7: dependencies: ms "^2.1.1" +debug@^4.3.4: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -4705,24 +4756,24 @@ dir-compare@^2.4.0: commander "2.9.0" minimatch "3.0.4" -dmg-builder@22.10.5: - version "22.10.5" - resolved "https://registry.npmjs.org/dmg-builder/-/dmg-builder-22.10.5.tgz#65a33c106ead5a350c7de8997c546559bd6e0e7c" - integrity sha512-58FEpfH8PEFqjbUNka4bYr52snRT8+LSXrP4gy6EZWOVICbOlmTOYj988pfoLam5C5iXb3odmyUQqwWOxlsEUw== +dmg-builder@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-23.6.0.tgz#d39d3871bce996f16c07d2cafe922d6ecbb2a948" + integrity sha512-jFZvY1JohyHarIAlTbfQOk+HnceGjjAdFjVn3n8xlDWKsYNqbO4muca6qXEZTfGXeQMG7TYim6CeS5XKSfSsGA== dependencies: - app-builder-lib "22.10.5" - builder-util "22.10.5" - fs-extra "^9.1.0" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + fs-extra "^10.0.0" iconv-lite "^0.6.2" - js-yaml "^4.0.0" - sanitize-filename "^1.6.3" + js-yaml "^4.1.0" optionalDependencies: - dmg-license "^1.0.8" + dmg-license "^1.0.11" -dmg-license@^1.0.8: - version "1.0.10" - resolved "https://registry.npmjs.org/dmg-license/-/dmg-license-1.0.10.tgz#89f52afae25d827fce8d818c13aff30af1c16bcc" - integrity sha512-SVeeyiOeinV5JCPHXMdKOgK1YVbak/4+8WL2rBnfqRYpA5FaeFaQnQWb25x628am1w70CbipGDv9S51biph63A== +dmg-license@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== dependencies: "@types/plist" "^3.0.1" "@types/verror" "^1.10.3" @@ -4766,22 +4817,15 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -dot-prop@^5.2.0: - version "5.3.0" - resolved "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" - integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== - dependencies: - is-obj "^2.0.0" - dotenv-expand@^5.1.0: version "5.1.0" resolved "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== -dotenv@^8.2.0: - version "8.6.0" - resolved "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b" - integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g== +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== duplexer3@^0.1.4: version "0.1.4" @@ -4823,61 +4867,68 @@ ee-first@1.1.1: resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -ejs@^3.0.1, ejs@^3.1.6: +ejs@^3.0.1: version "3.1.6" resolved "https://registry.npmjs.org/ejs/-/ejs-3.1.6.tgz#5bfd0a0689743bb5268b3550cceeebbc1702822a" integrity sha512-9lt9Zse4hPucPkoP7FHDF0LQAlGyF9JVpnClFLFH3aSSbxmyoqINRpp/9wePWJTUl4KOQwRL72Iw3InHPDkoGw== dependencies: jake "^10.6.1" -electron-builder@22.10.5: - version "22.10.5" - resolved "https://registry.npmjs.org/electron-builder/-/electron-builder-22.10.5.tgz#03b156b93e6012609027c3aaa69201a3ad21e454" - integrity sha512-0q/289UUJUhRou6lZKDz/wzK6WprIQ6VXMTmaI+w9qXvSNugPC9UA5s2zXInOkjZOvO/xKnjeyiavrVSHYF3tA== +ejs@^3.1.7: + version "3.1.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b" + integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ== dependencies: - "@types/yargs" "^15.0.13" - app-builder-lib "22.10.5" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - dmg-builder "22.10.5" - fs-extra "^9.1.0" - is-ci "^2.0.0" - lazy-val "^1.0.4" - read-config-file "6.0.0" - sanitize-filename "^1.6.3" - update-notifier "^5.1.0" - yargs "^16.2.0" + jake "^10.8.5" -electron-publish@22.10.5: - version "22.10.5" - resolved "https://registry.npmjs.org/electron-publish/-/electron-publish-22.10.5.tgz#9cbe46266b6c79d8c6e99840755682e2262d3543" - integrity sha512-dHyuazv3P3j1Xyv7pdwTwAvxWab2pCb0G0Oa6qWQoCc4b1/mRGY00M7AvYW1cPuUijj9zYAf1HmXfM6MifaMlA== +electron-builder@^23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-23.6.0.tgz#c79050cbdce90ed96c5feb67c34e9e0a21b5331b" + integrity sha512-y8D4zO+HXGCNxFBV/JlyhFnoQ0Y0K7/sFH+XwIbj47pqaW8S6PGYQbjoObolKBR1ddQFPt4rwp4CnwMJrW3HAw== dependencies: - "@types/fs-extra" "^9.0.7" - bluebird-lst "^1.0.9" - builder-util "22.10.5" - builder-util-runtime "8.7.3" - chalk "^4.1.0" - fs-extra "^9.1.0" - lazy-val "^1.0.4" - mime "^2.5.0" + "@types/yargs" "^17.0.1" + app-builder-lib "23.6.0" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + dmg-builder "23.6.0" + fs-extra "^10.0.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.2.0" + simple-update-notifier "^1.0.7" + yargs "^17.5.1" + +electron-osx-sign@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz#9b69c191d471d9458ef5b1e4fdd52baa059f1bb8" + integrity sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg== + 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" + +electron-publish@23.6.0: + version "23.6.0" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-23.6.0.tgz#ac9b469e0b07752eb89357dd660e5fb10b3d1ce9" + integrity sha512-jPj3y+eIZQJF/+t5SLvsI5eS4mazCbNYqatv5JihbqOstIM13k0d1Z3vAWntvtt13Itl61SO6seicWdioOU5dg== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "23.6.0" + builder-util-runtime "9.1.1" + chalk "^4.1.1" + fs-extra "^10.0.0" + lazy-val "^1.0.5" + mime "^2.5.2" electron-to-chromium@^1.4.17: version "1.4.65" resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz#c0820db06e268e0a2fd4dbce38fb5376d38ca449" integrity sha512-0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw== -electron@11.2.0: - version "11.2.0" - resolved "https://registry.npmjs.org/electron/-/electron-11.2.0.tgz#f8577ea4c9ba94068850256145be26b0b89a5dd7" - integrity sha512-weszOPAJPoPu6ozL7vR9enXmaDSqH+KE9iZODfbGdnFgtVfVdfyedjlvEGIUJkLMPXM1y/QWwCl2dINzr0Jq5Q== - dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" - extract-zip "^1.0.3" - electron@^11.4.6: version "11.5.0" resolved "https://registry.npmjs.org/electron/-/electron-11.5.0.tgz#f1650543b9d8f2047d3807755bdb120153ed210f" @@ -4887,6 +4938,15 @@ electron@^11.4.6: "@types/node" "^12.0.12" extract-zip "^1.0.3" +electron@^23.0.0: + version "23.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-23.0.0.tgz#4da457d7585149bb1a98ea8bddb286e72322a309" + integrity sha512-S6hVtTAjauMiiWP9sBVR5RpcUC464cNZ06I2EMUjeZBq+KooS6tLmNsfw0zLpAXDp1qosjlBP3v71NTZ3gd9iA== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^16.11.26" + extract-zip "^2.0.1" + emittery@^0.7.1: version "0.7.2" resolved "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz#25595908e13af0f5674ab419396e2fb394cdfa82" @@ -4978,11 +5038,6 @@ escalade@^3.1.1: resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== -escape-goat@^2.0.0: - version "2.1.1" - resolved "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" - integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== - escape-html@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -5389,7 +5444,7 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extract-zip@2.0.1, extract-zip@^2.0.0: +extract-zip@2.0.1, extract-zip@^2.0.0, extract-zip@^2.0.1: version "2.0.1" resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== @@ -5691,6 +5746,15 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" +fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -5700,7 +5764,7 @@ fs-extra@^8.1.0: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0: +fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -5928,13 +5992,6 @@ global-agent@^3.0.0: semver "^7.3.2" serialize-error "^7.0.1" -global-dirs@^3.0.0: - version "3.0.0" - resolved "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686" - integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA== - dependencies: - ini "2.0.0" - global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -6003,6 +6060,23 @@ got@^11.0.2, got@^11.8.1: p-cancelable "^2.0.0" responselike "^2.0.0" +got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + got@^9.6.0: version "9.6.0" resolved "https://registry.npmjs.org/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" @@ -6128,11 +6202,6 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has-yarn@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77" - integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw== - has@^1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -6166,16 +6235,9 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^3.0.8: - version "3.0.8" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz#6e35d4cc87af2c5f816e4cb9ce350ba87a3f370d" - integrity sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.1.0: version "4.1.0" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== dependencies: lru-cache "^6.0.0" @@ -6224,6 +6286,15 @@ http-proxy-agent@^4.0.1: agent-base "6" debug "4" +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -6319,11 +6390,6 @@ import-fresh@^3.0.0: parent-module "^1.0.0" resolve-from "^4.0.0" -import-lazy@^2.1.0: - version "2.1.0" - resolved "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= - import-local@^3.0.2: version "3.1.0" resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4" @@ -6360,11 +6426,6 @@ inherits@2, inherits@2.0.4, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, i resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -ini@2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" - integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== - ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" @@ -6493,7 +6554,14 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.0, is-core-module@^2.8.1: +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + +is-core-module@^2.2.0, is-core-module@^2.8.0, is-core-module@^2.8.1: version "2.8.1" resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211" integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA== @@ -6600,14 +6668,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" -is-installed-globally@^0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520" - integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ== - dependencies: - global-dirs "^3.0.0" - is-path-inside "^3.0.2" - is-interactive@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" @@ -6618,11 +6678,6 @@ is-negative-zero@^2.0.1: resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== -is-npm@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8" - integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA== - is-number-object@^1.0.4: version "1.0.6" resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" @@ -6642,16 +6697,6 @@ is-number@^7.0.0: resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== -is-obj@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" - integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== - -is-path-inside@^3.0.2: - version "3.0.3" - resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" - integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== - is-plain-obj@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287" @@ -6740,11 +6785,6 @@ is-wsl@^2.2.0: dependencies: is-docker "^2.0.0" -is-yarn-global@^0.3.0: - version "0.3.0" - resolved "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232" - integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw== - isarray@0.0.1: version "0.0.1" resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -6755,6 +6795,18 @@ isarray@1.0.0, isarray@~1.0.0: resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isbinaryfile@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.3.tgz#5d6def3edebf6e8ca8cae9c30183a804b5f8be80" + integrity sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw== + dependencies: + buffer-alloc "^1.2.0" + +isbinaryfile@^4.0.10: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -6872,14 +6924,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -istextorbinary@^5.12.0: - version "5.15.0" - resolved "https://registry.npmjs.org/istextorbinary/-/istextorbinary-5.15.0.tgz#6e726d1dbfb8c2c1c0a50b13fb57103259368c8d" - integrity sha512-4/Fz28VGgSCb5j6kGJqL1iU28WAFMkcx+uUWaa/pzpGqz5bMIoPzW4F6Nbf/7XFx7nSa+qD6HHprDrilB4RNzw== - dependencies: - binaryextensions "^4.18.0" - textextensions "^5.13.0" - jake@^10.6.1: version "10.8.2" resolved "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz#ebc9de8558160a66d82d0eadc6a2e58fbc500a7b" @@ -6890,6 +6934,16 @@ jake@^10.6.1: filelist "^1.0.1" minimatch "^3.0.4" +jake@^10.8.5: + version "10.8.5" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" + integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.1" + minimatch "^3.0.4" + jest-changed-files@^26.6.2: version "26.6.2" resolved "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" @@ -7714,7 +7768,7 @@ js-tokens@^3.0.2: resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= -js-yaml@4.1.0, js-yaml@^4.0.0: +js-yaml@4.1.0, js-yaml@^4.1.0: version "4.1.0" resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -7878,7 +7932,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -7979,16 +8033,9 @@ ky@^0.28.5: resolved "https://registry.npmjs.org/ky/-/ky-0.28.7.tgz#10c42be863fb96c1846d6e71e229263ffb72eb15" integrity sha512-a23i6qSr/ep15vdtw/zyEQIDLoUaKDg9Jf04CYl/0ns/wXNYna26zJpI+MeIFaPeDvkrjLPrKtKOiiI3IE53RQ== -latest-version@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" - integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== - dependencies: - package-json "^6.3.0" - -lazy-val@^1.0.4: +lazy-val@^1.0.4, lazy-val@^1.0.5: version "1.0.5" - resolved "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== lazystream@^1.0.0: @@ -8178,7 +8225,7 @@ lodash.zip@^4.2.0: resolved "https://registry.npmjs.org/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020" integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA= -lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.2.1, lodash@^4.7.0, lodash@~4.17.10: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -8373,9 +8420,9 @@ mime@1.6.0, mime@^1.3.4: resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.5.0: +mime@^2.5.2: version "2.6.0" - resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== mimic-fn@^2.0.0, mimic-fn@^2.1.0: @@ -8419,6 +8466,13 @@ minimatch@3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5: version "1.2.5" resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -8431,6 +8485,11 @@ minipass@^3.0.0: dependencies: yallist "^4.0.0" +minipass@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-4.0.3.tgz#00bfbaf1e16e35e804f4aa31a7c1f6b8d9f0ee72" + integrity sha512-OW2r4sQ0sI+z5ckEt5c1Tri4xTgZwYDxpE54eqWlQloQRoWtXjqt9udJ5Z4dSv7wK+nfFI7FRXyCpBSft+gpFw== + minizlib@^2.1.1: version "2.1.2" resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -8675,16 +8734,6 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: semver "2 || 3 || 4 || 5" validate-npm-package-license "^3.0.1" -normalize-package-data@^3.0.0: - version "3.0.3" - resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz#dbcc3e2da59509a0983422884cd172eefdfa525e" - integrity sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA== - dependencies: - hosted-git-info "^4.0.1" - is-core-module "^2.5.0" - semver "^7.3.4" - validate-npm-package-license "^3.0.1" - normalize-path@^2.1.1: version "2.1.1" resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" @@ -9077,16 +9126,6 @@ package-hash@^4.0.0: lodash.flattendeep "^4.4.0" release-zalgo "^1.0.0" -package-json@^6.3.0: - version "6.5.0" - resolved "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0" - integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ== - dependencies: - got "^9.6.0" - registry-auth-token "^4.0.0" - registry-url "^5.0.0" - semver "^6.2.0" - pako@^1.0.5: version "1.0.11" resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -9513,13 +9552,6 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -pupa@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62" - integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A== - dependencies: - escape-goat "^2.0.0" - puppeteer-core@9.1.1, puppeteer-core@^9.1.0: version "9.1.1" resolved "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-9.1.1.tgz#0c189c3275967d65c39270e6b146e559baca3d47" @@ -9616,7 +9648,7 @@ raw-body@2.4.2: iconv-lite "0.4.24" unpipe "1.0.0" -rc@^1.2.7, rc@^1.2.8: +rc@^1.2.7: version "1.2.8" resolved "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -9636,15 +9668,15 @@ react-is@^17.0.1: resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -read-config-file@6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/read-config-file/-/read-config-file-6.0.0.tgz#224b5dca6a5bdc1fb19e63f89f342680efdb9299" - integrity sha512-PHjROSdpceKUmqS06wqwP92VrM46PZSTubmNIMJ5DrMwg1OgenSTSEHIkCa6TiOJ+y/J0xnG1fFwG3M+Oi1aNA== +read-config-file@6.2.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.2.0.tgz#71536072330bcd62ba814f91458b12add9fc7ade" + integrity sha512-gx7Pgr5I56JtYz+WuqEbQHj/xWo+5Vwua2jhb1VwM4Wid5PqYmZ4i00ZB0YEGIfkVBsCv9UrjgyqCiQfS/Oosg== dependencies: - dotenv "^8.2.0" + dotenv "^9.0.2" dotenv-expand "^5.1.0" - js-yaml "^3.13.1" - json5 "^2.1.2" + js-yaml "^4.1.0" + json5 "^2.2.0" lazy-val "^1.0.4" read-pkg-up@^1.0.1: @@ -9827,20 +9859,6 @@ regexpu-core@^5.0.1: unicode-match-property-ecmascript "^2.0.0" unicode-match-property-value-ecmascript "^2.0.0" -registry-auth-token@^4.0.0: - version "4.2.1" - resolved "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250" - integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw== - dependencies: - rc "^1.2.8" - -registry-url@^5.0.0: - version "5.1.0" - resolved "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009" - integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw== - dependencies: - rc "^1.2.8" - regjsgen@^0.6.0: version "0.6.0" resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d" @@ -10174,19 +10192,12 @@ semver-compare@^1.0.0: resolved "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -semver-diff@^3.1.1: - version "3.1.1" - resolved "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b" - integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg== - dependencies: - semver "^6.3.0" - "semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@7.0.0: +semver@7.0.0, semver@~7.0.0: version "7.0.0" resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== @@ -10196,13 +10207,20 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4: +semver@^7.0.0, semver@^7.3.2: version "7.3.5" resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" +semver@^7.3.7: + version "7.3.8" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" + integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + dependencies: + lru-cache "^6.0.0" + send@0.17.2: version "0.17.2" resolved "https://registry.npmjs.org/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820" @@ -10351,6 +10369,13 @@ simple-get@^3.0.3: once "^1.3.1" simple-concat "^1.0.0" +simple-update-notifier@^1.0.7: + version "1.1.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz#67694c121de354af592b347cdba798463ed49c82" + integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg== + dependencies: + semver "~7.0.0" + sinon@^9.0.1: version "9.2.4" resolved "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz#e55af4d3b174a4443a8762fa8421c2976683752b" @@ -10629,7 +10654,7 @@ string-width@^1.0.1: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3: +"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -10865,7 +10890,7 @@ tar-stream@^2.1.4, tar-stream@^2.2.0: tar@^6.0.1: version "6.1.11" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== dependencies: chownr "^2.0.0" @@ -10875,6 +10900,18 @@ tar@^6.0.1: mkdirp "^1.0.3" yallist "^4.0.0" +tar@^6.1.11: + version "6.1.13" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" + integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^4.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + teen_process@^1.5.1: version "1.16.0" resolved "https://registry.npmjs.org/teen_process/-/teen_process-1.16.0.tgz#2bad3e33b4d0a3a271cdd0c836434befa7771b44" @@ -10887,9 +10924,9 @@ teen_process@^1.5.1: source-map-support "^0.5.3" which "^2.0.2" -temp-file@^3.3.7: +temp-file@^3.4.0: version "3.4.0" - resolved "https://registry.npmjs.org/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== dependencies: async-exit-hook "^2.0.1" @@ -10927,11 +10964,6 @@ text-table@^0.2.0: resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= -textextensions@^5.13.0: - version "5.14.0" - resolved "https://registry.npmjs.org/textextensions/-/textextensions-5.14.0.tgz#a6ff6aee5faaa751e6157d422c722a2bfd59eedf" - integrity sha512-4cAYwNFNYlIAHBUo7p6zw8POUvWbZor+/R0Tanv+rIhsauEyV9QSrEXL40pI+GfTQxKX8k6Tyw6CmdSDSmASrg== - throat@^4.0.0: version "4.1.0" resolved "https://registry.npmjs.org/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" @@ -10962,6 +10994,13 @@ tinycolor2@^1.4.1: resolved "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz#3f6a4d1071ad07676d7fa472e1fac40a719d8803" integrity sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA== +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" @@ -10969,6 +11008,13 @@ tmp@^0.0.33: dependencies: os-tmpdir "~1.0.2" +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" + tmpl@1.0.5: version "1.0.5" resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -11229,13 +11275,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -unique-string@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d" - integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg== - dependencies: - crypto-random-string "^2.0.0" - universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" @@ -11264,26 +11303,6 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" -update-notifier@^5.1.0: - version "5.1.0" - resolved "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9" - integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw== - dependencies: - boxen "^5.0.0" - chalk "^4.1.0" - configstore "^5.0.1" - has-yarn "^2.1.0" - import-lazy "^2.1.0" - is-ci "^2.0.0" - is-installed-globally "^0.4.0" - is-npm "^5.0.0" - is-yarn-global "^0.3.0" - latest-version "^5.1.0" - pupa "^2.1.1" - semver "^7.3.4" - semver-diff "^3.1.1" - xdg-basedir "^4.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -11677,13 +11696,6 @@ wide-align@^1.1.0, wide-align@^1.1.2: dependencies: string-width "^1.0.2 || 2 || 3 || 4" -widest-line@^3.1.0: - version "3.1.0" - resolved "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca" - integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg== - dependencies: - string-width "^4.0.0" - word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -11777,10 +11789,10 @@ ws@^7.0.0, ws@^7.2.3, ws@^7.4.6: resolved "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz#e59fc509fb15ddfb65487ee9765c5a51dec5fe7b" integrity sha512-6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA== -xdg-basedir@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" - integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== +ws@^8.12.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.12.0.tgz#485074cc392689da78e1828a9ff23585e06cddd8" + integrity sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig== xhr@^2.0.1: version "2.6.0" @@ -11904,6 +11916,11 @@ yargs-parser@^21.0.0: resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz#a485d3966be4317426dd56bdb6a30131b281dc55" integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs-unparser@2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb" @@ -11914,7 +11931,7 @@ yargs-unparser@2.0.0: flat "^5.0.2" is-plain-obj "^2.1.0" -yargs@16.2.0, yargs@^16.2.0: +yargs@16.2.0: version "16.2.0" resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== @@ -11991,6 +12008,19 @@ yargs@^17.0.0: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.5.1: + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yarn-install@^1.0.0: version "1.0.0" resolved "https://registry.npmjs.org/yarn-install/-/yarn-install-1.0.0.tgz#57f45050b82efd57182b3973c54aa05cb5d25230" From cbdf59d93c5d4be886d9271610ba61dfe6e5214a Mon Sep 17 00:00:00 2001 From: Hans Otto Wirtz Date: Thu, 9 Feb 2023 19:08:52 +0100 Subject: [PATCH 2/5] Fix more dependencies --- README.md | 6 ++++++ packages/uxp-devtools-cli/package.json | 17 +++++++++-------- packages/uxp-devtools-core/package.json | 3 +++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d6c5555..19dbe47 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ +## This repo contains edits to make the `uxp` CLI command usable. + +```bash +npm i -g uxp-devtools-cli-fixed +``` + # Overview UXP Devtools is a standard tool for rapid Adobe UXP plugin development. UXP Devtools provides the ability to do all of the following: diff --git a/packages/uxp-devtools-cli/package.json b/packages/uxp-devtools-cli/package.json index 3b4d5a4..04a1250 100644 --- a/packages/uxp-devtools-cli/package.json +++ b/packages/uxp-devtools-cli/package.json @@ -1,6 +1,6 @@ { - "name": "uxp-devtools-cli-fixed", - "version": "1.5.1", + "name": "@adobe-fixed-uxp/uxp-devtools-cli", + "version": "1.5.2", "description": "Command line interface for rapid UXP plugin development", "main": "src/uxp.js", "scripts": { @@ -24,21 +24,22 @@ "author": "Adobe Inc", "license": "Apache-2.0", "dependencies": { - "@adobe/uxp-devtools-core": "^1.5.0", - "@adobe/uxp-inspect-frontend": "^1.5.1", - "@adobe/uxp-template-ps-starter": "^1.0.0", + "@adobe-fixed-uxp/uxp-devtools-core": "^1.5.0", + "@adobe-fixed-uxp/uxp-wdio-automation-template": "^1.0.0", "@adobe/uxp-template-default-starter": "^1.0.0", - "@adobe/uxp-template-default-starter-xd": "^1.0.0", "@adobe/uxp-template-default-starter-ps": "^1.0.0", + "@adobe/uxp-template-default-starter-xd": "^1.0.0", "@adobe/uxp-template-ps-react-starter": "^1.0.0", "@adobe/uxp-template-ps-react-typescript": "^1.0.0", + "@adobe/uxp-template-ps-starter": "^1.0.0", "@adobe/uxp-template-xd-starter": "^1.0.0", - "@adobe/uxp-wdio-automation-template": "^1.0.0", - "@adobe/uxp_web_driver": "2.2.1", "chalk": "^3.0.0", "cli-table3": "^0.6.0", "prompts": "^2.3.2", "semver": "^7.3.2", "yargs": "^15.3.1" + }, + "devDependencies": { + "@adobe-fixed-uxp/uxp-inspect-frontend": "^1.5.1" } } diff --git a/packages/uxp-devtools-core/package.json b/packages/uxp-devtools-core/package.json index 88da235..94c7bc2 100644 --- a/packages/uxp-devtools-core/package.json +++ b/packages/uxp-devtools-core/package.json @@ -33,5 +33,8 @@ "archiver": "5.3.0", "ignore-walk": "^3.0.3", "shell-exec": "^1.0.2" + }, + "devDependencies": { + "@adobe/uxp_web_driver": "^2.2.1" } } From 683eb3716d896ae148640e0233fccb8e32f8d74e Mon Sep 17 00:00:00 2001 From: Hans Otto Wirtz Date: Thu, 9 Feb 2023 19:34:08 +0100 Subject: [PATCH 3/5] Publish more packages --- README.md | 2 +- packages/uxp-devtools-cli/src/cli/commands/apps/AppsCmds.js | 2 +- packages/uxp-devtools-cli/src/cli/commands/plugin/init.js | 2 +- .../cli/commands/plugin/init/TemplateBasedInitWorkflow.js | 2 +- packages/uxp-devtools-cli/src/cli/commands/plugin/load.js | 2 +- .../uxp-devtools-cli/src/cli/commands/plugin/pluginTest.js | 2 +- packages/uxp-devtools-cli/src/cli/commands/plugin/watch.js | 2 +- .../src/cli/commands/service/ServiceCmds.js | 2 +- packages/uxp-devtools-cli/src/cli/utils/Tool.js | 2 +- packages/uxp-devtools-cli/src/cli/utils/common.js | 2 +- packages/uxp-devtools-cli/src/uxp.js | 2 +- packages/uxp-devtools-core/package.json | 6 +++--- .../src/core/client/plugin/actions/PluginTestBaseCommand.js | 2 +- packages/uxp-devtools-core/src/core/common/DevToolsMgr.js | 2 +- packages/uxp-devtools-core/startUxpDriver.js | 2 +- packages/uxp-devtools-feature/package.json | 2 +- packages/uxp-devtools-helper/package.json | 4 ++-- packages/uxp-devtools-helper/src/DevToolsUtils.js | 2 +- packages/uxp-inspect-frontend/package.json | 6 +++--- .../uxp-wdio-automation-template/package.json | 2 +- packages/uxp-webdriver/package.json | 2 +- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 19dbe47..af3c068 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## This repo contains edits to make the `uxp` CLI command usable. ```bash -npm i -g uxp-devtools-cli-fixed +npm i -g @adobe-fixed-uxp/uxp-devtools-cli ``` # Overview diff --git a/packages/uxp-devtools-cli/src/cli/commands/apps/AppsCmds.js b/packages/uxp-devtools-cli/src/cli/commands/apps/AppsCmds.js index e42a033..73feab7 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/apps/AppsCmds.js +++ b/packages/uxp-devtools-cli/src/cli/commands/apps/AppsCmds.js @@ -12,7 +12,7 @@ */ const Table = require("cli-table3"); -const { CoreHelpers } = require("@adobe/uxp-devtools-core"); +const { CoreHelpers } = require("@adobe-fixed-uxp/uxp-devtools-core"); function handleAppsListCommand() { this.app.logLevel = CoreHelpers.LoggerLevel.WARN; diff --git a/packages/uxp-devtools-cli/src/cli/commands/plugin/init.js b/packages/uxp-devtools-cli/src/cli/commands/plugin/init.js index 0d0d071..5898140 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/plugin/init.js +++ b/packages/uxp-devtools-cli/src/cli/commands/plugin/init.js @@ -14,7 +14,7 @@ const chalk = require("chalk"); const BasicInitWorkflow = require("./init/BasicInitWorkflow"); const { initWithBundledPluginTemplate } = require("./init/TemplateBasedInitWorkflow"); -const { DevToolsError } = require("@adobe/uxp-devtools-core"); +const { DevToolsError } = require("@adobe-fixed-uxp/uxp-devtools-core"); const templateHelp = `Specify a template for the plugin. A custom ${chalk.cyan("--template")} can be one of: diff --git a/packages/uxp-devtools-cli/src/cli/commands/plugin/init/TemplateBasedInitWorkflow.js b/packages/uxp-devtools-cli/src/cli/commands/plugin/init/TemplateBasedInitWorkflow.js index 13a4415..aed4968 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/plugin/init/TemplateBasedInitWorkflow.js +++ b/packages/uxp-devtools-cli/src/cli/commands/plugin/init/TemplateBasedInitWorkflow.js @@ -14,7 +14,7 @@ const path = require("path"); const fs = require("fs-extra"); const _ = require("lodash"); -const { DevToolsError } = require("@adobe/uxp-devtools-core"); +const { DevToolsError } = require("@adobe-fixed-uxp/uxp-devtools-core"); // Check for file conflicts. function getConflictingFilesList(pluginDir, uxpPackageDir) { diff --git a/packages/uxp-devtools-cli/src/cli/commands/plugin/load.js b/packages/uxp-devtools-cli/src/cli/commands/plugin/load.js index 6f4f500..865ff52 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/plugin/load.js +++ b/packages/uxp-devtools-cli/src/cli/commands/plugin/load.js @@ -12,7 +12,7 @@ */ const path = require("path"); -const { DevToolsError } = require("@adobe/uxp-devtools-core"); +const { DevToolsError } = require("@adobe-fixed-uxp/uxp-devtools-core"); const loadOptions = { manifest: { diff --git a/packages/uxp-devtools-cli/src/cli/commands/plugin/pluginTest.js b/packages/uxp-devtools-cli/src/cli/commands/plugin/pluginTest.js index 07101af..2b9e8ae 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/plugin/pluginTest.js +++ b/packages/uxp-devtools-cli/src/cli/commands/plugin/pluginTest.js @@ -18,7 +18,7 @@ function handlePluginTestCommand(args) { const manifestRelPath = args.manifest ? args.manifest : "manifest.json"; const manifest = path.resolve(manifestRelPath); const apps = args.appId ? args.appId.split(" ") : []; - const packageName = `@adobe/uxp-wdio-automation-template`; + const packageName = `@adobe-fixed-uxp/uxp-wdio-automation-template`; const driverPort = args.port; const params = { manifest, diff --git a/packages/uxp-devtools-cli/src/cli/commands/plugin/watch.js b/packages/uxp-devtools-cli/src/cli/commands/plugin/watch.js index bcff638..0111be8 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/plugin/watch.js +++ b/packages/uxp-devtools-cli/src/cli/commands/plugin/watch.js @@ -12,7 +12,7 @@ */ const path = require("path"); const { loadPluginSessionFromUxpRc } = require("../../utils/Common"); -const { CoreHelpers } = require("@adobe/uxp-devtools-core"); +const { CoreHelpers } = require("@adobe-fixed-uxp/uxp-devtools-core"); const watchOptions = { path: { diff --git a/packages/uxp-devtools-cli/src/cli/commands/service/ServiceCmds.js b/packages/uxp-devtools-cli/src/cli/commands/service/ServiceCmds.js index c30aa6f..df5bc0a 100644 --- a/packages/uxp-devtools-cli/src/cli/commands/service/ServiceCmds.js +++ b/packages/uxp-devtools-cli/src/cli/commands/service/ServiceCmds.js @@ -11,7 +11,7 @@ * */ -const { CoreHelpers } = require("@adobe/uxp-devtools-core"); +const { CoreHelpers } = require("@adobe-fixed-uxp/uxp-devtools-core"); function handleServiceStartCommand(argv) { // start the service at the given port. diff --git a/packages/uxp-devtools-cli/src/cli/utils/Tool.js b/packages/uxp-devtools-cli/src/cli/utils/Tool.js index 9f66716..f7c7a00 100644 --- a/packages/uxp-devtools-cli/src/cli/utils/Tool.js +++ b/packages/uxp-devtools-cli/src/cli/utils/Tool.js @@ -14,7 +14,7 @@ /* eslint-disable func-names */ /* eslint-disable global-require */ -const { UDTApplication } = require("@adobe/uxp-devtools-core"); +const { UDTApplication } = require("@adobe-fixed-uxp/uxp-devtools-core"); class Tool { constructor(modules) { diff --git a/packages/uxp-devtools-cli/src/cli/utils/common.js b/packages/uxp-devtools-cli/src/cli/utils/common.js index 5231e30..c572459 100644 --- a/packages/uxp-devtools-cli/src/cli/utils/common.js +++ b/packages/uxp-devtools-cli/src/cli/utils/common.js @@ -14,7 +14,7 @@ function loadPluginSessionFromUxpRc() { // eslint-disable-next-line global-require - const { CoreHelpers } = require("@adobe/uxp-devtools-core"); + const { CoreHelpers } = require("@adobe-fixed-uxp/uxp-devtools-core"); return CoreHelpers.PluginSession.createFromRcFile(); } diff --git a/packages/uxp-devtools-cli/src/uxp.js b/packages/uxp-devtools-cli/src/uxp.js index d210cda..5cf31e3 100755 --- a/packages/uxp-devtools-cli/src/uxp.js +++ b/packages/uxp-devtools-cli/src/uxp.js @@ -13,7 +13,7 @@ */ /* eslint-disable global-require */ const Tool = require("./cli/utils/Tool"); -const { UDTApplication } = require("@adobe/uxp-devtools-core"); +const { UDTApplication } = require("@adobe-fixed-uxp/uxp-devtools-core"); const commands = [ require("./cli/commands/apps/index"), diff --git a/packages/uxp-devtools-core/package.json b/packages/uxp-devtools-core/package.json index 94c7bc2..082caeb 100644 --- a/packages/uxp-devtools-core/package.json +++ b/packages/uxp-devtools-core/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp-devtools-core", + "name": "@adobe-fixed-uxp/uxp-devtools-core", "version": "1.5.0", "description": "UXP Devtools Core Module", "main": "src/index.js", @@ -21,7 +21,7 @@ "author": "Adobe Inc", "license": "Apache-2.0", "dependencies": { - "@adobe/uxp-devtools-helper": "^1.5.0", + "@adobe-fixed-uxp/uxp-devtools-helper": "^1.5.0", "chalk": "^3.0.0", "chokidar": "^3.4.2", "express": "^4.17.1", @@ -35,6 +35,6 @@ "shell-exec": "^1.0.2" }, "devDependencies": { - "@adobe/uxp_web_driver": "^2.2.1" + "@adobe-fixed-uxp/uxp_web_driver": "^2.2.1" } } diff --git a/packages/uxp-devtools-core/src/core/client/plugin/actions/PluginTestBaseCommand.js b/packages/uxp-devtools-core/src/core/client/plugin/actions/PluginTestBaseCommand.js index daae37c..7139678 100644 --- a/packages/uxp-devtools-core/src/core/client/plugin/actions/PluginTestBaseCommand.js +++ b/packages/uxp-devtools-core/src/core/client/plugin/actions/PluginTestBaseCommand.js @@ -47,7 +47,7 @@ class PluginTestBaseCommand extends PluginBaseCommand { const uxpDriver_logFilePath = path.resolve(logPath , logFileName).toString(); const uxpDriver_logFile = await fsPromises.open(uxpDriver_logFilePath, "w+"); - let uxpDevtoolCoreDir = require.resolve("@adobe/uxp-devtools-core/package.json"); + let uxpDevtoolCoreDir = require.resolve("@adobe-fixed-uxp/uxp-devtools-core/package.json"); uxpDevtoolCoreDir = path.dirname(uxpDevtoolCoreDir); process.chdir(uxpDevtoolCoreDir); diff --git a/packages/uxp-devtools-core/src/core/common/DevToolsMgr.js b/packages/uxp-devtools-core/src/core/common/DevToolsMgr.js index 8b29224..796bab9 100644 --- a/packages/uxp-devtools-core/src/core/common/DevToolsMgr.js +++ b/packages/uxp-devtools-core/src/core/common/DevToolsMgr.js @@ -11,7 +11,7 @@ * */ /* eslint-disable class-methods-use-this */ -const DevToolsHelper = require("@adobe/uxp-devtools-helper"); +const DevToolsHelper = require("@adobe-fixed-uxp/uxp-devtools-helper"); class DevToolsMgr { constructor(isServer) { diff --git a/packages/uxp-devtools-core/startUxpDriver.js b/packages/uxp-devtools-core/startUxpDriver.js index 7ddcab8..86cabc1 100644 --- a/packages/uxp-devtools-core/startUxpDriver.js +++ b/packages/uxp-devtools-core/startUxpDriver.js @@ -12,7 +12,7 @@ * */ -const { startUXPDriver } = require("@adobe/uxp_web_driver"); +const { startUXPDriver } = require("@adobe-fixed-uxp/uxp_web_driver"); function startTestService() { try { const UXPDriverPort = process.argv[2]; diff --git a/packages/uxp-devtools-feature/package.json b/packages/uxp-devtools-feature/package.json index 325fba1..b91ca96 100644 --- a/packages/uxp-devtools-feature/package.json +++ b/packages/uxp-devtools-feature/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp-devtools-feature", + "name": "@adobe-fixed-uxp/uxp-devtools-feature", "version": "1.5.0", "description": "UXP Devtools Feature Config Module", "main": "src/index.js", diff --git a/packages/uxp-devtools-helper/package.json b/packages/uxp-devtools-helper/package.json index fa1504c..a1cd7d1 100644 --- a/packages/uxp-devtools-helper/package.json +++ b/packages/uxp-devtools-helper/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp-devtools-helper", + "name": "@adobe-fixed-uxp/uxp-devtools-helper", "version": "1.5.0", "description": "Adobe Devtools helper package used by uxp cli", "main": "src/DevToolsHelper.js", @@ -20,7 +20,7 @@ "dependencies": { "fs-extra": "^9.0.0", "node-gyp-build": "^4.2.3", - "@adobe/uxp-devtools-feature": "^1.0.0", + "@adobe-fixed-uxp/uxp-devtools-feature": "^1.0.0", "tar": "^6.0.1" } } diff --git a/packages/uxp-devtools-helper/src/DevToolsUtils.js b/packages/uxp-devtools-helper/src/DevToolsUtils.js index fbabd17..84bb0da 100644 --- a/packages/uxp-devtools-helper/src/DevToolsUtils.js +++ b/packages/uxp-devtools-helper/src/DevToolsUtils.js @@ -15,7 +15,7 @@ const path = require("path"); const fs = require("fs"); const { exec } = require("child_process"); -const { FeatureFlag } = require("@adobe/uxp-devtools-feature"); +const { FeatureFlag } = require("@adobe-fixed-uxp/uxp-devtools-feature"); const isInternalBuild = FeatureFlag.isFeatureEnabled("internalPluginWorkspace"); diff --git a/packages/uxp-inspect-frontend/package.json b/packages/uxp-inspect-frontend/package.json index f38abfd..b158847 100644 --- a/packages/uxp-inspect-frontend/package.json +++ b/packages/uxp-inspect-frontend/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp-inspect-frontend", + "name": "@adobe-fixed-uxp/uxp-inspect-frontend", "productName": "Adobe UXP Developer Tool", "appMenuName": "Adobe UXP Developer Tool", "version": "1.5.1", @@ -13,8 +13,8 @@ "license": "Apache-2.0", "scripts": { "cleanup": "rimraf dist/", - "package": "yarn cleanup && electron-builder --dir", - "package-arm64": "export build_arch=arm64 && yarn cleanup && electron-builder --dir --arm64", + "package": "electron-builder --dir --x64", + "package-arm64": "electron-builder --dir --arm64", "postinstall": "node scripts/setup.js" }, "build": { diff --git a/packages/uxp-templates-pack/uxp-wdio-automation-template/package.json b/packages/uxp-templates-pack/uxp-wdio-automation-template/package.json index edb2c0f..ebd46fa 100644 --- a/packages/uxp-templates-pack/uxp-wdio-automation-template/package.json +++ b/packages/uxp-templates-pack/uxp-wdio-automation-template/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp-wdio-automation-template", + "name": "@adobe-fixed-uxp/uxp-wdio-automation-template", "version": "1.0.0", "description": "A starter automation project created using WebDriverIO framework", "main": "index.js", diff --git a/packages/uxp-webdriver/package.json b/packages/uxp-webdriver/package.json index 4d7967e..245cb3e 100644 --- a/packages/uxp-webdriver/package.json +++ b/packages/uxp-webdriver/package.json @@ -1,5 +1,5 @@ { - "name": "@adobe/uxp_web_driver", + "name": "@adobe-fixed-uxp/uxp_web_driver", "version": "2.2.1", "main": "uxp_driver_export.js", "scripts": { From fa7fa0c766b524de514fce6f00c24adec4c2e8ab Mon Sep 17 00:00:00 2001 From: Hans Otto Wirtz Date: Thu, 9 Feb 2023 19:41:17 +0100 Subject: [PATCH 4/5] Find uxp app --- packages/uxp-devtools-cli/package.json | 3 +- .../scripts/setupInspectApp.js | 2 +- .../src/cli/utils/CLICDTInspectMgr.js | 31 ++++++++++++------- yarn.lock | 7 +++++ 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/packages/uxp-devtools-cli/package.json b/packages/uxp-devtools-cli/package.json index 04a1250..21a63c4 100644 --- a/packages/uxp-devtools-cli/package.json +++ b/packages/uxp-devtools-cli/package.json @@ -1,6 +1,6 @@ { "name": "@adobe-fixed-uxp/uxp-devtools-cli", - "version": "1.5.2", + "version": "1.5.8", "description": "Command line interface for rapid UXP plugin development", "main": "src/uxp.js", "scripts": { @@ -33,6 +33,7 @@ "@adobe/uxp-template-ps-react-typescript": "^1.0.0", "@adobe/uxp-template-ps-starter": "^1.0.0", "@adobe/uxp-template-xd-starter": "^1.0.0", + "app-path": "^3.3.0", "chalk": "^3.0.0", "cli-table3": "^0.6.0", "prompts": "^2.3.2", diff --git a/packages/uxp-devtools-cli/scripts/setupInspectApp.js b/packages/uxp-devtools-cli/scripts/setupInspectApp.js index f776008..71d78a5 100644 --- a/packages/uxp-devtools-cli/scripts/setupInspectApp.js +++ b/packages/uxp-devtools-cli/scripts/setupInspectApp.js @@ -13,7 +13,7 @@ const path = require("path"); const { execSync } = require("child_process"); function generateDevtoolsAppPacakge() { - let uxpDevtoolAppDir = require.resolve("@adobe/uxp-inspect-frontend/package.json"); + let uxpDevtoolAppDir = require.resolve("@adobe-fixed-uxp/uxp-inspect-frontend/package.json"); uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir); execSync("yarn package", { diff --git a/packages/uxp-devtools-cli/src/cli/utils/CLICDTInspectMgr.js b/packages/uxp-devtools-cli/src/cli/utils/CLICDTInspectMgr.js index 898f62f..e6b4926 100644 --- a/packages/uxp-devtools-cli/src/cli/utils/CLICDTInspectMgr.js +++ b/packages/uxp-devtools-cli/src/cli/utils/CLICDTInspectMgr.js @@ -13,24 +13,31 @@ governing permissions and limitations under the License. const path = require("path"); const child_process = require("child_process"); const process = require("process"); +const appPath = require("app-path"); const { createDeferredPromise } = require("./common"); function getDevtoolsAppExecutablePath() { - let uxpDevtoolAppDir = require.resolve("@adobe/uxp-inspect-frontend/package.json"); - uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir); - const productName = "Adobe UXP Developer Tool"; - const baseFolder = path.resolve(uxpDevtoolAppDir, "dist"); + try { + let uxpDevtoolAppDir = require.resolve("@adobe-fixed-uxp/uxp-inspect-frontend/package.json"); + uxpDevtoolAppDir = path.dirname(uxpDevtoolAppDir); - let executablePath = ""; - if (process.platform === "darwin") { - executablePath = `${baseFolder}/mac/${productName}.app/Contents/MacOS/${productName}`; - } - else if (process.platform === "win32") { - executablePath = `${baseFolder}/win-unpacked/${productName}.exe`; - } + const baseFolder = path.resolve(uxpDevtoolAppDir, "dist"); - return executablePath; + let executablePath = ""; + if (process.platform === "darwin") { + executablePath = `${baseFolder}/mac/${productName}.app/Contents/MacOS/${productName}`; + } + else if (process.platform === "win32") { + executablePath = `${baseFolder}/win-unpacked/${productName}.exe`; + } + + return executablePath; + } catch (e) { + const p = appPath.sync(productName); + if (!p) throw new Error(`${productName} not found`); + return `${p}/Contents/MacOS/${productName}`; + } } function wrapArg(name, arg) { diff --git a/yarn.lock b/yarn.lock index 3c3c9c5..c1c0496 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2894,6 +2894,13 @@ app-builder-lib@23.6.0: tar "^6.1.11" temp-file "^3.4.0" +app-path@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/app-path/-/app-path-3.3.0.tgz#0342a909db37079c593979c720f99e872475eba3" + integrity sha512-EAgEXkdcxH1cgEePOSsmUtw9ItPl0KTxnh/pj9ZbhvbKbij9x0oX6PWpGnorDr0DS5AosLgoa5n3T/hZmKQpYA== + dependencies: + execa "^1.0.0" + append-transform@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz#99d9d29c7b38391e6f428d28ce136551f0b77e12" From b09ebb9f95a0622dd0882981bbc91bfe505bc1d4 Mon Sep 17 00:00:00 2001 From: Hans Otto Wirtz Date: Wed, 7 Jun 2023 11:08:05 +0200 Subject: [PATCH 5/5] Dirty updates --- packages/uxp-devtools-cli/package.json | 7 +++++-- packages/uxp-devtools-core/package.json | 4 ++-- packages/uxp-devtools-helper/package.json | 5 +---- packages/uxp-devtools-helper/src/DevToolsHelper.js | 1 + 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/uxp-devtools-cli/package.json b/packages/uxp-devtools-cli/package.json index 21a63c4..cf2e11c 100644 --- a/packages/uxp-devtools-cli/package.json +++ b/packages/uxp-devtools-cli/package.json @@ -1,6 +1,6 @@ { "name": "@adobe-fixed-uxp/uxp-devtools-cli", - "version": "1.5.8", + "version": "1.5.9", "description": "Command line interface for rapid UXP plugin development", "main": "src/uxp.js", "scripts": { @@ -24,7 +24,7 @@ "author": "Adobe Inc", "license": "Apache-2.0", "dependencies": { - "@adobe-fixed-uxp/uxp-devtools-core": "^1.5.0", + "@adobe-fixed-uxp/uxp-devtools-core": "^1.5.1", "@adobe-fixed-uxp/uxp-wdio-automation-template": "^1.0.0", "@adobe/uxp-template-default-starter": "^1.0.0", "@adobe/uxp-template-default-starter-ps": "^1.0.0", @@ -42,5 +42,8 @@ }, "devDependencies": { "@adobe-fixed-uxp/uxp-inspect-frontend": "^1.5.1" + }, + "optionalDependencies": { + "@adobe-fixed-uxp/uxp-inspect-frontend": "^1.5.1" } } diff --git a/packages/uxp-devtools-core/package.json b/packages/uxp-devtools-core/package.json index 082caeb..8bfca04 100644 --- a/packages/uxp-devtools-core/package.json +++ b/packages/uxp-devtools-core/package.json @@ -1,6 +1,6 @@ { "name": "@adobe-fixed-uxp/uxp-devtools-core", - "version": "1.5.0", + "version": "1.5.1", "description": "UXP Devtools Core Module", "main": "src/index.js", "scripts": { @@ -21,7 +21,7 @@ "author": "Adobe Inc", "license": "Apache-2.0", "dependencies": { - "@adobe-fixed-uxp/uxp-devtools-helper": "^1.5.0", + "@adobe-fixed-uxp/uxp-devtools-helper": "^1.5.1", "chalk": "^3.0.0", "chokidar": "^3.4.2", "express": "^4.17.1", diff --git a/packages/uxp-devtools-helper/package.json b/packages/uxp-devtools-helper/package.json index a1cd7d1..22bae12 100644 --- a/packages/uxp-devtools-helper/package.json +++ b/packages/uxp-devtools-helper/package.json @@ -1,11 +1,8 @@ { "name": "@adobe-fixed-uxp/uxp-devtools-helper", - "version": "1.5.0", + "version": "1.5.1", "description": "Adobe Devtools helper package used by uxp cli", "main": "src/DevToolsHelper.js", - "scripts": { - "install": "node scripts/devtools_setup.js" - }, "repository": { "type": "git", "url": "git@github.com:adobe-uxp/devtools-cli.git", diff --git a/packages/uxp-devtools-helper/src/DevToolsHelper.js b/packages/uxp-devtools-helper/src/DevToolsHelper.js index b6041a4..c55efe8 100644 --- a/packages/uxp-devtools-helper/src/DevToolsHelper.js +++ b/packages/uxp-devtools-helper/src/DevToolsHelper.js @@ -114,6 +114,7 @@ class DevToolsHelper { prom.resolve(payload.port); } catch (err) { + console.error(err) prom.reject(new Error(errorMsg)); } prom.handled = true;