From e8cc8e37dc1ebee48e4890104a322f18fa5eb5f3 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Sun, 5 Aug 2018 20:01:24 +0300 Subject: [PATCH] fix(link): use linked package's own .npmrc during installation supi: refactor: supi.link() always skips installation BREAKING CHANGE: linking always skips installation --- packages/config/shrinkwrap.yaml | 46 ++-- packages/config/src/index.ts | 2 +- packages/default-reporter/shrinkwrap.yaml | 53 ++-- packages/headless/shrinkwrap.yaml | 211 ++++++++-------- packages/pnpm/package.json | 1 + packages/pnpm/shrinkwrap.yaml | 237 +++++++++--------- packages/pnpm/src/cmd/link.ts | 10 + packages/pnpm/src/cmd/recursive/index.ts | 3 +- packages/pnpm/src/getConfigs.ts | 16 ++ packages/pnpm/src/main.ts | 8 +- packages/pnpm/src/pnpmPkgJson.ts | 7 +- packages/pnpm/src/types.ts | 1 + packages/pnpm/test/link.ts | 42 +++- .../packages/hello-world-js-bin/package.json | 3 + packages/pnpm/test/utils/index.ts | 2 + packages/pnpm/test/utils/localPkg.ts | 9 + packages/supi/shrinkwrap.yaml | 218 ++++++++-------- packages/supi/src/api/link.ts | 17 -- packages/supi/test/link.ts | 16 +- packages/supi/test/uninstall.ts | 10 +- packages/utils/shrinkwrap.yaml | 38 +-- tools/shrinkwrap.yaml | 6 +- 22 files changed, 523 insertions(+), 433 deletions(-) create mode 100644 packages/pnpm/src/getConfigs.ts create mode 100644 packages/pnpm/test/utils/localPkg.ts diff --git a/packages/config/shrinkwrap.yaml b/packages/config/shrinkwrap.yaml index 9bc21416db..09d9258896 100644 --- a/packages/config/shrinkwrap.yaml +++ b/packages/config/shrinkwrap.yaml @@ -1,7 +1,7 @@ dependencies: '@pnpm/config': 'link:' '@types/camelcase': 4.1.0 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/which': 1.3.1 '@zkochan/npm-conf': 1.2.0 camelcase: 5.0.0 @@ -22,7 +22,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.5 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -42,13 +42,13 @@ packages: integrity: sha512-nsaprOtNLvUrLyFX5+mRpE9h2Q0d5YzQRr+Lav3fxdYtc1/E/U7G+Ld861NWBDDtWY3MnwKoUOhCrE1nrVxUQA== /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== /@types/got/8.3.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-OXZz0iG3oX9RHTZAeVGJQCjCOGx0r7MnSWebgUoX5CiFq0aVcRJrUPLQo/dBdKOaosbp4K9NTZTSec2zWk9YIg== @@ -58,16 +58,16 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== /@types/tape/4.2.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -414,10 +414,10 @@ packages: dev: true resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer-from/1.1.0: + /buffer-from/1.1.1: dev: true resolution: - integrity: sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer/3.6.0: dependencies: base64-js: 0.0.8 @@ -614,10 +614,10 @@ packages: dev: true resolution: integrity: sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw== - /commander/2.16.0: + /commander/2.17.0: dev: true resolution: - integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /concat-map/0.0.1: dev: true resolution: @@ -1598,7 +1598,7 @@ packages: is-builtin-module: 1.0.0 mos-hosted-git-info: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 dev: true resolution: integrity: sha1-D9oITzRT8B7UtWVTQeYDPxeaeas= @@ -1834,7 +1834,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 dev: true resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -1964,7 +1964,7 @@ packages: '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2070,7 +2070,7 @@ packages: integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== /peek-stream/1.1.3: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 duplexify: 3.6.0 through2: 2.0.3 dev: true @@ -2513,7 +2513,7 @@ packages: integrity: sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA== /source-map-support/0.5.6: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 source-map: 0.6.1 dev: true resolution: @@ -2691,7 +2691,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -2847,7 +2847,7 @@ packages: /ts-node/6.2.0: dependencies: arrify: 1.0.1 - buffer-from: 1.1.0 + buffer-from: 1.1.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -2869,7 +2869,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -2938,7 +2938,7 @@ packages: integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== /unpack-stream/3.0.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -2984,13 +2984,13 @@ packages: dev: true resolution: integrity: sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho= - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 dev: true resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /which/1.3.1: dependencies: isexe: 2.0.0 diff --git a/packages/config/src/index.ts b/packages/config/src/index.ts index 1f65d9e88b..321aee9e7d 100644 --- a/packages/config/src/index.ts +++ b/packages/config/src/index.ts @@ -83,7 +83,7 @@ export default async ( const workspaceManifestLocation = await findUp(WORKSPACE_MANIFEST_FILENAME, { cwd: cliArgs['prefix'] || process.cwd(), // tslint:disable-line }) - const npmConfig = loadNpmConf(null, types, { + const npmConfig = loadNpmConf(cliArgs, types, { 'bail': true, 'globalconfig': npmDefaults.globalconfig, 'package-lock': npmDefaults['package-lock'], diff --git a/packages/default-reporter/shrinkwrap.yaml b/packages/default-reporter/shrinkwrap.yaml index 0170666a41..98ddc36632 100644 --- a/packages/default-reporter/shrinkwrap.yaml +++ b/packages/default-reporter/shrinkwrap.yaml @@ -1,6 +1,6 @@ dependencies: '@types/common-tags': 1.4.0 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 '@types/semver': 5.5.0 '@types/strip-ansi': 3.0.0 @@ -11,6 +11,7 @@ dependencies: most: 1.7.3 ndjson: 1.5.0 normalize-path: 3.0.0 + pnpm-default-reporter: 'link:' pretty-bytes: 5.1.0 ramda: 0.25.0 right-pad: 1.0.1 @@ -54,7 +55,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.5 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -64,7 +65,7 @@ packages: integrity: sha512-1zLmh6tRftQXfZ1IFHq1IexP0KaJhN6pSCA/IzK+Vixn4hPvxwcIbGjKW0KH9hsHSmrPpmSit2EWj7jGNgfa6Q== /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -88,13 +89,13 @@ packages: integrity: sha512-D1/YuYOcdOIdaQnaiUJ77VcilVvESkynw79CtGqpjkXyv4OUezEVZtdXnSOwXL8Zcelu66QbyC8QQcVQ/ZPdig== /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== /@types/got/8.3.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-OXZz0iG3oX9RHTZAeVGJQCjCOGx0r7MnSWebgUoX5CiFq0aVcRJrUPLQo/dBdKOaosbp4K9NTZTSec2zWk9YIg== @@ -104,17 +105,17 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== - /@types/node/8.10.22: + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== + /@types/node/8.10.23: dev: false resolution: - integrity: sha512-HCJ1dUJEQVFRekwBAlyv9pJ+2rzxq9uimSmsK2q7YDYMbXR3b4BXcO9rsN+36ZBwSWQ5BNh5o8xdZijDSonS5A== + integrity: sha512-aEp5ZTLr4mYhR9S85cJ+sEYkcsgFY10N1Si5m49iTAVzanZXOwp/pgw6ibFLKXxpflqm71aSWZCRtnTXXO56gA== /@types/ramda/0.25.34: dev: false resolution: @@ -129,7 +130,7 @@ packages: integrity: sha1-m2PUU6a1SqhJGCIHcRoIvo7qSK4= /@types/tape/4.2.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -287,10 +288,10 @@ packages: dev: true resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer-from/1.1.0: + /buffer-from/1.1.1: dev: true resolution: - integrity: sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer/3.6.0: dependencies: base64-js: 0.0.8 @@ -401,10 +402,10 @@ packages: node: '>= 0.6.x' resolution: integrity: sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= - /commander/2.16.0: + /commander/2.17.0: dev: true resolution: - integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /commander/2.9.0: dependencies: graceful-readlink: 1.0.1 @@ -452,7 +453,7 @@ packages: integrity: sha1-mI3zP+qxke95mmE2nddsF635V+o= /data-uri-to-buffer/2.0.0: dependencies: - '@types/node': 8.10.22 + '@types/node': 8.10.23 dev: false resolution: integrity: sha512-YbKCNLPPP4inc0E5If4OaalBc7gpaM2MRv77Pv2VThVComLKfbGYtJcdDCViDyp1Wd4SebhHLz94vp91zbK6bw== @@ -1082,7 +1083,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 dev: true resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -1165,7 +1166,7 @@ packages: '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -1235,7 +1236,7 @@ packages: integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== /peek-stream/1.1.3: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 duplexify: 3.6.0 through2: 2.0.3 dev: true @@ -1432,7 +1433,7 @@ packages: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= /source-map-support/0.5.6: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 source-map: 0.6.1 dev: true resolution: @@ -1598,7 +1599,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -1699,7 +1700,7 @@ packages: /ts-node/6.2.0: dependencies: arrify: 1.0.1 - buffer-from: 1.1.0 + buffer-from: 1.1.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -1721,7 +1722,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -1768,7 +1769,7 @@ packages: integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== /unpack-stream/3.0.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -1780,13 +1781,13 @@ packages: /util-deprecate/1.0.2: resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 dev: true resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /which/1.3.1: dependencies: isexe: 2.0.0 diff --git a/packages/headless/shrinkwrap.yaml b/packages/headless/shrinkwrap.yaml index f99e8828dc..1123008bd3 100644 --- a/packages/headless/shrinkwrap.yaml +++ b/packages/headless/shrinkwrap.yaml @@ -12,7 +12,7 @@ dependencies: dependency-path: 1.2.1 graph-sequencer: 2.0.0 p-limit: 2.0.0 - package-store: 0.23.0 + package-store: 0.23.1 path-exists: 3.0.0 pnpm-shrinkwrap: 7.0.0 ramda: 0.25.0 @@ -25,7 +25,7 @@ devDependencies: '@pnpm/store-path': 1.0.3 '@types/fs-extra': 5.0.4 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/path-exists': 3.0.0 '@types/rimraf': 2.0.2 '@types/sinon': 5.0.1 @@ -93,7 +93,7 @@ packages: dependencies: '@pnpm/git-resolver': 0.3.8 '@pnpm/local-resolver': 1.0.0 - '@pnpm/npm-resolver': 2.1.4 + '@pnpm/npm-resolver': 2.1.5 '@pnpm/tarball-resolver': 0.1.1 dev: true engines: @@ -104,7 +104,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.5 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -121,7 +121,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -131,7 +131,7 @@ packages: integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== /@pnpm/git-fetcher/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dint: 3.0.1 execa: 0.10.0 path-temp: 1.0.0 @@ -144,7 +144,7 @@ packages: /@pnpm/git-resolver/0.3.8: dependencies: '@pnpm/resolver-base': 1.1.0 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 got: 8.3.2 graceful-git: 1.0.3 @@ -175,7 +175,7 @@ packages: '@pnpm/read-package-json': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 '@zkochan/cmd-shim': 3.0.1 arr-flatten: 1.1.0 @@ -195,7 +195,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/graceful-fs': 4.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 normalize-path: 3.0.0 osenv: 0.1.5 @@ -209,7 +209,7 @@ packages: integrity: sha512-rCVZc//o1Db18pD6zPoCP/gz/EeZU/wHvCWJjeoq+NHgiTT4bGbXnj6mdQ6za/J3IgGEEHw0DHd3i5/NBDAArQ== /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -225,13 +225,13 @@ packages: node: '>=4' resolution: integrity: sha512-bl9TPt2UObSEpGPQHZ2soXSSwz+/0XZqK+afBRJ4L78NKV41oZTUnrLjeNbeNEVwIG9icrQ3ZeSslIvQy4L+Dw== - /@pnpm/npm-resolver/2.1.4: + /@pnpm/npm-resolver/2.1.5: dependencies: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mem': 1.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 '@types/write-json-file': 2.2.1 credentials-by-uri: 1.0.0 @@ -250,7 +250,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-KAS+ti+yMv9T2ks0QMVYp3uUTC1+gAuOYBOArSvOqfHqQ//kbM3PTbNspNEDshA2UVwdgIE6xY7+GzOl0Ti/eA== + integrity: sha512-z0zWtn0xq9TTEUCcnYu9mDSYQMqX7BA2kjhUu/8KvBIXozgxJjbt58qXfPUWrBCr1/SD+Ifm7pC4XprQogC6Pw== /@pnpm/package-bins/1.0.0: dependencies: '@pnpm/types': 1.7.0 @@ -271,7 +271,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 5.0.0 @@ -326,7 +326,7 @@ packages: integrity: sha512-NnkmxKFQJMkHL2TcLAl2sof7mVu8dgode4zGzwtvEaZ/xjOHm3CfUJomincmZcpWoXrjHkvbPxjczEPP41Wmqg== /@pnpm/store-path/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 '@types/touch': 3.1.0 can-link: 1.0.2 mkdirp-promise: 5.0.1 @@ -346,7 +346,7 @@ packages: '@pnpm/fetcher-base': 1.0.0 '@types/mem': 1.1.2 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/retry': 0.10.2 '@types/rimraf': 2.0.2 credentials-by-uri: 1.0.0 @@ -402,7 +402,7 @@ packages: integrity: sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== @@ -410,19 +410,19 @@ packages: dependencies: '@types/events': 1.2.0 '@types/minimatch': 3.0.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg== /@types/got/8.3.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-OXZz0iG3oX9RHTZAeVGJQCjCOGx0r7MnSWebgUoX5CiFq0aVcRJrUPLQo/dBdKOaosbp4K9NTZTSec2zWk9YIg== /@types/graceful-fs/4.1.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-epDhsJAVxJsWfeqpzEDFhLnhHMbHie/VMFY+2Hvt5p7FemeW5ELM+6gcVYL/ZsUwdu3zrWpDE3VUTddXW+EMYg== @@ -443,16 +443,16 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== - /@types/node/9.6.24: + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== + /@types/node/9.6.25: dev: true resolution: - integrity: sha512-o5K0mt8x735EaqS7F2x+5AG0b1Mt3V9jgV5SeW8SD6RNhE++dvwqLf2R2e4c8FmhNLaogz2oXrsiXnqnsBSSIQ== + integrity: sha512-uZpzO9MKSHy7zBiTtziA3JgZP3upcAvLTASkKgheLj6/rNZmRX4UyvsFYaY2kbYcmmh8bNZ2T0eocBRCfZdGvQ== /@types/p-queue/2.3.1: dev: false resolution: @@ -472,7 +472,7 @@ packages: /@types/rimraf/2.0.2: dependencies: '@types/glob': 5.0.35 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== @@ -485,7 +485,7 @@ packages: integrity: sha512-yxzBCIjE3lp9lYjfBbIK/LRCoXgCLLbIIBIje7eNCcUIIR2CZZtyX5uto2hVoMSMqLrsRrT6mwwUEd0yFgOwpA== /@types/tape/4.2.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -495,7 +495,7 @@ packages: integrity: sha512-2qeSxI2bMucW58Jsj8jrBXZxobtcKkvO44AvJzKGaD8+m/3KRuBqeKitJ5U6sqy3a9tFsqhzsxMkqR4Wcl6AmQ== /@types/touch/3.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-Bskfd5wztYbQ/mvU4rgHUB3fKcjW2hA6o/F0JN8O+jRPJQDN/2pPV6SmdIiFm2vLyyN/XQzoCULTE05ZOpnNbQ== @@ -546,14 +546,14 @@ packages: node: '>=6' resolution: integrity: sha512-bwKWp1qPnbUuZJDc81AeSLWguW8rY3uiCSDb+bev4ODm6zBfL77vV0bNvCAB3+Tovq5o2hMZEAhzFAmHg8sARA== - /JSONStream/1.3.2: + /JSONStream/1.3.3: dependencies: jsonparse: 1.3.1 through: 2.3.8 dev: true hasBin: true resolution: - integrity: sha1-wQI3G27Dp887hHygDCC7D85Mbeo= + integrity: sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg== /abbrev/1.1.1: resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -574,14 +574,14 @@ packages: node: '>= 4.0.0' resolution: integrity: sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== - /agentkeepalive/3.4.1: + /agentkeepalive/3.5.1: dependencies: humanize-ms: 1.2.1 dev: true engines: node: '>= 4.0.0' resolution: - integrity: sha512-MPIwsZU9PP9kOrZpyu2042kYA8Fdt/AedQYkYXucHgF9QoD9dXVp0ypuGnHXSR0hTstBxdt85Xkh4JolYfK5wg== + integrity: sha512-Cte/sTY9/XcygXjJ0q58v//SnEQ7ViWExKyJpLJlLqomDbQyMLh6Is4KuWJ/wmxzhiwkGRple7Gqv1zf6Syz5w== /ajv/4.11.8: dependencies: co: 4.6.0 @@ -735,9 +735,11 @@ packages: yarn: '>=1.1.0' resolution: integrity: sha512-GFBpOZiRih8jW8HEqlwU6ywUOE0XHso1cPTG/4YtNbR+0DxZ9H3aQ7JMTBeSsc82pIiUR9MtWXAHIZ6L3IOeFg== - /asn1/0.2.3: + /asn1/0.2.4: + dependencies: + safer-buffer: 2.1.2 resolution: - integrity: sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= + integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== /assert-plus/0.2.0: dev: false engines: @@ -753,12 +755,6 @@ packages: dev: true resolution: integrity: sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - /async/2.6.0: - dependencies: - lodash: 4.17.10 - dev: true - resolution: - integrity: sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw== /async/2.6.1: dependencies: lodash: 4.17.10 @@ -905,10 +901,10 @@ packages: dev: true resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer-from/1.1.0: + /buffer-from/1.1.1: dev: true resolution: - integrity: sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer/3.6.0: dependencies: base64-js: 0.0.8 @@ -957,7 +953,7 @@ packages: hasBin: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacache/11.0.2: + /cacache/11.1.0: dependencies: bluebird: 3.5.1 chownr: 1.0.1 @@ -975,7 +971,7 @@ packages: y18n: 4.0.0 dev: true resolution: - integrity: sha512-hMiz7LN4w8sdfmKsvNs80ao/vf2JCGWWdpu95JyY90AJZRbZJmgE71dCefRiNf8OCqiZQDcUBfYiLlUNu4/j5A== + integrity: sha512-wFLexxfPdlvoUlpHIaU4y4Vm+Im/otOPCg1ov5g9/HRfUhVA8GpDdQL66SWBgRpgNC+5ebMT1Vr1RyPaFrJVqw== /cacheable-request/2.1.4: dependencies: clone-response: 1.0.2 @@ -1105,14 +1101,14 @@ packages: dev: true resolution: integrity: sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw== - /commander/2.15.0: - dev: true - resolution: - integrity: sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg== /commander/2.16.0: dev: true resolution: integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + /commander/2.17.0: + dev: true + resolution: + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /compressible/2.0.14: dependencies: mime-db: 1.35.0 @@ -1135,12 +1131,26 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-qv+81qr4VLROuygDU9WtFlH1mmk= + /compression/1.7.3: + dependencies: + accepts: 1.3.5 + bytes: 3.0.0 + compressible: 2.0.14 + debug: 2.6.9 + on-headers: 1.0.1 + safe-buffer: 5.1.2 + vary: 1.1.2 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== /concat-map/0.0.1: resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /concat-stream/1.6.2: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 inherits: 2.0.3 readable-stream: 2.3.6 typedarray: 0.0.6 @@ -1635,7 +1645,7 @@ packages: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /fetch-from-npm-registry/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 make-fetch-happen: 4.0.1 dev: true engines: @@ -2299,14 +2309,6 @@ packages: dev: true resolution: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= - /js-yaml/3.11.0: - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - dev: true - hasBin: true - resolution: - integrity: sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw== /js-yaml/3.12.0: dependencies: argparse: 1.0.10 @@ -2356,7 +2358,7 @@ packages: '0': node >= 0.2.0 resolution: integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - /jsonwebtoken/8.2.1: + /jsonwebtoken/8.3.0: dependencies: jws: 3.1.5 lodash.includes: 4.3.0 @@ -2367,13 +2369,12 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.1 - xtend: 4.0.1 dev: true engines: node: '>=0.12' npm: '>=1.4.28' resolution: - integrity: sha512-l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw== + integrity: sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag== /jsprim/1.4.1: dependencies: assert-plus: 1.0.0 @@ -2474,6 +2475,12 @@ packages: dev: true resolution: integrity: sha1-Jjj8OaAzHpysGgS3F5mTHJxQ33k= + /lockfile/1.0.4: + dependencies: + signal-exit: 3.0.2 + dev: true + resolution: + integrity: sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== /lodash.get/4.4.2: dev: true resolution: @@ -2566,8 +2573,8 @@ packages: integrity: sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g== /make-fetch-happen/4.0.1: dependencies: - agentkeepalive: 3.4.1 - cacache: 11.0.2 + agentkeepalive: 3.5.1 + cacache: 11.1.0 http-cache-semantics: 3.8.1 http-proxy-agent: 2.1.0 https-proxy-agent: 2.2.1 @@ -2596,13 +2603,13 @@ packages: dev: true resolution: integrity: sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= - /marked/0.3.17: + /marked/0.4.0: dev: true engines: node: '>=0.10.0' hasBin: true resolution: - integrity: sha512-+AKbNsjZl6jFfLPwHhWmGTqE009wTKn3RTmn9K8oUKHrX/abPJjtcRtXpYB/FFrwPJRUA86LX/de3T0knkPCmQ== + integrity: sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw== /media-typer/0.3.0: dev: true engines: @@ -2666,13 +2673,13 @@ packages: hasBin: true resolution: integrity: sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== - /mime/2.2.0: + /mime/2.3.1: dev: true engines: - node: '>=6.0.0' + node: '>=4.0.0' hasBin: true resolution: - integrity: sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA== + integrity: sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg== /mimic-fn/1.2.0: engines: node: '>=4' @@ -2725,7 +2732,7 @@ packages: parallel-transform: 1.1.0 pump: 3.0.0 pumpify: 1.5.1 - stream-each: 1.2.2 + stream-each: 1.2.3 through2: 2.0.3 dev: true engines: @@ -2885,7 +2892,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== /normalize-path/3.0.0: @@ -3156,7 +3163,7 @@ packages: '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -3175,7 +3182,7 @@ packages: hasBin: true resolution: integrity: sha512-GQ4w5vrDXoy8UVJM+0W7oWd5MYF21/IXkdzcupGNXdfqQuMzgQT+LXde109uHaH7xyqvCzPPBSxYM/HqQOi3+w== - /package-store/0.23.0: + /package-store/0.23.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.2 @@ -3184,7 +3191,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 encode-registry: 1.1.0 load-json-file: 5.0.0 @@ -3206,7 +3213,7 @@ packages: peerDependencies: '@pnpm/logger': ^2.1.0 resolution: - integrity: sha512-up8AtzXWTJRpQRxe6o6qjSmaEZbCTOS0oHymivYlk/kpqEMYkJ/4REP+oZnHfTmyxZGjC7BYOgfrnvFfhOmo9w== + integrity: sha512-hCGAENKoQnGTlZFJlruTGi9k2kv9rIKsfJy3LkeRFny6BNKtperN/8PgrPNp6jYFpUC5DxWvMEY+IeK7IVF00g== /pako/0.2.9: dev: true resolution: @@ -3229,7 +3236,7 @@ packages: integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= /parse-npm-tarball-url/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 semver-regex: 1.0.0 dev: true engines: @@ -3308,7 +3315,7 @@ packages: integrity: sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= /peek-stream/1.1.3: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 duplexify: 3.6.0 through2: 2.0.3 dev: true @@ -3343,7 +3350,7 @@ packages: anonymous-npm-registry-client: 0.1.2 cpr: 3.0.1 rimraf: 2.6.2 - verdaccio: 3.4.1 + verdaccio: 3.5.1 dev: true engines: node: '>=6' @@ -3355,7 +3362,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/js-yaml': 3.11.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -3906,7 +3913,7 @@ packages: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= /source-map-support/0.5.6: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 source-map: 0.6.1 dev: true resolution: @@ -3967,7 +3974,7 @@ packages: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= /sshpk/1.14.2: dependencies: - asn1: 0.2.3 + asn1: 0.2.4 assert-plus: 1.0.0 dashdash: 1.14.1 getpass: 0.1.7 @@ -4009,13 +4016,13 @@ packages: dev: true resolution: integrity: sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= - /stream-each/1.2.2: + /stream-each/1.2.3: dependencies: end-of-stream: 1.4.1 stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== + integrity: sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== /stream-shift/1.0.0: dev: true resolution: @@ -4120,7 +4127,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -4262,7 +4269,7 @@ packages: /ts-node/6.2.0: dependencies: arrify: 1.0.1 - buffer-from: 1.1.0 + buffer-from: 1.1.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -4284,7 +4291,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -4408,7 +4415,7 @@ packages: integrity: sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs= /unpack-stream/3.0.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -4419,7 +4426,7 @@ packages: integrity: sha512-h3Ii7ThTL7P5LlX1RuMPsuW4V5EZnLyjPwStIMQ4V0F6rblgmXIS+IkpAOu9THHDZYUO/D8TTJddVc6HIY4S5g== /unpack-stream/4.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 6.0.0 tar-fs: 1.16.3 @@ -4467,12 +4474,12 @@ packages: hasBin: true resolution: integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /vary/1.1.2: dev: true engines: @@ -4499,35 +4506,35 @@ packages: node: '>=6.12.0' resolution: integrity: sha512-60R1AEAjKmIGms7gSfotWmUhw0JOPdeyx6DOATtCuOJNfgameiDm2gPlAGJ/XKHoXn96EaVfuhg2ruDmq1AQug== - /verdaccio/3.4.1: + /verdaccio/3.5.1: dependencies: '@verdaccio/file-locking': 0.0.7 '@verdaccio/local-storage': 1.1.3 '@verdaccio/streams': 1.0.0 - JSONStream: 1.3.2 + JSONStream: 1.3.3 asciidoctor.js: 1.5.6 - async: 2.6.0 - body-parser: 1.18.2 + async: 2.6.1 + body-parser: 1.18.3 bunyan: 1.8.12 chalk: 2.4.1 - commander: 2.15.0 - compression: 1.7.2 + commander: 2.16.0 + compression: 1.7.3 cookies: 0.7.1 cors: 2.8.4 date-fns: 1.29.0 express: 4.16.3 global: 4.3.2 handlebars: 4.0.11 - http-errors: 1.6.2 + http-errors: 1.6.3 js-base64: 2.4.8 js-string-escape: 1.0.1 - js-yaml: 3.11.0 - jsonwebtoken: 8.2.1 - lockfile: 1.0.3 + js-yaml: 3.12.0 + jsonwebtoken: 8.3.0 + lockfile: 1.0.4 lodash: 4.17.10 lunr: 0.7.0 - marked: 0.3.17 - mime: 2.2.0 + marked: 0.4.0 + mime: 2.3.1 minimatch: 3.0.4 mkdirp: 0.5.1 pkginfo: 0.4.1 @@ -4541,7 +4548,7 @@ packages: npm: '>=3' hasBin: true resolution: - integrity: sha512-+1FHJXpoCleQbk8PDOp7UZsgJ/KsCPSsQrsKWHC5Jif/9yQFsn6/bD6j2DAwFgI3Y+Ia3sRj0Q7nNrU7FvfSIw== + integrity: sha512-shCedQ4/vHOSFwMKlSq17RxaOxBH2umo+iPn6C67uolmlVrXx/TSQRpdGgt9L8WwJM5D81Yz5srWg5K9WW2rBw== /verror/1.10.0: dependencies: assert-plus: 1.0.0 diff --git a/packages/pnpm/package.json b/packages/pnpm/package.json index ab6e2eb361..c9d842f8ef 100644 --- a/packages/pnpm/package.json +++ b/packages/pnpm/package.json @@ -100,6 +100,7 @@ "deep-require-cwd": "^1.0.0", "exists-link": "^2.0.0", "mkdirp": "^0.5.1", + "ncp": "^2.0.0", "normalize-newline": "^3.0.0", "npm-run-all": "^4.0.1", "npm-scripts-info": "^0.3.6", diff --git a/packages/pnpm/shrinkwrap.yaml b/packages/pnpm/shrinkwrap.yaml index 46b4c6addb..56320c22f7 100644 --- a/packages/pnpm/shrinkwrap.yaml +++ b/packages/pnpm/shrinkwrap.yaml @@ -38,7 +38,7 @@ dependencies: mz: 2.7.0 nopt: 4.0.1 p-limit: 2.0.0 - package-store: 0.23.0 + package-store: 0.23.1 path-absolute: 1.0.0 path-name: 1.0.0 pkgs-graph: 2.0.0 @@ -65,7 +65,7 @@ devDependencies: '@types/delay': 2.0.1 '@types/load-json-file': 2.0.7 '@types/mkdirp': 0.5.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/nopt': 3.0.29 '@types/ramda': 0.25.34 '@types/retry': 0.10.2 @@ -79,6 +79,7 @@ devDependencies: deep-require-cwd: 1.0.0 exists-link: 2.0.0 mkdirp: 0.5.1 + ncp: 2.0.0 normalize-newline: 3.0.0 npm-run-all: 4.1.3 npm-scripts-info: 0.3.7 @@ -159,7 +160,7 @@ packages: dependencies: '@pnpm/git-resolver': 0.3.8 '@pnpm/local-resolver': 1.0.0 - '@pnpm/npm-resolver': 2.1.4 + '@pnpm/npm-resolver': 2.1.5 '@pnpm/tarball-resolver': 0.1.1 dev: false engines: @@ -170,7 +171,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.5 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -188,7 +189,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -198,7 +199,7 @@ packages: integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== /@pnpm/git-fetcher/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dint: 3.0.1 execa: 0.10.0 path-temp: 1.0.0 @@ -211,7 +212,7 @@ packages: /@pnpm/git-resolver/0.3.8: dependencies: '@pnpm/resolver-base': 1.1.0 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 got: 8.3.2 graceful-git: 1.0.3 @@ -241,7 +242,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/graceful-fs': 4.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 normalize-path: 3.0.0 osenv: 0.1.5 @@ -255,7 +256,7 @@ packages: integrity: sha512-rCVZc//o1Db18pD6zPoCP/gz/EeZU/wHvCWJjeoq+NHgiTT4bGbXnj6mdQ6za/J3IgGEEHw0DHd3i5/NBDAArQ== /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 bole: 3.0.2 ndjson: 1.5.0 dev: false @@ -272,13 +273,13 @@ packages: node: '>=4' resolution: integrity: sha512-bl9TPt2UObSEpGPQHZ2soXSSwz+/0XZqK+afBRJ4L78NKV41oZTUnrLjeNbeNEVwIG9icrQ3ZeSslIvQy4L+Dw== - /@pnpm/npm-resolver/2.1.4: + /@pnpm/npm-resolver/2.1.5: dependencies: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mem': 1.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 '@types/write-json-file': 2.2.1 credentials-by-uri: 1.0.0 @@ -297,13 +298,13 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-KAS+ti+yMv9T2ks0QMVYp3uUTC1+gAuOYBOArSvOqfHqQ//kbM3PTbNspNEDshA2UVwdgIE6xY7+GzOl0Ti/eA== + integrity: sha512-z0zWtn0xq9TTEUCcnYu9mDSYQMqX7BA2kjhUu/8KvBIXozgxJjbt58qXfPUWrBCr1/SD+Ifm7pC4XprQogC6Pw== /@pnpm/outdated/0.4.0: dependencies: - '@pnpm/npm-resolver': 2.1.4 + '@pnpm/npm-resolver': 2.1.5 '@pnpm/read-package-json': 1.0.0 '@pnpm/store-path': 1.0.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dependency-path: 1.2.1 pnpm-shrinkwrap: 7.0.0 dev: false @@ -322,7 +323,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 5.0.0 @@ -381,12 +382,12 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/p-limit': 2.0.0 '@types/uuid': 3.4.3 got: 8.3.2 p-limit: 2.0.0 - package-store: 0.23.0 + package-store: 0.23.1 uuid: 3.3.2 dev: false engines: @@ -397,7 +398,7 @@ packages: integrity: sha512-CL1GFKJfSp7cYZeI+ylBpPhbTLRytjTyvuhRocSVgK+qTASTsJ+dlzsJUDXNC8HynkB26pajqPWUqy8+vN4y1g== /@pnpm/store-path/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 '@types/touch': 3.1.0 can-link: 1.0.2 mkdirp-promise: 5.0.1 @@ -417,7 +418,7 @@ packages: '@pnpm/fetcher-base': 1.0.0 '@types/mem': 1.1.2 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/retry': 0.10.2 '@types/rimraf': 2.0.2 credentials-by-uri: 1.0.0 @@ -463,7 +464,7 @@ packages: integrity: sha512-v+dxizsFVyXgD3EpFuqT9YjdEjbJmPxNf1QIX9ohZOhxh1ZF2yhqv3vYaeum9lg3VghhxS5S0a6yldN9J9lPEQ== /@types/byline/4.2.31: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -485,7 +486,7 @@ packages: integrity: sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== @@ -497,18 +498,18 @@ packages: dependencies: '@types/events': 1.2.0 '@types/minimatch': 3.0.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg== /@types/got/8.3.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 resolution: integrity: sha512-OXZz0iG3oX9RHTZAeVGJQCjCOGx0r7MnSWebgUoX5CiFq0aVcRJrUPLQo/dBdKOaosbp4K9NTZTSec2zWk9YIg== /@types/graceful-fs/4.1.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-epDhsJAVxJsWfeqpzEDFhLnhHMbHie/VMFY+2Hvt5p7FemeW5ELM+6gcVYL/ZsUwdu3zrWpDE3VUTddXW+EMYg== @@ -533,22 +534,22 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mkdirp/0.5.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== - /@types/node/9.6.24: + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== + /@types/node/9.6.25: dev: false resolution: - integrity: sha512-o5K0mt8x735EaqS7F2x+5AG0b1Mt3V9jgV5SeW8SD6RNhE++dvwqLf2R2e4c8FmhNLaogz2oXrsiXnqnsBSSIQ== + integrity: sha512-uZpzO9MKSHy7zBiTtziA3JgZP3upcAvLTASkKgheLj6/rNZmRX4UyvsFYaY2kbYcmmh8bNZ2T0eocBRCfZdGvQ== /@types/nopt/3.0.29: dev: true resolution: @@ -574,7 +575,7 @@ packages: /@types/rimraf/2.0.2: dependencies: '@types/glob': 5.0.35 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== @@ -583,13 +584,13 @@ packages: integrity: sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== /@types/tape/4.2.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== /@types/touch/3.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-Bskfd5wztYbQ/mvU4rgHUB3fKcjW2hA6o/F0JN8O+jRPJQDN/2pPV6SmdIiFm2vLyyN/XQzoCULTE05ZOpnNbQ== @@ -599,7 +600,7 @@ packages: integrity: sha512-QdVXvKa36soA86VI09WCAxLU44udSWFNPDpeXq9pNhZs0Yj2hQcuL4NDGrolD4NY4akjuXgBubjgplGucQ0FJQ== /@types/uuid/3.4.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-5fRLCYhLtDb3hMWqQyH10qtF+Ud2JnNCXTCZ+9ktNdCcgslcuXkDTkFcJNk++MT29yDntDnlF1+jD+uVGumsbw== @@ -653,14 +654,14 @@ packages: dev: false resolution: integrity: sha512-R/aNEf1thmTbjXwXZuG86Gd7dwJEIthdX4gGbYYbIB1/w1Odqkr5Ubn20zAAIBZPcPK7hgGbtq5gGWzHtmPJ6Q== - /JSONStream/1.3.2: + /JSONStream/1.3.3: dependencies: jsonparse: 1.3.1 through: 2.3.8 dev: true hasBin: true resolution: - integrity: sha1-wQI3G27Dp887hHygDCC7D85Mbeo= + integrity: sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg== /abbrev/1.1.1: dev: false resolution: @@ -686,14 +687,14 @@ packages: node: '>= 4.0.0' resolution: integrity: sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== - /agentkeepalive/3.4.1: + /agentkeepalive/3.5.1: dependencies: humanize-ms: 1.2.1 dev: false engines: node: '>= 4.0.0' resolution: - integrity: sha512-MPIwsZU9PP9kOrZpyu2042kYA8Fdt/AedQYkYXucHgF9QoD9dXVp0ypuGnHXSR0hTstBxdt85Xkh4JolYfK5wg== + integrity: sha512-Cte/sTY9/XcygXjJ0q58v//SnEQ7ViWExKyJpLJlLqomDbQyMLh6Is4KuWJ/wmxzhiwkGRple7Gqv1zf6Syz5w== /ajv/4.11.8: dependencies: co: 4.6.0 @@ -894,9 +895,11 @@ packages: yarn: '>=1.1.0' resolution: integrity: sha512-GFBpOZiRih8jW8HEqlwU6ywUOE0XHso1cPTG/4YtNbR+0DxZ9H3aQ7JMTBeSsc82pIiUR9MtWXAHIZ6L3IOeFg== - /asn1/0.2.3: + /asn1/0.2.4: + dependencies: + safer-buffer: 2.1.2 resolution: - integrity: sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= + integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== /assert-plus/0.2.0: dev: false engines: @@ -918,12 +921,6 @@ packages: dev: true resolution: integrity: sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - /async/2.6.0: - dependencies: - lodash: 4.17.10 - dev: true - resolution: - integrity: sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw== /async/2.6.1: dependencies: lodash: 4.17.10 @@ -1116,9 +1113,9 @@ packages: /buffer-fill/1.0.0: resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer-from/1.1.0: + /buffer-from/1.1.1: resolution: - integrity: sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer/3.6.0: dependencies: base64-js: 0.0.8 @@ -1178,7 +1175,7 @@ packages: hasBin: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacache/11.0.2: + /cacache/11.1.0: dependencies: bluebird: 3.5.1 chownr: 1.0.1 @@ -1196,7 +1193,7 @@ packages: y18n: 4.0.0 dev: false resolution: - integrity: sha512-hMiz7LN4w8sdfmKsvNs80ao/vf2JCGWWdpu95JyY90AJZRbZJmgE71dCefRiNf8OCqiZQDcUBfYiLlUNu4/j5A== + integrity: sha512-wFLexxfPdlvoUlpHIaU4y4Vm+Im/otOPCg1ov5g9/HRfUhVA8GpDdQL66SWBgRpgNC+5ebMT1Vr1RyPaFrJVqw== /cache-base/1.0.1: dependencies: collection-visit: 1.0.0 @@ -1424,14 +1421,14 @@ packages: dev: true resolution: integrity: sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw== - /commander/2.15.0: - dev: true - resolution: - integrity: sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg== /commander/2.16.0: dev: true resolution: integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + /commander/2.17.0: + dev: true + resolution: + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /common-tags/1.8.0: dev: false engines: @@ -1464,12 +1461,26 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-qv+81qr4VLROuygDU9WtFlH1mmk= + /compression/1.7.3: + dependencies: + accepts: 1.3.5 + bytes: 3.0.0 + compressible: 2.0.14 + debug: 2.6.9 + on-headers: 1.0.1 + safe-buffer: 5.1.2 + vary: 1.1.2 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== /concat-map/0.0.1: resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /concat-stream/1.6.2: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 inherits: 2.0.3 readable-stream: 2.3.6 typedarray: 0.0.6 @@ -1637,7 +1648,7 @@ packages: /csv-parser/1.12.1: dependencies: buffer-alloc: 1.2.0 - buffer-from: 1.1.0 + buffer-from: 1.1.1 generate-function: 1.1.0 generate-object-property: 1.2.0 inherits: 2.0.3 @@ -1846,7 +1857,7 @@ packages: integrity: sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= /dependencies-hierarchy/3.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 dependency-path: 1.2.1 pnpm-shrinkwrap: 7.0.0 @@ -2248,7 +2259,7 @@ packages: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /fetch-from-npm-registry/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 make-fetch-happen: 4.0.1 dev: false engines: @@ -2299,7 +2310,7 @@ packages: integrity: sha512-3lcasU5kFaqBp/IJ19lDRv5I0FG42J94s2oIP5r0KA5z5+ID0vocMylMUEuuGbXqJ5WLNZteQB9CAVIzUnk9bQ== /find-packages/2.2.0: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 fast-glob: 2.2.2 p-filter: 1.0.0 read-pkg: 3.0.0 @@ -3254,14 +3265,6 @@ packages: dev: true resolution: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= - /js-yaml/3.11.0: - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - dev: true - hasBin: true - resolution: - integrity: sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw== /js-yaml/3.12.0: dependencies: argparse: 1.0.10 @@ -3320,7 +3323,7 @@ packages: '0': node >= 0.2.0 resolution: integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - /jsonwebtoken/8.2.1: + /jsonwebtoken/8.3.0: dependencies: jws: 3.1.5 lodash.includes: 4.3.0 @@ -3331,13 +3334,12 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.1 - xtend: 4.0.1 dev: true engines: node: '>=0.12' npm: '>=1.4.28' resolution: - integrity: sha512-l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw== + integrity: sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag== /jsprim/1.4.1: dependencies: assert-plus: 1.0.0 @@ -3493,6 +3495,12 @@ packages: dev: true resolution: integrity: sha1-Jjj8OaAzHpysGgS3F5mTHJxQ33k= + /lockfile/1.0.4: + dependencies: + signal-exit: 3.0.2 + dev: true + resolution: + integrity: sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== /lodash.includes/4.3.0: dev: true resolution: @@ -3576,8 +3584,8 @@ packages: integrity: sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g== /make-fetch-happen/4.0.1: dependencies: - agentkeepalive: 3.4.1 - cacache: 11.0.2 + agentkeepalive: 3.5.1 + cacache: 11.1.0 http-cache-semantics: 3.8.1 http-proxy-agent: 2.1.0 https-proxy-agent: 2.2.1 @@ -3619,13 +3627,13 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - /marked/0.3.17: + /marked/0.4.0: dev: true engines: node: '>=0.10.0' hasBin: true resolution: - integrity: sha512-+AKbNsjZl6jFfLPwHhWmGTqE009wTKn3RTmn9K8oUKHrX/abPJjtcRtXpYB/FFrwPJRUA86LX/de3T0knkPCmQ== + integrity: sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw== /media-typer/0.3.0: dev: true engines: @@ -3724,13 +3732,13 @@ packages: hasBin: true resolution: integrity: sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== - /mime/2.2.0: + /mime/2.3.1: dev: true engines: - node: '>=6.0.0' + node: '>=4.0.0' hasBin: true resolution: - integrity: sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA== + integrity: sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg== /mimic-fn/1.2.0: engines: node: '>=4' @@ -3782,7 +3790,7 @@ packages: parallel-transform: 1.1.0 pump: 3.0.0 pumpify: 1.5.1 - stream-each: 1.2.2 + stream-each: 1.2.3 through2: 2.0.3 dev: false engines: @@ -3989,7 +3997,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== /normalize-path/3.0.0: @@ -4359,7 +4367,7 @@ packages: '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -4378,7 +4386,7 @@ packages: hasBin: true resolution: integrity: sha512-GQ4w5vrDXoy8UVJM+0W7oWd5MYF21/IXkdzcupGNXdfqQuMzgQT+LXde109uHaH7xyqvCzPPBSxYM/HqQOi3+w== - /package-store/0.23.0: + /package-store/0.23.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.2 @@ -4387,7 +4395,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 encode-registry: 1.1.0 load-json-file: 5.0.0 @@ -4409,7 +4417,7 @@ packages: peerDependencies: '@pnpm/logger': ^2.1.0 resolution: - integrity: sha512-up8AtzXWTJRpQRxe6o6qjSmaEZbCTOS0oHymivYlk/kpqEMYkJ/4REP+oZnHfTmyxZGjC7BYOgfrnvFfhOmo9w== + integrity: sha512-hCGAENKoQnGTlZFJlruTGi9k2kv9rIKsfJy3LkeRFny6BNKtperN/8PgrPNp6jYFpUC5DxWvMEY+IeK7IVF00g== /pako/0.2.9: resolution: integrity: sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU= @@ -4445,7 +4453,7 @@ packages: integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= /parse-npm-tarball-url/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 semver-regex: 1.0.0 dev: false engines: @@ -4543,7 +4551,7 @@ packages: integrity: sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= /peek-stream/1.1.3: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 duplexify: 3.6.0 through2: 2.0.3 resolution: @@ -4588,7 +4596,7 @@ packages: integrity: sha1-tUGO8EOd5UJfxJlQQtztFPsqhP8= /pkgs-graph/2.0.0: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 '@types/ramda': 0.25.34 '@types/semver': 5.5.0 npm-package-arg: 6.1.0 @@ -4602,7 +4610,7 @@ packages: /pnpm-file-reporter/0.1.0: dependencies: '@types/graceful-fs': 4.1.2 - '@types/node': 9.6.24 + '@types/node': 9.6.25 graceful-fs: 4.1.11 json2yaml: 1.1.0 path-exists: 3.0.0 @@ -4614,7 +4622,7 @@ packages: /pnpm-list/4.0.0: dependencies: '@types/archy': 0.0.31 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 archy: 1.0.0 chalk: 2.4.1 @@ -4634,7 +4642,7 @@ packages: anonymous-npm-registry-client: 0.1.2 cpr: 3.0.1 rimraf: 2.6.2 - verdaccio: 3.4.1 + verdaccio: 3.5.1 dev: true engines: node: '>=6' @@ -4646,7 +4654,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/js-yaml': 3.11.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -5402,7 +5410,7 @@ packages: integrity: sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA== /source-map-support/0.5.6: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 source-map: 0.6.1 dev: true resolution: @@ -5479,7 +5487,7 @@ packages: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= /sshpk/1.14.2: dependencies: - asn1: 0.2.3 + asn1: 0.2.4 assert-plus: 1.0.0 dashdash: 1.14.1 getpass: 0.1.7 @@ -5534,13 +5542,13 @@ packages: dev: true resolution: integrity: sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= - /stream-each/1.2.2: + /stream-each/1.2.3: dependencies: end-of-stream: 1.4.1 stream-shift: 1.0.0 dev: false resolution: - integrity: sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== + integrity: sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== /stream-shift/1.0.0: resolution: integrity: sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI= @@ -5663,7 +5671,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -5836,7 +5844,7 @@ packages: /ts-node/6.2.0: dependencies: arrify: 1.0.1 - buffer-from: 1.1.0 + buffer-from: 1.1.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -5858,7 +5866,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -6010,7 +6018,7 @@ packages: integrity: sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs= /unpack-stream/3.0.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -6021,7 +6029,7 @@ packages: integrity: sha512-h3Ii7ThTL7P5LlX1RuMPsuW4V5EZnLyjPwStIMQ4V0F6rblgmXIS+IkpAOu9THHDZYUO/D8TTJddVc6HIY4S5g== /unpack-stream/4.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 6.0.0 tar-fs: 1.16.3 @@ -6122,12 +6130,12 @@ packages: hasBin: true resolution: integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /validate-npm-package-name/3.0.0: dependencies: builtins: 1.0.3 @@ -6160,35 +6168,35 @@ packages: node: '>=6.12.0' resolution: integrity: sha512-60R1AEAjKmIGms7gSfotWmUhw0JOPdeyx6DOATtCuOJNfgameiDm2gPlAGJ/XKHoXn96EaVfuhg2ruDmq1AQug== - /verdaccio/3.4.1: + /verdaccio/3.5.1: dependencies: '@verdaccio/file-locking': 0.0.7 '@verdaccio/local-storage': 1.1.3 '@verdaccio/streams': 1.0.0 - JSONStream: 1.3.2 + JSONStream: 1.3.3 asciidoctor.js: 1.5.6 - async: 2.6.0 - body-parser: 1.18.2 + async: 2.6.1 + body-parser: 1.18.3 bunyan: 1.8.12 chalk: 2.4.1 - commander: 2.15.0 - compression: 1.7.2 + commander: 2.16.0 + compression: 1.7.3 cookies: 0.7.1 cors: 2.8.4 date-fns: 1.29.0 express: 4.16.3 global: 4.3.2 handlebars: 4.0.11 - http-errors: 1.6.2 + http-errors: 1.6.3 js-base64: 2.4.8 js-string-escape: 1.0.1 - js-yaml: 3.11.0 - jsonwebtoken: 8.2.1 - lockfile: 1.0.3 + js-yaml: 3.12.0 + jsonwebtoken: 8.3.0 + lockfile: 1.0.4 lodash: 4.17.10 lunr: 0.7.0 - marked: 0.3.17 - mime: 2.2.0 + marked: 0.4.0 + mime: 2.3.1 minimatch: 3.0.4 mkdirp: 0.5.1 pkginfo: 0.4.1 @@ -6202,7 +6210,7 @@ packages: npm: '>=3' hasBin: true resolution: - integrity: sha512-+1FHJXpoCleQbk8PDOp7UZsgJ/KsCPSsQrsKWHC5Jif/9yQFsn6/bD6j2DAwFgI3Y+Ia3sRj0Q7nNrU7FvfSIw== + integrity: sha512-shCedQ4/vHOSFwMKlSq17RxaOxBH2umo+iPn6C67uolmlVrXx/TSQRpdGgt9L8WwJM5D81Yz5srWg5K9WW2rBw== /verror/1.10.0: dependencies: assert-plus: 1.0.0 @@ -6453,6 +6461,7 @@ specifiers: mkdirp: ^0.5.1 mkdirp-promise: ^5.0.1 mz: ^2.7.0 + ncp: ^2.0.0 nopt: ^4.0.1 normalize-newline: ^3.0.0 npm-run-all: ^4.0.1 diff --git a/packages/pnpm/src/cmd/link.ts b/packages/pnpm/src/cmd/link.ts index 707931bd92..510a6b0eae 100644 --- a/packages/pnpm/src/cmd/link.ts +++ b/packages/pnpm/src/cmd/link.ts @@ -1,3 +1,4 @@ +import pLimit = require('p-limit') import path = require('path') import pathAbsolute = require('path-absolute') import R = require('ramda') @@ -7,7 +8,11 @@ import { } from 'supi' import createStoreController from '../createStoreController' import findWorkspacePackages from '../findWorkspacePackages' +import getConfigs from '../getConfigs' import {PnpmOptions} from '../types' +import install from './install' + +const installLimit = pLimit(4) export default async ( input: string[], @@ -49,5 +54,10 @@ export default async ( globalPkgNames.forEach((pkgName) => pkgPaths.push(path.join(globalPkgPath, 'node_modules', pkgName))) } + await Promise.all( + pkgPaths.map((prefix) => installLimit(async () => + await install([], await getConfigs({...opts.cliArgs, prefix}, {excludeReporter: true})), + )), + ) await link(pkgPaths, path.join(cwd, 'node_modules'), linkOpts) } diff --git a/packages/pnpm/src/cmd/recursive/index.ts b/packages/pnpm/src/cmd/recursive/index.ts index d8723c29f1..cc7d87862c 100644 --- a/packages/pnpm/src/cmd/recursive/index.ts +++ b/packages/pnpm/src/cmd/recursive/index.ts @@ -221,13 +221,12 @@ function linkPackages ( }, ) { const limitLinking = pLimit(12) - const linkOpts = {...opts, skipInstall: true} return Promise.all( Object.keys(graph) .filter((pkgPath) => graph[pkgPath].dependencies && graph[pkgPath].dependencies.length) .map((pkgPath) => limitLinking(() => - link(graph[pkgPath].dependencies, path.join(pkgPath, 'node_modules'), {...linkOpts, prefix: pkgPath}), + link(graph[pkgPath].dependencies, path.join(pkgPath, 'node_modules'), {...opts, prefix: pkgPath}), ), ), ) diff --git a/packages/pnpm/src/getConfigs.ts b/packages/pnpm/src/getConfigs.ts new file mode 100644 index 0000000000..d9e9c65220 --- /dev/null +++ b/packages/pnpm/src/getConfigs.ts @@ -0,0 +1,16 @@ +import getConfigs from '@pnpm/config' +import packageManager from './pnpmPkgJson' + +export default async function (cliArgs: object, opts: {excludeReporter: boolean}) { + const configs = await getConfigs({ + cliArgs, + packageManager, + }) + configs.cliArgs = cliArgs + + if (opts.excludeReporter) { + delete configs.reporter // This is a silly workaround because supi expects a function as opts.reporter + } + + return configs +} diff --git a/packages/pnpm/src/main.ts b/packages/pnpm/src/main.ts index 379dd55918..1ced123a82 100644 --- a/packages/pnpm/src/main.ts +++ b/packages/pnpm/src/main.ts @@ -12,7 +12,7 @@ gfs.gracefulify(fs) import loudRejection = require('loud-rejection') loudRejection() -import getConfigs, {types} from '@pnpm/config' +import {types} from '@pnpm/config' import logger from '@pnpm/logger' import camelcase = require('camelcase') import {stripIndent} from 'common-tags' @@ -23,6 +23,7 @@ import checkForUpdates from './checkForUpdates' import * as pnpmCmds from './cmd' import runNpm from './cmd/runNpm' import getCommandFullName from './getCommandFullName' +import getConfigs from './getConfigs' import './logging/fileLogger' import packageManager from './pnpmPkgJson' import initReporter, { ReporterType } from './reporter' @@ -162,10 +163,7 @@ export default async function run (argv: string[]) { cliConf.save = cliConf.save || !cliConf['save-dev'] && !cliConf['save-optional'] - const opts = await getConfigs({ - cliArgs: cliConf, - packageManager, - }) + const opts = await getConfigs(cliConf, {excludeReporter: false}) const selfUpdate = opts.global && (cmd === 'install' || cmd === 'update') && cliConf.argv.remain.indexOf(packageManager.name) !== -1 diff --git a/packages/pnpm/src/pnpmPkgJson.ts b/packages/pnpm/src/pnpmPkgJson.ts index c34b12ed6f..2d5d869463 100644 --- a/packages/pnpm/src/pnpmPkgJson.ts +++ b/packages/pnpm/src/pnpmPkgJson.ts @@ -1,4 +1,9 @@ import loadJsonFile = require('load-json-file') import path = require('path') -export default loadJsonFile.sync(path.resolve(__dirname, '../package.json')) +const pkgJson = loadJsonFile.sync(path.resolve(__dirname, '../package.json')) +const packageManager = { + name: pkgJson.name, + version: pkgJson.version, +} +export default packageManager diff --git a/packages/pnpm/src/types.ts b/packages/pnpm/src/types.ts index 8616be58de..c8b4657b7c 100644 --- a/packages/pnpm/src/types.ts +++ b/packages/pnpm/src/types.ts @@ -7,6 +7,7 @@ export type ReadPackageHook = (pkg: PackageManifest) => PackageManifest export interface PnpmOptions { bail: boolean, + cliArgs: object, filter: string[], rawNpmConfig: object, globalPrefix: string, diff --git a/packages/pnpm/test/link.ts b/packages/pnpm/test/link.ts index 529b7091ba..5adb49a7ff 100644 --- a/packages/pnpm/test/link.ts +++ b/packages/pnpm/test/link.ts @@ -1,16 +1,22 @@ -import {isExecutable} from '@pnpm/assert-project' +import assertProject, {isExecutable} from '@pnpm/assert-project' import tape = require('tape') import promisifyTape from 'tape-promise' +import loadYamlFile = require('load-yaml-file') const test = promisifyTape(tape) import path = require('path') +import promisify = require('util.promisify') import writePkg = require('write-pkg') import { + pathToLocalPkg, prepare, testDefaults, execPnpm, } from './utils' import fs = require('mz/fs') import isWindows = require('is-windows') +import ncpCB = require('ncp') + +const ncp = promisify(ncpCB.ncp) test('linking multiple packages', async (t: tape.Test) => { const project = prepare(t) @@ -19,7 +25,8 @@ test('linking multiple packages', async (t: tape.Test) => { process.env.NPM_CONFIG_PREFIX = path.resolve('global') await writePkg('linked-foo', {name: 'linked-foo', version: '1.0.0'}) - await writePkg('linked-bar', {name: 'linked-bar', version: '1.0.0'}) + await writePkg('linked-bar', {name: 'linked-bar', version: '1.0.0', dependencies: {'is-positive': '1.0.0'}}) + await fs.writeFile('linked-bar/.npmrc', 'shamefully-flatten = true') process.chdir('linked-foo') @@ -33,6 +40,9 @@ test('linking multiple packages', async (t: tape.Test) => { project.has('linked-foo') project.has('linked-bar') + + const modules = await loadYamlFile('../linked-bar/node_modules/.modules.yaml') + t.ok(modules['shamefullyFlatten'] === true, 'the linked package used its own configs during installation') // tslint:disable-line:no-string-literal }) test('link global bin', async function (t: tape.Test) { @@ -53,3 +63,31 @@ test('link global bin', async function (t: tape.Test) { const globalBin = isWindows() ? path.join(global, 'npm') : path.join(global, 'bin') await isExecutable(t, path.join(globalBin, 'package-with-bin')) }) + +test('relative link', async (t: tape.Test) => { + const project = prepare(t, { + dependencies: { + 'hello-world-js-bin': '*', + }, + }) + + const linkedPkgName = 'hello-world-js-bin' + const linkedPkgPath = path.resolve('..', linkedPkgName) + + await ncp(pathToLocalPkg(linkedPkgName), linkedPkgPath) + await execPnpm('link', `../${linkedPkgName}`) + + await project.isExecutable('.bin/hello-world-js-bin') + + // The linked package has been installed successfully as well with bins linked + // to node_modules/.bin + const linkedProject = assertProject(t, linkedPkgPath) + await linkedProject.isExecutable('.bin/cowsay') + + const wantedShrinkwrap = await project.loadShrinkwrap() + t.equal(wantedShrinkwrap.dependencies['hello-world-js-bin'], 'link:../hello-world-js-bin', 'link added to wanted shrinkwrap') + t.equal(wantedShrinkwrap.specifiers['hello-world-js-bin'], '*', 'specifier of linked dependency added to shrinkwrap.yaml') + + const currentShrinkwrap = await project.loadCurrentShrinkwrap() + t.equal(currentShrinkwrap.dependencies['hello-world-js-bin'], 'link:../hello-world-js-bin', 'link added to wanted shrinkwrap') +}) diff --git a/packages/pnpm/test/packages/hello-world-js-bin/package.json b/packages/pnpm/test/packages/hello-world-js-bin/package.json index 18dec7e9da..e6a7a7ec4c 100644 --- a/packages/pnpm/test/packages/hello-world-js-bin/package.json +++ b/packages/pnpm/test/packages/hello-world-js-bin/package.json @@ -12,5 +12,8 @@ "repository": { "type": "git", "url": "https://github.com/pnpm/pnpm/tree/master/test/packages/hello-world-js-bin" + }, + "dependencies": { + "cowsay": "1.2.1" } } diff --git a/packages/pnpm/test/utils/index.ts b/packages/pnpm/test/utils/index.ts index 685801c8e9..41e212a0e7 100644 --- a/packages/pnpm/test/utils/index.ts +++ b/packages/pnpm/test/utils/index.ts @@ -7,10 +7,12 @@ import execPnpm, { import prepare, { tempDir, preparePackages } from './prepare' import retryLoadJsonFile from './retryLoadJsonFile' import testDefaults from './testDefaults' +import {pathToLocalPkg} from './localPkg' export { createDeferred, Deferred, + pathToLocalPkg, prepare, preparePackages, tempDir, diff --git a/packages/pnpm/test/utils/localPkg.ts b/packages/pnpm/test/utils/localPkg.ts new file mode 100644 index 0000000000..05b7f189ef --- /dev/null +++ b/packages/pnpm/test/utils/localPkg.ts @@ -0,0 +1,9 @@ +import path = require('path') + +export function pathToLocalPkg (pkgName: string) { + return path.join(__dirname, '..', 'packages', pkgName) +} + +export function local (pkgName: string) { + return `file:${pathToLocalPkg(pkgName)}` +} diff --git a/packages/supi/shrinkwrap.yaml b/packages/supi/shrinkwrap.yaml index 2e4bc100a1..2cd15e0ceb 100644 --- a/packages/supi/shrinkwrap.yaml +++ b/packages/supi/shrinkwrap.yaml @@ -15,7 +15,7 @@ dependencies: '@types/common-tags': 1.4.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/nopt': 3.0.29 '@types/npm': 2.0.29 '@types/p-series': 1.0.1 @@ -42,7 +42,7 @@ dependencies: os-homedir: 1.0.2 p-filter: 1.0.0 p-limit: 2.0.0 - package-store: 0.23.0 + package-store: 0.23.1 path-absolute: 1.0.0 path-exists: 3.0.0 pnpm-install-checks: 1.1.0 @@ -53,6 +53,7 @@ dependencies: resolve-link-target: 1.0.1 rimraf-then: 1.0.1 semver: 5.5.0 + supi: 'link:' symlink-dir: 1.1.3 util.promisify: 1.0.0 validate-npm-package-name: 3.0.0 @@ -139,7 +140,7 @@ packages: dependencies: '@pnpm/git-resolver': 0.3.8 '@pnpm/local-resolver': 1.0.0 - '@pnpm/npm-resolver': 2.1.4 + '@pnpm/npm-resolver': 2.1.5 '@pnpm/tarball-resolver': 0.1.1 dev: true engines: @@ -150,7 +151,7 @@ packages: dependencies: '@pnpm/self-installer': 2.0.5 '@types/got': 8.3.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -167,7 +168,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -177,7 +178,7 @@ packages: integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== /@pnpm/git-fetcher/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dint: 3.0.1 execa: 0.10.0 path-temp: 1.0.0 @@ -190,7 +191,7 @@ packages: /@pnpm/git-resolver/0.3.8: dependencies: '@pnpm/resolver-base': 1.1.0 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 got: 8.3.2 graceful-git: 1.0.3 @@ -221,7 +222,7 @@ packages: '@pnpm/read-package-json': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 '@zkochan/cmd-shim': 3.0.1 arr-flatten: 1.1.0 @@ -241,7 +242,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/graceful-fs': 4.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 normalize-path: 3.0.0 osenv: 0.1.5 @@ -255,7 +256,7 @@ packages: integrity: sha512-rCVZc//o1Db18pD6zPoCP/gz/EeZU/wHvCWJjeoq+NHgiTT4bGbXnj6mdQ6za/J3IgGEEHw0DHd3i5/NBDAArQ== /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -271,13 +272,13 @@ packages: node: '>=4' resolution: integrity: sha512-bl9TPt2UObSEpGPQHZ2soXSSwz+/0XZqK+afBRJ4L78NKV41oZTUnrLjeNbeNEVwIG9icrQ3ZeSslIvQy4L+Dw== - /@pnpm/npm-resolver/2.1.4: + /@pnpm/npm-resolver/2.1.5: dependencies: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mem': 1.1.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/semver': 5.5.0 '@types/write-json-file': 2.2.1 credentials-by-uri: 1.0.0 @@ -296,7 +297,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-KAS+ti+yMv9T2ks0QMVYp3uUTC1+gAuOYBOArSvOqfHqQ//kbM3PTbNspNEDshA2UVwdgIE6xY7+GzOl0Ti/eA== + integrity: sha512-z0zWtn0xq9TTEUCcnYu9mDSYQMqX7BA2kjhUu/8KvBIXozgxJjbt58qXfPUWrBCr1/SD+Ifm7pC4XprQogC6Pw== /@pnpm/package-bins/1.0.0: dependencies: '@pnpm/types': 1.7.0 @@ -317,7 +318,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 5.0.0 @@ -372,7 +373,7 @@ packages: integrity: sha512-NnkmxKFQJMkHL2TcLAl2sof7mVu8dgode4zGzwtvEaZ/xjOHm3CfUJomincmZcpWoXrjHkvbPxjczEPP41Wmqg== /@pnpm/store-path/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 '@types/touch': 3.1.0 can-link: 1.0.2 mkdirp-promise: 5.0.1 @@ -392,7 +393,7 @@ packages: '@pnpm/fetcher-base': 1.0.0 '@types/mem': 1.1.2 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/retry': 0.10.2 '@types/rimraf': 2.0.2 credentials-by-uri: 1.0.0 @@ -444,7 +445,7 @@ packages: integrity: sha512-D7VxhADdZbDJ0HjUTMnSQ5xIGb4H2yWpg8k9Sf1T08zfFiQYlaxM8LZydpR4FQ2E6LZJX8IlabNZ5io4vdChwg== /@types/byline/4.2.31: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha1-DmH8ucA+BH0hxEllVMcRYperYM0= @@ -458,7 +459,7 @@ packages: integrity: sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA== /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== @@ -466,19 +467,19 @@ packages: dependencies: '@types/events': 1.2.0 '@types/minimatch': 3.0.3 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-wc+VveszMLyMWFvXLkloixT4n0harUIVZjnpzztaZ0nKLuul7Z32iMt2fUFGAaZ4y1XWjFRMtCI5ewvyh4aIeg== /@types/got/8.3.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-OXZz0iG3oX9RHTZAeVGJQCjCOGx0r7MnSWebgUoX5CiFq0aVcRJrUPLQo/dBdKOaosbp4K9NTZTSec2zWk9YIg== /@types/graceful-fs/4.1.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-epDhsJAVxJsWfeqpzEDFhLnhHMbHie/VMFY+2Hvt5p7FemeW5ELM+6gcVYL/ZsUwdu3zrWpDE3VUTddXW+EMYg== @@ -503,29 +504,29 @@ packages: integrity: sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== /@types/mkdirp/0.5.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== - /@types/node/9.6.24: + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== + /@types/node/9.6.25: dev: true resolution: - integrity: sha512-o5K0mt8x735EaqS7F2x+5AG0b1Mt3V9jgV5SeW8SD6RNhE++dvwqLf2R2e4c8FmhNLaogz2oXrsiXnqnsBSSIQ== + integrity: sha512-uZpzO9MKSHy7zBiTtziA3JgZP3upcAvLTASkKgheLj6/rNZmRX4UyvsFYaY2kbYcmmh8bNZ2T0eocBRCfZdGvQ== /@types/nopt/3.0.29: dev: false resolution: integrity: sha1-8Z3z20yX7hRZonQAKDIKcdcJZM4= /@types/npm/2.0.29: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-McqGDdeT1tSMu8sPaL0ya7xBwojQYKGVwCrlPNBcaF+o+H4wLNH03nYRTfycU11Xdu8eziEb4cgdGmu4VF/NWA== @@ -556,7 +557,7 @@ packages: /@types/rimraf/2.0.2: dependencies: '@types/glob': 5.0.35 - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-Hm/bnWq0TCy7jmjeN5bKYij9vw5GrDFWME4IuxV08278NtU/VdGbzsBohcCUJ7+QMqmUq5hpRKB39HeQWJjztQ== @@ -569,13 +570,13 @@ packages: integrity: sha512-yxzBCIjE3lp9lYjfBbIK/LRCoXgCLLbIIBIje7eNCcUIIR2CZZtyX5uto2hVoMSMqLrsRrT6mwwUEd0yFgOwpA== /@types/tape/4.2.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== /@types/touch/3.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: true resolution: integrity: sha512-Bskfd5wztYbQ/mvU4rgHUB3fKcjW2hA6o/F0JN8O+jRPJQDN/2pPV6SmdIiFm2vLyyN/XQzoCULTE05ZOpnNbQ== @@ -635,14 +636,14 @@ packages: dev: false resolution: integrity: sha512-ufMBw0x+4y7uaiPu1uhwMaHaysLB57+EJoo63DGf28FG+TIrYiIIE886qSNXuDqyhqt+PVsRLB9e8+QVGe+Dtg== - /JSONStream/1.3.2: + /JSONStream/1.3.3: dependencies: jsonparse: 1.3.1 through: 2.3.8 dev: true hasBin: true resolution: - integrity: sha1-wQI3G27Dp887hHygDCC7D85Mbeo= + integrity: sha512-3Sp6WZZ/lXl+nTDoGpGWHEpTnnC6X5fnkolYZR6nwIfzbxxvA8utPWe1gCt7i0m9uVGsSz2IS8K8mJ7HmlduMg== /abbrev/1.1.1: resolution: integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== @@ -663,14 +664,14 @@ packages: node: '>= 4.0.0' resolution: integrity: sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== - /agentkeepalive/3.4.1: + /agentkeepalive/3.5.1: dependencies: humanize-ms: 1.2.1 dev: true engines: node: '>= 4.0.0' resolution: - integrity: sha512-MPIwsZU9PP9kOrZpyu2042kYA8Fdt/AedQYkYXucHgF9QoD9dXVp0ypuGnHXSR0hTstBxdt85Xkh4JolYfK5wg== + integrity: sha512-Cte/sTY9/XcygXjJ0q58v//SnEQ7ViWExKyJpLJlLqomDbQyMLh6Is4KuWJ/wmxzhiwkGRple7Gqv1zf6Syz5w== /ajv/4.11.8: dependencies: co: 4.6.0 @@ -824,9 +825,11 @@ packages: yarn: '>=1.1.0' resolution: integrity: sha512-GFBpOZiRih8jW8HEqlwU6ywUOE0XHso1cPTG/4YtNbR+0DxZ9H3aQ7JMTBeSsc82pIiUR9MtWXAHIZ6L3IOeFg== - /asn1/0.2.3: + /asn1/0.2.4: + dependencies: + safer-buffer: 2.1.2 resolution: - integrity: sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y= + integrity: sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== /assert-plus/0.2.0: dev: false engines: @@ -842,12 +845,6 @@ packages: dev: true resolution: integrity: sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo= - /async/2.6.0: - dependencies: - lodash: 4.17.10 - dev: true - resolution: - integrity: sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw== /async/2.6.1: dependencies: lodash: 4.17.10 @@ -994,10 +991,10 @@ packages: dev: true resolution: integrity: sha1-+PeLdniYiO858gXNY39o5wISKyw= - /buffer-from/1.1.0: + /buffer-from/1.1.1: dev: true resolution: - integrity: sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ== + integrity: sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== /buffer/3.6.0: dependencies: base64-js: 0.0.8 @@ -1050,7 +1047,7 @@ packages: hasBin: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= - /cacache/11.0.2: + /cacache/11.1.0: dependencies: bluebird: 3.5.1 chownr: 1.0.1 @@ -1068,7 +1065,7 @@ packages: y18n: 4.0.0 dev: true resolution: - integrity: sha512-hMiz7LN4w8sdfmKsvNs80ao/vf2JCGWWdpu95JyY90AJZRbZJmgE71dCefRiNf8OCqiZQDcUBfYiLlUNu4/j5A== + integrity: sha512-wFLexxfPdlvoUlpHIaU4y4Vm+Im/otOPCg1ov5g9/HRfUhVA8GpDdQL66SWBgRpgNC+5ebMT1Vr1RyPaFrJVqw== /cacheable-request/2.1.4: dependencies: clone-response: 1.0.2 @@ -1213,14 +1210,14 @@ packages: dev: true resolution: integrity: sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw== - /commander/2.15.0: - dev: true - resolution: - integrity: sha512-7B1ilBwtYSbetCgTY1NJFg+gVpestg0fdA1MhC1Vs4ssyfSXnCAjFr+QcQM9/RedXC0EaUx1sG8Smgw2VfgKEg== /commander/2.16.0: dev: true resolution: integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + /commander/2.17.0: + dev: true + resolution: + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /common-tags/1.8.0: dev: false engines: @@ -1249,12 +1246,26 @@ packages: node: '>= 0.8.0' resolution: integrity: sha1-qv+81qr4VLROuygDU9WtFlH1mmk= + /compression/1.7.3: + dependencies: + accepts: 1.3.5 + bytes: 3.0.0 + compressible: 2.0.14 + debug: 2.6.9 + on-headers: 1.0.1 + safe-buffer: 5.1.2 + vary: 1.1.2 + dev: true + engines: + node: '>= 0.8.0' + resolution: + integrity: sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg== /concat-map/0.0.1: resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= /concat-stream/1.6.2: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 inherits: 2.0.3 readable-stream: 2.3.6 typedarray: 0.0.6 @@ -1778,7 +1789,7 @@ packages: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /fetch-from-npm-registry/1.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 make-fetch-happen: 4.0.1 dev: true engines: @@ -2473,14 +2484,6 @@ packages: dev: true resolution: integrity: sha1-mGbfOVECEw449/mWvOtlRDIJwls= - /js-yaml/3.11.0: - dependencies: - argparse: 1.0.10 - esprima: 4.0.1 - dev: true - hasBin: true - resolution: - integrity: sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw== /js-yaml/3.12.0: dependencies: argparse: 1.0.10 @@ -2530,7 +2533,7 @@ packages: '0': node >= 0.2.0 resolution: integrity: sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - /jsonwebtoken/8.2.1: + /jsonwebtoken/8.3.0: dependencies: jws: 3.1.5 lodash.includes: 4.3.0 @@ -2541,13 +2544,12 @@ packages: lodash.isstring: 4.0.1 lodash.once: 4.1.1 ms: 2.1.1 - xtend: 4.0.1 dev: true engines: node: '>=0.12' npm: '>=1.4.28' resolution: - integrity: sha512-l8rUBr0fqYYwPc8/ZGrue7GiW7vWdZtZqelxo4Sd5lMvuEeCK8/wS54sEo6tJhdZ6hqfutsj6COgC0d1XdbHGw== + integrity: sha512-oge/hvlmeJCH+iIz1DwcO7vKPkNGJHhgkspk8OH3VKlw+mbi42WtD4ig1+VXRln765vxptAv+xT26Fd3cteqag== /jsprim/1.4.1: dependencies: assert-plus: 1.0.0 @@ -2654,6 +2656,12 @@ packages: dev: true resolution: integrity: sha1-Jjj8OaAzHpysGgS3F5mTHJxQ33k= + /lockfile/1.0.4: + dependencies: + signal-exit: 3.0.2 + dev: true + resolution: + integrity: sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA== /lodash.get/4.4.2: dev: true resolution: @@ -2746,8 +2754,8 @@ packages: integrity: sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g== /make-fetch-happen/4.0.1: dependencies: - agentkeepalive: 3.4.1 - cacache: 11.0.2 + agentkeepalive: 3.5.1 + cacache: 11.1.0 http-cache-semantics: 3.8.1 http-proxy-agent: 2.1.0 https-proxy-agent: 2.2.1 @@ -2776,13 +2784,13 @@ packages: dev: true resolution: integrity: sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ= - /marked/0.3.17: + /marked/0.4.0: dev: true engines: node: '>=0.10.0' hasBin: true resolution: - integrity: sha512-+AKbNsjZl6jFfLPwHhWmGTqE009wTKn3RTmn9K8oUKHrX/abPJjtcRtXpYB/FFrwPJRUA86LX/de3T0knkPCmQ== + integrity: sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw== /media-typer/0.3.0: dev: true engines: @@ -2846,13 +2854,13 @@ packages: hasBin: true resolution: integrity: sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ== - /mime/2.2.0: + /mime/2.3.1: dev: true engines: - node: '>=6.0.0' + node: '>=4.0.0' hasBin: true resolution: - integrity: sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA== + integrity: sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg== /mimic-fn/1.2.0: engines: node: '>=4' @@ -2905,7 +2913,7 @@ packages: parallel-transform: 1.1.0 pump: 3.0.0 pumpify: 1.5.1 - stream-each: 1.2.2 + stream-each: 1.2.3 through2: 2.0.3 dev: true engines: @@ -3064,7 +3072,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== /normalize-path/3.0.0: @@ -3351,7 +3359,7 @@ packages: '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -3370,7 +3378,7 @@ packages: hasBin: true resolution: integrity: sha512-GQ4w5vrDXoy8UVJM+0W7oWd5MYF21/IXkdzcupGNXdfqQuMzgQT+LXde109uHaH7xyqvCzPPBSxYM/HqQOi3+w== - /package-store/0.23.0: + /package-store/0.23.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.2 @@ -3379,7 +3387,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 encode-registry: 1.1.0 load-json-file: 5.0.0 @@ -3401,7 +3409,7 @@ packages: peerDependencies: '@pnpm/logger': ^2.1.0 resolution: - integrity: sha512-up8AtzXWTJRpQRxe6o6qjSmaEZbCTOS0oHymivYlk/kpqEMYkJ/4REP+oZnHfTmyxZGjC7BYOgfrnvFfhOmo9w== + integrity: sha512-hCGAENKoQnGTlZFJlruTGi9k2kv9rIKsfJy3LkeRFny6BNKtperN/8PgrPNp6jYFpUC5DxWvMEY+IeK7IVF00g== /pako/0.2.9: dev: true resolution: @@ -3424,7 +3432,7 @@ packages: integrity: sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= /parse-npm-tarball-url/1.0.3: dependencies: - '@types/node': 9.6.24 + '@types/node': 9.6.25 semver-regex: 1.0.0 dev: true engines: @@ -3505,7 +3513,7 @@ packages: integrity: sha1-/lo0sMvOErWqaitAPuLnO2AvFEU= /peek-stream/1.1.3: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 duplexify: 3.6.0 through2: 2.0.3 dev: true @@ -3546,7 +3554,7 @@ packages: anonymous-npm-registry-client: 0.1.2 cpr: 3.0.1 rimraf: 2.6.2 - verdaccio: 3.4.1 + verdaccio: 3.5.1 dev: true engines: node: '>=6' @@ -3558,7 +3566,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/js-yaml': 3.11.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -4158,7 +4166,7 @@ packages: integrity: sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg= /source-map-support/0.5.6: dependencies: - buffer-from: 1.1.0 + buffer-from: 1.1.1 source-map: 0.6.1 dev: true resolution: @@ -4219,7 +4227,7 @@ packages: integrity: sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= /sshpk/1.14.2: dependencies: - asn1: 0.2.3 + asn1: 0.2.4 assert-plus: 1.0.0 dashdash: 1.14.1 getpass: 0.1.7 @@ -4261,13 +4269,13 @@ packages: dev: true resolution: integrity: sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ= - /stream-each/1.2.2: + /stream-each/1.2.3: dependencies: end-of-stream: 1.4.1 stream-shift: 1.0.0 dev: true resolution: - integrity: sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA== + integrity: sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw== /stream-shift/1.0.0: dev: true resolution: @@ -4371,7 +4379,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -4498,7 +4506,7 @@ packages: /ts-node/6.2.0: dependencies: arrify: 1.0.1 - buffer-from: 1.1.0 + buffer-from: 1.1.1 diff: 3.5.0 make-error: 1.3.4 minimist: 1.2.0 @@ -4520,7 +4528,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -4644,7 +4652,7 @@ packages: integrity: sha1-HAgkFQSBvHoB1J6Y8exmjYJBLzs= /unpack-stream/3.0.3: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -4655,7 +4663,7 @@ packages: integrity: sha512-h3Ii7ThTL7P5LlX1RuMPsuW4V5EZnLyjPwStIMQ4V0F6rblgmXIS+IkpAOu9THHDZYUO/D8TTJddVc6HIY4S5g== /unpack-stream/4.0.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 decompress-maybe: 1.0.0 ssri: 6.0.0 tar-fs: 1.16.3 @@ -4707,12 +4715,12 @@ packages: hasBin: true resolution: integrity: sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /validate-npm-package-name/3.0.0: dependencies: builtins: 1.0.3 @@ -4745,35 +4753,35 @@ packages: node: '>=6.12.0' resolution: integrity: sha512-60R1AEAjKmIGms7gSfotWmUhw0JOPdeyx6DOATtCuOJNfgameiDm2gPlAGJ/XKHoXn96EaVfuhg2ruDmq1AQug== - /verdaccio/3.4.1: + /verdaccio/3.5.1: dependencies: '@verdaccio/file-locking': 0.0.7 '@verdaccio/local-storage': 1.1.3 '@verdaccio/streams': 1.0.0 - JSONStream: 1.3.2 + JSONStream: 1.3.3 asciidoctor.js: 1.5.6 - async: 2.6.0 - body-parser: 1.18.2 + async: 2.6.1 + body-parser: 1.18.3 bunyan: 1.8.12 chalk: 2.4.1 - commander: 2.15.0 - compression: 1.7.2 + commander: 2.16.0 + compression: 1.7.3 cookies: 0.7.1 cors: 2.8.4 date-fns: 1.29.0 express: 4.16.3 global: 4.3.2 handlebars: 4.0.11 - http-errors: 1.6.2 + http-errors: 1.6.3 js-base64: 2.4.8 js-string-escape: 1.0.1 - js-yaml: 3.11.0 - jsonwebtoken: 8.2.1 - lockfile: 1.0.3 + js-yaml: 3.12.0 + jsonwebtoken: 8.3.0 + lockfile: 1.0.4 lodash: 4.17.10 lunr: 0.7.0 - marked: 0.3.17 - mime: 2.2.0 + marked: 0.4.0 + mime: 2.3.1 minimatch: 3.0.4 mkdirp: 0.5.1 pkginfo: 0.4.1 @@ -4787,7 +4795,7 @@ packages: npm: '>=3' hasBin: true resolution: - integrity: sha512-+1FHJXpoCleQbk8PDOp7UZsgJ/KsCPSsQrsKWHC5Jif/9yQFsn6/bD6j2DAwFgI3Y+Ia3sRj0Q7nNrU7FvfSIw== + integrity: sha512-shCedQ4/vHOSFwMKlSq17RxaOxBH2umo+iPn6C67uolmlVrXx/TSQRpdGgt9L8WwJM5D81Yz5srWg5K9WW2rBw== /verror/1.10.0: dependencies: assert-plus: 1.0.0 diff --git a/packages/supi/src/api/link.ts b/packages/supi/src/api/link.ts index ccfef5deae..74a4aa89fd 100644 --- a/packages/supi/src/api/link.ts +++ b/packages/supi/src/api/link.ts @@ -15,7 +15,6 @@ import { } from '@pnpm/utils' import loadJsonFile = require('load-json-file') import normalize = require('normalize-path') -import pLimit = require('p-limit') import path = require('path') import pathAbsolute = require('path-absolute') import { @@ -35,14 +34,10 @@ import extendOptions, { import {install} from './install' import getPref from './utils/getPref' -const linkLogger = logger('link') -const installLimit = pLimit(4) - export default async function link ( linkFromPkgs: string[], destModules: string, maybeOpts: InstallOptions & { - skipInstall?: boolean, linkToBin?: string, }, ) { @@ -53,18 +48,6 @@ export default async function link ( maybeOpts.saveProd = maybeOpts.saveProd === true const opts = await extendOptions(maybeOpts) - if (!maybeOpts || !maybeOpts.skipInstall) { - await Promise.all( - linkFromPkgs.map((prefix) => installLimit(() => - install({ - ...opts, - bin: path.join(prefix, 'node_modules', '.bin'), - global: false, - prefix, - }), - )), - ) - } const shrFiles = await readShrinkwrapFile({ force: opts.force, prefix: opts.prefix, diff --git a/packages/supi/test/link.ts b/packages/supi/test/link.ts index 550535e58e..b5f583fb41 100644 --- a/packages/supi/test/link.ts +++ b/packages/supi/test/link.ts @@ -38,11 +38,6 @@ test('relative link', async (t: tape.Test) => { await project.isExecutable('.bin/hello-world-js-bin') - // The linked package has been installed successfully as well with bins linked - // to node_modules/.bin - const linkedProject = assertProject(t, linkedPkgPath) - await linkedProject.isExecutable('.bin/cowsay') - const wantedShrinkwrap = await project.loadShrinkwrap() t.equal(wantedShrinkwrap.dependencies['hello-world-js-bin'], 'link:../hello-world-js-bin', 'link added to wanted shrinkwrap') t.equal(wantedShrinkwrap.specifiers['hello-world-js-bin'], '*', 'specifier of linked dependency added to shrinkwrap.yaml') @@ -58,9 +53,10 @@ test('relative link is not rewritten by install', async (t: tape.Test) => { const linkedPkgPath = path.resolve('..', linkedPkgName) const reporter = sinon.spy() + const opts = await testDefaults() await ncp(pathToLocalPkg(linkedPkgName), linkedPkgPath) - await link([linkedPkgPath], path.join(process.cwd(), 'node_modules'), await testDefaults({reporter})) + await link([linkedPkgPath], path.join(process.cwd(), 'node_modules'), {...opts, reporter} as any) // tslint:disable-line:no-any t.ok(reporter.calledWithMatch({ added: { @@ -75,7 +71,7 @@ test('relative link is not rewritten by install', async (t: tape.Test) => { prefix: process.cwd(), } as RootLog), 'linked root dependency logged') - await installPkgs(['hello-world-js-bin'], await testDefaults()) + await installPkgs(['hello-world-js-bin'], opts) t.ok(project.requireModule('hello-world-js-bin/package.json').isLocal) @@ -95,10 +91,12 @@ test('global link', async (t: tape.Test) => { await ncp(pathToLocalPkg(linkedPkgName), linkedPkgPath) + const opts = await testDefaults() + process.chdir(linkedPkgPath) const globalPrefix = path.resolve('..', 'global') const globalBin = path.resolve('..', 'global', 'bin') - await linkToGlobal(process.cwd(), await testDefaults({globalPrefix, globalBin})) + await linkToGlobal(process.cwd(), {...opts, globalPrefix, globalBin} as any) // tslint:disable-line:no-any await isExecutable(t, path.join(globalBin, 'hello-world-js-bin')) @@ -108,7 +106,7 @@ test('global link', async (t: tape.Test) => { process.chdir(projectPath) - await linkFromGlobal([linkedPkgName], process.cwd(), await testDefaults({globalPrefix})) + await linkFromGlobal([linkedPkgName], process.cwd(), {...opts, globalPrefix} as any) // tslint:disable-line:no-any await project.isExecutable('.bin/hello-world-js-bin') }) diff --git a/packages/supi/test/uninstall.ts b/packages/supi/test/uninstall.ts index 704bcfb4b3..5b13f67fa7 100644 --- a/packages/supi/test/uninstall.ts +++ b/packages/supi/test/uninstall.ts @@ -93,8 +93,9 @@ test('uninstall scoped package', async (t) => { test('uninstall tarball dependency', async (t: tape.Test) => { const project = prepare(t) - await installPkgs(['http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz'], await testDefaults({ save: true })) - await uninstall(['is-array'], await testDefaults({ save: true })) + const opts = await testDefaults({ save: true }) + await installPkgs(['http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz'], opts) + await uninstall(['is-array'], opts) t.ok(await exists(path.join(await project.getStorePath(), 'registry.npmjs.org', 'is-array', '1.0.1'))) @@ -150,13 +151,14 @@ test('uninstall package with its bin files', async (t) => { test('relative link is uninstalled', async (t: tape.Test) => { const project = prepare(t) + const opts = await testDefaults() const linkedPkgName = 'hello-world-js-bin' const linkedPkgPath = path.resolve('..', linkedPkgName) await ncp(pathToLocalPkg(linkedPkgName), linkedPkgPath) - await link([`../${linkedPkgName}`], path.join(process.cwd(), 'node_modules'), await testDefaults()) - await uninstall([linkedPkgName], await testDefaults()) + await link([`../${linkedPkgName}`], path.join(process.cwd(), 'node_modules'), opts) + await uninstall([linkedPkgName], opts) await project.hasNot(linkedPkgName) }) diff --git a/packages/utils/shrinkwrap.yaml b/packages/utils/shrinkwrap.yaml index 8e8cd208a8..c6c6f1b13d 100644 --- a/packages/utils/shrinkwrap.yaml +++ b/packages/utils/shrinkwrap.yaml @@ -3,12 +3,12 @@ dependencies: '@pnpm/read-package-json': 1.0.0 '@pnpm/types': 1.7.0 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 dependency-path: 1.2.1 fs-vacuum: 1.2.10 mz: 2.7.0 - package-store: 0.23.0 + package-store: 0.23.1 pnpm-shrinkwrap: 7.0.0 ramda: 0.25.0 rimraf-then: 1.0.1 @@ -39,7 +39,7 @@ packages: integrity: sha512-kp5ooq4wC84gelVjkQuV8GzDHe/m99+yvlx3HTHOP25SdfkshIG5k/q784cmw8axjBke/LXdgE9sR5JRNs8TTw== /@pnpm/fs-locker/1.0.2: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 mkdirp-promise: 5.0.1 proper-lockfile: 2.0.1 dev: false @@ -49,7 +49,7 @@ packages: integrity: sha512-ASULw2KzrapsjQVSMYdDc3f6+wYOs9cPt0M5Ip9VUkTfYfPrfxd0UYXcOPoUHkk7L12HUj0vwUYK0DE1da2gww== /@pnpm/logger/2.1.0: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 bole: 3.0.2 ndjson: 1.5.0 dev: true @@ -77,7 +77,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/p-queue': 2.3.1 '@types/write-json-file': 2.2.1 load-json-file: 5.0.0 @@ -139,13 +139,13 @@ packages: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== /@types/mz/0.0.32: dependencies: - '@types/node': 10.5.4 + '@types/node': 10.5.6 dev: false resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/node/10.5.4: + /@types/node/10.5.6: resolution: - integrity: sha512-8TqvB0ReZWwtcd3LXq3YSrBoLyXFgBX/sBZfGye9+YS8zH7/g+i6QRIuiDmwBoTzcQ/pk89nZYTYU4c5akKkzw== + integrity: sha512-c5Z1j1ysgo4878ptz6gxLcgMfJ6Wf908R3l5KAGabr0XJ72ZFmOCgsaodPpNYTfp4iOrSwgTDvR/BxbFfB4zPQ== /@types/p-queue/2.3.1: dev: false resolution: @@ -252,10 +252,10 @@ packages: dev: true resolution: integrity: sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok= - /commander/2.16.0: + /commander/2.17.0: dev: true resolution: - integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== + integrity: sha512-477o1hdVORiFlZxw8wgsXYCef3lh0zl/OV0FTftqiDxJSWw6dPQ2ipS4k20J2qBcsmsmLKSyr2iFrf9e3JGi4w== /concat-map/0.0.1: resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= @@ -643,7 +643,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 dev: false resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -745,7 +745,7 @@ packages: node: '>=6' resolution: integrity: sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ== - /package-store/0.23.0: + /package-store/0.23.1: dependencies: '@pnpm/fetcher-base': 1.0.0 '@pnpm/fs-locker': 1.0.2 @@ -754,7 +754,7 @@ packages: '@pnpm/types': 1.7.0 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 encode-registry: 1.1.0 load-json-file: 5.0.0 @@ -776,7 +776,7 @@ packages: peerDependencies: '@pnpm/logger': ^2.1.0 resolution: - integrity: sha512-up8AtzXWTJRpQRxe6o6qjSmaEZbCTOS0oHymivYlk/kpqEMYkJ/4REP+oZnHfTmyxZGjC7BYOgfrnvFfhOmo9w== + integrity: sha512-hCGAENKoQnGTlZFJlruTGi9k2kv9rIKsfJy3LkeRFny6BNKtperN/8PgrPNp6jYFpUC5DxWvMEY+IeK7IVF00g== /parse-json/4.0.0: dependencies: error-ex: 1.3.2 @@ -830,7 +830,7 @@ packages: '@pnpm/resolver-base': 1.1.0 '@pnpm/types': 1.7.0 '@types/js-yaml': 3.11.2 - '@types/node': 10.5.4 + '@types/node': 10.5.6 '@types/ramda': 0.25.34 dependency-path: 1.2.1 get-npm-tarball-url: 2.0.1 @@ -1020,7 +1020,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.5.4 + '@types/node': 10.5.6 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -1061,7 +1061,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.16.0 + commander: 2.17.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -1112,13 +1112,13 @@ packages: dev: false resolution: integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA== - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 dev: false resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /wrappy/1.0.2: resolution: integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= diff --git a/tools/shrinkwrap.yaml b/tools/shrinkwrap.yaml index 90759d85c1..47655528a2 100644 --- a/tools/shrinkwrap.yaml +++ b/tools/shrinkwrap.yaml @@ -1051,7 +1051,7 @@ packages: hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 - validate-npm-package-license: 3.0.3 + validate-npm-package-license: 3.0.4 dev: false resolution: integrity: sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw== @@ -1615,13 +1615,13 @@ packages: dev: false resolution: integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - /validate-npm-package-license/3.0.3: + /validate-npm-package-license/3.0.4: dependencies: spdx-correct: 3.0.0 spdx-expression-parse: 3.0.0 dev: false resolution: - integrity: sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g== + integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== /vorpal/1.12.0: dependencies: babel-polyfill: 6.26.0