From d6ba5d193fd8dbeefc58ba3a7d0282d4936cff78 Mon Sep 17 00:00:00 2001 From: calebboyd Date: Sun, 26 Apr 2020 09:08:25 -0500 Subject: [PATCH] fix: update resolve-dependencies --- package-lock.json | 691 ++++++++++++++++++++------------ package.json | 34 +- src/compiler.ts | 14 +- src/fs/bundle.ts | 2 +- src/fs/patch.ts | 38 +- src/logger.ts | 6 +- src/options.ts | 27 +- src/patches/boot-nexe.ts | 12 +- src/patches/disable-node-cli.ts | 2 +- src/patches/gyp.ts | 4 +- src/patches/node-rc.ts | 4 +- src/patches/snapshot.ts | 2 +- src/patches/third-party-main.ts | 2 +- src/releases.ts | 13 +- src/steps/artifacts.ts | 24 +- src/steps/bundle.ts | 8 +- src/steps/download.ts | 4 +- src/steps/resource.ts | 4 +- src/steps/shim.ts | 2 +- src/target.ts | 6 +- src/util.ts | 10 +- tasks/build.ts | 24 +- tasks/docker.ts | 17 +- 23 files changed, 563 insertions(+), 387 deletions(-) diff --git a/package-lock.json b/package-lock.json index 73f7bed..9d28396 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,36 @@ "requires": true, "dependencies": { "@babel/code-frame": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", - "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "dev": true, "requires": { - "@babel/highlight": "^7.0.0" + "@babel/highlight": "^7.8.3" } }, + "@babel/helper-validator-identifier": { + "version": "7.9.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz", + "integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==", + "dev": true + }, "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz", + "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==", "dev": true, "requires": { + "@babel/helper-validator-identifier": "^7.9.0", "chalk": "^2.0.0", - "esutils": "^2.0.2", "js-tokens": "^4.0.0" } }, + "@calebboyd/async": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@calebboyd/async/-/async-1.4.0.tgz", + "integrity": "sha512-Q5tSWP28OF1nGd9KD6qspJselIfrHqk5+1gLGNNuQiUy80LE4g4ZAb+r+P8MYe1/FS5ICbm+OXiIalC7xhde3A==" + }, "@calebboyd/semaphore": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/@calebboyd/semaphore/-/semaphore-1.3.1.tgz", @@ -66,9 +77,9 @@ } }, "@types/chai": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.3.tgz", - "integrity": "sha512-VRw2xEGbll3ZiTQ4J02/hUjNqZoue1bMhoo2dgM2LXjDdyaq4q80HgBDHwpI0/VKlo4Eg+BavyQMv/NYgTetzA==", + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.2.11.tgz", + "integrity": "sha512-t7uW6eFafjO+qJ3BIV2gGUyZs27egcNRkUdalkud+Qa3+kg//f129iuOFivHDXQ+vnU3fDXuwgv0cqMCbcE8sw==", "dev": true }, "@types/decompress": { @@ -117,9 +128,9 @@ } }, "@types/glob": { - "version": "5.0.35", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-5.0.35.tgz", - "integrity": "sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", "dev": true, "requires": { "@types/events": "*", @@ -137,9 +148,9 @@ } }, "@types/got": { - "version": "9.6.7", - "resolved": "https://registry.npmjs.org/@types/got/-/got-9.6.7.tgz", - "integrity": "sha512-LMc2ja42bQorKpBxf38ZBPdT3FhYL0lyAqnZBo5vAPCtobYa8AiHwSLH5zDvR19r2Pr5Ojar3hT/QLLb2SoPYA==", + "version": "9.6.10", + "resolved": "https://registry.npmjs.org/@types/got/-/got-9.6.10.tgz", + "integrity": "sha512-owBY1cgHUIXjObzY+vs+J9Cpw0czvfksJX+qEkgxRojFutFq7n1tKoj6Ekg57DhvXMk0vGQ7FbinvS9I/1wxcg==", "dev": true, "requires": { "@types/node": "*", @@ -159,18 +170,18 @@ "dev": true }, "@types/mkdirp": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz", - "integrity": "sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-1.0.0.tgz", + "integrity": "sha512-ONFY9//bCEr3DWKON3iDv/Q8LXnhaYYaNDeFSN0AtO5o4sLf9F0pstJKKKjQhXE0kJEeHs8eR6SAsROhhc2Csw==", "dev": true, "requires": { "@types/node": "*" } }, "@types/mocha": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz", - "integrity": "sha512-NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz", + "integrity": "sha512-ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w==", "dev": true }, "@types/multistream": { @@ -203,9 +214,9 @@ "dev": true }, "@types/rimraf": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-2.0.2.tgz", - "integrity": "sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/rimraf/-/rimraf-3.0.0.tgz", + "integrity": "sha512-7WhJ0MdpFgYQPXlF4Dx+DhgvlPCfz/x5mHaeDQAKhcenvQP1KCpLQ18JklAqeGMYSAT2PxLpzd0g2/HE7fj7hQ==", "dev": true, "requires": { "@types/glob": "*", @@ -213,15 +224,18 @@ } }, "@types/semver": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.2.tgz", - "integrity": "sha512-G1Ggy7/9Nsa1Jt2yiBR2riEuyK2DFNnqow6R7cromXPMNynackRY1vqFTLz/gwnef1LHokbXThcPhqMRjUbkpQ==", - "dev": true + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.1.0.tgz", + "integrity": "sha512-pOKLaubrAEMUItGNpgwl0HMFPrSAFic8oSVIvfu1UwcgGNmNyK9gyhBHKmBnUTwwVvpZfkzUC0GaMgnL6P86uA==", + "dev": true, + "requires": { + "@types/node": "*" + } }, "@types/tough-cookie": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.5.tgz", - "integrity": "sha512-SCcK7mvGi3+ZNz833RRjFIxrn4gI1PPR3NtuIS+6vMkvmsGjosqTJwRt5bAEFLRz+wtJMWv8+uOnZf2hi2QXTg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==", "dev": true }, "ansi-colors": { @@ -243,10 +257,20 @@ "color-convert": "^1.9.0" } }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, "app-builder": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/app-builder/-/app-builder-5.2.0.tgz", - "integrity": "sha512-RRj/vu8WhmMM71G9BxMLRvcwpr1QUJZ9NXURGGo1v3fPiauzkQfNi31kM7irRNqR87NV+lJ/qI62iTzcAc+V0Q==" + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/app-builder/-/app-builder-6.2.2.tgz", + "integrity": "sha512-s6EXBTusX8D6mBCcW5kS/h+MgF/ykLQPtQK+8oNeIUCjRvSm9HqytSVhE5igyKCNcIdus7sW3T2mtMe7YbPvug==" }, "archive-type": { "version": "4.0.0", @@ -264,9 +288,9 @@ } }, "arg": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.1.tgz", - "integrity": "sha512-SlmP3fEA88MBv0PypnXZ8ZfJhwmDeIE3SP71j37AiXQBXYosPV0x6uISAaHYSlSVhmHOVkomen0tbGk6Anlebw==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", + "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", "dev": true }, "argparse": { @@ -301,9 +325,15 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base64-js": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz", - "integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg=" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + }, + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true }, "bl": { "version": "1.2.2", @@ -338,13 +368,12 @@ "dev": true }, "buffer": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz", - "integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz", + "integrity": "sha512-/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==", "requires": { - "base64-js": "0.0.8", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" } }, "buffer-alloc": { @@ -456,6 +485,33 @@ "resolved": "https://registry.npmjs.org/cherow/-/cherow-1.6.9.tgz", "integrity": "sha512-pmmkpIQRcnDA7EawKcg9+ncSZNTYfXqDx+K3oqqYvpZlqVBChjTomTfw+hePnkqYR3Y013818c0R1Q5P/7PGrQ==" }, + "chokidar": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz", + "integrity": "sha512-dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.1", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.2.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } + }, "cli-cursor": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", @@ -529,9 +585,9 @@ } }, "commander": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.1.tgz", - "integrity": "sha512-cCuLsMhJeWQ/ZpsFTbE765kvVfoeSddc4nU3up4fV+fDBcfUXnbITJ+JzhkdjzOqhURjZgujxaioam4RM9yGUg==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "concat-map": { @@ -559,9 +615,9 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cross-spawn": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz", - "integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", "dev": true, "requires": { "path-key": "^3.1.0", @@ -590,9 +646,9 @@ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=" }, "decompress": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.0.tgz", - "integrity": "sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-4.2.1.tgz", + "integrity": "sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ==", "requires": { "decompress-tar": "^4.0.0", "decompress-tarbz2": "^4.0.0", @@ -825,12 +881,12 @@ } }, "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz", + "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==", "requires": { "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", + "memory-fs": "^0.5.0", "tapable": "^1.0.0" } }, @@ -843,27 +899,28 @@ } }, "es-abstract": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.15.0.tgz", - "integrity": "sha512-bhkEqWJ2t2lMeaJDuk7okMkJWI/yqgH/EoGwpcvv0XW9RWQsRspI4wt6xuyuvMvvQE3gg/D9HXppgk21w78GyQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", + "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "has": "^1.0.3", - "has-symbols": "^1.0.0", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-inspect": "^1.6.0", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", "object-keys": "^1.1.1", - "string.prototype.trimleft": "^2.1.0", - "string.prototype.trimright": "^2.1.0" + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" } }, "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, "requires": { "is-callable": "^1.1.4", @@ -892,25 +949,19 @@ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, "execa": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz", - "integrity": "sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz", + "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", "dev": true, "requires": { "cross-spawn": "^7.0.0", "get-stream": "^5.0.0", + "human-signals": "^1.1.1", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^3.0.0", + "npm-run-path": "^4.0.0", "onetime": "^5.1.0", - "p-finally": "^2.0.0", "signal-exit": "^3.0.2", "strip-final-newline": "^2.0.0" }, @@ -944,12 +995,6 @@ "requires": { "mimic-fn": "^2.1.0" } - }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==", - "dev": true } } }, @@ -1081,6 +1126,13 @@ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, + "fsevents": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", + "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -1258,9 +1310,9 @@ "integrity": "sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==" }, "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, "has-to-string-tag-x": { @@ -1282,10 +1334,16 @@ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==" }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==", + "dev": true + }, "ieee754": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", - "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==" + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "ignore": { "version": "5.1.2", @@ -1320,6 +1378,15 @@ "p-is-promise": "^1.1.0" } }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, "is-buffer": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", @@ -1327,15 +1394,15 @@ "dev": true }, "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", "dev": true }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", "dev": true }, "is-extglob": { @@ -1378,12 +1445,12 @@ "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", "dev": true, "requires": { - "has": "^1.0.1" + "has": "^1.0.3" } }, "is-retry-allowed": { @@ -1397,12 +1464,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" } }, "isarray": { @@ -1452,11 +1519,6 @@ "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=" }, - "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=" - }, "keyv": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.0.0.tgz", @@ -1516,15 +1578,15 @@ } }, "make-error": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.5.tgz", - "integrity": "sha512-c3sIjNUow0+8swNwVpqoH4YCShKNFkMaw6oH1mNS2haDZQqkeZFlHS3dhoeEbKKmJB4vXpJucU6oH75aDYeE9g==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", + "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", "dev": true }, "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz", + "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==", "requires": { "errno": "^0.1.3", "readable-stream": "^2.0.1" @@ -1542,9 +1604,9 @@ "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==" }, "meriyah": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/meriyah/-/meriyah-1.5.0.tgz", - "integrity": "sha512-jc1FKVJJDJWvOJQ3bclNbj3/EQvLuZdSMChT2qfLf0myUkAzX8TTcrNDRX7vgKG3YAvMaMSa8MTJ+r5/9CI0uA==" + "version": "1.9.12", + "resolved": "https://registry.npmjs.org/meriyah/-/meriyah-1.9.12.tgz", + "integrity": "sha512-EgnwghBfzhegstEg3GL17cyjXs/YZOzDGW4mDpiv+v4ZqZgfjNvjfjsAJ99IJMA3LyGvdC8nffZJRGX65FOqLQ==" }, "micromatch": { "version": "4.0.2", @@ -1561,18 +1623,18 @@ "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg==" }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.27", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz", + "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==", "dev": true, "requires": { - "mime-db": "1.40.0" + "mime-db": "1.44.0" }, "dependencies": { "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", + "version": "1.44.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz", + "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg==", "dev": true } } @@ -1596,33 +1658,24 @@ } }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - }, - "dependencies": { - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" - } - } + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" }, "mocha": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.1.tgz", - "integrity": "sha512-VCcWkLHwk79NYQc8cxhkmI8IigTIhsCwZ6RTxQsqK6go4UvEhzJkYuHm8B2YtlSxcYq2fY+ucr4JBwoD6ci80A==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz", + "integrity": "sha512-3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA==", "dev": true, "requires": { "ansi-colors": "3.2.3", "browser-stdout": "1.3.1", + "chokidar": "3.3.0", "debug": "3.2.6", "diff": "3.5.0", "escape-string-regexp": "1.0.5", @@ -1631,21 +1684,39 @@ "growl": "1.10.5", "he": "1.2.0", "js-yaml": "3.13.1", - "log-symbols": "2.2.0", + "log-symbols": "3.0.0", "minimatch": "3.0.4", - "mkdirp": "0.5.1", + "mkdirp": "0.5.3", "ms": "2.1.1", - "node-environment-flags": "1.0.5", + "node-environment-flags": "1.0.6", "object.assign": "4.1.0", "strip-json-comments": "2.0.1", "supports-color": "6.0.0", "which": "1.3.1", "wide-align": "1.1.3", - "yargs": "13.3.0", - "yargs-parser": "13.1.1", + "yargs": "13.3.2", + "yargs-parser": "13.1.2", "yargs-unparser": "1.6.0" }, "dependencies": { + "log-symbols": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "dev": true, + "requires": { + "chalk": "^2.4.2" + } + }, + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "supports-color": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz", @@ -1693,15 +1764,21 @@ } }, "node-environment-flags": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz", - "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz", + "integrity": "sha512-5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==", "dev": true, "requires": { "object.getownpropertydescriptors": "^2.0.3", "semver": "^5.7.0" } }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, "normalize-url": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-2.0.1.tgz", @@ -1739,9 +1816,9 @@ } }, "npm-run-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-3.1.0.tgz", - "integrity": "sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", "dev": true, "requires": { "path-key": "^3.0.0" @@ -1753,9 +1830,9 @@ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-inspect": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.6.0.tgz", - "integrity": "sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", "dev": true }, "object-keys": { @@ -1777,13 +1854,13 @@ } }, "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "once": { @@ -1839,9 +1916,9 @@ "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=" }, "p-limit": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz", - "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==", + "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" @@ -1882,9 +1959,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.0.tgz", - "integrity": "sha512-8cChqz0RP6SHJkMt48FW0A7+qUOn+OsnOsVtzI59tZ8m+5bCSk7hzwET0pulwOM2YMn9J1efb07KB9l9f30SGg==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { @@ -1938,9 +2015,9 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=" }, "prettier": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz", - "integrity": "sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz", + "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==", "dev": true }, "process-nextick-args": { @@ -1991,6 +2068,15 @@ "util-deprecate": "~1.0.1" } }, + "readdirp": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz", + "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==", + "dev": true, + "requires": { + "picomatch": "^2.0.4" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -2004,25 +2090,97 @@ "dev": true }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz", + "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==", "dev": true, "requires": { "path-parse": "^1.0.6" } }, "resolve-dependencies": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-3.0.2.tgz", - "integrity": "sha512-PLSfcI29OFmkU23PU8lKhNhe5IL/LwDHJL50o34OeOg/sJaog/hOH3aPzLXBwSZCOqtACdHUQUOQTdLZeyiSlg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-dependencies/-/resolve-dependencies-4.0.0.tgz", + "integrity": "sha512-M5d5+5HSsei7JB9fLMcVh4F3Gn1xwYbo4W+pWNFUpDpd1+foJ7ruLpEy3VzG4O6dmkOrL7blTfoy15hJyGQXOw==", "requires": { - "@calebboyd/semaphore": "^1.3.1", - "enhanced-resolve": "^4.1.0", - "globby": "^10.0.1", - "json-stringify-safe": "^5.0.1", - "meriyah": "^1.5.0", - "pify": "^4.0.1" + "@calebboyd/async": "^1.4.0", + "enhanced-resolve": "^4.1.1", + "globby": "^11.0.0", + "meriyah": "^1.9.12" + }, + "dependencies": { + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==" + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } + }, + "fast-glob": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.2.tgz", + "integrity": "sha512-UDV82o4uQyljznxwMxyVRJgZZt3O5wENYojjzbaGEGZgeOxkLFf+V4cnUD+krzb2F72E18RhamkMZ7AdeggF7A==", + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, + "glob-parent": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", + "integrity": "sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==", + "requires": { + "is-glob": "^4.0.1" + } + }, + "globby": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz", + "integrity": "sha512-iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg==", + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + } + }, + "ignore": { + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.4.tgz", + "integrity": "sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==" + }, + "merge2": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.3.0.tgz", + "integrity": "sha512-2j4DAdlBOkiSZIsaXk4mTE3sRS02yBHAtfy127xRV3bQUFqXkjHCHLW6Scv7DwNRbIWNHH8zpnz9zMaKXIdvYw==" + }, + "picomatch": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + } } }, "responselike": { @@ -2143,9 +2301,9 @@ "dev": true }, "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -2190,24 +2348,46 @@ } } }, - "string.prototype.trimleft": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", - "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==", + "string.prototype.trimend": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz", + "integrity": "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5" + } + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz", - "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + }, + "string.prototype.trimstart": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz", + "integrity": "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" } }, "string_decoder": { @@ -2268,16 +2448,16 @@ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==" }, "tar-stream": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.1.tgz", - "integrity": "sha512-IFLM5wp3QrJODQFPm6/to3LJZrONdBY/otxcvDIQzu217zKye6yVR3hhi9lAjrC2Z+m/j5oDxMPb1qcd8cIvpA==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz", + "integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==", "requires": { "bl": "^1.0.0", - "buffer-alloc": "^1.1.0", + "buffer-alloc": "^1.2.0", "end-of-stream": "^1.0.0", "fs-constants": "^1.0.0", "readable-stream": "^2.3.0", - "to-buffer": "^1.1.0", + "to-buffer": "^1.1.1", "xtend": "^4.0.0" } }, @@ -2318,36 +2498,36 @@ } }, "ts-node": { - "version": "8.4.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz", - "integrity": "sha512-5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw==", + "version": "8.9.0", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz", + "integrity": "sha512-rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w==", "dev": true, "requires": { "arg": "^4.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.6", - "yn": "^3.0.0" + "source-map-support": "^0.5.17", + "yn": "3.1.1" }, "dependencies": { "diff": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true } } }, "tslib": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", - "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz", + "integrity": "sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA==", "dev": true }, "tslint": { - "version": "5.20.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz", - "integrity": "sha512-2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g==", + "version": "6.1.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.1.tgz", + "integrity": "sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -2358,18 +2538,27 @@ "glob": "^7.1.1", "js-yaml": "^3.13.1", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", + "mkdirp": "^0.5.3", "resolve": "^1.3.2", "semver": "^5.3.0", - "tslib": "^1.8.0", + "tslib": "^1.10.0", "tsutils": "^2.29.0" }, "dependencies": { "diff": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz", - "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", + "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true + }, + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } } } }, @@ -2380,9 +2569,9 @@ "dev": true }, "tslint-plugin-prettier": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.0.1.tgz", - "integrity": "sha512-4FX9JIx/1rKHIPJNfMb+ooX1gPk5Vg3vNi7+dyFYpLO+O57F4g+b/fo1+W/G0SUOkBLHB/YKScxjX/P+7ZT/Tw==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslint-plugin-prettier/-/tslint-plugin-prettier-2.3.0.tgz", + "integrity": "sha512-F9e4K03yc9xuvv+A0v1EmjcnDwpz8SpCD8HzqSDe0eyg34cBinwn9JjmnnRrNAs4HdleRQj7qijp+P/JTxt4vA==", "dev": true, "requires": { "eslint-plugin-prettier": "^2.2.0", @@ -2414,18 +2603,18 @@ "dev": true }, "typescript": { - "version": "3.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.6.3.tgz", - "integrity": "sha512-N7bceJL1CtRQ2RiG0AQME13ksR7DiuQh/QehubYcghzv20tnh+MQnQIuJddTmsbqYj+dztchykemz0zFzlvdQw==", + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz", + "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==", "dev": true }, "unbzip2-stream": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz", - "integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz", + "integrity": "sha512-pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg==", "requires": { - "buffer": "^3.0.1", - "through": "^2.3.6" + "buffer": "^5.2.1", + "through": "^2.3.8" } }, "url-parse-lax": { @@ -2455,9 +2644,9 @@ } }, "which": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.1.tgz", - "integrity": "sha512-N7GBZOTswtB9lkQBZA4+zAXrjEIWAUOB93AvzUiudRzRxhUdLURQ7D/gAIMY1gatT/LTbmbcv8SiYazy3eYB7w==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "requires": { "isexe": "^2.0.0" @@ -2508,9 +2697,9 @@ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", + "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==" }, "y18n": { "version": "4.0.0", @@ -2519,9 +2708,9 @@ "dev": true }, "yargs": { - "version": "13.3.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz", - "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==", + "version": "13.3.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz", + "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==", "dev": true, "requires": { "cliui": "^5.0.0", @@ -2533,7 +2722,7 @@ "string-width": "^3.0.0", "which-module": "^2.0.0", "y18n": "^4.0.0", - "yargs-parser": "^13.1.1" + "yargs-parser": "^13.1.2" }, "dependencies": { "string-width": { @@ -2550,9 +2739,9 @@ } }, "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", + "version": "13.1.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz", + "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==", "dev": true, "requires": { "camelcase": "^5.0.0", diff --git a/package.json b/package.json index 84def3f..f42582d 100644 --- a/package.json +++ b/package.json @@ -34,43 +34,43 @@ }, "dependencies": { "@calebboyd/semaphore": "^1.3.1", - "app-builder": "^5.2.0", + "app-builder": "^6.2.2", "caw": "^2.0.1", "chalk": "^2.4.2", "cherow": "1.6.9", "download": "^7.1.0", "globby": "^10.0.1", "got": "^9.6.0", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", + "minimist": "^1.2.5", + "mkdirp": "^1.0.4", "multistream": "^4.0.0", "ora": "^3.4.0", "pify": "^4.0.1", - "resolve-dependencies": "^3.0.2", + "resolve-dependencies": "^4.0.0", "rimraf": "^3.0.0" }, "devDependencies": { - "@types/chai": "^4.2.3", + "@types/chai": "^4.2.11", "@types/download": "^6.2.4", "@types/execa": "^2.0.0", "@types/globby": "^9.1.0", - "@types/got": "^9.6.7", + "@types/got": "^9.6.10", "@types/minimist": "^1.2.0", - "@types/mkdirp": "^0.5.2", - "@types/mocha": "^5.2.7", + "@types/mkdirp": "^1.0.0", + "@types/mocha": "^7.0.2", "@types/multistream": "^2.1.1", "@types/ora": "^3.2.0", "@types/pify": "3.0.2", - "@types/rimraf": "2.0.2", - "@types/semver": "^6.0.2", + "@types/rimraf": "3.0.0", + "@types/semver": "^7.1.0", "chai": "^4.2.0", - "execa": "^2.1.0", - "mocha": "^6.2.1", - "prettier": "^1.18.2", - "ts-node": "^8.4.1", - "tslint": "^5.20.0", + "execa": "^4.0.0", + "mocha": "^7.1.1", + "prettier": "^2.0.5", + "ts-node": "^8.9.0", + "tslint": "^6.1.1", "tslint-config-prettier": "^1.18.0", - "tslint-plugin-prettier": "^2.0.1", - "typescript": "^3.6.3" + "tslint-plugin-prettier": "^2.3.0", + "typescript": "^3.8.3" } } diff --git a/src/compiler.ts b/src/compiler.ts index 599d78c..332ca52 100644 --- a/src/compiler.ts +++ b/src/compiler.ts @@ -11,7 +11,7 @@ import { dequote, isWindows, bound, - semverGt + semverGt, } from './util' import { NexeOptions, version } from './options' import { NexeTarget } from './target' @@ -151,16 +151,16 @@ export class NexeCompiler { @bound async readFileAsync(file: string) { this.assertBuild() - let cachedFile = this.files.find(x => normalize(x.filename) === normalize(file)) + let cachedFile = this.files.find((x) => normalize(x.filename) === normalize(file)) if (!cachedFile) { const absPath = join(this.src, file) cachedFile = { absPath, filename: file, - contents: await readFileAsync(absPath, 'utf-8').catch(x => { + contents: await readFileAsync(absPath, 'utf-8').catch((x) => { if (x.code === 'ENOENT') return '' throw x - }) + }), } this.files.push(cachedFile) } @@ -215,7 +215,7 @@ export class NexeCompiler { spawn(command, args, { cwd: this.src, env: this.env, - stdio: this.log.verbose ? 'inherit' : 'ignore' + stdio: this.log.verbose ? 'inherit' : 'ignore', }) .once('error', (e: Error) => { if (this.log.verbose) { @@ -242,7 +242,7 @@ export class NexeCompiler { } return this._runBuildCommandAsync(this.env.PYTHON || 'python', [ this.configureScript, - ...this.options.configure + ...this.options.configure, ]) } @@ -313,7 +313,7 @@ export class NexeCompiler { binary, toStream(startup), this.bundle.toStream(), - toStream(Buffer.concat([Buffer.from(''), lengths])) + toStream(Buffer.concat([Buffer.from(''), lengths])), ]) } } diff --git a/src/fs/bundle.ts b/src/fs/bundle.ts index 89b88a9..0f87869 100644 --- a/src/fs/bundle.ts +++ b/src/fs/bundle.ts @@ -18,7 +18,7 @@ export function toStream(content: Buffer | string) { read() { this.push(content) this.push(null) - } + }, }) return readable } diff --git a/src/fs/patch.ts b/src/fs/patch.ts index be8d2a5..ee4b75d 100644 --- a/src/fs/patch.ts +++ b/src/fs/patch.ts @@ -34,7 +34,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { isString = (x: any): x is string => typeof x === 'string' || x instanceof String, noop = () => {}, path = require('path'), - winPath: (key: string) => string = isWin ? upcaseDriveLetter : s => s, + winPath: (key: string) => string = isWin ? upcaseDriveLetter : (s) => s, baseDir = winPath(path.dirname(process.execPath)) let log = (_: string) => true @@ -63,7 +63,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { return winPath(key) } - const statTime = function() { + const statTime = function () { return { dev: 0, ino: 0, @@ -80,7 +80,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { ctime: new Date(stat.ctime), ctimMs: stat.ctime.getTime(), birthtime: new Date(stat.birthtime), - birthtimeMs: stat.birthtime.getTime() + birthtimeMs: stat.birthtime.getTime(), } } @@ -89,7 +89,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { BigInt = eval('BigInt') } catch (ignored) {} - const createStat = function(extensions: any, options: any) { + const createStat = function (extensions: any, options: any) { const stat = Object.assign(new fs.Stats(), binary.layout.stat, statTime(), extensions) if (options && options.bigint && BigInt) { for (const k in stat) { @@ -101,7 +101,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { return stat } - const ownStat = function(filepath: any, options: any) { + const ownStat = function (filepath: any, options: any) { setupManifest() const key = getKey(filepath) if (directories[key]) { @@ -124,7 +124,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { } let setupManifest = () => { - Object.keys(manifest).forEach(filepath => { + Object.keys(manifest).forEach((filepath) => { const entry = manifest[filepath] const absolutePath = getKey(filepath) const longPath = makeLong(absolutePath) @@ -218,19 +218,19 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { const encoding = fileOpts(options).encoding callback = typeof options === 'function' ? options : callback - originalFsMethods.open(blobPath, 'r', function(err: Error, fd: number) { + originalFsMethods.open(blobPath, 'r', function (err: Error, fd: number) { if (err) return callback(err, null) - originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function( + originalFsMethods.read(fd, Buffer.alloc(length), 0, length, resourceOffset, function ( error: Error, bytesRead: number, result: Buffer ) { if (error) { - return originalFsMethods.close(fd, function() { + return originalFsMethods.close(fd, function () { callback(error, null) }) } - originalFsMethods.close(fd, function(err: Error) { + originalFsMethods.close(fd, function (err: Error) { if (err) { return callback(err, result) } @@ -253,7 +253,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { blobPath, Object.assign({}, opts, { start: resourceOffset, - end: resourceOffset + length - 1 + end: resourceOffset + length - 1, }) ) }, @@ -294,11 +294,11 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { } else { return originalFsMethods.stat.apply(fs, arguments) } - } + }, } if (typeof fs.exists === 'function') { - nfs.exists = function(filepath: string, cb: Function) { + nfs.exists = function (filepath: string, cb: Function) { cb = cb || noop const exists = nfs.existsSync(filepath) process.nextTick(() => cb(exists)) @@ -307,7 +307,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { const patches = (process as any).nexe.patches || {} delete (process as any).nexe - patches.internalModuleReadFile = function(this: any, original: any, ...args: any[]) { + patches.internalModuleReadFile = function (this: any, original: any, ...args: any[]) { setupManifest() const filepath = getKey(args[0]) if (manifest[filepath]) { @@ -318,7 +318,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { return original.call(this, ...args) } patches.internalModuleReadJSON = patches.internalModuleReadFile - patches.internalModuleStat = function(this: any, original: any, ...args: any[]) { + patches.internalModuleStat = function (this: any, original: any, ...args: any[]) { setupManifest() const filepath = getKey(args[0]) if (manifest[filepath]) { @@ -341,7 +341,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { } if (typeof fs.exists === 'function') { - nfs.exists = function(filepath: string, cb: Function) { + nfs.exists = function (filepath: string, cb: Function) { cb = cb || noop const exists = nfs.existsSync(filepath) if (!exists) { @@ -352,7 +352,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { } if (typeof fs.copyFile === 'function') { - nfs.copyFile = function(filepath: string, dest: string, flags: number, callback: Function) { + nfs.copyFile = function (filepath: string, dest: string, flags: number, callback: Function) { setupManifest() const entry = manifest[getKey(filepath)] if (!entry) { @@ -374,7 +374,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { }) }) } - nfs.copyFileSync = function(filepath: string, dest: string) { + nfs.copyFileSync = function (filepath: string, dest: string) { setupManifest() const entry = manifest[getKey(filepath)] if (!entry) { @@ -387,7 +387,7 @@ function shimFs(binary: NexeBinary, fs: any = require('fs')) { Object.assign(fs, nfs) lazyRestoreFs = () => { - Object.keys(nfs).forEach(key => { + Object.keys(nfs).forEach((key) => { fs[key] = originalFsMethods[key] }) lazyRestoreFs = () => {} diff --git a/src/logger.ts b/src/logger.ts index 45ff0ff..f97bbfd 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -24,7 +24,7 @@ export class Logger { this.ora = ora({ text: 'Starting...', color: 'blue', - spinner: 'dots' + spinner: 'dots', }) this.ora.stop() } @@ -35,7 +35,7 @@ export class Logger { flush() { !this.silent && this.ora.succeed() - return new Promise(resolve => setTimeout(resolve, frameLength)) + return new Promise((resolve) => setTimeout(resolve, frameLength)) } _write(update: string, color = 'green') { @@ -66,7 +66,7 @@ export class Logger { modify: this.modify, log: this.verbose ? this.write : this.modify, pause: () => this.ora.stopAndPersist(), - resume: () => this.ora.start() + resume: () => this.ora.start(), } as LogStep } } diff --git a/src/options.ts b/src/options.ts index d240b1d..8b1393a 100644 --- a/src/options.ts +++ b/src/options.ts @@ -70,7 +70,7 @@ const defaults = { build: false, bundle: true, patches: [], - plugins: [] + plugins: [], } const alias = { i: 'input', @@ -88,7 +88,7 @@ const alias = { h: 'help', l: 'loglevel', 'fake-argv': 'fakeArgv', - 'gh-token': 'ghToken' + 'gh-token': 'ghToken', } const argv = parseArgv(process.argv, { alias, default: { ...defaults } }) let help = ` @@ -133,7 +133,7 @@ ${c.bold('nexe [options]')} help = EOL + help + EOL function flatten(...args: any[]): string[] { - return ([] as string[]).concat(...args).filter(x => x) + return ([] as string[]).concat(...args).filter((x) => x) } /** @@ -144,16 +144,13 @@ function flatten(...args: any[]): string[] { */ function extractCliMap(match: RegExp, options: any) { return Object.keys(options) - .filter(x => match.test(x)) - .reduce( - (map: any, option: any) => { - const key = option.split('-')[1] - map[key] = options[option] - delete options[option] - return map - }, - {} as any - ) + .filter((x) => match.test(x)) + .reduce((map: any, option: any) => { + const key = option.split('-')[1] + map[key] = options[option] + delete options[option] + return map + }, {} as any) } function extractLogLevel(options: NexeOptions) { @@ -292,8 +289,8 @@ function normalizeOptions(input?: Partial): NexeOptions { } Object.keys(alias) - .filter(k => k !== 'rc') - .forEach(x => delete opts[x]) + .filter((k) => k !== 'rc') + .forEach((x) => delete opts[x]) return options } diff --git a/src/patches/boot-nexe.ts b/src/patches/boot-nexe.ts index 4dc3d44..06f8f4e 100644 --- a/src/patches/boot-nexe.ts +++ b/src/patches/boot-nexe.ts @@ -20,13 +20,13 @@ const footer = tailWindow.slice(footerPosition, footerPosition + 32), Object.defineProperty( process, '__nexe', - (function() { + (function () { let nexeHeader: any = null return { - get: function() { + get: function () { return nexeHeader }, - set: function(value: any) { + set: function (value: any) { if (nexeHeader) { throw new Error('This property is readonly') } @@ -37,13 +37,13 @@ Object.defineProperty( contentSize, contentStart, resourceSize, - resourceStart - } + resourceStart, + }, }) Object.freeze(nexeHeader) }, enumerable: false, - configurable: false + configurable: false, } })() ) diff --git a/src/patches/disable-node-cli.ts b/src/patches/disable-node-cli.ts index 02b8a4d..2270990 100644 --- a/src/patches/disable-node-cli.ts +++ b/src/patches/disable-node-cli.ts @@ -21,7 +21,7 @@ export default async function disableNodeCli(compiler: NexeCompiler, next: () => 'int i = v8_argc; i < v8_argc; i++' ) let matches = 0 - await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, match => { + await compiler.replaceInFileAsync('src/node.cc', /v8_argc > 1/g, (match) => { if (matches++) { return 'false' } diff --git a/src/patches/gyp.ts b/src/patches/gyp.ts index 10e1a5f..c050a2a 100644 --- a/src/patches/gyp.ts +++ b/src/patches/gyp.ts @@ -13,8 +13,8 @@ export default async function nodeGyp( ` ${nodeGypMarker} ${files - .filter(x => x.filename.startsWith('lib')) - .map(x => `'${x.filename}'`) + .filter((x) => x.filename.startsWith('lib')) + .map((x) => `'${x.filename}'`) .toString()}, `.trim() ) diff --git a/src/patches/node-rc.ts b/src/patches/node-rc.ts index 4f709d8..53fd177 100644 --- a/src/patches/node-rc.ts +++ b/src/patches/node-rc.ts @@ -8,7 +8,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise const file = await compiler.readFileAsync('src/res/node.rc') - Object.keys(options).forEach(key => { + Object.keys(options).forEach((key) => { let value = options[key] const isVar = /^[A-Z_]+$/.test(value) value = isVar ? value : `"${value}"` @@ -17,7 +17,7 @@ export default async function nodeRc(compiler: NexeCompiler, next: () => Promise `VALUE "${key}", ${value}` ) }) - ;['PRODUCTVERSION', 'FILEVERSION'].forEach(x => { + ;['PRODUCTVERSION', 'FILEVERSION'].forEach((x) => { if (options[x]) { file.contents = file.contents.replace(new RegExp(x + ' .*$', 'm'), `${x} ${options[x]}`) } diff --git a/src/patches/snapshot.ts b/src/patches/snapshot.ts index f74204d..c00d1d7 100644 --- a/src/patches/snapshot.ts +++ b/src/patches/snapshot.ts @@ -2,7 +2,7 @@ import { resolve } from 'path' import { NexeCompiler } from '../compiler' import { semverGt } from '../util' -export default async function(compiler: NexeCompiler, next: () => Promise) { +export default async function (compiler: NexeCompiler, next: () => Promise) { const { snapshot, warmup, cwd } = compiler.options if (!snapshot) { diff --git a/src/patches/third-party-main.ts b/src/patches/third-party-main.ts index a68ee9d..0206c0b 100644 --- a/src/patches/third-party-main.ts +++ b/src/patches/third-party-main.ts @@ -42,7 +42,7 @@ export default async function main(compiler: NexeCompiler, next: () => Promise( 'https://nodejs.org/download/release/index.json' ) - const existingVersions = (await getLatestGitRelease(options)).assets.map(x => getTarget(x.name)) + const existingVersions = (await getLatestGitRelease(options)).assets.map((x) => getTarget(x.name)) const versionMap: { [key: string]: true } = {} return nodeReleases @@ -52,8 +49,8 @@ export async function getUnBuiltReleases(options?: any) { return versions } versionMap[version] = true - platforms.forEach(platform => { - architectures.forEach(arch => { + platforms.forEach((platform) => { + architectures.forEach((arch) => { if (arch === 'x86' && platform === 'mac') return if (arch.includes('arm')) return versions.push(getTarget({ platform, arch, version })) @@ -61,5 +58,5 @@ export async function getUnBuiltReleases(options?: any) { }) return versions }, []) - .filter(x => !existingVersions.some(t => targetsEqual(t, x))) + .filter((x) => !existingVersions.some((t) => targetsEqual(t, x))) } diff --git a/src/steps/artifacts.ts b/src/steps/artifacts.ts index 1eec47d..120e142 100644 --- a/src/steps/artifacts.ts +++ b/src/steps/artifacts.ts @@ -1,29 +1,27 @@ import { join, dirname } from 'path' -import { readdir, unlink } from 'fs' +import { promises } from 'fs' import { readFileAsync, writeFileAsync, isDirectoryAsync } from '../util' -import * as mkdirp from 'mkdirp' +import mkdirpAsync = require('mkdirp') import { NexeCompiler } from '../compiler' -import pify = require('pify') -const mkdirpAsync = pify(mkdirp) -const unlinkAsync = pify(unlink) -const readdirAsync = pify(readdir) +const unlinkAsync = promises.unlink +const readdirAsync = promises.readdir function readDirAsync(dir: string): Promise { - return readdirAsync(dir).then(paths => { + return readdirAsync(dir).then((paths) => { return Promise.all( paths.map((file: string) => { const path = join(dir, file) - return isDirectoryAsync(path).then(x => (x ? readDirAsync(path) : (path as any))) + return isDirectoryAsync(path).then((x) => (x ? readDirAsync(path) : (path as any))) }) - ).then(result => { + ).then((result) => { return [].concat(...(result as any)) }) }) } function maybeReadFileContentsAsync(file: string) { - return readFileAsync(file, 'utf-8').catch(e => { + return readFileAsync(file, 'utf-8').catch((e) => { if (e.code === 'ENOENT') { return '' } @@ -47,16 +45,16 @@ export default async function artifacts(compiler: NexeCompiler, next: () => Prom const tmpFiles = await readDirAsync(temp) await Promise.all( - tmpFiles.map(async path => { + tmpFiles.map(async (path) => { return compiler.writeFileAsync(path.replace(temp, ''), await readFileAsync(path, 'utf-8')) }) ) await next() - await Promise.all(tmpFiles.map(x => unlinkAsync(x))) + await Promise.all(tmpFiles.map((x) => unlinkAsync(x))) return Promise.all( - compiler.files.map(async file => { + compiler.files.map(async (file) => { const sourceFile = join(src, file.filename) const tempFile = join(temp, file.filename) const fileContents = await maybeReadFileContentsAsync(sourceFile) diff --git a/src/steps/bundle.ts b/src/steps/bundle.ts index 48997a2..d7efb78 100644 --- a/src/steps/bundle.ts +++ b/src/steps/bundle.ts @@ -7,7 +7,7 @@ import { Readable } from 'stream' function getStdIn(stdin: Readable): Promise { let out = '' - return new Promise(resolve => { + return new Promise((resolve) => { stdin .setEncoding('utf8') .on('readable', () => { @@ -64,18 +64,18 @@ export default async function bundle(compiler: NexeCompiler, next: any) { const { files, warnings } = await resolveFiles( input, - ...Object.keys(compiler.bundle.index).filter(x => x.endsWith('.js')), + ...Object.keys(compiler.bundle.index).filter((x) => x.endsWith('.js')), { cwd, expand: 'variable', loadContent: false } ) if ( - warnings.filter(x => x.startsWith('Error parsing file') && !x.includes('node_modules')).length + warnings.filter((x) => x.startsWith('Error parsing file') && !x.includes('node_modules')).length ) { throw new NexeError('Parsing Error:\n' + warnings.join('\n')) } await each(Object.keys(files), (filename: string) => compiler.addResource(filename), { - concurrency: 10 + concurrency: 10, }) return next() } diff --git a/src/steps/download.ts b/src/steps/download.ts index 399357f..ebf1f11 100644 --- a/src/steps/download.ts +++ b/src/steps/download.ts @@ -11,7 +11,7 @@ function fetchNodeSourceAsync(dest: string, url: string, step: LogStep, options .on('response', (res: IncomingMessage) => { const total = +res.headers['content-length']! let current = 0 - res.on('data', data => { + res.on('data', (data) => { current += data.length setText((current / total) * 100) if (current === total) { @@ -32,7 +32,7 @@ async function fetchPrebuiltBinary(compiler: NexeCompiler, step: any) { (res: IncomingMessage) => { const total = +res.headers['content-length']! let current = 0 - res.on('data', data => { + res.on('data', (data) => { current += data.length step!.modify(`Downloading...${((current / total) * 100).toFixed()}%`) }) diff --git a/src/steps/resource.ts b/src/steps/resource.ts index 9e2a3aa..7152fd0 100644 --- a/src/steps/resource.ts +++ b/src/steps/resource.ts @@ -12,9 +12,9 @@ export default async function resource(compiler: NexeCompiler, next: () => Promi // workaround for https://github.com/sindresorhus/globby/issues/127 // and https://github.com/mrmlnc/fast-glob#pattern-syntax - const resourcesWithForwardSlashes = resources.map(r => r.replace(/\\/g, '/')) + const resourcesWithForwardSlashes = resources.map((r) => r.replace(/\\/g, '/')) - await each(globs(resourcesWithForwardSlashes, { cwd }), async file => { + await each(globs(resourcesWithForwardSlashes, { cwd }), async (file) => { if (await isDirectoryAsync(file)) { return } diff --git a/src/steps/shim.ts b/src/steps/shim.ts index 6aaac11..a38e6fa 100644 --- a/src/steps/shim.ts +++ b/src/steps/shim.ts @@ -1,7 +1,7 @@ import { NexeCompiler } from '../compiler' import { wrap } from '../util' -export default async function(compiler: NexeCompiler, next: () => Promise) { +export default async function (compiler: NexeCompiler, next: () => Promise) { await next() compiler.shims.push( diff --git a/src/target.ts b/src/target.ts index 8c53d10..3620db7 100644 --- a/src/target.ts +++ b/src/target.ts @@ -21,7 +21,7 @@ const prettyPlatform: { [key: string]: NodePlatform } = { mac: 'mac', linux: 'linux', static: 'alpine', - alpine: 'alpine' + alpine: 'alpine', } const prettyArch: { [key: string]: NodeArch } = { @@ -35,7 +35,7 @@ const prettyArch: { [key: string]: NodeArch } = { amd64: 'x64', ia32: 'x86', x32: 'x86', - x64: 'x64' + x64: 'x64', } function isVersion(x: string) { @@ -80,7 +80,7 @@ export function getTarget(target: string | Partial = ''): NexeTarget target .toLowerCase() .split('-') - .forEach(x => { + .forEach((x) => { if (isVersion(x)) { version = x.replace(/v/g, '') } diff --git a/src/util.ts b/src/util.ts index 9afcd5e..789116d 100644 --- a/src/util.ts +++ b/src/util.ts @@ -42,10 +42,10 @@ const bound: MethodDecorator = function bound( Object.defineProperty(this, propertyKey as string, { configurable, value, - writable: true + writable: true, }) return value - } + }, } } @@ -72,13 +72,13 @@ const isWindows = process.platform === 'win32' function pathExistsAsync(path: string) { return statAsync(path) - .then(x => true) + .then((x) => true) .catch(falseOnEnoent) } function isDirectoryAsync(path: string) { return statAsync(path) - .then(x => x.isDirectory()) + .then((x) => x.isDirectory()) .catch(falseOnEnoent) } /** @@ -109,5 +109,5 @@ export { readFileAsync, pathExistsAsync, isDirectoryAsync, - writeFileAsync + writeFileAsync, } diff --git a/tasks/build.ts b/tasks/build.ts index cea1c9d..4520cb1 100644 --- a/tasks/build.ts +++ b/tasks/build.ts @@ -14,12 +14,12 @@ const env = process.env, isMac = process.platform === 'darwin', headers = { Authorization: 'token ' + env.GITHUB_TOKEN, - 'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)' + 'User-Agent': 'nexe (https://www.npmjs.com/package/nexe)', } if (require.main === module) { if (!isPullRequest) { - build().catch(x => { + build().catch((x) => { console.error(x) process.exit(1) }) @@ -31,10 +31,10 @@ async function build() { if (!releases.length) { return } - const windowsBuild = releases.find(x => x.platform === 'windows'), - macBuild = releases.find(x => x.platform === 'mac'), - linux = releases.find(x => x.platform === 'linux'), - alpine = releases.find(x => x.platform === 'alpine') + const windowsBuild = releases.find((x) => x.platform === 'windows'), + macBuild = releases.find((x) => x.platform === 'mac'), + linux = releases.find((x) => x.platform === 'linux'), + alpine = releases.find((x) => x.platform === 'alpine') let target: NexeTarget | undefined @@ -62,7 +62,7 @@ async function build() { verbose: Boolean(env.NEXE_VERBOSE!), target, make: ['-j' + cpus().length], - output + output, } console.log('Building: ' + target + ' on ' + buildHost) const stop = keepalive() @@ -80,7 +80,7 @@ async function build() { await assertNexeBinary(output) const gitRelease = await getLatestGitRelease({ headers }), unbuiltReleases = await getUnBuiltReleases({ headers }) - if (!unbuiltReleases.some(x => targetsEqual(x, target!))) { + if (!unbuiltReleases.some((x) => targetsEqual(x, target!))) { console.log(`${target} already uploaded.`) process.exit(0) return @@ -90,9 +90,9 @@ async function build() { body: await readFileAsync(output), headers: { ...headers, - 'Content-Type': 'application/octet-stream' - } - }).catch(reason => { + 'Content-Type': 'application/octet-stream', + }, + }).catch((reason) => { console.log(reason && reason.response && reason.response.body) throw reason }) @@ -107,7 +107,7 @@ function keepalive() { } function assertNexeBinary(file: string) { - return execFileAsync(file).catch(e => { + return execFileAsync(file).catch((e) => { if (e && e.stack && e.stack.includes('Invalid Nexe binary')) { return } diff --git a/tasks/docker.ts b/tasks/docker.ts index 2be1780..794bffb 100644 --- a/tasks/docker.ts +++ b/tasks/docker.ts @@ -58,16 +58,11 @@ export async function runDockerBuild(target: NexeTarget) { appendFileSync(outFilename, x.stderr) appendFileSync(outFilename, x.stdout) }) - await got( - `https://transfer.sh/${Math.random() - .toString(36) - .substring(2)}.txt`, - { - body: await readFileAsync(outFilename), - method: 'PUT' - } - ) - .then(x => console.log('Posted docker log: ', x.body)) - .catch(e => console.log('Error posting log', e)) + await got(`https://transfer.sh/${Math.random().toString(36).substring(2)}.txt`, { + body: await readFileAsync(outFilename), + method: 'PUT', + }) + .then((x) => console.log('Posted docker log: ', x.body)) + .catch((e) => console.log('Error posting log', e)) } }