From fdeb71b0bc43abe15ed1b31f0efda2c4e750e3e3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 6 May 2018 14:41:06 +0300 Subject: [PATCH] ci(travis): test on Node.js 10 --- .travis.yml | 2 +- package.json | 2 +- shrinkwrap.yaml | 141 ++++++++++++++++--------------- test/install/aliases.ts | 5 +- test/install/lifecycleScripts.ts | 2 +- test/rebuild.ts | 4 +- test/shrinkwrap.ts | 17 ++-- typings/local.d.ts | 8 +- 8 files changed, 97 insertions(+), 84 deletions(-) diff --git a/.travis.yml b/.travis.yml index be302abd0e..03ae7182d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ node_js: - 4 - 6 - 8 - - 9 + - 10 sudo: false before_install: - git fetch --unshallow diff --git a/package.json b/package.json index c421802d44..ef73723d70 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "npm-scripts-info": "^0.3.6", "package-preview": "^1.0.0", "path-name": "^1.0.0", - "pnpm-registry-mock": "^1.21.0", + "pnpm-registry-mock": "^1.22.2", "read-pkg": "^3.0.0", "rimraf": "^2.6.2", "sepia": "^2.0.2", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index b55f353445..63b438fa07 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -14,7 +14,7 @@ dependencies: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -86,15 +86,15 @@ devDependencies: npm-scripts-info: 0.3.7 package-preview: 1.0.5 path-name: 1.0.0 - pnpm-registry-mock: 1.21.0 + pnpm-registry-mock: 1.22.2 read-pkg: 3.0.0 rimraf: 2.6.2 sepia: 2.0.2 - sinon: 5.0.3 + sinon: 5.0.4 tape: 4.9.0 tape-promise: 2.0.1 ts-node: 6.0.2 - tslint: 5.9.1 + tslint: 5.10.0 typescript: 2.8.3 write-json-file: 2.3.0 write-yaml-file: 1.0.1 @@ -334,9 +334,9 @@ packages: integrity: sha512-2lJb/Du0gzF9IBV8051c59xaWVLOdfjNqMSMIGojuXJe5Ru4mODTs0wFQr5t5g7ocjp+djAWgEvvy8ySv+4i9g== /@pnpm/exec/1.1.4: dependencies: - '@pnpm/self-installer': 2.0.2 + '@pnpm/self-installer': 2.0.3 '@types/got': 7.1.8 - '@types/node': 9.6.11 + '@types/node': 9.6.12 command-exists: 1.2.6 cross-spawn: 5.1.0 dev: true @@ -353,7 +353,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.1: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -363,7 +363,7 @@ packages: integrity: sha512-gmM3SM6fBpssvbSD1U8wJbArNPiQchFzt90ICkfawo0OGQBYY6mgt+sqxF93E9yLfNY7WGtPJYhAQW3Uht6m7A== /@pnpm/git-fetcher/0.3.2: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dint: 2.0.2 execa: 0.10.0 path-temp: 1.0.0 @@ -375,7 +375,7 @@ packages: integrity: sha512-1+05HxsiqLBrj2/89PSNhKDw0/UDJBIatXd06tY+NGSMd3zhc75x+BBvpj9UKFU91UJLBhyEOpEcDhed/YcUnA== /@pnpm/git-resolver/0.3.3: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/semver': 5.5.0 got: 8.3.1 graceful-git: 1.0.3 @@ -406,7 +406,7 @@ packages: pnpm-shrinkwrap: 6.3.2 ramda: 0.25.0 read-package-json: 2.0.13 - supi: 0.16.8 + supi: 0.16.9 symlink-dir: 1.1.2 util.promisify: 1.0.0 dev: false @@ -435,7 +435,7 @@ packages: '@pnpm/package-bins': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/ramda': 0.25.24 '@zkochan/cmd-shim': 2.2.4 arr-flatten: 1.1.0 @@ -457,7 +457,7 @@ packages: dependencies: '@pnpm/types': 1.7.0 '@types/graceful-fs': 4.1.2 - '@types/node': 9.6.11 + '@types/node': 9.6.12 graceful-fs: 4.1.11 normalize-path: 3.0.0 osenv: 0.1.5 @@ -471,7 +471,7 @@ packages: integrity: sha512-LclcVTZ/L35lvZyhnuzOvm2KzJinWqS+6LV8sPBdBNsvFCz0cZng9PHlRFsh5gAloP0kKPu3+WiK82TxDCqCcw== /@pnpm/logger/1.0.1: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -492,7 +492,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mem': 1.1.2 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/semver': 5.5.0 '@types/write-json-file': 2.2.1 credentials-by-uri: 1.0.0 @@ -532,7 +532,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 4.0.0 @@ -569,15 +569,15 @@ packages: node: '>=4' resolution: integrity: sha512-+y47No75LZFnkN7VAnoEtkIzDgOuc8ZT4QjyhuNIBVLx4oqFa/R16DpSyRjmaTZMCSREXunObULKL/hoLipNDA== - /@pnpm/self-installer/2.0.2: + /@pnpm/self-installer/2.0.3: dev: true engines: node: '>=4' resolution: - integrity: sha1-hbuHZMfM0iOZn2FCGQBixibo8oc= + integrity: sha512-Awzcm+UsGmUZaZXkLH5efJEos9UICA4PIXpedyiY7Mg4LXVUtrGtX/jYNkuxj3x/bwh+7LnEvbBV4GpscxsFjw== /@pnpm/store-path/1.0.3: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/touch': 3.1.0 can-link: 1.0.2 mkdirp-promise: 5.0.1 @@ -597,7 +597,7 @@ packages: '@pnpm/fetcher-base': 1.0.0 '@types/mem': 1.1.2 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/retry': 0.10.2 '@types/rimraf': 2.0.2 credentials-by-uri: 1.0.0 @@ -645,7 +645,7 @@ packages: tarball: 'http://registry.npmjs.org/@sinonjs/formatio/-/formatio-2.0.0.tgz' /@types/byline/4.2.31: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: false resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -659,7 +659,7 @@ packages: integrity: sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== /@types/fs-extra/5.0.2: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-Q3FWsbdmkQd1ib11A4XNWQvRD//5KpPoGawA8aB2DR7pWKoW9XQv3+dGxD/Z1eVFze23Okdo27ZQytVFlweKvQ== @@ -667,19 +667,19 @@ packages: dependencies: '@types/events': 1.2.0 '@types/minimatch': 3.0.3 - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg== /@types/got/7.1.8: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-QxcSkx9PjHH7uqbzqKTKOAjGbayyo+dECnnqM3BBMC0WjYAqx0e6Qi9AFR4jluvx91e7qzgz4aGka7AhCTHYRw== /@types/graceful-fs/4.1.2: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-epDhsJAVxJsWfeqpzEDFhLnhHMbHie/VMFY+2Hvt5p7FemeW5ELM+6gcVYL/ZsUwdu3zrWpDE3VUTddXW+EMYg== @@ -704,25 +704,25 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mkdirp/0.5.2: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== /@types/mz/0.0.32: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/9.6.11: + /@types/node/9.6.12: resolution: - integrity: sha512-Zm2W8b3ouIP/rB4ZgIDBMsdi1a/5NuKG3IguCM6aUwXtT+h6g1/Lh59Td7S1QtHMRXU7AbrGRDJ7lbxW4MEDmg== + integrity: sha512-2Z8ziWjJbvV8hHL5YcqCG9ng+/qwUlO1gB4frBD7QI5Wm1Y1iM+AEkGVEv0S5P+aDMwTtAhPJFR4rp1uqagSig== /@types/nopt/3.0.29: dev: false resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: false resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -753,7 +753,7 @@ packages: /@types/rimraf/2.0.2: dependencies: '@types/glob': 5.0.35 - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== @@ -766,13 +766,13 @@ packages: integrity: sha512-DK4YtH30I67k4klURIBS4VAe1aBISfS9lgNlHFkibSmKem2tLQc5VkKoJreT3dCJAd+xRyCS8bx1o97iq3yUVg== /@types/tape/4.2.32: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== /@types/touch/3.1.0: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 dev: true resolution: integrity: sha512-Bskfd5wztYbQ/mvU4rgHUB3fKcjW2hA6o/F0JN8O+jRPJQDN/2pPV6SmdIiFm2vLyyN/XQzoCULTE05ZOpnNbQ== @@ -1215,7 +1215,7 @@ packages: dependencies: is-bzip2: 1.0.0 peek-stream: 1.1.3 - pumpify: 1.4.0 + pumpify: 1.5.0 through2: 2.0.3 unbzip2-stream: 1.2.5 dev: true @@ -1696,7 +1696,7 @@ packages: dependencies: bzip2-maybe: 1.0.0 gunzip-maybe: 1.4.1 - pumpify: 1.4.0 + pumpify: 1.5.0 dev: true resolution: integrity: sha1-rf54xmzAaeZOgkvRQFuF515tHLs= @@ -1836,7 +1836,7 @@ packages: dev: true resolution: integrity: sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= - /duplexify/3.5.4: + /duplexify/3.6.0: dependencies: end-of-stream: 1.4.1 inherits: 2.0.3 @@ -1844,7 +1844,7 @@ packages: stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-JzYSLYMhoVVBe8+mbHQ4KgpvHpm0DZpJuL8PY93Vyv1fW7jYJ90LoXa1di/CVbJM+TgMs91rbDapE/RNIfnJsA== + integrity: sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ== /ecc-jsbn/0.1.1: dependencies: jsbn: 0.1.1 @@ -1877,7 +1877,7 @@ packages: integrity: sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= /encoding/0.1.12: dependencies: - iconv-lite: 0.4.21 + iconv-lite: 0.4.22 dev: true resolution: integrity: sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= @@ -2067,7 +2067,7 @@ packages: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /fetch-from-npm-registry/0.1.3: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 make-fetch-happen: 3.0.0 dev: true engines: @@ -2383,7 +2383,7 @@ packages: is-deflate: 1.0.0 is-gzip: 1.0.0 peek-stream: 1.1.3 - pumpify: 1.4.0 + pumpify: 1.5.0 through2: 2.0.3 dev: true resolution: @@ -2546,14 +2546,14 @@ packages: node: '>=0.10.0' resolution: integrity: sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ== - /iconv-lite/0.4.21: + /iconv-lite/0.4.22: dependencies: safer-buffer: 2.1.2 dev: true engines: node: '>=0.10.0' resolution: - integrity: sha512-En5V9za5mBt2oUA03WGD3TwDv0MKAruqsuxstbMUZaj9W9k/m1CV/9py3l0L5kw9Bln8fdHQmzHSYtvpvTLpKw== + integrity: sha512-1AinFBeDTnsvVEP+V1QBlHpM1UZZl7gWB6fcz7B1Ho+LI1dUh2sSrxoCfVt2PinRHzXAziSniEV3P7JbTDHcXA== /ieee754/1.1.11: dev: true resolution: @@ -3336,13 +3336,13 @@ packages: /mississippi/2.0.0: dependencies: concat-stream: 1.6.2 - duplexify: 3.5.4 + duplexify: 3.6.0 end-of-stream: 1.4.1 flush-write-stream: 1.0.3 from2: 2.3.0 parallel-transform: 1.1.0 pump: 2.0.1 - pumpify: 1.4.0 + pumpify: 1.5.0 stream-each: 1.2.2 through2: 2.0.3 dev: true @@ -3353,13 +3353,13 @@ packages: /mississippi/3.0.0: dependencies: concat-stream: 1.6.2 - duplexify: 3.5.4 + duplexify: 3.6.0 end-of-stream: 1.4.1 flush-write-stream: 1.0.3 from2: 2.3.0 parallel-transform: 1.1.0 pump: 3.0.0 - pumpify: 1.4.0 + pumpify: 1.5.0 stream-each: 1.2.2 through2: 2.0.3 dev: true @@ -3806,7 +3806,7 @@ packages: '@types/fs-extra': 5.0.2 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -3833,7 +3833,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/ramda': 0.25.24 encode-registry: 1.1.0 load-json-file: 4.0.0 @@ -3886,7 +3886,7 @@ packages: integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= /parse-npm-tarball-url/1.0.3: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 semver-regex: 1.0.0 dev: true engines: @@ -3990,7 +3990,7 @@ packages: /peek-stream/1.1.3: dependencies: buffer-from: 1.0.0 - duplexify: 3.5.4 + duplexify: 3.6.0 through2: 2.0.3 dev: true resolution: @@ -4034,7 +4034,7 @@ packages: dev: false resolution: integrity: sha1-dB2ZeXYv362T8+Rp3rSoFNNDAAg= - /pnpm-registry-mock/1.21.0: + /pnpm-registry-mock/1.22.2: dependencies: anonymous-npm-registry-client: 0.1.2 cpr: 3.0.1 @@ -4042,12 +4042,12 @@ packages: verdaccio: 2.7.4 dev: true resolution: - integrity: sha512-GHWWTjKQUs8VLb/DYQeVUjmr3DPqGx5uzaKXqCS0Vm5Hr7P3oRD7P3u984806+1bRsjIoWLhk0Uw0sHJZFDU2Q== + integrity: sha512-VzZU7TyWHOND8whBA01+XJo6RRH/yca1FoiALZKhqDV+k7bKx9U6s7xcFz8PUDcVKgTOE8IsjnXImO/6YzjGBA== /pnpm-shrinkwrap/6.3.2: dependencies: '@pnpm/resolver-base': 1.0.0 '@types/js-yaml': 3.11.1 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/ramda': 0.25.24 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -4152,14 +4152,14 @@ packages: dev: true resolution: integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - /pumpify/1.4.0: + /pumpify/1.5.0: dependencies: - duplexify: 3.5.4 + duplexify: 3.6.0 inherits: 2.0.3 pump: 2.0.1 dev: true resolution: - integrity: sha512-2kmNR9ry+Pf45opRVirpNuIFotsxUGLaYqxIwuR77AYrYRMuFCz9eryHBS52L360O+NcR383CL4QYlMKPq4zYA== + integrity: sha512-UWi0klDoq8xtVzlMRgENV9F7iCTZExaJQSQL187UXsxpk9NnrKGqTqqUNYAKGOzucSOxs2+jUnRNI+rLviPhJg== /punycode/1.4.1: resolution: integrity: sha1-wNWmOycYgArY4esPpSachN1BhF4= @@ -4171,10 +4171,16 @@ packages: resolution: integrity: sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= /qs/6.5.1: + dev: true engines: node: '>=0.6' resolution: integrity: sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A== + /qs/6.5.2: + engines: + node: '>=0.6' + resolution: + integrity: sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== /query-string/5.1.1: dependencies: decode-uri-component: 0.2.0 @@ -4364,7 +4370,7 @@ packages: mime-types: 2.1.18 oauth-sign: 0.8.2 performance-now: 2.1.0 - qs: 6.5.1 + qs: 6.5.2 safe-buffer: 5.1.2 stringstream: 0.0.5 tough-cookie: 2.3.4 @@ -4625,7 +4631,7 @@ packages: /signal-exit/3.0.2: resolution: integrity: sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - /sinon/5.0.3: + /sinon/5.0.4: dependencies: '@sinonjs/formatio': 2.0.0 diff: 3.5.0 @@ -4638,7 +4644,7 @@ packages: dev: true requiresBuild: true resolution: - integrity: sha512-kzBkET1Hf0r0J4uVnlicuAEiq9nnhPrEHZWS0mds+5EaB9rA0XoliIkLaqkBNU9lwPuJACo/velUQQOmTRJtUw== + integrity: sha512-FBWjLLxSpsdoVM+5FrE0dOlANLRbEoaxwahyXvrOxIfqKN5D+dYUS8AKWNVDDjtQaiBo/tzbVoi4AKve8G2+iw== /slash/1.0.0: engines: node: '>=0.10.0' @@ -4878,7 +4884,7 @@ packages: node: '>=4' resolution: integrity: sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= - /supi/0.16.8: + /supi/0.16.9: dependencies: '@pnpm/check-package': 1.0.0 '@pnpm/fs-locker': 1.0.1 @@ -4895,7 +4901,7 @@ packages: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -4907,6 +4913,7 @@ packages: dependency-path: 1.2.1 encode-registry: 1.1.0 execa: 0.10.0 + fs-vacuum: 1.2.10 get-npm-tarball-url: 2.0.1 graceful-fs: 4.1.11 graph-sequencer: 2.0.0 @@ -4944,7 +4951,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 resolution: - integrity: sha512-uIkr1EFyTYFOl8PPg7Q0vPJzdl+kIN2AEBT42AlCKsvqemFCCr9rYbS2ulOBsMk36NNCOirvvCAlnfZVNN0XiQ== + integrity: sha512-WvktG5DWynV11BVUOKxe6H7mcZpAswd6QU7Q4FiKhCn/iojb/FXoqIQNvUnHHsNBfxxScsedixDE/G36QC1UyQ== /supports-color/2.0.0: dev: true engines: @@ -4962,7 +4969,7 @@ packages: /symlink-dir/1.1.2: dependencies: '@types/mz': 0.0.32 - '@types/node': 9.6.11 + '@types/node': 9.6.12 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -5132,7 +5139,7 @@ packages: dev: true resolution: integrity: sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ== - /tslint/5.9.1: + /tslint/5.10.0: dependencies: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 @@ -5150,9 +5157,9 @@ packages: engines: node: '>=4.8.0' peerDependencies: - typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev' + typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: - integrity: sha1-ElX4ej/1frCw4fDmEKi0dIBGya4= + integrity: sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM= /tsutils/2.26.2: dependencies: tslib: 1.9.0 @@ -5256,7 +5263,7 @@ packages: integrity: sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs= /unpack-stream/3.0.2: dependencies: - '@types/node': 9.6.11 + '@types/node': 9.6.12 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.2 @@ -5583,7 +5590,7 @@ specifiers: path-exists: ^3.0.0 path-name: ^1.0.0 pnpm-install-checks: ^1.1.0 - pnpm-registry-mock: ^1.21.0 + pnpm-registry-mock: ^1.22.2 pnpm-shrinkwrap: ^6.3.2 ramda: ^0.25.0 read-package-json: ^2.0.5 diff --git a/test/install/aliases.ts b/test/install/aliases.ts index 46028a3c8e..7c68c5ac74 100644 --- a/test/install/aliases.ts +++ b/test/install/aliases.ts @@ -1,3 +1,4 @@ +import {getIntegrity} from 'pnpm-registry-mock' import { install, installPkgs, @@ -85,7 +86,7 @@ test('a dependency has an aliased subdependency', async (t: tape.Test) => { '/dep-of-pkg-with-1-dep/100.1.0': { dev: false, resolution: { - integrity: 'sha512-NrDz2149fygGT7uMe8Jj6rsgxZWuJQJqXfWk/gj5KWoxfRxmXkQZnPgOdoLnxCEq3RrKOotVcgUJtlM8fNRgvA==', + integrity: getIntegrity('dep-of-pkg-with-1-dep', '100.1.0'), }, }, '/pkg-with-1-aliased-dep/100.0.0': { @@ -94,7 +95,7 @@ test('a dependency has an aliased subdependency', async (t: tape.Test) => { }, dev: false, resolution: { - integrity: 'sha512-zazvlUhlPW5Rr64YqOiZ9KRvPOcVI5ESbbBZ7obfDiwLwbI02EUX+Oo25D7GwTP0o2GoGPB3UkGdpz3HNQq0uw==', + integrity: getIntegrity('pkg-with-1-aliased-dep', '100.0.0'), }, }, }, diff --git a/test/install/lifecycleScripts.ts b/test/install/lifecycleScripts.ts index 8de6f58978..48b7d063cd 100644 --- a/test/install/lifecycleScripts.ts +++ b/test/install/lifecycleScripts.ts @@ -65,7 +65,7 @@ test('testing that the bins are linked when the package with the bins was alread t.ok(typeof generatedByPostinstall === 'function', 'generatedByPostinstall() is available') }) -test('run install scripts', async (t) => { +test('run install scripts', async (t: tape.Test) => { const project = prepare(t) await installPkgs(['install-script-example'], await testDefaults()) diff --git a/test/rebuild.ts b/test/rebuild.ts index f30d675ef2..68d86f20dc 100644 --- a/test/rebuild.ts +++ b/test/rebuild.ts @@ -20,7 +20,7 @@ test('rebuilds dependencies', async (t: tape.Test) => { let modules = await project.loadModules() t.deepEqual(modules!.pendingBuilds, [ '/pre-and-postinstall-scripts-example/1.0.0', - 'github.com/zkochan/install-scripts-example/26950260310939009680b6a377a0efd0925df9ba', + 'github.com/zkochan/install-scripts-example/6d879afcee10ece4d3f0e8c09de2993232f3430a', ]) await rebuild(await testDefaults()) @@ -70,7 +70,7 @@ test('rebuild with pending option', async (t: tape.Test) => { let modules = await project.loadModules() t.deepEqual(modules!.pendingBuilds, [ '/pre-and-postinstall-scripts-example/1.0.0', - 'github.com/zkochan/install-scripts-example/26950260310939009680b6a377a0efd0925df9ba', + 'github.com/zkochan/install-scripts-example/6d879afcee10ece4d3f0e8c09de2993232f3430a', ]) await project.hasNot('pre-and-postinstall-scripts-example/generated-by-preinstall') diff --git a/test/shrinkwrap.ts b/test/shrinkwrap.ts index 0a0c087ec7..fccea529a0 100644 --- a/test/shrinkwrap.ts +++ b/test/shrinkwrap.ts @@ -3,6 +3,7 @@ import loadJsonFile = require('load-json-file') import fs = require('mz/fs') import path = require('path') import exists = require('path-exists') +import {getIntegrity} from 'pnpm-registry-mock' import R = require('ramda') import rimraf = require('rimraf-then') import sinon = require('sinon') @@ -373,7 +374,7 @@ test('subdeps are updated on repeat install if outer shrinkwrap.yaml does not ma shr.packages['/dep-of-pkg-with-1-dep/100.1.0'] = { resolution: { - integrity: 'sha512-NrDz2149fygGT7uMe8Jj6rsgxZWuJQJqXfWk/gj5KWoxfRxmXkQZnPgOdoLnxCEq3RrKOotVcgUJtlM8fNRgvA==', + integrity: getIntegrity('dep-of-pkg-with-1-dep', '100.1.0'), }, } @@ -648,7 +649,7 @@ test('updating shrinkwrap version 3 to 3.5', async (t: tape.Test) => { abc-parent-with-ab: /abc-parent-with-ab/1.0.0/peer-c@1.0.0 peer-c: 1.0.0 resolution: - integrity: sha512-3EErLw7/353/uC+pncEwER5VrBL5H4ZW92zGWsIsO+FrldwHEg4jkPjkFA/QGiZzkFMpJE9ttZ2+Hn15zINLWQ== + integrity: ${getIntegrity('abc-grand-parent-with-c', '1.0.0')} /abc-parent-with-ab/1.0.0/peer-c@1.0.0: dependencies: abc: /abc/1.0.0/165e1e08a3f7e7f77ddb572ad0e55660 @@ -656,7 +657,7 @@ test('updating shrinkwrap version 3 to 3.5', async (t: tape.Test) => { peer-b: 1.0.0 id: localhost+4873/abc-parent-with-ab/1.0.0 resolution: - integrity: sha512-t0Hk901ZrPzw7xZa3vqQn6IO5IDhOCee2SGYP0Lt1DKSDWWsm5SdZG0Wc61l0yXnEn3Fhp6NodWEJ9kCSjjXjg== + integrity: ${getIntegrity('abc-parent-with-ab', '1.0.0')} /abc/1.0.0/165e1e08a3f7e7f77ddb572ad0e55660: dependencies: dep-of-pkg-with-1-dep: 100.0.0 @@ -665,19 +666,19 @@ test('updating shrinkwrap version 3 to 3.5', async (t: tape.Test) => { peer-c: 1.0.0 id: localhost+4873/abc/1.0.0 resolution: - integrity: sha512-zbZb8ge7WUrBOv9xYmZ/1M5Y4Mw1bX7nl/oHMDv2PTjBjvVIth4ekgYl/fv6HMltv8WFvvOQyX8DrdOiik9u5A== + integrity: ${getIntegrity('abc', '1.0.0')} /dep-of-pkg-with-1-dep/100.0.0: resolution: - integrity: sha512-RWObNQIluSr56fVbOwD75Dt5CE2aiPReTMMUblYEMEqUI+iJw5ovTyO7LzUG/VJ4iVL2uUrbkQ6+rq4z4WOdDw== + integrity: ${getIntegrity('dep-of-pkg-with-1-dep', '100.0.0')} /peer-a/1.0.0: resolution: - integrity: sha512-7askcvPrlKmQ6rZ7DYMlqm5OzjH/YGA1ya52ORZDFg7iQe/tdbUYy9dkhRVK7f0fw/eijwzq8n35gJVdxwtWAQ== + integrity: ${getIntegrity('peer-a', '1.0.0')} /peer-b/1.0.0: resolution: - integrity: sha512-ITIi+Xxva7/j2aRh/LydLppOk0SbCvgxnnNXq++BwGOiN/89Z5cbCThldVmUEYlHx5RSGY9yjcre8+YT4vjc0A== + integrity: ${getIntegrity('peer-b', '1.0.0')} /peer-c/1.0.0: resolution: - integrity: sha512-iTTaaqSlxmLgaaadWpTWL2CSCbzRkYRk8UhqdYgwNkqrKW5w9woqjyPxJI0da6BDd4Ebj0TwpJ775ybqOjYUKw== + integrity: ${getIntegrity('peer-c', '1.0.0')} registry: 'http://localhost:4873/' shrinkwrapVersion: 3 specifiers: diff --git a/typings/local.d.ts b/typings/local.d.ts index b43a1fe053..1340fae13f 100644 --- a/typings/local.d.ts +++ b/typings/local.d.ts @@ -209,9 +209,13 @@ declare module 'npm/lib/config/get-credentials-by-uri' { export = anything; } +declare namespace pnpmRegistryMock { + function getIntegrity (pkgName: string, pkgVersion: string): string + function addDistTag (opts: {package: string, version: string, distTag: string}): Promise +} + declare module 'pnpm-registry-mock' { - const anything: any; - export = anything; + export = pnpmRegistryMock } declare module 'read-package-json' {