From 86ee00288a9084af6670e25cfd12e6f07143cc0a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 15:33:51 -0600 Subject: [PATCH 01/14] fix: make get-serve-d part of the runtime code --- package.json | 14 ++-- pnpm-lock.yaml | 176 ++++++----------------------------------- scripts/get-serve-d.js | 26 ------ src/get-serve-d.ts | 32 ++++++++ 4 files changed, 61 insertions(+), 187 deletions(-) delete mode 100644 scripts/get-serve-d.js create mode 100644 src/get-serve-d.ts diff --git a/package.json b/package.json index fc7db42..26c17ab 100644 --- a/package.json +++ b/package.json @@ -21,9 +21,9 @@ }, "scripts": { "format": "prettier --write .", - "test.format": "prettier . --check", - "lint": "eslint . --fix", - "test.lint": "eslint .", + "test.format": "prettier . --check", + "lint": "eslint . --fix", + "test.lint": "eslint .", "test": "atom --test spec", "clean": "shx rm -rf dist", "tsc": "tsc -p src/tsconfig.json", @@ -31,7 +31,6 @@ "build": "npm run tsc", "dev": "npm run tsc.dev", "get.grammars": "node ./scripts/get-grammars.js", - "get.serve-d": "node ./scripts/get-serve-d.js", "build-commit": "build-commit -o dist", "prepare": "npm run build" }, @@ -83,14 +82,12 @@ } }, "devDependencies": { - "@terascope/fetch-github-release": "^0.7.4", "@types/atom": "1.40.7", + "@types/decompress": "^4.2.3", "@types/fs-extra": "^9.0.7", "@types/node": "^14.14.31", "build-commit": "0.1.4", "cross-env": "7.0.3", - "decompress": "^4.2.1", - "decompress-tarxz": "^3.0.0", "eslint": "7.20.0", "eslint-config-atomic": "^1.10.2", "gitly": "^2.0.2", @@ -99,7 +96,10 @@ "typescript": "^4.2.2" }, "dependencies": { + "@terascope/fetch-github-release": "^0.7.4", "atom-languageclient": "^1.2.2", + "decompress": "^4.2.1", + "decompress-tarxz": "^3.0.0", "fs-extra": "^9.1.0", "path-exists": "^4.0.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 48f8a28..8fe26ae 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,16 +1,17 @@ dependencies: + '@terascope/fetch-github-release': 0.7.4 atom-languageclient: 1.2.2 + decompress: 4.2.1 + decompress-tarxz: 3.0.0 fs-extra: 9.1.0 path-exists: 4.0.0 devDependencies: - '@terascope/fetch-github-release': 0.7.4 '@types/atom': 1.40.7 + '@types/decompress': 4.2.3 '@types/fs-extra': 9.0.7 '@types/node': 14.14.31 build-commit: 0.1.4 cross-env: 7.0.3 - decompress: 4.2.1 - decompress-tarxz: 3.0.0 eslint: 7.20.0 eslint-config-atomic: 1.10.2_eslint@7.20.0 gitly: 2.0.2 @@ -234,7 +235,6 @@ packages: resolution: integrity: sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== /@sindresorhus/is/4.0.0: - dev: true engines: node: '>=10' resolution: @@ -242,7 +242,6 @@ packages: /@szmarczak/http-timer/4.0.5: dependencies: defer-to-connect: 2.0.0 - dev: true engines: node: '>=10' resolution: @@ -257,7 +256,7 @@ packages: multi-progress: 4.0.0_progress@2.0.3 progress: 2.0.3 regenerator-runtime: 0.13.7 - dev: true + dev: false hasBin: true resolution: integrity: sha512-AVk3ckeL9VoPU8qEOlPQJVa3wOm5GqK4f+LwqcxgPa/If3Q2p6ingzClsFYrUClABlZfLbiFRFNM4H100nEEyg== @@ -273,9 +272,14 @@ packages: '@types/keyv': 3.1.1 '@types/node': 14.14.22 '@types/responselike': 1.0.0 - dev: true resolution: integrity: sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== + /@types/decompress/4.2.3: + dependencies: + '@types/node': 14.14.31 + dev: true + resolution: + integrity: sha512-W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ== /@types/fs-extra/9.0.7: dependencies: '@types/node': 14.14.28 @@ -283,7 +287,6 @@ packages: resolution: integrity: sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== /@types/http-cache-semantics/4.0.0: - dev: true resolution: integrity: sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== /@types/json-schema/7.0.7: @@ -297,11 +300,9 @@ packages: /@types/keyv/3.1.1: dependencies: '@types/node': 14.14.22 - dev: true resolution: integrity: sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== /@types/node/14.14.22: - dev: true resolution: integrity: sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== /@types/node/14.14.28: @@ -315,13 +316,12 @@ packages: /@types/responselike/1.0.0: dependencies: '@types/node': 14.14.22 - dev: true resolution: integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== /@types/yauzl/2.9.1: dependencies: '@types/node': 14.14.22 - dev: true + dev: false optional: true resolution: integrity: sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA== @@ -432,7 +432,6 @@ packages: resolution: integrity: sha512-KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w== /abbrev/1.1.1: - dev: true resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== /acorn-jsx/5.3.1_acorn@7.4.1: @@ -475,13 +474,11 @@ packages: resolution: integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== /ansi-regex/2.1.1: - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: - dev: true engines: node: '>=4' resolution: @@ -515,18 +512,15 @@ packages: resolution: integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== /aproba/1.2.0: - dev: true resolution: integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== /aproba/2.0.0: - dev: true resolution: integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== /are-we-there-yet/1.1.5: dependencies: delegates: 1.0.0 readable-stream: 2.3.7 - dev: true resolution: integrity: sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== /argparse/1.0.10: @@ -747,11 +741,9 @@ packages: resolution: integrity: sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ== /balanced-match/1.0.0: - dev: true resolution: integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= /base64-js/1.5.1: - dev: true resolution: integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== /bindings/1.5.0: @@ -764,14 +756,12 @@ packages: dependencies: readable-stream: 2.3.7 safe-buffer: 5.1.2 - dev: true resolution: integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== /brace-expansion/1.1.11: dependencies: balanced-match: 1.0.0 concat-map: 0.0.1 - dev: true resolution: integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== /braces/3.0.2: @@ -783,29 +773,24 @@ packages: resolution: integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== /buffer-alloc-unsafe/1.1.0: - dev: true resolution: integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== /buffer-alloc/1.2.0: dependencies: buffer-alloc-unsafe: 1.1.0 buffer-fill: 1.0.0 - dev: true resolution: integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== /buffer-crc32/0.2.13: - dev: true resolution: integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= /buffer-fill/1.0.0: - dev: true resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= /buffer/5.7.1: dependencies: base64-js: 1.5.1 ieee754: 1.2.1 - dev: true resolution: integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== /build-commit/0.1.4: @@ -820,7 +805,6 @@ packages: resolution: integrity: sha512-LpdIncz6SaYSRormDsK2M6hBcCq8ZMpGZnIcZHUCOU4RTjTLgGRch9WK16iWy+9ngQsJGvfsal+aD0tt1vT74g== /cacheable-lookup/5.0.4: - dev: true engines: node: '>=10.6.0' resolution: @@ -834,7 +818,6 @@ packages: lowercase-keys: 2.0.0 normalize-url: 4.5.0 responselike: 2.0.0 - dev: true engines: node: '>=8' resolution: @@ -884,7 +867,6 @@ packages: resolution: integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== /chownr/1.1.4: - dev: true resolution: integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== /chownr/2.0.0: @@ -909,11 +891,9 @@ packages: /clone-response/1.0.2: dependencies: mimic-response: 1.0.1 - dev: true resolution: integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= /code-point-at/1.1.0: - dev: true engines: node: '>=0.10.0' resolution: @@ -955,7 +935,6 @@ packages: resolution: integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== /color-support/1.1.3: - dev: true hasBin: true resolution: integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== @@ -966,17 +945,14 @@ packages: resolution: integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== /commander/2.20.3: - dev: true resolution: integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== /commander/7.0.0: - dev: true engines: node: '>= 10' resolution: integrity: sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== /concat-map/0.0.1: - dev: true resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /confusing-browser-globals/1.0.10: @@ -990,7 +966,6 @@ packages: resolution: integrity: sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= /console-control-strings/1.1.0: - dev: true resolution: integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= /contains-path/0.1.0: @@ -1017,12 +992,11 @@ packages: resolution: integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== /core-js/3.8.3: - dev: true + dev: false requiresBuild: true resolution: integrity: sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== /core-util-is/1.0.2: - dev: true resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-env/7.0.3: @@ -1063,13 +1037,11 @@ packages: /debug/3.2.7: dependencies: ms: 2.1.2 - dev: true resolution: integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== /debug/4.3.1: dependencies: ms: 2.1.2 - dev: true engines: node: '>=6.0' peerDependencies: @@ -1082,7 +1054,6 @@ packages: /decompress-response/6.0.0: dependencies: mimic-response: 3.1.0 - dev: true engines: node: '>=10' resolution: @@ -1092,7 +1063,6 @@ packages: file-type: 5.2.0 is-stream: 1.1.0 tar-stream: 1.6.2 - dev: true engines: node: '>=4' resolution: @@ -1104,7 +1074,6 @@ packages: is-stream: 1.1.0 seek-bzip: 1.0.6 unbzip2-stream: 1.4.3 - dev: true engines: node: '>=4' resolution: @@ -1114,7 +1083,6 @@ packages: decompress-tar: 4.1.1 file-type: 5.2.0 is-stream: 1.1.0 - dev: true engines: node: '>=4' resolution: @@ -1125,7 +1093,7 @@ packages: file-type: 12.4.2 is-stream: 2.0.0 lzma-native: 4.0.6 - dev: true + dev: false engines: node: '>=8' resolution: @@ -1136,7 +1104,6 @@ packages: get-stream: 2.3.1 pify: 2.3.0 yauzl: 2.10.0 - dev: true engines: node: '>=4' resolution: @@ -1151,13 +1118,12 @@ packages: make-dir: 1.3.0 pify: 2.3.0 strip-dirs: 2.1.0 - dev: true + dev: false engines: node: '>=4' resolution: integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== /deep-extend/0.6.0: - dev: true engines: node: '>=4.0.0' resolution: @@ -1167,7 +1133,6 @@ packages: resolution: integrity: sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= /defer-to-connect/2.0.0: - dev: true engines: node: '>=10' resolution: @@ -1181,11 +1146,9 @@ packages: resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== /delegates/1.0.0: - dev: true resolution: integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= /detect-libc/1.0.3: - dev: true engines: node: '>=0.10' hasBin: true @@ -1267,7 +1230,6 @@ packages: /end-of-stream/1.4.4: dependencies: once: 1.4.0 - dev: true resolution: integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== /enquirer/2.3.6: @@ -1731,7 +1693,7 @@ packages: debug: 4.3.1 get-stream: 5.2.0 yauzl: 2.10.0 - dev: true + dev: false engines: node: '>= 10.17.0' hasBin: true @@ -1773,7 +1735,6 @@ packages: /fd-slicer/1.1.0: dependencies: pend: 1.2.0 - dev: true resolution: integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= /file-entry-cache/6.0.0: @@ -1785,25 +1746,21 @@ packages: resolution: integrity: sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== /file-type/12.4.2: - dev: true engines: node: '>=8' resolution: integrity: sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg== /file-type/3.9.0: - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-JXoHg4TR24CHvESdEH1SpSZyuek= /file-type/5.2.0: - dev: true engines: node: '>=4' resolution: integrity: sha1-LdvqfHP/42No365J3DOMBYwritY= /file-type/6.2.0: - dev: true engines: node: '>=4' resolution: @@ -1853,7 +1810,6 @@ packages: resolution: integrity: sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== /fs-constants/1.0.0: - dev: true resolution: integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-extra/9.1.0: @@ -1870,7 +1826,6 @@ packages: /fs-minipass/1.2.7: dependencies: minipass: 2.9.0 - dev: true resolution: integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== /fs-minipass/2.1.0: @@ -1882,7 +1837,6 @@ packages: resolution: integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== /fs.realpath/1.0.0: - dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= /function-bind/1.1.1: @@ -1903,7 +1857,6 @@ packages: string-width: 1.0.2 strip-ansi: 3.0.1 wide-align: 1.1.3 - dev: true resolution: integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= /gauge/3.0.0: @@ -1916,7 +1869,7 @@ packages: string-width: 2.1.1 strip-ansi: 3.0.1 wide-align: 1.1.3 - dev: true + dev: false engines: node: '>=10' resolution: @@ -1939,7 +1892,6 @@ packages: dependencies: object-assign: 4.1.1 pinkie-promise: 2.0.1 - dev: true engines: node: '>=0.10.0' resolution: @@ -1947,7 +1899,7 @@ packages: /get-stream/5.2.0: dependencies: pump: 3.0.0 - dev: true + dev: false engines: node: '>=8' resolution: @@ -1975,7 +1927,6 @@ packages: minimatch: 3.0.4 once: 1.4.0 path-is-absolute: 1.0.1 - dev: true resolution: integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== /globals/11.12.0: @@ -2024,13 +1975,12 @@ packages: lowercase-keys: 2.0.0 p-cancelable: 2.0.0 responselike: 2.0.0 - dev: true + dev: false engines: node: '>=10.19.0' resolution: integrity: sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== /graceful-fs/4.2.4: - dev: true resolution: integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== /graceful-fs/4.2.6: @@ -2063,7 +2013,6 @@ packages: resolution: integrity: sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== /has-unicode/2.0.1: - dev: true resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= /has/1.0.3: @@ -2089,14 +2038,12 @@ packages: resolution: integrity: sha1-mWwosZFRaovoZQGn15dX5ccMEGg= /http-cache-semantics/4.1.0: - dev: true resolution: integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== /http2-wrapper/1.0.0-beta.5.2: dependencies: quick-lru: 5.1.1 resolve-alpn: 1.0.0 - dev: true engines: node: '>=10.19.0' resolution: @@ -2104,19 +2051,16 @@ packages: /iconv-lite/0.4.24: dependencies: safer-buffer: 2.1.2 - dev: true engines: node: '>=0.10.0' resolution: integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== /ieee754/1.2.1: - dev: true resolution: integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== /ignore-walk/3.0.3: dependencies: minimatch: 3.0.4 - dev: true resolution: integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== /ignore/4.0.6: @@ -2150,15 +2094,12 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 - dev: true resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= /inherits/2.0.4: - dev: true resolution: integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== /ini/1.3.8: - dev: true resolution: integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== /internal-slot/1.0.3: @@ -2214,13 +2155,11 @@ packages: /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: - dev: true engines: node: '>=4' resolution: @@ -2240,7 +2179,6 @@ packages: resolution: integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== /is-natural-number/4.0.1: - dev: true resolution: integrity: sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= /is-negative-zero/2.0.1: @@ -2264,13 +2202,11 @@ packages: resolution: integrity: sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== /is-stream/1.1.0: - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= /is-stream/2.0.0: - dev: true engines: node: '>=8' resolution: @@ -2294,7 +2230,6 @@ packages: resolution: integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= /isarray/1.0.0: - dev: true resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= /isexe/2.0.0: @@ -2338,7 +2273,6 @@ packages: resolution: integrity: sha512-TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA== /json-buffer/3.0.1: - dev: true resolution: integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== /json-schema-traverse/0.4.1: @@ -2402,7 +2336,6 @@ packages: /keyv/4.0.3: dependencies: json-buffer: 3.0.1 - dev: true resolution: integrity: sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA== /language-subtag-registry/0.3.21: @@ -2455,7 +2388,6 @@ packages: resolution: integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== /lowercase-keys/2.0.0: - dev: true engines: node: '>=8' resolution: @@ -2474,7 +2406,6 @@ packages: node-pre-gyp: 0.11.0 readable-stream: 2.3.7 rimraf: 2.7.1 - dev: true engines: node: '>=6.0.0' hasBin: true @@ -2484,7 +2415,6 @@ packages: /make-dir/1.3.0: dependencies: pify: 3.0.0 - dev: true engines: node: '>=4' resolution: @@ -2512,13 +2442,11 @@ packages: resolution: integrity: sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== /mimic-response/1.0.1: - dev: true engines: node: '>=4' resolution: integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== /mimic-response/3.1.0: - dev: true engines: node: '>=10' resolution: @@ -2526,18 +2454,15 @@ packages: /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 - dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== /minimist/1.2.5: - dev: true resolution: integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== /minipass/2.9.0: dependencies: safe-buffer: 5.1.2 yallist: 3.1.1 - dev: true resolution: integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== /minipass/3.1.3: @@ -2551,7 +2476,6 @@ packages: /minizlib/1.3.3: dependencies: minipass: 2.9.0 - dev: true resolution: integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== /minizlib/2.1.2: @@ -2566,7 +2490,6 @@ packages: /mkdirp/0.5.5: dependencies: minimist: 1.2.5 - dev: true hasBin: true resolution: integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -2582,19 +2505,17 @@ packages: resolution: integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= /ms/2.1.2: - dev: true resolution: integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== /multi-progress/4.0.0_progress@2.0.3: dependencies: progress: 2.0.3 - dev: true + dev: false peerDependencies: progress: ^2.0.0 resolution: integrity: sha512-9zcjyOou3FFCKPXsmkbC3ethv51SFPoA4dJD6TscIp2pUmy26kBDZW6h9XofPELrzseSkuD7r0V+emGEeo39Pg== /nan/2.14.2: - dev: true resolution: integrity: sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== /natural-compare/1.4.0: @@ -2606,7 +2527,6 @@ packages: debug: 3.2.7 iconv-lite: 0.4.24 sax: 1.2.4 - dev: true engines: node: '>= 4.4.x' hasBin: true @@ -2633,7 +2553,6 @@ packages: rimraf: 2.7.1 semver: 5.7.1 tar: 4.4.13 - dev: true hasBin: true resolution: integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== @@ -2641,7 +2560,6 @@ packages: dependencies: abbrev: 1.1.1 osenv: 0.1.5 - dev: true hasBin: true resolution: integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== @@ -2655,7 +2573,6 @@ packages: resolution: integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== /normalize-url/4.5.0: - dev: true engines: node: '>=8' resolution: @@ -2663,11 +2580,9 @@ packages: /npm-bundled/1.1.1: dependencies: npm-normalize-package-bin: 1.0.1 - dev: true resolution: integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== /npm-normalize-package-bin/1.0.1: - dev: true resolution: integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== /npm-packlist/1.4.8: @@ -2675,7 +2590,6 @@ packages: ignore-walk: 3.0.3 npm-bundled: 1.1.1 npm-normalize-package-bin: 1.0.1 - dev: true resolution: integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== /npmlog/4.1.2: @@ -2684,11 +2598,9 @@ packages: console-control-strings: 1.1.0 gauge: 2.7.4 set-blocking: 2.0.0 - dev: true resolution: integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== /number-is-nan/1.0.1: - dev: true engines: node: '>=0.10.0' resolution: @@ -2755,7 +2667,6 @@ packages: /once/1.4.0: dependencies: wrappy: 1.0.2 - dev: true resolution: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= /optionator/0.9.1: @@ -2772,13 +2683,11 @@ packages: resolution: integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== /os-homedir/1.0.2: - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= /os-tmpdir/1.0.2: - dev: true engines: node: '>=0.10.0' resolution: @@ -2787,11 +2696,9 @@ packages: dependencies: os-homedir: 1.0.2 os-tmpdir: 1.0.2 - dev: true resolution: integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-cancelable/2.0.0: - dev: true engines: node: '>=8' resolution: @@ -2847,7 +2754,6 @@ packages: resolution: integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== /path-is-absolute/1.0.1: - dev: true engines: node: '>=0.10.0' resolution: @@ -2877,7 +2783,6 @@ packages: resolution: integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== /pend/1.2.0: - dev: true resolution: integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA= /picomatch/2.2.2: @@ -2887,13 +2792,11 @@ packages: resolution: integrity: sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== /pify/2.3.0: - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= /pify/3.0.0: - dev: true engines: node: '>=4' resolution: @@ -2901,13 +2804,11 @@ packages: /pinkie-promise/2.0.1: dependencies: pinkie: 2.0.4 - dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= /pinkie/2.0.4: - dev: true engines: node: '>=0.10.0' resolution: @@ -2934,11 +2835,9 @@ packages: resolution: integrity: sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== /process-nextick-args/2.0.1: - dev: true resolution: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== /progress/2.0.3: - dev: true engines: node: '>=0.4.0' resolution: @@ -2955,7 +2854,6 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 - dev: true resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== /punycode/2.1.1: @@ -2965,7 +2863,6 @@ packages: resolution: integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== /quick-lru/5.1.1: - dev: true engines: node: '>=10' resolution: @@ -2976,7 +2873,6 @@ packages: ini: 1.3.8 minimist: 1.2.5 strip-json-comments: 2.0.1 - dev: true hasBin: true resolution: integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -3041,7 +2937,6 @@ packages: safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 - dev: true resolution: integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== /rechoir/0.6.2: @@ -3057,7 +2952,6 @@ packages: resolution: integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== /regenerator-runtime/0.13.7: - dev: true resolution: integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== /regexp-tree/0.1.23: @@ -3087,7 +2981,6 @@ packages: resolution: integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== /resolve-alpn/1.0.0: - dev: true resolution: integrity: sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== /resolve-from/4.0.0: @@ -3106,7 +2999,6 @@ packages: /responselike/2.0.0: dependencies: lowercase-keys: 2.0.0 - dev: true resolution: integrity: sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== /reusify/1.0.4: @@ -3119,7 +3011,6 @@ packages: /rimraf/2.7.1: dependencies: glob: 7.1.6 - dev: true hasBin: true resolution: integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -3143,15 +3034,12 @@ packages: resolution: integrity: sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== /safe-buffer/5.1.2: - dev: true resolution: integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== /safer-buffer/2.1.2: - dev: true resolution: integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== /sax/1.2.4: - dev: true resolution: integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== /scheduler/0.20.1: @@ -3164,12 +3052,10 @@ packages: /seek-bzip/1.0.6: dependencies: commander: 2.20.3 - dev: true hasBin: true resolution: integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== /semver/5.7.1: - dev: true hasBin: true resolution: integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -3188,7 +3074,6 @@ packages: resolution: integrity: sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== /set-blocking/2.0.0: - dev: true resolution: integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= /shebang-command/2.0.0: @@ -3242,7 +3127,6 @@ packages: resolution: integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== /signal-exit/3.0.3: - dev: true resolution: integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== /slash/3.0.0: @@ -3298,7 +3182,6 @@ packages: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 - dev: true engines: node: '>=0.10.0' resolution: @@ -3307,7 +3190,6 @@ packages: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 - dev: true engines: node: '>=4' resolution: @@ -3355,13 +3237,11 @@ packages: /string_decoder/1.1.1: dependencies: safe-buffer: 5.1.2 - dev: true resolution: integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 - dev: true engines: node: '>=0.10.0' resolution: @@ -3369,7 +3249,6 @@ packages: /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 - dev: true engines: node: '>=4' resolution: @@ -3391,7 +3270,6 @@ packages: /strip-dirs/2.1.0: dependencies: is-natural-number: 4.0.1 - dev: true resolution: integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== /strip-json-comments/1.0.4: @@ -3402,7 +3280,6 @@ packages: resolution: integrity: sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= /strip-json-comments/2.0.1: - dev: true engines: node: '>=0.10.0' resolution: @@ -3455,7 +3332,6 @@ packages: readable-stream: 2.3.7 to-buffer: 1.1.1 xtend: 4.0.2 - dev: true engines: node: '>= 0.8.0' resolution: @@ -3469,7 +3345,6 @@ packages: mkdirp: 0.5.5 safe-buffer: 5.1.2 yallist: 3.1.1 - dev: true engines: node: '>=4.5' resolution: @@ -3492,11 +3367,9 @@ packages: resolution: integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= /through/2.3.8: - dev: true resolution: integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /to-buffer/1.1.1: - dev: true resolution: integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== /to-fast-properties/1.0.3: @@ -3574,7 +3447,6 @@ packages: dependencies: buffer: 5.7.1 through: 2.3.8 - dev: true resolution: integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== /universalify/2.0.0: @@ -3590,7 +3462,6 @@ packages: resolution: integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== /util-deprecate/1.0.2: - dev: true resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /v8-compile-cache/2.2.0: @@ -3659,7 +3530,6 @@ packages: /wide-align/1.1.3: dependencies: string-width: 2.1.1 - dev: true resolution: integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== /word-wrap/1.2.3: @@ -3669,17 +3539,14 @@ packages: resolution: integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== /wrappy/1.0.2: - dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= /xtend/4.0.2: - dev: true engines: node: '>=0.4' resolution: integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== /yallist/3.1.1: - dev: true resolution: integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== /yallist/4.0.0: @@ -3690,7 +3557,7 @@ packages: dependencies: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 - dev: true + dev: false resolution: integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= /zadeh/2.0.2: @@ -3705,6 +3572,7 @@ packages: specifiers: '@terascope/fetch-github-release': ^0.7.4 '@types/atom': 1.40.7 + '@types/decompress': ^4.2.3 '@types/fs-extra': ^9.0.7 '@types/node': ^14.14.31 atom-languageclient: ^1.2.2 diff --git a/scripts/get-serve-d.js b/scripts/get-serve-d.js deleted file mode 100644 index 72804ba..0000000 --- a/scripts/get-serve-d.js +++ /dev/null @@ -1,26 +0,0 @@ -// script to download serve-d binaries from GitHub - -const downloadRelease = require("@terascope/fetch-github-release") -const { join, dirname, basename, extname } = require("path") -const { remove, ensureDir } = require("fs-extra") -const decompress = require("decompress") -const decompressTarxz = require("decompress-tarxz") - -;(async () => { - const distFolder = join(dirname(__dirname), "dist") - await remove(distFolder) - await ensureDir(distFolder) - const assets = await downloadRelease("Pure-D", "serve-d", distFolder, undefined, undefined, true) - for (const asset of assets) { - const platform = basename(asset).match(/windows|linux|osx/)[0] - extname(asset) - if (extname(asset) === ".xz") { - await decompress(asset, join(distFolder, platform), { - plugins: [decompressTarxz()], - }) - } else { - await decompress(asset, join(distFolder, platform)) - } - remove(asset) - } -})() diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts new file mode 100644 index 0000000..1d3facf --- /dev/null +++ b/src/get-serve-d.ts @@ -0,0 +1,32 @@ +import downloadRelease from "@terascope/fetch-github-release" +import { join, dirname, basename, extname } from "path" +import { remove, ensureDir } from "fs-extra" +import decompress from "decompress" +import decompressTarxz from "decompress-tarxz" + +// function to download serve-d binaries from GitHub +export async function getServeD() { + const distFolder = join(dirname(__dirname), "dist") + await remove(distFolder) + await ensureDir(distFolder) + const assets = ((await downloadRelease( + "Pure-D", + "serve-d", + distFolder, + undefined, + undefined, + true + )) as unknown) as string[] + for (const asset of assets) { + const platform = basename(asset).match(/windows|linux|osx/)[0] + extname(asset) + if (extname(asset) === ".xz") { + await decompress(asset, join(distFolder, platform), { + plugins: [decompressTarxz()], + }) + } else { + await decompress(asset, join(distFolder, platform)) + } + remove(asset) + } +} From 23dda4e153438aff1929f06493a5aed8a94dc740 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:23:38 -0600 Subject: [PATCH 02/14] fix: only download the asset for that platform --- src/get-serve-d.ts | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts index 1d3facf..66f61e6 100644 --- a/src/get-serve-d.ts +++ b/src/get-serve-d.ts @@ -1,32 +1,39 @@ import downloadRelease from "@terascope/fetch-github-release" -import { join, dirname, basename, extname } from "path" +import { join, dirname, extname } from "path" import { remove, ensureDir } from "fs-extra" import decompress from "decompress" import decompressTarxz from "decompress-tarxz" +const assetMap = { + win32: "windows", + darwin: "osx", + linux: "linux", +} + // function to download serve-d binaries from GitHub export async function getServeD() { const distFolder = join(dirname(__dirname), "dist") await remove(distFolder) await ensureDir(distFolder) + + const platform = assetMap[process.platform] + const assets = ((await downloadRelease( - "Pure-D", - "serve-d", - distFolder, - undefined, - undefined, + /* username */ "Pure-D", + /* repo */ "serve-d", + /* download folder */ distFolder, + /* filter asset */ undefined, + /* filter asset */ (asset) => asset.name.indexOf(platform) >= 0, true )) as unknown) as string[] - for (const asset of assets) { - const platform = basename(asset).match(/windows|linux|osx/)[0] - extname(asset) - if (extname(asset) === ".xz") { - await decompress(asset, join(distFolder, platform), { - plugins: [decompressTarxz()], - }) - } else { - await decompress(asset, join(distFolder, platform)) - } - remove(asset) + + const asset = assets[0] // Assume there is only one possibility + if (extname(asset) === ".xz") { + await decompress(asset, join(distFolder, platform), { + plugins: [decompressTarxz()], + }) + } else { + await decompress(asset, join(distFolder, platform)) } + remove(asset) } From 7dcebe363e426b895a8ad81ff136893481e3df68 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:23:56 -0600 Subject: [PATCH 03/14] fix: download serve-d in installation --- src/installation.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/installation.ts b/src/installation.ts index 8105dc9..840e62c 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -32,6 +32,10 @@ export async function installServeD() { const codeDBinFolder = await getCodeDBinFolder() const serveDPath = join(codeDBinFolder, serveDExeFileName) if (!(await isServeDInstalled(serveDPath))) { + const { getServeD } = await import("./get-serve-d") + // download serve-d + getServeD() + // copy the whole served folder await copy(bundledServerMap[process.platform], codeDBinFolder) } From fd91bc738369d255b84cd299b86d8c228a9b9847 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:28:26 -0600 Subject: [PATCH 04/14] fix: add notifications for installation --- src/get-serve-d.ts | 4 ++-- src/installation.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts index 66f61e6..61bbf50 100644 --- a/src/get-serve-d.ts +++ b/src/get-serve-d.ts @@ -22,12 +22,12 @@ export async function getServeD() { /* username */ "Pure-D", /* repo */ "serve-d", /* download folder */ distFolder, - /* filter asset */ undefined, + /* filter release */ undefined, /* filter asset */ (asset) => asset.name.indexOf(platform) >= 0, true )) as unknown) as string[] - const asset = assets[0] // Assume there is only one possibility + const asset = assets[0] // Assume there is only one possibility if (extname(asset) === ".xz") { await decompress(asset, join(distFolder, platform), { plugins: [decompressTarxz()], diff --git a/src/installation.ts b/src/installation.ts index 840e62c..f464d1a 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -32,12 +32,16 @@ export async function installServeD() { const codeDBinFolder = await getCodeDBinFolder() const serveDPath = join(codeDBinFolder, serveDExeFileName) if (!(await isServeDInstalled(serveDPath))) { + atom.notifications.addInfo("Installing serve-d...") + const { getServeD } = await import("./get-serve-d") // download serve-d getServeD() // copy the whole served folder await copy(bundledServerMap[process.platform], codeDBinFolder) + + atom.notifications.addSuccess("Serve-d was installed") } return serveDPath } From 5d5283649d9aae61e3ed38ff8587786d3ac9fd7a Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:37:45 -0600 Subject: [PATCH 05/14] fix: load decompress-tarxz only on non-windows --- src/get-serve-d.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts index 61bbf50..5697a2b 100644 --- a/src/get-serve-d.ts +++ b/src/get-serve-d.ts @@ -2,7 +2,6 @@ import downloadRelease from "@terascope/fetch-github-release" import { join, dirname, extname } from "path" import { remove, ensureDir } from "fs-extra" import decompress from "decompress" -import decompressTarxz from "decompress-tarxz" const assetMap = { win32: "windows", @@ -18,6 +17,11 @@ export async function getServeD() { const platform = assetMap[process.platform] + const decompressPlugins = [] + if (process.platform !== "win32") { + decompressPlugins.push(await import("decompress-tarxz")) + } + const assets = ((await downloadRelease( /* username */ "Pure-D", /* repo */ "serve-d", @@ -30,7 +34,7 @@ export async function getServeD() { const asset = assets[0] // Assume there is only one possibility if (extname(asset) === ".xz") { await decompress(asset, join(distFolder, platform), { - plugins: [decompressTarxz()], + plugins: decompressPlugins, }) } else { await decompress(asset, join(distFolder, platform)) From 3389b10af23a005b12072d89756c78d3f1f118b4 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:39:00 -0600 Subject: [PATCH 06/14] chore: update lock files --- pnpm-lock.yaml | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8fe26ae..7d6871a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -235,6 +235,7 @@ packages: resolution: integrity: sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== /@sindresorhus/is/4.0.0: + dev: false engines: node: '>=10' resolution: @@ -242,6 +243,7 @@ packages: /@szmarczak/http-timer/4.0.5: dependencies: defer-to-connect: 2.0.0 + dev: false engines: node: '>=10' resolution: @@ -272,6 +274,7 @@ packages: '@types/keyv': 3.1.1 '@types/node': 14.14.22 '@types/responselike': 1.0.0 + dev: false resolution: integrity: sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== /@types/decompress/4.2.3: @@ -287,6 +290,7 @@ packages: resolution: integrity: sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== /@types/http-cache-semantics/4.0.0: + dev: false resolution: integrity: sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== /@types/json-schema/7.0.7: @@ -300,6 +304,7 @@ packages: /@types/keyv/3.1.1: dependencies: '@types/node': 14.14.22 + dev: false resolution: integrity: sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== /@types/node/14.14.22: @@ -316,6 +321,7 @@ packages: /@types/responselike/1.0.0: dependencies: '@types/node': 14.14.22 + dev: false resolution: integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== /@types/yauzl/2.9.1: @@ -432,6 +438,7 @@ packages: resolution: integrity: sha512-KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w== /abbrev/1.1.1: + dev: false resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== /acorn-jsx/5.3.1_acorn@7.4.1: @@ -479,6 +486,7 @@ packages: resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: + dev: false engines: node: '>=4' resolution: @@ -512,15 +520,18 @@ packages: resolution: integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== /aproba/1.2.0: + dev: false resolution: integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== /aproba/2.0.0: + dev: false resolution: integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== /are-we-there-yet/1.1.5: dependencies: delegates: 1.0.0 readable-stream: 2.3.7 + dev: false resolution: integrity: sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== /argparse/1.0.10: @@ -744,6 +755,7 @@ packages: resolution: integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= /base64-js/1.5.1: + dev: false resolution: integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== /bindings/1.5.0: @@ -756,6 +768,7 @@ packages: dependencies: readable-stream: 2.3.7 safe-buffer: 5.1.2 + dev: false resolution: integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== /brace-expansion/1.1.11: @@ -773,24 +786,29 @@ packages: resolution: integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== /buffer-alloc-unsafe/1.1.0: + dev: false resolution: integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== /buffer-alloc/1.2.0: dependencies: buffer-alloc-unsafe: 1.1.0 buffer-fill: 1.0.0 + dev: false resolution: integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== /buffer-crc32/0.2.13: + dev: false resolution: integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= /buffer-fill/1.0.0: + dev: false resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= /buffer/5.7.1: dependencies: base64-js: 1.5.1 ieee754: 1.2.1 + dev: false resolution: integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== /build-commit/0.1.4: @@ -805,6 +823,7 @@ packages: resolution: integrity: sha512-LpdIncz6SaYSRormDsK2M6hBcCq8ZMpGZnIcZHUCOU4RTjTLgGRch9WK16iWy+9ngQsJGvfsal+aD0tt1vT74g== /cacheable-lookup/5.0.4: + dev: false engines: node: '>=10.6.0' resolution: @@ -818,6 +837,7 @@ packages: lowercase-keys: 2.0.0 normalize-url: 4.5.0 responselike: 2.0.0 + dev: false engines: node: '>=8' resolution: @@ -867,6 +887,7 @@ packages: resolution: integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== /chownr/1.1.4: + dev: false resolution: integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== /chownr/2.0.0: @@ -891,9 +912,11 @@ packages: /clone-response/1.0.2: dependencies: mimic-response: 1.0.1 + dev: false resolution: integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= /code-point-at/1.1.0: + dev: false engines: node: '>=0.10.0' resolution: @@ -935,6 +958,7 @@ packages: resolution: integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== /color-support/1.1.3: + dev: false hasBin: true resolution: integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== @@ -945,6 +969,7 @@ packages: resolution: integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== /commander/2.20.3: + dev: false resolution: integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== /commander/7.0.0: @@ -966,6 +991,7 @@ packages: resolution: integrity: sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= /console-control-strings/1.1.0: + dev: false resolution: integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= /contains-path/0.1.0: @@ -1037,6 +1063,7 @@ packages: /debug/3.2.7: dependencies: ms: 2.1.2 + dev: false resolution: integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== /debug/4.3.1: @@ -1054,6 +1081,7 @@ packages: /decompress-response/6.0.0: dependencies: mimic-response: 3.1.0 + dev: false engines: node: '>=10' resolution: @@ -1063,6 +1091,7 @@ packages: file-type: 5.2.0 is-stream: 1.1.0 tar-stream: 1.6.2 + dev: false engines: node: '>=4' resolution: @@ -1074,6 +1103,7 @@ packages: is-stream: 1.1.0 seek-bzip: 1.0.6 unbzip2-stream: 1.4.3 + dev: false engines: node: '>=4' resolution: @@ -1083,6 +1113,7 @@ packages: decompress-tar: 4.1.1 file-type: 5.2.0 is-stream: 1.1.0 + dev: false engines: node: '>=4' resolution: @@ -1104,6 +1135,7 @@ packages: get-stream: 2.3.1 pify: 2.3.0 yauzl: 2.10.0 + dev: false engines: node: '>=4' resolution: @@ -1124,6 +1156,7 @@ packages: resolution: integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== /deep-extend/0.6.0: + dev: false engines: node: '>=4.0.0' resolution: @@ -1133,6 +1166,7 @@ packages: resolution: integrity: sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= /defer-to-connect/2.0.0: + dev: false engines: node: '>=10' resolution: @@ -1146,9 +1180,11 @@ packages: resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== /delegates/1.0.0: + dev: false resolution: integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= /detect-libc/1.0.3: + dev: false engines: node: '>=0.10' hasBin: true @@ -1230,6 +1266,7 @@ packages: /end-of-stream/1.4.4: dependencies: once: 1.4.0 + dev: false resolution: integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== /enquirer/2.3.6: @@ -1735,6 +1772,7 @@ packages: /fd-slicer/1.1.0: dependencies: pend: 1.2.0 + dev: false resolution: integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= /file-entry-cache/6.0.0: @@ -1746,21 +1784,25 @@ packages: resolution: integrity: sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== /file-type/12.4.2: + dev: false engines: node: '>=8' resolution: integrity: sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg== /file-type/3.9.0: + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-JXoHg4TR24CHvESdEH1SpSZyuek= /file-type/5.2.0: + dev: false engines: node: '>=4' resolution: integrity: sha1-LdvqfHP/42No365J3DOMBYwritY= /file-type/6.2.0: + dev: false engines: node: '>=4' resolution: @@ -1810,6 +1852,7 @@ packages: resolution: integrity: sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== /fs-constants/1.0.0: + dev: false resolution: integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-extra/9.1.0: @@ -1826,6 +1869,7 @@ packages: /fs-minipass/1.2.7: dependencies: minipass: 2.9.0 + dev: false resolution: integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== /fs-minipass/2.1.0: @@ -1857,6 +1901,7 @@ packages: string-width: 1.0.2 strip-ansi: 3.0.1 wide-align: 1.1.3 + dev: false resolution: integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= /gauge/3.0.0: @@ -1892,6 +1937,7 @@ packages: dependencies: object-assign: 4.1.1 pinkie-promise: 2.0.1 + dev: false engines: node: '>=0.10.0' resolution: @@ -1981,6 +2027,7 @@ packages: resolution: integrity: sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== /graceful-fs/4.2.4: + dev: false resolution: integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== /graceful-fs/4.2.6: @@ -2013,6 +2060,7 @@ packages: resolution: integrity: sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== /has-unicode/2.0.1: + dev: false resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= /has/1.0.3: @@ -2038,12 +2086,14 @@ packages: resolution: integrity: sha1-mWwosZFRaovoZQGn15dX5ccMEGg= /http-cache-semantics/4.1.0: + dev: false resolution: integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== /http2-wrapper/1.0.0-beta.5.2: dependencies: quick-lru: 5.1.1 resolve-alpn: 1.0.0 + dev: false engines: node: '>=10.19.0' resolution: @@ -2051,16 +2101,19 @@ packages: /iconv-lite/0.4.24: dependencies: safer-buffer: 2.1.2 + dev: false engines: node: '>=0.10.0' resolution: integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== /ieee754/1.2.1: + dev: false resolution: integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== /ignore-walk/3.0.3: dependencies: minimatch: 3.0.4 + dev: false resolution: integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== /ignore/4.0.6: @@ -2100,6 +2153,7 @@ packages: resolution: integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== /ini/1.3.8: + dev: false resolution: integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== /internal-slot/1.0.3: @@ -2155,11 +2209,13 @@ packages: /is-fullwidth-code-point/1.0.0: dependencies: number-is-nan: 1.0.1 + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: + dev: false engines: node: '>=4' resolution: @@ -2179,6 +2235,7 @@ packages: resolution: integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== /is-natural-number/4.0.1: + dev: false resolution: integrity: sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= /is-negative-zero/2.0.1: @@ -2202,11 +2259,13 @@ packages: resolution: integrity: sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== /is-stream/1.1.0: + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= /is-stream/2.0.0: + dev: false engines: node: '>=8' resolution: @@ -2273,6 +2332,7 @@ packages: resolution: integrity: sha512-TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA== /json-buffer/3.0.1: + dev: false resolution: integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== /json-schema-traverse/0.4.1: @@ -2336,6 +2396,7 @@ packages: /keyv/4.0.3: dependencies: json-buffer: 3.0.1 + dev: false resolution: integrity: sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA== /language-subtag-registry/0.3.21: @@ -2388,6 +2449,7 @@ packages: resolution: integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== /lowercase-keys/2.0.0: + dev: false engines: node: '>=8' resolution: @@ -2406,6 +2468,7 @@ packages: node-pre-gyp: 0.11.0 readable-stream: 2.3.7 rimraf: 2.7.1 + dev: false engines: node: '>=6.0.0' hasBin: true @@ -2415,6 +2478,7 @@ packages: /make-dir/1.3.0: dependencies: pify: 3.0.0 + dev: false engines: node: '>=4' resolution: @@ -2442,11 +2506,13 @@ packages: resolution: integrity: sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== /mimic-response/1.0.1: + dev: false engines: node: '>=4' resolution: integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== /mimic-response/3.1.0: + dev: false engines: node: '>=10' resolution: @@ -2463,6 +2529,7 @@ packages: dependencies: safe-buffer: 5.1.2 yallist: 3.1.1 + dev: false resolution: integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== /minipass/3.1.3: @@ -2476,6 +2543,7 @@ packages: /minizlib/1.3.3: dependencies: minipass: 2.9.0 + dev: false resolution: integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== /minizlib/2.1.2: @@ -2490,6 +2558,7 @@ packages: /mkdirp/0.5.5: dependencies: minimist: 1.2.5 + dev: false hasBin: true resolution: integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -2516,6 +2585,7 @@ packages: resolution: integrity: sha512-9zcjyOou3FFCKPXsmkbC3ethv51SFPoA4dJD6TscIp2pUmy26kBDZW6h9XofPELrzseSkuD7r0V+emGEeo39Pg== /nan/2.14.2: + dev: false resolution: integrity: sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== /natural-compare/1.4.0: @@ -2527,6 +2597,7 @@ packages: debug: 3.2.7 iconv-lite: 0.4.24 sax: 1.2.4 + dev: false engines: node: '>= 4.4.x' hasBin: true @@ -2553,6 +2624,7 @@ packages: rimraf: 2.7.1 semver: 5.7.1 tar: 4.4.13 + dev: false hasBin: true resolution: integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== @@ -2560,6 +2632,7 @@ packages: dependencies: abbrev: 1.1.1 osenv: 0.1.5 + dev: false hasBin: true resolution: integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== @@ -2573,6 +2646,7 @@ packages: resolution: integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== /normalize-url/4.5.0: + dev: false engines: node: '>=8' resolution: @@ -2580,9 +2654,11 @@ packages: /npm-bundled/1.1.1: dependencies: npm-normalize-package-bin: 1.0.1 + dev: false resolution: integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== /npm-normalize-package-bin/1.0.1: + dev: false resolution: integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== /npm-packlist/1.4.8: @@ -2590,6 +2666,7 @@ packages: ignore-walk: 3.0.3 npm-bundled: 1.1.1 npm-normalize-package-bin: 1.0.1 + dev: false resolution: integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== /npmlog/4.1.2: @@ -2598,9 +2675,11 @@ packages: console-control-strings: 1.1.0 gauge: 2.7.4 set-blocking: 2.0.0 + dev: false resolution: integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== /number-is-nan/1.0.1: + dev: false engines: node: '>=0.10.0' resolution: @@ -2683,11 +2762,13 @@ packages: resolution: integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== /os-homedir/1.0.2: + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= /os-tmpdir/1.0.2: + dev: false engines: node: '>=0.10.0' resolution: @@ -2696,9 +2777,11 @@ packages: dependencies: os-homedir: 1.0.2 os-tmpdir: 1.0.2 + dev: false resolution: integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-cancelable/2.0.0: + dev: false engines: node: '>=8' resolution: @@ -2783,6 +2866,7 @@ packages: resolution: integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== /pend/1.2.0: + dev: false resolution: integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA= /picomatch/2.2.2: @@ -2797,6 +2881,7 @@ packages: resolution: integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= /pify/3.0.0: + dev: false engines: node: '>=4' resolution: @@ -2804,11 +2889,13 @@ packages: /pinkie-promise/2.0.1: dependencies: pinkie: 2.0.4 + dev: false engines: node: '>=0.10.0' resolution: integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= /pinkie/2.0.4: + dev: false engines: node: '>=0.10.0' resolution: @@ -2835,6 +2922,7 @@ packages: resolution: integrity: sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== /process-nextick-args/2.0.1: + dev: false resolution: integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== /progress/2.0.3: @@ -2854,6 +2942,7 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 + dev: false resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== /punycode/2.1.1: @@ -2863,6 +2952,7 @@ packages: resolution: integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== /quick-lru/5.1.1: + dev: false engines: node: '>=10' resolution: @@ -2873,6 +2963,7 @@ packages: ini: 1.3.8 minimist: 1.2.5 strip-json-comments: 2.0.1 + dev: false hasBin: true resolution: integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== @@ -2937,6 +3028,7 @@ packages: safe-buffer: 5.1.2 string_decoder: 1.1.1 util-deprecate: 1.0.2 + dev: false resolution: integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== /rechoir/0.6.2: @@ -2981,6 +3073,7 @@ packages: resolution: integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== /resolve-alpn/1.0.0: + dev: false resolution: integrity: sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== /resolve-from/4.0.0: @@ -2999,6 +3092,7 @@ packages: /responselike/2.0.0: dependencies: lowercase-keys: 2.0.0 + dev: false resolution: integrity: sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== /reusify/1.0.4: @@ -3011,6 +3105,7 @@ packages: /rimraf/2.7.1: dependencies: glob: 7.1.6 + dev: false hasBin: true resolution: integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -3037,9 +3132,11 @@ packages: resolution: integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== /safer-buffer/2.1.2: + dev: false resolution: integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== /sax/1.2.4: + dev: false resolution: integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== /scheduler/0.20.1: @@ -3052,6 +3149,7 @@ packages: /seek-bzip/1.0.6: dependencies: commander: 2.20.3 + dev: false hasBin: true resolution: integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== @@ -3074,6 +3172,7 @@ packages: resolution: integrity: sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== /set-blocking/2.0.0: + dev: false resolution: integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= /shebang-command/2.0.0: @@ -3127,6 +3226,7 @@ packages: resolution: integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== /signal-exit/3.0.3: + dev: false resolution: integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== /slash/3.0.0: @@ -3182,6 +3282,7 @@ packages: code-point-at: 1.1.0 is-fullwidth-code-point: 1.0.0 strip-ansi: 3.0.1 + dev: false engines: node: '>=0.10.0' resolution: @@ -3190,6 +3291,7 @@ packages: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 + dev: false engines: node: '>=4' resolution: @@ -3237,6 +3339,7 @@ packages: /string_decoder/1.1.1: dependencies: safe-buffer: 5.1.2 + dev: false resolution: integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /strip-ansi/3.0.1: @@ -3249,6 +3352,7 @@ packages: /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 + dev: false engines: node: '>=4' resolution: @@ -3270,6 +3374,7 @@ packages: /strip-dirs/2.1.0: dependencies: is-natural-number: 4.0.1 + dev: false resolution: integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== /strip-json-comments/1.0.4: @@ -3280,6 +3385,7 @@ packages: resolution: integrity: sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= /strip-json-comments/2.0.1: + dev: false engines: node: '>=0.10.0' resolution: @@ -3332,6 +3438,7 @@ packages: readable-stream: 2.3.7 to-buffer: 1.1.1 xtend: 4.0.2 + dev: false engines: node: '>= 0.8.0' resolution: @@ -3345,6 +3452,7 @@ packages: mkdirp: 0.5.5 safe-buffer: 5.1.2 yallist: 3.1.1 + dev: false engines: node: '>=4.5' resolution: @@ -3367,9 +3475,11 @@ packages: resolution: integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= /through/2.3.8: + dev: false resolution: integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= /to-buffer/1.1.1: + dev: false resolution: integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== /to-fast-properties/1.0.3: @@ -3447,6 +3557,7 @@ packages: dependencies: buffer: 5.7.1 through: 2.3.8 + dev: false resolution: integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== /universalify/2.0.0: @@ -3462,6 +3573,7 @@ packages: resolution: integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== /util-deprecate/1.0.2: + dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /v8-compile-cache/2.2.0: @@ -3530,6 +3642,7 @@ packages: /wide-align/1.1.3: dependencies: string-width: 2.1.1 + dev: false resolution: integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== /word-wrap/1.2.3: @@ -3542,11 +3655,13 @@ packages: resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= /xtend/4.0.2: + dev: false engines: node: '>=0.4' resolution: integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== /yallist/3.1.1: + dev: false resolution: integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== /yallist/4.0.0: From 41b072ff50403845a491dac150858ed9e425d507 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 16:43:41 -0600 Subject: [PATCH 07/14] fix: use tarxz based on file extention --- src/get-serve-d.ts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts index 5697a2b..68cf03d 100644 --- a/src/get-serve-d.ts +++ b/src/get-serve-d.ts @@ -12,15 +12,11 @@ const assetMap = { // function to download serve-d binaries from GitHub export async function getServeD() { const distFolder = join(dirname(__dirname), "dist") - await remove(distFolder) - await ensureDir(distFolder) - const platform = assetMap[process.platform] + const downloadFolder = join(distFolder, platform) - const decompressPlugins = [] - if (process.platform !== "win32") { - decompressPlugins.push(await import("decompress-tarxz")) - } + await remove(distFolder) + await ensureDir(distFolder) const assets = ((await downloadRelease( /* username */ "Pure-D", @@ -33,11 +29,11 @@ export async function getServeD() { const asset = assets[0] // Assume there is only one possibility if (extname(asset) === ".xz") { - await decompress(asset, join(distFolder, platform), { - plugins: decompressPlugins, + await decompress(asset, downloadFolder, { + plugins: [await import("decompress-tarxz")], }) } else { - await decompress(asset, join(distFolder, platform)) + await decompress(asset, downloadFolder) } remove(asset) } From 2e587b5fe638a2b074311c2645115ee08c2a95ad Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 17:25:55 -0600 Subject: [PATCH 08/14] fix: use system tar to decompress file on Unix systems --- package.json | 3 - pnpm-lock.yaml | 576 ++------------------------------------------- src/get-serve-d.ts | 26 +- 3 files changed, 32 insertions(+), 573 deletions(-) diff --git a/package.json b/package.json index 26c17ab..c5ec333 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,6 @@ }, "devDependencies": { "@types/atom": "1.40.7", - "@types/decompress": "^4.2.3", "@types/fs-extra": "^9.0.7", "@types/node": "^14.14.31", "build-commit": "0.1.4", @@ -98,8 +97,6 @@ "dependencies": { "@terascope/fetch-github-release": "^0.7.4", "atom-languageclient": "^1.2.2", - "decompress": "^4.2.1", - "decompress-tarxz": "^3.0.0", "fs-extra": "^9.1.0", "path-exists": "^4.0.0" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7d6871a..a20fe10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,13 +1,10 @@ dependencies: '@terascope/fetch-github-release': 0.7.4 atom-languageclient: 1.2.2 - decompress: 4.2.1 - decompress-tarxz: 3.0.0 fs-extra: 9.1.0 path-exists: 4.0.0 devDependencies: '@types/atom': 1.40.7 - '@types/decompress': 4.2.3 '@types/fs-extra': 9.0.7 '@types/node': 14.14.31 build-commit: 0.1.4 @@ -277,12 +274,6 @@ packages: dev: false resolution: integrity: sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== - /@types/decompress/4.2.3: - dependencies: - '@types/node': 14.14.31 - dev: true - resolution: - integrity: sha512-W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ== /@types/fs-extra/9.0.7: dependencies: '@types/node': 14.14.28 @@ -437,10 +428,6 @@ packages: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: integrity: sha512-KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w== - /abbrev/1.1.1: - dev: false - resolution: - integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== /acorn-jsx/5.3.1_acorn@7.4.1: dependencies: acorn: 7.4.1 @@ -519,21 +506,10 @@ packages: node: '>=8' resolution: integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== - /aproba/1.2.0: - dev: false - resolution: - integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== /aproba/2.0.0: dev: false resolution: integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - /are-we-there-yet/1.1.5: - dependencies: - delegates: 1.0.0 - readable-stream: 2.3.7 - dev: false - resolution: - integrity: sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== /argparse/1.0.10: dependencies: sprintf-js: 1.0.3 @@ -752,29 +728,20 @@ packages: resolution: integrity: sha512-+rq2cr4GDhtToEzKFD6KZZMDBXhjFAr9JjPw9pAppZACeEWqNM294j+NdBzkSHYXwzzBmVjZ3nEVJlOhbR2gOQ== /balanced-match/1.0.0: + dev: true resolution: integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - /base64-js/1.5.1: - dev: false - resolution: - integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== /bindings/1.5.0: dependencies: file-uri-to-path: 1.0.0 dev: false resolution: integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== - /bl/1.2.3: - dependencies: - readable-stream: 2.3.7 - safe-buffer: 5.1.2 - dev: false - resolution: - integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== /brace-expansion/1.1.11: dependencies: balanced-match: 1.0.0 concat-map: 0.0.1 + dev: true resolution: integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== /braces/3.0.2: @@ -785,32 +752,10 @@ packages: node: '>=8' resolution: integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - /buffer-alloc-unsafe/1.1.0: - dev: false - resolution: - integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - /buffer-alloc/1.2.0: - dependencies: - buffer-alloc-unsafe: 1.1.0 - buffer-fill: 1.0.0 - dev: false - resolution: - integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== /buffer-crc32/0.2.13: dev: false resolution: integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= - /buffer-fill/1.0.0: - dev: false - resolution: - integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer/5.7.1: - dependencies: - base64-js: 1.5.1 - ieee754: 1.2.1 - dev: false - resolution: - integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== /build-commit/0.1.4: dependencies: colors: 1.4.0 @@ -886,10 +831,6 @@ packages: node: '>=10' resolution: integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== - /chownr/1.1.4: - dev: false - resolution: - integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== /chownr/2.0.0: dev: true engines: @@ -915,12 +856,6 @@ packages: dev: false resolution: integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= - /code-point-at/1.1.0: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= /coffeescript/1.12.7: dev: true engines: @@ -968,16 +903,13 @@ packages: node: '>=0.1.90' resolution: integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== - /commander/2.20.3: - dev: false - resolution: - integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== /commander/7.0.0: engines: node: '>= 10' resolution: integrity: sha512-ovx/7NkTrnPuIV8sqk/GjUIIM1+iUQeqA3ye2VNpq9sVoiZsooObWlQy+OPWGI17GDaEoybuAGJm6U8yC077BA== /concat-map/0.0.1: + dev: true resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /confusing-browser-globals/1.0.10: @@ -1023,6 +955,7 @@ packages: resolution: integrity: sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== /core-util-is/1.0.2: + dev: true resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= /cross-env/7.0.3: @@ -1060,12 +993,6 @@ packages: dev: true resolution: integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - /debug/3.2.7: - dependencies: - ms: 2.1.2 - dev: false - resolution: - integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== /debug/4.3.1: dependencies: ms: 2.1.2 @@ -1086,81 +1013,6 @@ packages: node: '>=10' resolution: integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - /decompress-tar/4.1.1: - dependencies: - file-type: 5.2.0 - is-stream: 1.1.0 - tar-stream: 1.6.2 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== - /decompress-tarbz2/4.1.1: - dependencies: - decompress-tar: 4.1.1 - file-type: 6.2.0 - is-stream: 1.1.0 - seek-bzip: 1.0.6 - unbzip2-stream: 1.4.3 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== - /decompress-targz/4.1.1: - dependencies: - decompress-tar: 4.1.1 - file-type: 5.2.0 - is-stream: 1.1.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== - /decompress-tarxz/3.0.0: - dependencies: - decompress-tar: 4.1.1 - file-type: 12.4.2 - is-stream: 2.0.0 - lzma-native: 4.0.6 - dev: false - engines: - node: '>=8' - resolution: - integrity: sha512-/85049bKZOmkVXrFz9Zf90DMBPYuXGGAMOQaytNgMGiB7u4iIJKLUaEXRiLBvugtknmYcP1Zv6KQWEYWshTblg== - /decompress-unzip/4.0.1: - dependencies: - file-type: 3.9.0 - get-stream: 2.3.1 - pify: 2.3.0 - yauzl: 2.10.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-3qrM39FK6vhVePczroIQ+bSEj2k= - /decompress/4.2.1: - dependencies: - decompress-tar: 4.1.1 - decompress-tarbz2: 4.1.1 - decompress-targz: 4.1.1 - decompress-unzip: 4.0.1 - graceful-fs: 4.2.4 - make-dir: 1.3.0 - pify: 2.3.0 - strip-dirs: 2.1.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== - /deep-extend/0.6.0: - dev: false - engines: - node: '>=4.0.0' - resolution: - integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== /deep-is/0.1.3: dev: true resolution: @@ -1179,17 +1031,6 @@ packages: node: '>= 0.4' resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== - /delegates/1.0.0: - dev: false - resolution: - integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= - /detect-libc/1.0.3: - dev: false - engines: - node: '>=0.10' - hasBin: true - resolution: - integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= /dir-glob/3.0.1: dependencies: path-type: 4.0.0 @@ -1783,30 +1624,6 @@ packages: node: ^10.12.0 || >=12.0.0 resolution: integrity: sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== - /file-type/12.4.2: - dev: false - engines: - node: '>=8' - resolution: - integrity: sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg== - /file-type/3.9.0: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-JXoHg4TR24CHvESdEH1SpSZyuek= - /file-type/5.2.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-LdvqfHP/42No365J3DOMBYwritY= - /file-type/6.2.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== /file-uri-to-path/1.0.0: dev: false resolution: @@ -1851,10 +1668,6 @@ packages: optional: true resolution: integrity: sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== - /fs-constants/1.0.0: - dev: false - resolution: - integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-extra/9.1.0: dependencies: at-least-node: 1.0.0 @@ -1866,12 +1679,6 @@ packages: node: '>=10' resolution: integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - /fs-minipass/1.2.7: - dependencies: - minipass: 2.9.0 - dev: false - resolution: - integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== /fs-minipass/2.1.0: dependencies: minipass: 3.1.3 @@ -1881,6 +1688,7 @@ packages: resolution: integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== /fs.realpath/1.0.0: + dev: true resolution: integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= /function-bind/1.1.1: @@ -1891,19 +1699,6 @@ packages: dev: true resolution: integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - /gauge/2.7.4: - dependencies: - aproba: 1.2.0 - console-control-strings: 1.1.0 - has-unicode: 2.0.1 - object-assign: 4.1.1 - signal-exit: 3.0.3 - string-width: 1.0.2 - strip-ansi: 3.0.1 - wide-align: 1.1.3 - dev: false - resolution: - integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= /gauge/3.0.0: dependencies: aproba: 2.0.0 @@ -1933,15 +1728,6 @@ packages: dev: true resolution: integrity: sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg== - /get-stream/2.3.1: - dependencies: - object-assign: 4.1.1 - pinkie-promise: 2.0.1 - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= /get-stream/5.2.0: dependencies: pump: 3.0.0 @@ -1973,6 +1759,7 @@ packages: minimatch: 3.0.4 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true resolution: integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== /globals/11.12.0: @@ -2026,10 +1813,6 @@ packages: node: '>=10.19.0' resolution: integrity: sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== - /graceful-fs/4.2.4: - dev: false - resolution: - integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== /graceful-fs/4.2.6: resolution: integrity: sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -2098,24 +1881,6 @@ packages: node: '>=10.19.0' resolution: integrity: sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ== - /iconv-lite/0.4.24: - dependencies: - safer-buffer: 2.1.2 - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== - /ieee754/1.2.1: - dev: false - resolution: - integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== - /ignore-walk/3.0.3: - dependencies: - minimatch: 3.0.4 - dev: false - resolution: - integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== /ignore/4.0.6: dev: true engines: @@ -2147,15 +1912,13 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 + dev: true resolution: integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= /inherits/2.0.4: + dev: true resolution: integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== - /ini/1.3.8: - dev: false - resolution: - integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== /internal-slot/1.0.3: dependencies: get-intrinsic: 1.1.0 @@ -2206,14 +1969,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - /is-fullwidth-code-point/1.0.0: - dependencies: - number-is-nan: 1.0.1 - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: dev: false engines: @@ -2234,10 +1989,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== - /is-natural-number/4.0.1: - dev: false - resolution: - integrity: sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= /is-negative-zero/2.0.1: dev: true engines: @@ -2258,18 +2009,6 @@ packages: node: '>= 0.4' resolution: integrity: sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== - /is-stream/1.1.0: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - /is-stream/2.0.0: - dev: false - engines: - node: '>=8' - resolution: - integrity: sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== /is-string/1.0.5: dev: true engines: @@ -2289,6 +2028,7 @@ packages: resolution: integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= /isarray/1.0.0: + dev: true resolution: integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= /isexe/2.0.0: @@ -2462,27 +2202,6 @@ packages: node: '>=10' resolution: integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - /lzma-native/4.0.6: - dependencies: - nan: 2.14.2 - node-pre-gyp: 0.11.0 - readable-stream: 2.3.7 - rimraf: 2.7.1 - dev: false - engines: - node: '>=6.0.0' - hasBin: true - requiresBuild: true - resolution: - integrity: sha512-1kiSs/KAcAuh9vyyd00ATXZFfrg6W8UCBqH1RKlWg/tBP5aQez6HYOY+SihmsZfpy0RVDioW5SLI76dZ3Mq5Rw== - /make-dir/1.3.0: - dependencies: - pify: 3.0.0 - dev: false - engines: - node: '>=4' - resolution: - integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== /marked/1.2.9: dev: false engines: @@ -2520,18 +2239,13 @@ packages: /minimatch/3.0.4: dependencies: brace-expansion: 1.1.11 + dev: true resolution: integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== /minimist/1.2.5: + dev: true resolution: integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== - /minipass/2.9.0: - dependencies: - safe-buffer: 5.1.2 - yallist: 3.1.1 - dev: false - resolution: - integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== /minipass/3.1.3: dependencies: yallist: 4.0.0 @@ -2540,12 +2254,6 @@ packages: node: '>=8' resolution: integrity: sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== - /minizlib/1.3.3: - dependencies: - minipass: 2.9.0 - dev: false - resolution: - integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== /minizlib/2.1.2: dependencies: minipass: 3.1.3 @@ -2555,13 +2263,6 @@ packages: node: '>= 8' resolution: integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - /mkdirp/0.5.5: - dependencies: - minimist: 1.2.5 - dev: false - hasBin: true - resolution: - integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== /mkdirp/1.0.4: dev: true engines: @@ -2584,25 +2285,10 @@ packages: progress: ^2.0.0 resolution: integrity: sha512-9zcjyOou3FFCKPXsmkbC3ethv51SFPoA4dJD6TscIp2pUmy26kBDZW6h9XofPELrzseSkuD7r0V+emGEeo39Pg== - /nan/2.14.2: - dev: false - resolution: - integrity: sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== /natural-compare/1.4.0: dev: true resolution: integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - /needle/2.6.0: - dependencies: - debug: 3.2.7 - iconv-lite: 0.4.24 - sax: 1.2.4 - dev: false - engines: - node: '>= 4.4.x' - hasBin: true - resolution: - integrity: sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== /node-addon-api/3.1.0: dev: false resolution: @@ -2612,30 +2298,6 @@ packages: hasBin: true resolution: integrity: sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== - /node-pre-gyp/0.11.0: - dependencies: - detect-libc: 1.0.3 - mkdirp: 0.5.5 - needle: 2.6.0 - nopt: 4.0.3 - npm-packlist: 1.4.8 - npmlog: 4.1.2 - rc: 1.2.8 - rimraf: 2.7.1 - semver: 5.7.1 - tar: 4.4.13 - dev: false - hasBin: true - resolution: - integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== - /nopt/4.0.3: - dependencies: - abbrev: 1.1.1 - osenv: 0.1.5 - dev: false - hasBin: true - resolution: - integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== /normalize-package-data/2.5.0: dependencies: hosted-git-info: 2.8.8 @@ -2651,39 +2313,6 @@ packages: node: '>=8' resolution: integrity: sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== - /npm-bundled/1.1.1: - dependencies: - npm-normalize-package-bin: 1.0.1 - dev: false - resolution: - integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== - /npm-normalize-package-bin/1.0.1: - dev: false - resolution: - integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== - /npm-packlist/1.4.8: - dependencies: - ignore-walk: 3.0.3 - npm-bundled: 1.1.1 - npm-normalize-package-bin: 1.0.1 - dev: false - resolution: - integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== - /npmlog/4.1.2: - dependencies: - are-we-there-yet: 1.1.5 - console-control-strings: 1.1.0 - gauge: 2.7.4 - set-blocking: 2.0.0 - dev: false - resolution: - integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== - /number-is-nan/1.0.1: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: engines: node: '>=0.10.0' @@ -2761,25 +2390,6 @@ packages: node: '>= 0.8.0' resolution: integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== - /os-homedir/1.0.2: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= - /os-tmpdir/1.0.2: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - /osenv/0.1.5: - dependencies: - os-homedir: 1.0.2 - os-tmpdir: 1.0.2 - dev: false - resolution: - integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-cancelable/2.0.0: dev: false engines: @@ -2837,6 +2447,7 @@ packages: resolution: integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== /path-is-absolute/1.0.1: + dev: true engines: node: '>=0.10.0' resolution: @@ -2876,30 +2487,11 @@ packages: resolution: integrity: sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== /pify/2.3.0: + dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - /pify/3.0.0: - dev: false - engines: - node: '>=4' - resolution: - integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - /pinkie-promise/2.0.1: - dependencies: - pinkie: 2.0.4 - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= - /pinkie/2.0.4: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pkg-dir/2.0.0: dependencies: find-up: 2.1.0 @@ -2921,10 +2513,6 @@ packages: hasBin: true resolution: integrity: sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== - /process-nextick-args/2.0.1: - dev: false - resolution: - integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== /progress/2.0.3: engines: node: '>=0.4.0' @@ -2957,16 +2545,6 @@ packages: node: '>=10' resolution: integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - /rc/1.2.8: - dependencies: - deep-extend: 0.6.0 - ini: 1.3.8 - minimist: 1.2.5 - strip-json-comments: 2.0.1 - dev: false - hasBin: true - resolution: - integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== /react-dom/17.0.1_react@17.0.1: dependencies: loose-envify: 1.4.0 @@ -3019,18 +2597,6 @@ packages: dev: true resolution: integrity: sha1-fPTFTvZI44EwhMY23SB54WbAgdk= - /readable-stream/2.3.7: - dependencies: - core-util-is: 1.0.2 - inherits: 2.0.4 - isarray: 1.0.0 - process-nextick-args: 2.0.1 - safe-buffer: 5.1.2 - string_decoder: 1.1.1 - util-deprecate: 1.0.2 - dev: false - resolution: - integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== /rechoir/0.6.2: dependencies: resolve: 1.19.0 @@ -3102,13 +2668,6 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== - /rimraf/2.7.1: - dependencies: - glob: 7.1.6 - dev: false - hasBin: true - resolution: - integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== /rimraf/3.0.2: dependencies: glob: 7.1.6 @@ -3129,16 +2688,9 @@ packages: resolution: integrity: sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ== /safe-buffer/5.1.2: + dev: true resolution: integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - /safer-buffer/2.1.2: - dev: false - resolution: - integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== - /sax/1.2.4: - dev: false - resolution: - integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== /scheduler/0.20.1: dependencies: loose-envify: 1.4.0 @@ -3146,14 +2698,8 @@ packages: dev: false resolution: integrity: sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== - /seek-bzip/1.0.6: - dependencies: - commander: 2.20.3 - dev: false - hasBin: true - resolution: - integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== /semver/5.7.1: + dev: true hasBin: true resolution: integrity: sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -3171,10 +2717,6 @@ packages: hasBin: true resolution: integrity: sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== - /set-blocking/2.0.0: - dev: false - resolution: - integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= /shebang-command/2.0.0: dependencies: shebang-regex: 3.0.0 @@ -3277,16 +2819,6 @@ packages: dev: true resolution: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - /string-width/1.0.2: - dependencies: - code-point-at: 1.1.0 - is-fullwidth-code-point: 1.0.0 - strip-ansi: 3.0.1 - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= /string-width/2.1.1: dependencies: is-fullwidth-code-point: 2.0.0 @@ -3336,12 +2868,6 @@ packages: dev: true resolution: integrity: sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= - /string_decoder/1.1.1: - dependencies: - safe-buffer: 5.1.2 - dev: false - resolution: - integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 @@ -3371,12 +2897,6 @@ packages: node: '>=4' resolution: integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - /strip-dirs/2.1.0: - dependencies: - is-natural-number: 4.0.1 - dev: false - resolution: - integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== /strip-json-comments/1.0.4: dev: true engines: @@ -3384,12 +2904,6 @@ packages: hasBin: true resolution: integrity: sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= - /strip-json-comments/2.0.1: - dev: false - engines: - node: '>=0.10.0' - resolution: - integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /strip-json-comments/3.1.1: dev: true engines: @@ -3429,34 +2943,6 @@ packages: node: '>=10.0.0' resolution: integrity: sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== - /tar-stream/1.6.2: - dependencies: - bl: 1.2.3 - buffer-alloc: 1.2.0 - end-of-stream: 1.4.4 - fs-constants: 1.0.0 - readable-stream: 2.3.7 - to-buffer: 1.1.1 - xtend: 4.0.2 - dev: false - engines: - node: '>= 0.8.0' - resolution: - integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== - /tar/4.4.13: - dependencies: - chownr: 1.1.4 - fs-minipass: 1.2.7 - minipass: 2.9.0 - minizlib: 1.3.3 - mkdirp: 0.5.5 - safe-buffer: 5.1.2 - yallist: 3.1.1 - dev: false - engines: - node: '>=4.5' - resolution: - integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== /tar/6.1.0: dependencies: chownr: 2.0.0 @@ -3474,14 +2960,6 @@ packages: dev: true resolution: integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - /through/2.3.8: - dev: false - resolution: - integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - /to-buffer/1.1.1: - dev: false - resolution: - integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== /to-fast-properties/1.0.3: dev: true engines: @@ -3553,13 +3031,6 @@ packages: hasBin: true resolution: integrity: sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== - /unbzip2-stream/1.4.3: - dependencies: - buffer: 5.7.1 - through: 2.3.8 - dev: false - resolution: - integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== /universalify/2.0.0: dev: false engines: @@ -3572,10 +3043,6 @@ packages: dev: true resolution: integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== - /util-deprecate/1.0.2: - dev: false - resolution: - integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /v8-compile-cache/2.2.0: dev: true resolution: @@ -3654,16 +3121,6 @@ packages: /wrappy/1.0.2: resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - /xtend/4.0.2: - dev: false - engines: - node: '>=0.4' - resolution: - integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== - /yallist/3.1.1: - dev: false - resolution: - integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== /yallist/4.0.0: dev: true resolution: @@ -3687,14 +3144,11 @@ packages: specifiers: '@terascope/fetch-github-release': ^0.7.4 '@types/atom': 1.40.7 - '@types/decompress': ^4.2.3 '@types/fs-extra': ^9.0.7 '@types/node': ^14.14.31 atom-languageclient: ^1.2.2 build-commit: 0.1.4 cross-env: 7.0.3 - decompress: ^4.2.1 - decompress-tarxz: ^3.0.0 eslint: 7.20.0 eslint-config-atomic: ^1.10.2 fs-extra: ^9.1.0 diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts index 68cf03d..026abaa 100644 --- a/src/get-serve-d.ts +++ b/src/get-serve-d.ts @@ -1,7 +1,9 @@ import downloadRelease from "@terascope/fetch-github-release" import { join, dirname, extname } from "path" import { remove, ensureDir } from "fs-extra" -import decompress from "decompress" +import { execFile as execFileRaw } from "child_process" +import { promisify } from "util" +const execFile = promisify(execFileRaw) const assetMap = { win32: "windows", @@ -13,7 +15,7 @@ const assetMap = { export async function getServeD() { const distFolder = join(dirname(__dirname), "dist") const platform = assetMap[process.platform] - const downloadFolder = join(distFolder, platform) + const outputFolder = join(distFolder, platform) await remove(distFolder) await ensureDir(distFolder) @@ -24,16 +26,22 @@ export async function getServeD() { /* download folder */ distFolder, /* filter release */ undefined, /* filter asset */ (asset) => asset.name.indexOf(platform) >= 0, - true + process.platform !== "win32" )) as unknown) as string[] const asset = assets[0] // Assume there is only one possibility - if (extname(asset) === ".xz") { - await decompress(asset, downloadFolder, { - plugins: [await import("decompress-tarxz")], + decompressTar(asset, outputFolder) + + remove(asset) +} + +/** Decompress if it is a tar file */ +async function decompressTar(filePath: string, outputFolder: string) { + if (/\.tar\.(g|x)z/.test(filePath)) { + // is tar file + const mod = extname(filePath) == ".xz" ? "J" : "z" + await execFile("tar", ["xvf" + mod, filePath], { + cwd: outputFolder, }) - } else { - await decompress(asset, downloadFolder) } - remove(asset) } From 45187fbdc9190d15946750c38f25c730fcf2f4d7 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 21:11:48 -0600 Subject: [PATCH 09/14] fix: make get.serve-d a script to download all release files --- package.json | 7 +- pnpm-lock.yaml | 727 ++++++++++++++++++++++++++++++++++++++--- scripts/get-serve-d.ts | 41 +++ scripts/tsconfig.json | 3 + src/get-serve-d.ts | 47 --- src/installation.ts | 8 +- 6 files changed, 733 insertions(+), 100 deletions(-) create mode 100644 scripts/get-serve-d.ts create mode 100644 scripts/tsconfig.json delete mode 100644 src/get-serve-d.ts diff --git a/package.json b/package.json index c5ec333..e8dac3c 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "build": "npm run tsc", "dev": "npm run tsc.dev", "get.grammars": "node ./scripts/get-grammars.js", + "get.serve-d": "ts-node -P ./scripts/tsconfig.json ./scripts/get-serve-d.ts", "build-commit": "build-commit -o dist", "prepare": "npm run build" }, @@ -82,20 +83,24 @@ } }, "devDependencies": { + "@terascope/fetch-github-release": "^0.7.4", "@types/atom": "1.40.7", + "@types/decompress": "^4.2.3", "@types/fs-extra": "^9.0.7", "@types/node": "^14.14.31", "build-commit": "0.1.4", "cross-env": "7.0.3", + "decompress": "^4.2.1", + "decompress-tarxz": "^3.0.0", "eslint": "7.20.0", "eslint-config-atomic": "^1.10.2", "gitly": "^2.0.2", "prettier": "^2.2.1", "shx": "0.3.3", + "ts-node": "^9.1.1", "typescript": "^4.2.2" }, "dependencies": { - "@terascope/fetch-github-release": "^0.7.4", "atom-languageclient": "^1.2.2", "fs-extra": "^9.1.0", "path-exists": "^4.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a20fe10..82e5260 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,19 +1,23 @@ dependencies: - '@terascope/fetch-github-release': 0.7.4 atom-languageclient: 1.2.2 fs-extra: 9.1.0 path-exists: 4.0.0 devDependencies: + '@terascope/fetch-github-release': 0.7.4 '@types/atom': 1.40.7 + '@types/decompress': 4.2.3 '@types/fs-extra': 9.0.7 '@types/node': 14.14.31 build-commit: 0.1.4 cross-env: 7.0.3 + decompress: 4.2.1 + decompress-tarxz: 3.0.0 eslint: 7.20.0 eslint-config-atomic: 1.10.2_eslint@7.20.0 gitly: 2.0.2 prettier: 2.2.1 shx: 0.3.3 + ts-node: 9.1.1_typescript@4.2.2 typescript: 4.2.2 lockfileVersion: 5.2 packages: @@ -232,7 +236,7 @@ packages: resolution: integrity: sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== /@sindresorhus/is/4.0.0: - dev: false + dev: true engines: node: '>=10' resolution: @@ -240,7 +244,7 @@ packages: /@szmarczak/http-timer/4.0.5: dependencies: defer-to-connect: 2.0.0 - dev: false + dev: true engines: node: '>=10' resolution: @@ -255,7 +259,7 @@ packages: multi-progress: 4.0.0_progress@2.0.3 progress: 2.0.3 regenerator-runtime: 0.13.7 - dev: false + dev: true hasBin: true resolution: integrity: sha512-AVk3ckeL9VoPU8qEOlPQJVa3wOm5GqK4f+LwqcxgPa/If3Q2p6ingzClsFYrUClABlZfLbiFRFNM4H100nEEyg== @@ -271,9 +275,15 @@ packages: '@types/keyv': 3.1.1 '@types/node': 14.14.22 '@types/responselike': 1.0.0 - dev: false + dev: true resolution: integrity: sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== + /@types/decompress/4.2.3: + dependencies: + '@types/node': 14.14.31 + dev: true + resolution: + integrity: sha512-W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ== /@types/fs-extra/9.0.7: dependencies: '@types/node': 14.14.28 @@ -281,7 +291,7 @@ packages: resolution: integrity: sha512-YGq2A6Yc3bldrLUlm17VNWOnUbnEzJ9CMgOeLFtQF3HOCN5lQBO8VyjG00a5acA5NNSM30kHVGp1trZgnVgi1Q== /@types/http-cache-semantics/4.0.0: - dev: false + dev: true resolution: integrity: sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== /@types/json-schema/7.0.7: @@ -295,10 +305,11 @@ packages: /@types/keyv/3.1.1: dependencies: '@types/node': 14.14.22 - dev: false + dev: true resolution: integrity: sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== /@types/node/14.14.22: + dev: true resolution: integrity: sha512-g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw== /@types/node/14.14.28: @@ -312,13 +323,13 @@ packages: /@types/responselike/1.0.0: dependencies: '@types/node': 14.14.22 - dev: false + dev: true resolution: integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== /@types/yauzl/2.9.1: dependencies: '@types/node': 14.14.22 - dev: false + dev: true optional: true resolution: integrity: sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA== @@ -428,6 +439,10 @@ packages: node: ^8.10.0 || ^10.13.0 || >=11.10.1 resolution: integrity: sha512-KBB+xLBxnBdTENs/rUgeUKO0UkPBRs2vD09oMRRIkj5BEN8PX1ToXV532desXfpQnZsYTyLLviS7JrPhdL154w== + /abbrev/1.1.1: + dev: true + resolution: + integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== /acorn-jsx/5.3.1_acorn@7.4.1: dependencies: acorn: 7.4.1 @@ -468,12 +483,13 @@ packages: resolution: integrity: sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== /ansi-regex/2.1.1: + dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-w7M6te42DYbg5ijwRorn7yfWVN8= /ansi-regex/3.0.0: - dev: false + dev: true engines: node: '>=4' resolution: @@ -506,10 +522,25 @@ packages: node: '>=8' resolution: integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + /aproba/1.2.0: + dev: true + resolution: + integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== /aproba/2.0.0: - dev: false + dev: true resolution: integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== + /are-we-there-yet/1.1.5: + dependencies: + delegates: 1.0.0 + readable-stream: 2.3.7 + dev: true + resolution: + integrity: sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w== + /arg/4.1.3: + dev: true + resolution: + integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== /argparse/1.0.10: dependencies: sprintf-js: 1.0.3 @@ -731,12 +762,23 @@ packages: dev: true resolution: integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + /base64-js/1.5.1: + dev: true + resolution: + integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== /bindings/1.5.0: dependencies: file-uri-to-path: 1.0.0 dev: false resolution: integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + /bl/1.2.3: + dependencies: + readable-stream: 2.3.7 + safe-buffer: 5.1.2 + dev: true + resolution: + integrity: sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww== /brace-expansion/1.1.11: dependencies: balanced-match: 1.0.0 @@ -752,10 +794,36 @@ packages: node: '>=8' resolution: integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + /buffer-alloc-unsafe/1.1.0: + dev: true + resolution: + integrity: sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== + /buffer-alloc/1.2.0: + dependencies: + buffer-alloc-unsafe: 1.1.0 + buffer-fill: 1.0.0 + dev: true + resolution: + integrity: sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== /buffer-crc32/0.2.13: - dev: false + dev: true resolution: integrity: sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI= + /buffer-fill/1.0.0: + dev: true + resolution: + integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= + /buffer-from/1.1.1: + dev: true + resolution: + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + /buffer/5.7.1: + dependencies: + base64-js: 1.5.1 + ieee754: 1.2.1 + dev: true + resolution: + integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== /build-commit/0.1.4: dependencies: colors: 1.4.0 @@ -768,7 +836,7 @@ packages: resolution: integrity: sha512-LpdIncz6SaYSRormDsK2M6hBcCq8ZMpGZnIcZHUCOU4RTjTLgGRch9WK16iWy+9ngQsJGvfsal+aD0tt1vT74g== /cacheable-lookup/5.0.4: - dev: false + dev: true engines: node: '>=10.6.0' resolution: @@ -782,7 +850,7 @@ packages: lowercase-keys: 2.0.0 normalize-url: 4.5.0 responselike: 2.0.0 - dev: false + dev: true engines: node: '>=8' resolution: @@ -831,6 +899,10 @@ packages: node: '>=10' resolution: integrity: sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + /chownr/1.1.4: + dev: true + resolution: + integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== /chownr/2.0.0: dev: true engines: @@ -853,9 +925,15 @@ packages: /clone-response/1.0.2: dependencies: mimic-response: 1.0.1 - dev: false + dev: true resolution: integrity: sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + /code-point-at/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= /coffeescript/1.12.7: dev: true engines: @@ -893,7 +971,7 @@ packages: resolution: integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== /color-support/1.1.3: - dev: false + dev: true hasBin: true resolution: integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== @@ -903,7 +981,12 @@ packages: node: '>=0.1.90' resolution: integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== + /commander/2.20.3: + dev: true + resolution: + integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== /commander/7.0.0: + dev: true engines: node: '>= 10' resolution: @@ -923,7 +1006,7 @@ packages: resolution: integrity: sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA= /console-control-strings/1.1.0: - dev: false + dev: true resolution: integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= /contains-path/0.1.0: @@ -950,7 +1033,7 @@ packages: resolution: integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== /core-js/3.8.3: - dev: false + dev: true requiresBuild: true resolution: integrity: sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q== @@ -958,6 +1041,10 @@ packages: dev: true resolution: integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + /create-require/1.1.1: + dev: true + resolution: + integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== /cross-env/7.0.3: dependencies: cross-spawn: 7.0.3 @@ -993,9 +1080,16 @@ packages: dev: true resolution: integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + /debug/3.2.7: + dependencies: + ms: 2.1.2 + dev: true + resolution: + integrity: sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== /debug/4.3.1: dependencies: ms: 2.1.2 + dev: true engines: node: '>=6.0' peerDependencies: @@ -1008,17 +1102,92 @@ packages: /decompress-response/6.0.0: dependencies: mimic-response: 3.1.0 - dev: false + dev: true engines: node: '>=10' resolution: integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + /decompress-tar/4.1.1: + dependencies: + file-type: 5.2.0 + is-stream: 1.1.0 + tar-stream: 1.6.2 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ== + /decompress-tarbz2/4.1.1: + dependencies: + decompress-tar: 4.1.1 + file-type: 6.2.0 + is-stream: 1.1.0 + seek-bzip: 1.0.6 + unbzip2-stream: 1.4.3 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A== + /decompress-targz/4.1.1: + dependencies: + decompress-tar: 4.1.1 + file-type: 5.2.0 + is-stream: 1.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w== + /decompress-tarxz/3.0.0: + dependencies: + decompress-tar: 4.1.1 + file-type: 12.4.2 + is-stream: 2.0.0 + lzma-native: 4.0.6 + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-/85049bKZOmkVXrFz9Zf90DMBPYuXGGAMOQaytNgMGiB7u4iIJKLUaEXRiLBvugtknmYcP1Zv6KQWEYWshTblg== + /decompress-unzip/4.0.1: + dependencies: + file-type: 3.9.0 + get-stream: 2.3.1 + pify: 2.3.0 + yauzl: 2.10.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-3qrM39FK6vhVePczroIQ+bSEj2k= + /decompress/4.2.1: + dependencies: + decompress-tar: 4.1.1 + decompress-tarbz2: 4.1.1 + decompress-targz: 4.1.1 + decompress-unzip: 4.0.1 + graceful-fs: 4.2.4 + make-dir: 1.3.0 + pify: 2.3.0 + strip-dirs: 2.1.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-e48kc2IjU+2Zw8cTb6VZcJQ3lgVbS4uuB1TfCHbiZIP/haNXm+SVyhu+87jts5/3ROpd82GSVCoNs/z8l4ZOaQ== + /deep-extend/0.6.0: + dev: true + engines: + node: '>=4.0.0' + resolution: + integrity: sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== /deep-is/0.1.3: dev: true resolution: integrity: sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= /defer-to-connect/2.0.0: - dev: false + dev: true engines: node: '>=10' resolution: @@ -1031,6 +1200,23 @@ packages: node: '>= 0.4' resolution: integrity: sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ== + /delegates/1.0.0: + dev: true + resolution: + integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + /detect-libc/1.0.3: + dev: true + engines: + node: '>=0.10' + hasBin: true + resolution: + integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= + /diff/4.0.2: + dev: true + engines: + node: '>=0.3.1' + resolution: + integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== /dir-glob/3.0.1: dependencies: path-type: 4.0.0 @@ -1107,7 +1293,7 @@ packages: /end-of-stream/1.4.4: dependencies: once: 1.4.0 - dev: false + dev: true resolution: integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== /enquirer/2.3.6: @@ -1571,7 +1757,7 @@ packages: debug: 4.3.1 get-stream: 5.2.0 yauzl: 2.10.0 - dev: false + dev: true engines: node: '>= 10.17.0' hasBin: true @@ -1613,7 +1799,7 @@ packages: /fd-slicer/1.1.0: dependencies: pend: 1.2.0 - dev: false + dev: true resolution: integrity: sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4= /file-entry-cache/6.0.0: @@ -1624,6 +1810,30 @@ packages: node: ^10.12.0 || >=12.0.0 resolution: integrity: sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== + /file-type/12.4.2: + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg== + /file-type/3.9.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-JXoHg4TR24CHvESdEH1SpSZyuek= + /file-type/5.2.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-LdvqfHP/42No365J3DOMBYwritY= + /file-type/6.2.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg== /file-uri-to-path/1.0.0: dev: false resolution: @@ -1668,6 +1878,10 @@ packages: optional: true resolution: integrity: sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA== + /fs-constants/1.0.0: + dev: true + resolution: + integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow== /fs-extra/9.1.0: dependencies: at-least-node: 1.0.0 @@ -1679,6 +1893,12 @@ packages: node: '>=10' resolution: integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + /fs-minipass/1.2.7: + dependencies: + minipass: 2.9.0 + dev: true + resolution: + integrity: sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== /fs-minipass/2.1.0: dependencies: minipass: 3.1.3 @@ -1699,6 +1919,19 @@ packages: dev: true resolution: integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + /gauge/2.7.4: + dependencies: + aproba: 1.2.0 + console-control-strings: 1.1.0 + has-unicode: 2.0.1 + object-assign: 4.1.1 + signal-exit: 3.0.3 + string-width: 1.0.2 + strip-ansi: 3.0.1 + wide-align: 1.1.3 + dev: true + resolution: + integrity: sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= /gauge/3.0.0: dependencies: aproba: 2.0.0 @@ -1709,7 +1942,7 @@ packages: string-width: 2.1.1 strip-ansi: 3.0.1 wide-align: 1.1.3 - dev: false + dev: true engines: node: '>=10' resolution: @@ -1728,10 +1961,19 @@ packages: dev: true resolution: integrity: sha512-M11rgtQp5GZMZzDL7jLTNxbDfurpzuau5uqRWDPvlHjfvg3TdScAZo96GLvhMjImrmR8uAt0FS2RLoMrfWGKlg== + /get-stream/2.3.1: + dependencies: + object-assign: 4.1.1 + pinkie-promise: 2.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4= /get-stream/5.2.0: dependencies: pump: 3.0.0 - dev: false + dev: true engines: node: '>=8' resolution: @@ -1808,11 +2050,15 @@ packages: lowercase-keys: 2.0.0 p-cancelable: 2.0.0 responselike: 2.0.0 - dev: false + dev: true engines: node: '>=10.19.0' resolution: integrity: sha512-9aYdZL+6nHmvJwHALLwKSUZ0hMwGaJGYv3hoPLPgnT8BoBXm1SjnZeky+91tfwJaDzun2s4RsBRy48IEYv2q2Q== + /graceful-fs/4.2.4: + dev: true + resolution: + integrity: sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== /graceful-fs/4.2.6: resolution: integrity: sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -1843,7 +2089,7 @@ packages: resolution: integrity: sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg== /has-unicode/2.0.1: - dev: false + dev: true resolution: integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= /has/1.0.3: @@ -1869,18 +2115,36 @@ packages: resolution: integrity: sha1-mWwosZFRaovoZQGn15dX5ccMEGg= /http-cache-semantics/4.1.0: - dev: false + dev: true resolution: integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== /http2-wrapper/1.0.0-beta.5.2: dependencies: quick-lru: 5.1.1 resolve-alpn: 1.0.0 - dev: false + dev: true engines: node: '>=10.19.0' resolution: integrity: sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ== + /iconv-lite/0.4.24: + dependencies: + safer-buffer: 2.1.2 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== + /ieee754/1.2.1: + dev: true + resolution: + integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== + /ignore-walk/3.0.3: + dependencies: + minimatch: 3.0.4 + dev: true + resolution: + integrity: sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw== /ignore/4.0.6: dev: true engines: @@ -1919,6 +2183,10 @@ packages: dev: true resolution: integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + /ini/1.3.8: + dev: true + resolution: + integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== /internal-slot/1.0.3: dependencies: get-intrinsic: 1.1.0 @@ -1969,8 +2237,16 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + /is-fullwidth-code-point/1.0.0: + dependencies: + number-is-nan: 1.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-754xOG8DGn8NZDr4L95QxFfvAMs= /is-fullwidth-code-point/2.0.0: - dev: false + dev: true engines: node: '>=4' resolution: @@ -1989,6 +2265,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + /is-natural-number/4.0.1: + dev: true + resolution: + integrity: sha1-q5124dtM7VHjXeDHLr7PCfc0zeg= /is-negative-zero/2.0.1: dev: true engines: @@ -2009,6 +2289,18 @@ packages: node: '>= 0.4' resolution: integrity: sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg== + /is-stream/1.1.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-EtSj3U5o4Lec6428hBc66A2RykQ= + /is-stream/2.0.0: + dev: true + engines: + node: '>=8' + resolution: + integrity: sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== /is-string/1.0.5: dev: true engines: @@ -2072,7 +2364,7 @@ packages: resolution: integrity: sha512-TwuuaUDmra0JMkuqvqy+WGo2xGHSNjv1BA1nTIgtH2K5z1jHuAEeAgp7laaR+hLRmajRjcrM71+vByBDanCyYA== /json-buffer/3.0.1: - dev: false + dev: true resolution: integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== /json-schema-traverse/0.4.1: @@ -2136,7 +2428,7 @@ packages: /keyv/4.0.3: dependencies: json-buffer: 3.0.1 - dev: false + dev: true resolution: integrity: sha512-zdGa2TOpSZPq5mU6iowDARnMBZgtCqJ11dJROFi6tg6kTn4nuUdU09lFyLFSaHrWqpIJ+EBq4E8/Dc0Vx5vLdA== /language-subtag-registry/0.3.21: @@ -2189,7 +2481,7 @@ packages: resolution: integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== /lowercase-keys/2.0.0: - dev: false + dev: true engines: node: '>=8' resolution: @@ -2202,6 +2494,31 @@ packages: node: '>=10' resolution: integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + /lzma-native/4.0.6: + dependencies: + nan: 2.14.2 + node-pre-gyp: 0.11.0 + readable-stream: 2.3.7 + rimraf: 2.7.1 + dev: true + engines: + node: '>=6.0.0' + hasBin: true + requiresBuild: true + resolution: + integrity: sha512-1kiSs/KAcAuh9vyyd00ATXZFfrg6W8UCBqH1RKlWg/tBP5aQez6HYOY+SihmsZfpy0RVDioW5SLI76dZ3Mq5Rw== + /make-dir/1.3.0: + dependencies: + pify: 3.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ== + /make-error/1.3.6: + dev: true + resolution: + integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== /marked/1.2.9: dev: false engines: @@ -2225,13 +2542,13 @@ packages: resolution: integrity: sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q== /mimic-response/1.0.1: - dev: false + dev: true engines: node: '>=4' resolution: integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== /mimic-response/3.1.0: - dev: false + dev: true engines: node: '>=10' resolution: @@ -2246,6 +2563,13 @@ packages: dev: true resolution: integrity: sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + /minipass/2.9.0: + dependencies: + safe-buffer: 5.1.2 + yallist: 3.1.1 + dev: true + resolution: + integrity: sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== /minipass/3.1.3: dependencies: yallist: 4.0.0 @@ -2254,6 +2578,12 @@ packages: node: '>=8' resolution: integrity: sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg== + /minizlib/1.3.3: + dependencies: + minipass: 2.9.0 + dev: true + resolution: + integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== /minizlib/2.1.2: dependencies: minipass: 3.1.3 @@ -2263,6 +2593,13 @@ packages: node: '>= 8' resolution: integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + /mkdirp/0.5.5: + dependencies: + minimist: 1.2.5 + dev: true + hasBin: true + resolution: + integrity: sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== /mkdirp/1.0.4: dev: true engines: @@ -2275,20 +2612,36 @@ packages: resolution: integrity: sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= /ms/2.1.2: + dev: true resolution: integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== /multi-progress/4.0.0_progress@2.0.3: dependencies: progress: 2.0.3 - dev: false + dev: true peerDependencies: progress: ^2.0.0 resolution: integrity: sha512-9zcjyOou3FFCKPXsmkbC3ethv51SFPoA4dJD6TscIp2pUmy26kBDZW6h9XofPELrzseSkuD7r0V+emGEeo39Pg== + /nan/2.14.2: + dev: true + resolution: + integrity: sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== /natural-compare/1.4.0: dev: true resolution: integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + /needle/2.6.0: + dependencies: + debug: 3.2.7 + iconv-lite: 0.4.24 + sax: 1.2.4 + dev: true + engines: + node: '>= 4.4.x' + hasBin: true + resolution: + integrity: sha512-KKYdza4heMsEfSWD7VPUIz3zX2XDwOyX2d+geb4vrERZMT5RMU6ujjaD+I5Yr54uZxQ2w6XRTAhHBbSCyovZBg== /node-addon-api/3.1.0: dev: false resolution: @@ -2298,6 +2651,30 @@ packages: hasBin: true resolution: integrity: sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg== + /node-pre-gyp/0.11.0: + dependencies: + detect-libc: 1.0.3 + mkdirp: 0.5.5 + needle: 2.6.0 + nopt: 4.0.3 + npm-packlist: 1.4.8 + npmlog: 4.1.2 + rc: 1.2.8 + rimraf: 2.7.1 + semver: 5.7.1 + tar: 4.4.13 + dev: true + hasBin: true + resolution: + integrity: sha512-TwWAOZb0j7e9eGaf9esRx3ZcLaE5tQ2lvYy1pb5IAaG1a2e2Kv5Lms1Y4hpj+ciXJRofIxxlt5haeQ/2ANeE0Q== + /nopt/4.0.3: + dependencies: + abbrev: 1.1.1 + osenv: 0.1.5 + dev: true + hasBin: true + resolution: + integrity: sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg== /normalize-package-data/2.5.0: dependencies: hosted-git-info: 2.8.8 @@ -2308,11 +2685,44 @@ packages: resolution: integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== /normalize-url/4.5.0: - dev: false + dev: true engines: node: '>=8' resolution: integrity: sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ== + /npm-bundled/1.1.1: + dependencies: + npm-normalize-package-bin: 1.0.1 + dev: true + resolution: + integrity: sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA== + /npm-normalize-package-bin/1.0.1: + dev: true + resolution: + integrity: sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== + /npm-packlist/1.4.8: + dependencies: + ignore-walk: 3.0.3 + npm-bundled: 1.1.1 + npm-normalize-package-bin: 1.0.1 + dev: true + resolution: + integrity: sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + /npmlog/4.1.2: + dependencies: + are-we-there-yet: 1.1.5 + console-control-strings: 1.1.0 + gauge: 2.7.4 + set-blocking: 2.0.0 + dev: true + resolution: + integrity: sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== + /number-is-nan/1.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= /object-assign/4.1.1: engines: node: '>=0.10.0' @@ -2375,6 +2785,7 @@ packages: /once/1.4.0: dependencies: wrappy: 1.0.2 + dev: true resolution: integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E= /optionator/0.9.1: @@ -2390,8 +2801,27 @@ packages: node: '>= 0.8.0' resolution: integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + /os-homedir/1.0.2: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-/7xJiDNuDoM94MFox+8VISGqf7M= + /os-tmpdir/1.0.2: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= + /osenv/0.1.5: + dependencies: + os-homedir: 1.0.2 + os-tmpdir: 1.0.2 + dev: true + resolution: + integrity: sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g== /p-cancelable/2.0.0: - dev: false + dev: true engines: node: '>=8' resolution: @@ -2477,7 +2907,7 @@ packages: resolution: integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== /pend/1.2.0: - dev: false + dev: true resolution: integrity: sha1-elfrVQpng/kRUzH89GY9XI4AelA= /picomatch/2.2.2: @@ -2492,6 +2922,26 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-7RQaasBDqEnqWISY59yosVMw6Qw= + /pify/3.0.0: + dev: true + engines: + node: '>=4' + resolution: + integrity: sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + /pinkie-promise/2.0.1: + dependencies: + pinkie: 2.0.4 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-ITXW36ejWMBprJsXh3YogihFD/o= + /pinkie/2.0.4: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-clVrgM+g1IqXToDnckjoDtT3+HA= /pkg-dir/2.0.0: dependencies: find-up: 2.1.0 @@ -2513,7 +2963,12 @@ packages: hasBin: true resolution: integrity: sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + /process-nextick-args/2.0.1: + dev: true + resolution: + integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== /progress/2.0.3: + dev: true engines: node: '>=0.4.0' resolution: @@ -2530,7 +2985,7 @@ packages: dependencies: end-of-stream: 1.4.4 once: 1.4.0 - dev: false + dev: true resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== /punycode/2.1.1: @@ -2540,11 +2995,21 @@ packages: resolution: integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== /quick-lru/5.1.1: - dev: false + dev: true engines: node: '>=10' resolution: integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + /rc/1.2.8: + dependencies: + deep-extend: 0.6.0 + ini: 1.3.8 + minimist: 1.2.5 + strip-json-comments: 2.0.1 + dev: true + hasBin: true + resolution: + integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== /react-dom/17.0.1_react@17.0.1: dependencies: loose-envify: 1.4.0 @@ -2597,6 +3062,18 @@ packages: dev: true resolution: integrity: sha1-fPTFTvZI44EwhMY23SB54WbAgdk= + /readable-stream/2.3.7: + dependencies: + core-util-is: 1.0.2 + inherits: 2.0.4 + isarray: 1.0.0 + process-nextick-args: 2.0.1 + safe-buffer: 5.1.2 + string_decoder: 1.1.1 + util-deprecate: 1.0.2 + dev: true + resolution: + integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== /rechoir/0.6.2: dependencies: resolve: 1.19.0 @@ -2610,6 +3087,7 @@ packages: resolution: integrity: sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== /regenerator-runtime/0.13.7: + dev: true resolution: integrity: sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== /regexp-tree/0.1.23: @@ -2639,7 +3117,7 @@ packages: resolution: integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== /resolve-alpn/1.0.0: - dev: false + dev: true resolution: integrity: sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA== /resolve-from/4.0.0: @@ -2658,7 +3136,7 @@ packages: /responselike/2.0.0: dependencies: lowercase-keys: 2.0.0 - dev: false + dev: true resolution: integrity: sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw== /reusify/1.0.4: @@ -2668,6 +3146,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + /rimraf/2.7.1: + dependencies: + glob: 7.1.6 + dev: true + hasBin: true + resolution: + integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== /rimraf/3.0.2: dependencies: glob: 7.1.6 @@ -2691,6 +3176,14 @@ packages: dev: true resolution: integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + /safer-buffer/2.1.2: + dev: true + resolution: + integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + /sax/1.2.4: + dev: true + resolution: + integrity: sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== /scheduler/0.20.1: dependencies: loose-envify: 1.4.0 @@ -2698,6 +3191,13 @@ packages: dev: false resolution: integrity: sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + /seek-bzip/1.0.6: + dependencies: + commander: 2.20.3 + dev: true + hasBin: true + resolution: + integrity: sha512-e1QtP3YL5tWww8uKaOCQ18UxIT2laNBXHjV/S2WYCiK4udiv8lkG89KRIoCjUagnAmCBurjF4zEVX2ByBbnCjQ== /semver/5.7.1: dev: true hasBin: true @@ -2717,6 +3217,10 @@ packages: hasBin: true resolution: integrity: sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + /set-blocking/2.0.0: + dev: true + resolution: + integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= /shebang-command/2.0.0: dependencies: shebang-regex: 3.0.0 @@ -2768,7 +3272,7 @@ packages: resolution: integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== /signal-exit/3.0.3: - dev: false + dev: true resolution: integrity: sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== /slash/3.0.0: @@ -2787,12 +3291,25 @@ packages: node: '>=10' resolution: integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + /source-map-support/0.5.19: + dependencies: + buffer-from: 1.1.1 + source-map: 0.6.1 + dev: true + resolution: + integrity: sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw== /source-map/0.5.7: dev: true engines: node: '>=0.10.0' resolution: integrity: sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + /source-map/0.6.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== /spdx-correct/3.1.1: dependencies: spdx-expression-parse: 3.0.1 @@ -2819,11 +3336,21 @@ packages: dev: true resolution: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + /string-width/1.0.2: + dependencies: + code-point-at: 1.1.0 + is-fullwidth-code-point: 1.0.0 + strip-ansi: 3.0.1 + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= /string-width/2.1.1: dependencies: is-fullwidth-code-point: 2.0.0 strip-ansi: 4.0.0 - dev: false + dev: true engines: node: '>=4' resolution: @@ -2868,9 +3395,16 @@ packages: dev: true resolution: integrity: sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ= + /string_decoder/1.1.1: + dependencies: + safe-buffer: 5.1.2 + dev: true + resolution: + integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== /strip-ansi/3.0.1: dependencies: ansi-regex: 2.1.1 + dev: true engines: node: '>=0.10.0' resolution: @@ -2878,7 +3412,7 @@ packages: /strip-ansi/4.0.0: dependencies: ansi-regex: 3.0.0 - dev: false + dev: true engines: node: '>=4' resolution: @@ -2897,6 +3431,12 @@ packages: node: '>=4' resolution: integrity: sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + /strip-dirs/2.1.0: + dependencies: + is-natural-number: 4.0.1 + dev: true + resolution: + integrity: sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g== /strip-json-comments/1.0.4: dev: true engines: @@ -2904,6 +3444,12 @@ packages: hasBin: true resolution: integrity: sha1-HhX7ysl9Pumb8tc7TGVrCCu6+5E= + /strip-json-comments/2.0.1: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-PFMZQukIwml8DsNEhYwobHygpgo= /strip-json-comments/3.1.1: dev: true engines: @@ -2943,6 +3489,34 @@ packages: node: '>=10.0.0' resolution: integrity: sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + /tar-stream/1.6.2: + dependencies: + bl: 1.2.3 + buffer-alloc: 1.2.0 + end-of-stream: 1.4.4 + fs-constants: 1.0.0 + readable-stream: 2.3.7 + to-buffer: 1.1.1 + xtend: 4.0.2 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A== + /tar/4.4.13: + dependencies: + chownr: 1.1.4 + fs-minipass: 1.2.7 + minipass: 2.9.0 + minizlib: 1.3.3 + mkdirp: 0.5.5 + safe-buffer: 5.1.2 + yallist: 3.1.1 + dev: true + engines: + node: '>=4.5' + resolution: + integrity: sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA== /tar/6.1.0: dependencies: chownr: 2.0.0 @@ -2960,6 +3534,14 @@ packages: dev: true resolution: integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + /through/2.3.8: + dev: true + resolution: + integrity: sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= + /to-buffer/1.1.1: + dev: true + resolution: + integrity: sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg== /to-fast-properties/1.0.3: dev: true engines: @@ -2980,6 +3562,23 @@ packages: node: '>=8.0' resolution: integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== + /ts-node/9.1.1_typescript@4.2.2: + dependencies: + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + source-map-support: 0.5.19 + typescript: 4.2.2 + yn: 3.1.1 + dev: true + engines: + node: '>=10.0.0' + hasBin: true + peerDependencies: + typescript: '>=2.7' + resolution: + integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg== /tsconfig-paths/3.9.0: dependencies: '@types/json5': 0.0.29 @@ -3031,6 +3630,13 @@ packages: hasBin: true resolution: integrity: sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== + /unbzip2-stream/1.4.3: + dependencies: + buffer: 5.7.1 + through: 2.3.8 + dev: true + resolution: + integrity: sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== /universalify/2.0.0: dev: false engines: @@ -3043,6 +3649,10 @@ packages: dev: true resolution: integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + /util-deprecate/1.0.2: + dev: true + resolution: + integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= /v8-compile-cache/2.2.0: dev: true resolution: @@ -3109,7 +3719,7 @@ packages: /wide-align/1.1.3: dependencies: string-width: 2.1.1 - dev: false + dev: true resolution: integrity: sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA== /word-wrap/1.2.3: @@ -3119,8 +3729,19 @@ packages: resolution: integrity: sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== /wrappy/1.0.2: + dev: true resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + /xtend/4.0.2: + dev: true + engines: + node: '>=0.4' + resolution: + integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== + /yallist/3.1.1: + dev: true + resolution: + integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== /yallist/4.0.0: dev: true resolution: @@ -3129,9 +3750,15 @@ packages: dependencies: buffer-crc32: 0.2.13 fd-slicer: 1.1.0 - dev: false + dev: true resolution: integrity: sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk= + /yn/3.1.1: + dev: true + engines: + node: '>=6' + resolution: + integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== /zadeh/2.0.2: dependencies: bindings: 1.5.0 @@ -3144,11 +3771,14 @@ packages: specifiers: '@terascope/fetch-github-release': ^0.7.4 '@types/atom': 1.40.7 + '@types/decompress': ^4.2.3 '@types/fs-extra': ^9.0.7 '@types/node': ^14.14.31 atom-languageclient: ^1.2.2 build-commit: 0.1.4 cross-env: 7.0.3 + decompress: ^4.2.1 + decompress-tarxz: ^3.0.0 eslint: 7.20.0 eslint-config-atomic: ^1.10.2 fs-extra: ^9.1.0 @@ -3156,4 +3786,5 @@ specifiers: path-exists: ^4.0.0 prettier: ^2.2.1 shx: 0.3.3 + ts-node: ^9.1.1 typescript: ^4.2.2 diff --git a/scripts/get-serve-d.ts b/scripts/get-serve-d.ts new file mode 100644 index 0000000..72f3506 --- /dev/null +++ b/scripts/get-serve-d.ts @@ -0,0 +1,41 @@ +import downloadRelease from "@terascope/fetch-github-release" +import { join, dirname, extname, basename } from "path" +import { remove, ensureDir } from "fs-extra" +import decompress from "decompress" +import decompressTarxz from "decompress-tarxz" + +// function to download serve-d binaries from GitHub +export async function getServeD() { + const distFolder = join(dirname(__dirname), "dist") + + await remove(distFolder) + await ensureDir(distFolder) + + const assets = ((await downloadRelease( + /* username */ "Pure-D", + /* repo */ "serve-d", + /* download folder */ distFolder, + /* filter release */ undefined, + /* filter asset */ undefined, // (asset) => asset.name.indexOf(platform) >= 0, + true + )) as unknown) as string[] + + for (const asset of assets) { + const platform = basename(asset).match(/windows|linux|osx/)[0] + const downloadFolder = join(distFolder, platform) + if (extname(asset) === ".xz") { + await decompress(asset, downloadFolder, { + plugins: [decompressTarxz()], + }) + } else { + await decompress(asset, downloadFolder) + } + remove(asset) + } +} + +getServeD() + .then(() => console.log("Done")) + .catch((e) => { + throw e + }) diff --git a/scripts/tsconfig.json b/scripts/tsconfig.json new file mode 100644 index 0000000..0a677a1 --- /dev/null +++ b/scripts/tsconfig.json @@ -0,0 +1,3 @@ +{ + "extends": "../src/tsconfig.json" +} diff --git a/src/get-serve-d.ts b/src/get-serve-d.ts deleted file mode 100644 index 026abaa..0000000 --- a/src/get-serve-d.ts +++ /dev/null @@ -1,47 +0,0 @@ -import downloadRelease from "@terascope/fetch-github-release" -import { join, dirname, extname } from "path" -import { remove, ensureDir } from "fs-extra" -import { execFile as execFileRaw } from "child_process" -import { promisify } from "util" -const execFile = promisify(execFileRaw) - -const assetMap = { - win32: "windows", - darwin: "osx", - linux: "linux", -} - -// function to download serve-d binaries from GitHub -export async function getServeD() { - const distFolder = join(dirname(__dirname), "dist") - const platform = assetMap[process.platform] - const outputFolder = join(distFolder, platform) - - await remove(distFolder) - await ensureDir(distFolder) - - const assets = ((await downloadRelease( - /* username */ "Pure-D", - /* repo */ "serve-d", - /* download folder */ distFolder, - /* filter release */ undefined, - /* filter asset */ (asset) => asset.name.indexOf(platform) >= 0, - process.platform !== "win32" - )) as unknown) as string[] - - const asset = assets[0] // Assume there is only one possibility - decompressTar(asset, outputFolder) - - remove(asset) -} - -/** Decompress if it is a tar file */ -async function decompressTar(filePath: string, outputFolder: string) { - if (/\.tar\.(g|x)z/.test(filePath)) { - // is tar file - const mod = extname(filePath) == ".xz" ? "J" : "z" - await execFile("tar", ["xvf" + mod, filePath], { - cwd: outputFolder, - }) - } -} diff --git a/src/installation.ts b/src/installation.ts index f464d1a..c2968d0 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -2,6 +2,10 @@ import { copy } from "fs-extra" import pathExists from "path-exists" import { join, dirname } from "path" +import { execFile as execFileRaw } from "child_process" +import { promisify } from "util" +const execFile = promisify(execFileRaw) + const distFolder = join(dirname(__dirname), "dist") const exeExtention = process.platform === "win32" ? ".exe" : "" @@ -34,10 +38,6 @@ export async function installServeD() { if (!(await isServeDInstalled(serveDPath))) { atom.notifications.addInfo("Installing serve-d...") - const { getServeD } = await import("./get-serve-d") - // download serve-d - getServeD() - // copy the whole served folder await copy(bundledServerMap[process.platform], codeDBinFolder) From b30933138a5e08331122e2461b034336029f855e Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 21:51:05 -0600 Subject: [PATCH 10/14] fix: add function to get the version of serve-d --- src/installation.ts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/installation.ts b/src/installation.ts index c2968d0..be812e3 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -32,6 +32,17 @@ async function isServeDInstalled(serveDPath: string) { return pathExists(serveDPath) } +/** get the version of serve-d */ +async function getServeDVersion(file: string) { + try { + const output = (await execFile(file, ["--version"])).stderr + const version = output.match(/v(\d\S*)\s/)[1] + return version + } catch (e) { + console.error(e) + return null + } +} export async function installServeD() { const codeDBinFolder = await getCodeDBinFolder() const serveDPath = join(codeDBinFolder, serveDExeFileName) From 79d558123a5d5cbb82ae96620ecdc1760c9f3608 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 22:10:44 -0600 Subject: [PATCH 11/14] fix: isServeDUpToDate --- package.json | 2 ++ pnpm-lock.yaml | 8 ++++++++ src/installation.ts | 11 +++++++++++ 3 files changed, 21 insertions(+) diff --git a/package.json b/package.json index e8dac3c..cba4625 100644 --- a/package.json +++ b/package.json @@ -88,6 +88,7 @@ "@types/decompress": "^4.2.3", "@types/fs-extra": "^9.0.7", "@types/node": "^14.14.31", + "@types/semver": "^7.3.4", "build-commit": "0.1.4", "cross-env": "7.0.3", "decompress": "^4.2.1", @@ -96,6 +97,7 @@ "eslint-config-atomic": "^1.10.2", "gitly": "^2.0.2", "prettier": "^2.2.1", + "semver": "^7.3.4", "shx": "0.3.3", "ts-node": "^9.1.1", "typescript": "^4.2.2" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 82e5260..6b89425 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,6 +8,7 @@ devDependencies: '@types/decompress': 4.2.3 '@types/fs-extra': 9.0.7 '@types/node': 14.14.31 + '@types/semver': 7.3.4 build-commit: 0.1.4 cross-env: 7.0.3 decompress: 4.2.1 @@ -16,6 +17,7 @@ devDependencies: eslint-config-atomic: 1.10.2_eslint@7.20.0 gitly: 2.0.2 prettier: 2.2.1 + semver: 7.3.4 shx: 0.3.3 ts-node: 9.1.1_typescript@4.2.2 typescript: 4.2.2 @@ -326,6 +328,10 @@ packages: dev: true resolution: integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== + /@types/semver/7.3.4: + dev: true + resolution: + integrity: sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ== /@types/yauzl/2.9.1: dependencies: '@types/node': 14.14.22 @@ -3774,6 +3780,7 @@ specifiers: '@types/decompress': ^4.2.3 '@types/fs-extra': ^9.0.7 '@types/node': ^14.14.31 + '@types/semver': ^7.3.4 atom-languageclient: ^1.2.2 build-commit: 0.1.4 cross-env: 7.0.3 @@ -3785,6 +3792,7 @@ specifiers: gitly: ^2.0.2 path-exists: ^4.0.0 prettier: ^2.2.1 + semver: ^7.3.4 shx: 0.3.3 ts-node: ^9.1.1 typescript: ^4.2.2 diff --git a/src/installation.ts b/src/installation.ts index be812e3..5de7a21 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -1,6 +1,7 @@ import { copy } from "fs-extra" import pathExists from "path-exists" import { join, dirname } from "path" +import semverCompare from "semver/functions/compare" import { execFile as execFileRaw } from "child_process" import { promisify } from "util" @@ -43,6 +44,16 @@ async function getServeDVersion(file: string) { return null } } + +/** Check if the given serve-d is up to date against the target version */ +export async function isServeDUpToDate(givenFile: string, targetFile: string) { + const givenVersion = await getServeDVersion(givenFile) + const targetVersion = await getServeDVersion(targetFile) + return semverCompare(givenVersion, targetVersion) !== 0 +} + +} + export async function installServeD() { const codeDBinFolder = await getCodeDBinFolder() const serveDPath = join(codeDBinFolder, serveDExeFileName) From 7bf1e698ec12f2cbe31a9e0924f4d5a034d77990 Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 22:10:49 -0600 Subject: [PATCH 12/14] fix: copyServeD if not installed or not up to date --- src/installation.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/installation.ts b/src/installation.ts index 5de7a21..57b21a2 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -52,18 +52,19 @@ export async function isServeDUpToDate(givenFile: string, targetFile: string) { return semverCompare(givenVersion, targetVersion) !== 0 } +async function copyServeD(codeDBinFolder: string) { + atom.notifications.addInfo("Installing serve-d...") + // copy the whole served folder + await copy(bundledServerMap[process.platform], codeDBinFolder, { overwrite: true }) + atom.notifications.addSuccess("Serve-d was installed") } export async function installServeD() { const codeDBinFolder = await getCodeDBinFolder() const serveDPath = join(codeDBinFolder, serveDExeFileName) - if (!(await isServeDInstalled(serveDPath))) { - atom.notifications.addInfo("Installing serve-d...") - - // copy the whole served folder - await copy(bundledServerMap[process.platform], codeDBinFolder) - - atom.notifications.addSuccess("Serve-d was installed") + const bundledServeDPath = join(bundledServerMap[process.platform], serveDExeFileName) + if (!(await isServeDInstalled(serveDPath)) || !(await isServeDUpToDate(serveDPath, bundledServeDPath))) { + await copyServeD(codeDBinFolder) } return serveDPath } From 0e468112dcbb7830d6db4eb4f8d683bb3d2014cb Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 22:18:25 -0600 Subject: [PATCH 13/14] fix: allow newer versions than the bundelded version --- src/installation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/installation.ts b/src/installation.ts index 57b21a2..a2d0be5 100644 --- a/src/installation.ts +++ b/src/installation.ts @@ -49,7 +49,7 @@ async function getServeDVersion(file: string) { export async function isServeDUpToDate(givenFile: string, targetFile: string) { const givenVersion = await getServeDVersion(givenFile) const targetVersion = await getServeDVersion(targetFile) - return semverCompare(givenVersion, targetVersion) !== 0 + return givenVersion && targetVersion && semverCompare(givenVersion, targetVersion) !== -1 } async function copyServeD(codeDBinFolder: string) { From 1890a3ed6af3a6c119fbecb75ca9559431a1146d Mon Sep 17 00:00:00 2001 From: Amin Yahyaabadi Date: Wed, 24 Feb 2021 22:28:05 -0600 Subject: [PATCH 14/14] fix: add built files to lfs --- .gitattributes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index 62ebebc..572b831 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,9 @@ * text=auto # don't diff machine generated files -dist/ -diff package-lock.json -diff pnpm-lock.yaml -diff + +# Built files +dist/ -diff +dist/** filter=lfs diff=lfs merge=lfs -text