diff --git a/package.json b/package.json index e714ad5936..85ad2d7da2 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/pnpm/npm-resolver#readme", "peerDependencies": { - "@pnpm/logger": "^1.0.0" + "@pnpm/logger": "^1.0.0 || ^2.0.0" }, "dependencies": { "@pnpm/resolver-base": "^1.1.0", @@ -55,7 +55,7 @@ "write-json-file": "^2.3.0" }, "devDependencies": { - "@pnpm/logger": "^1.0.0", + "@pnpm/logger": "^2.0.1", "@types/nock": "^9.1.1", "@types/path-exists": "^3.0.0", "@types/tape": "^4.2.31", diff --git a/shrinkwrap.yaml b/shrinkwrap.yaml index f15b2133bc..6b7f977637 100644 --- a/shrinkwrap.yaml +++ b/shrinkwrap.yaml @@ -1,9 +1,10 @@ dependencies: + '@pnpm/npm-resolver': 'link:../__package_previews__/npm-resolver/@pnpm/npm-resolver' '@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.3.4 + '@types/node': 10.5.2 '@types/semver': 5.5.0 '@types/write-json-file': 2.2.1 credentials-by-uri: 1.0.0 @@ -17,14 +18,14 @@ dependencies: version-selector-type: 2.0.0 write-json-file: 2.3.0 devDependencies: - '@pnpm/logger': 1.0.2 - '@types/nock': 9.1.3 + '@pnpm/logger': 2.0.1 + '@types/nock': 9.3.0 '@types/path-exists': 3.0.0 '@types/tape': 4.2.32 '@types/tempy': 0.1.0 mos: 2.0.0-alpha.3 mos-plugin-readme: 1.0.4 - nock: 9.3.3 + nock: 9.4.1 package-preview: 1.0.6 path-exists: 3.0.0 rimraf: 2.6.2 @@ -36,9 +37,9 @@ devDependencies: packages: /@pnpm/exec/1.1.5: dependencies: - '@pnpm/self-installer': 2.0.4 - '@types/got': 8.3.1 - '@types/node': 10.3.4 + '@pnpm/self-installer': 2.0.5 + '@types/got': 8.3.2 + '@types/node': 10.5.2 command-exists: 1.2.7 cross-spawn: 6.0.5 dev: true @@ -46,16 +47,16 @@ packages: node: '>=4' resolution: integrity: sha512-1zLmh6tRftQXfZ1IFHq1IexP0KaJhN6pSCA/IzK+Vixn4hPvxwcIbGjKW0KH9hsHSmrPpmSit2EWj7jGNgfa6Q== - /@pnpm/logger/1.0.2: + /@pnpm/logger/2.0.1: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 bole: 3.0.2 ndjson: 1.5.0 dev: true engines: - node: '>=4' + node: '>=6' resolution: - integrity: sha512-A8XbJKvdueazvJGPn1qQ9LL6uopV88ebIT+dJKNQ68gT7yfCbtfT8j5ZzdVczmGbkiuBeZ1VckZerkO0tjOXZA== + integrity: sha512-dST450D6Nj9iu0L16wqBv6dEXpbSQ6tyG1G9zSIzzjHqcDdKgdtpNR/0DvxpDEzBPfwGFQ868+o7AFaCuQsyig== /@pnpm/resolver-base/1.1.0: dependencies: '@pnpm/types': 1.7.0 @@ -64,28 +65,28 @@ packages: node: '>=4' resolution: integrity: sha512-YRUmjy2mR7Qk0r3xCUs0UkWLwRM2Mu2Fjyl2513PNlzsjDFG1xw4lbHRuz/bCMeN+ZKynJbIbfSW0ddMitfbgA== - /@pnpm/self-installer/2.0.4: + /@pnpm/self-installer/2.0.5: dev: true engines: node: '>=4' resolution: - integrity: sha512-xfqm5VkoTPwuiEmqIbLMA6ogdtyBZHy70Ddh1BsQQDNJ/xRk1YvdFxYggS3D2O0VPJVU3aku0TaF/1FpfCg7rA== + integrity: sha512-NnkmxKFQJMkHL2TcLAl2sof7mVu8dgode4zGzwtvEaZ/xjOHm3CfUJomincmZcpWoXrjHkvbPxjczEPP41Wmqg== /@pnpm/types/1.7.0: dev: false resolution: integrity: sha512-pn7g4uxcofWTNG/cxmKvkMK2lxr4OUIhrQDrEVYEdVhW0WkWztsHkFrYjFgfNzPbYu3ITlB3T6aSVjCoJQTOlw== - /@types/fs-extra/5.0.3: + /@types/fs-extra/5.0.4: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 dev: true resolution: - integrity: sha512-m2QKoRrJnei1s10e1ZfMIa7QcABBVLdQhVUv5+bMRaHhPzxO/IWMmREiags59AqFbI+piWPq/PupTahNS/0kyA== - /@types/got/8.3.1: + integrity: sha512-DsknoBvD8s+RFfSGjmERJ7ZOP1HI0UZRA3FSI+Zakhrc/Gy26YQsLI+m5V5DHxroHRJqCDLKJp7Hixn8zyaF7g== + /@types/got/8.3.2: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 dev: true resolution: - integrity: sha512-CGEPw67/Ub6gNMusk062tueurxN+HyjDCvYl4QVBKiSO+fqluXmRX/wSqST/4RtKth4mz8lDZiaZIpXr/uPROg== + integrity: sha512-279dKa5CgaJ1sYxLyKULh+rtGSmSGiY/9FScEIxbUQZgCKieApw1v6UmKkKigzRBcypC7LbvSfSR/0SYbsewvQ== /@types/load-json-file/2.0.7: resolution: integrity: sha512-NrH6jPlV77QCVPhAHofWeiOr77TgpKt82c2RVxSBChWBJqyY/u4ngl3CA4mcsAg/w7rNLrkR7dkObMV0ihLLXw== @@ -95,19 +96,19 @@ packages: integrity: sha1-48iwlfLyVjtRjwqtWd+f5qi4IGU= /@types/mz/0.0.32: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 dev: true resolution: integrity: sha512-cy3yebKhrHuOcrJGkfwNHhpTXQLgmXSv1BX+4p32j+VUQ6aP2eJ5cL7OvGcAQx75fCTFaAIIAKewvqL+iwSd4g== - /@types/nock/9.1.3: + /@types/nock/9.3.0: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 dev: true resolution: - integrity: sha512-S8rJ+SaW82ICX87pZP62UcMifrMfjEdqNzSp+llx4YcvKw6bO650Ye6HwTqER1Dar3S40GIZECQisOrAICDCjA== - /@types/node/10.3.4: + integrity: sha512-ZHf/X8rTQ5Tb1rHjxIJYqm55uO265agE3G7NoSXVa2ep+EcJXgB2fsme+zBvK7MhrxTwkC/xkB6THyv50u0MGw== + /@types/node/10.5.2: resolution: - integrity: sha512-YMLlzdeNnAyLrQew39IFRkMacAR5BqKGIEei9ZjdHsIZtv+ZWKYTu1i7QJhetxQ9ReXx8w5f+cixdHZG3zgMQA== + integrity: sha512-m9zXmifkZsMHZBOyxZWilMwmTlpC8x5Ty360JKTiXvlXZfBWYpsg9ZZvP/Ye+iZUh+Q+MxDLjItVTWIsfwz+8Q== /@types/path-exists/3.0.0: dev: true resolution: @@ -118,7 +119,7 @@ packages: integrity: sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== /@types/tape/4.2.32: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 dev: true resolution: integrity: sha512-xil0KO5wkPoixdBWGIGolPv9dekf6dVkjjJLAFYchfKcd4DICou67rgGCIO7wAh3i5Ff/6j9IDgZz+GU9cMaqQ== @@ -140,16 +141,17 @@ packages: dev: true engines: node: '>=0.4.0' + hasBin: true resolution: integrity: sha1-BPJElQ/bj6+FUHrUgcLt7nrs3uw= - /agent-base/4.2.0: + /agent-base/4.2.1: dependencies: es6-promisify: 5.0.0 dev: false engines: node: '>= 4.0.0' resolution: - integrity: sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg== + integrity: sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg== /agentkeepalive/3.4.1: dependencies: humanize-ms: 1.2.1 @@ -415,6 +417,7 @@ packages: integrity: sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc= /babylon/6.18.0: dev: true + hasBin: true resolution: integrity: sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ== /balanced-match/1.0.0: @@ -511,6 +514,7 @@ packages: through2: 2.0.3 unbzip2-stream: 1.2.5 dev: true + hasBin: true resolution: integrity: sha1-ya73AIprlDy+mcxhcSXrS9R4KWs= /cacache/11.0.2: @@ -713,10 +717,10 @@ packages: dev: true resolution: integrity: sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw== - /commander/2.15.1: + /commander/2.16.0: dev: true resolution: - integrity: sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== + integrity: sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew== /concat-map/0.0.1: resolution: integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= @@ -981,7 +985,7 @@ packages: es-to-primitive: 1.1.1 function-bind: 1.1.1 has: 1.0.3 - is-callable: 1.1.3 + is-callable: 1.1.4 is-regex: 1.0.4 dev: true engines: @@ -990,7 +994,7 @@ packages: integrity: sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA== /es-to-primitive/1.1.1: dependencies: - is-callable: 1.1.3 + is-callable: 1.1.4 is-date-object: 1.0.1 is-symbol: 1.0.1 dev: true @@ -1018,6 +1022,7 @@ packages: dev: true engines: node: '>=4' + hasBin: true resolution: integrity: sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw== /estree-walker/0.2.1: @@ -1040,7 +1045,7 @@ packages: integrity: sha1-oB6c2cnkkXFcmKdaQtXwu9EH/3Y= /fetch-from-npm-registry/1.0.0: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 make-fetch-happen: 4.0.1 dev: false engines: @@ -1113,7 +1118,7 @@ packages: integrity: sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw== /for-each/0.3.3: dependencies: - is-callable: 1.1.3 + is-callable: 1.1.4 dev: true resolution: integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== @@ -1241,6 +1246,7 @@ packages: pumpify: 1.5.1 through2: 2.0.3 dev: true + hasBin: true resolution: integrity: sha512-qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g== /has-ansi/0.1.0: @@ -1249,6 +1255,7 @@ packages: dev: true engines: node: '>=0.10.0' + hasBin: true resolution: integrity: sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4= /has-ansi/2.0.0: @@ -1282,19 +1289,17 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-42w/LSyufXRqhX440Y1fMqeILbg= - /hosted-git-info/2.6.0: + /hosted-git-info/2.7.1: dev: true - engines: - node: '>=4' resolution: - integrity: sha512-lIbgIIQA3lz5XaB6vxakj6sDHADJiZadYEJB+FgA+C4nubM1NwcuvUr9EJPmnH1skZqpqUzWborWo8EIUi0Sdw== + integrity: sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w== /http-cache-semantics/3.8.1: dev: false resolution: integrity: sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w== /http-proxy-agent/2.1.0: dependencies: - agent-base: 4.2.0 + agent-base: 4.2.1 debug: 3.1.0 dev: false engines: @@ -1303,7 +1308,7 @@ packages: integrity: sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg== /https-proxy-agent/2.2.1: dependencies: - agent-base: 4.2.0 + agent-base: 4.2.1 debug: 3.1.0 dev: false engines: @@ -1416,12 +1421,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-XuWOqlounIDiFAe+3yOuWsCRs/w= - /is-callable/1.1.3: + /is-callable/1.1.4: dev: true engines: node: '>= 0.4' resolution: - integrity: sha1-hut1OSgF3cM69xySoO7fdO52BLI= + integrity: sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA== /is-date-object/1.0.1: dev: true engines: @@ -1553,10 +1558,12 @@ packages: argparse: 1.0.10 esprima: 4.0.0 dev: true + hasBin: true resolution: integrity: sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A== /jsesc/1.3.0: dev: true + hasBin: true resolution: integrity: sha1-RsP+yMGJKxKwgz25vHYiF226s0s= /json-parse-better-errors/1.0.2: @@ -1568,6 +1575,7 @@ packages: integrity: sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= /json5/0.5.1: dev: true + hasBin: true resolution: integrity: sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= /jsondiffpatch/0.1.43: @@ -1575,6 +1583,7 @@ packages: dependencies: chalk: 0.5.1 dev: true + hasBin: true resolution: integrity: sha1-wFKImpnvfroZ0AlfkPclz6cKVhE= /jsonfile/4.0.0: @@ -1650,6 +1659,7 @@ packages: dependencies: js-tokens: 3.0.2 dev: true + hasBin: true resolution: integrity: sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg= /loud-rejection/1.6.0: @@ -1831,6 +1841,7 @@ packages: /mkdirp/0.5.1: dependencies: minimist: 0.0.8 + hasBin: true resolution: integrity: sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= /mos-core/1.0.2: @@ -2035,6 +2046,7 @@ packages: tap-parser: 1.3.2 through2: 2.0.3 dev: true + hasBin: true resolution: integrity: sha1-NDOB0f2e1RljsLMVNbf9i64E/3A= /mos/2.0.0-alpha.3: @@ -2070,6 +2082,7 @@ packages: dev: true engines: node: '>=4' + hasBin: true resolution: integrity: sha1-t+m8RNw22I6vHVgmBn54ySEeqVE= /move-concurrently/1.0.1: @@ -2105,6 +2118,7 @@ packages: split2: 2.2.0 through2: 2.0.3 dev: true + hasBin: true resolution: integrity: sha1-rmA7NrE0vOw0e0UkIrC/mNWDLsg= /nerf-dart/1.0.0: @@ -2121,7 +2135,7 @@ packages: dev: true resolution: integrity: sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA== - /nock/9.3.3: + /nock/9.4.1: dependencies: chai: 4.1.2 debug: 3.1.0 @@ -2136,7 +2150,7 @@ packages: engines: '0': node >= 4.0 resolution: - integrity: sha512-FBgnx25er2ly7KBr0Est5F0z5g+lnyr6a72vZI1KMi7nTL4ojU6XpFhlrfw6CXRdnT2FA5i8exHiT1uVNUM1qA== + integrity: sha512-VJ/02wdCfqJP8syNI5q2CFbejAqN0NLEPvA/nNcGXn3U8GoivtmICmTK3BOqLbfJyaDCXF0Jq+lkQUXBJ1ZMtw== /node-fetch-npm/2.0.2: dependencies: encoding: 0.1.12 @@ -2161,7 +2175,7 @@ packages: integrity: sha1-yIv2pUcUYqzrP2UXE7wjmw+stUk= /normalize-package-data/2.4.0: dependencies: - hosted-git-info: 2.6.0 + hosted-git-info: 2.7.1 is-builtin-module: 1.0.0 semver: 5.5.0 validate-npm-package-license: 3.0.3 @@ -2288,10 +2302,10 @@ packages: /package-preview/1.0.6: dependencies: '@pnpm/exec': 1.1.5 - '@types/fs-extra': 5.0.3 + '@types/fs-extra': 5.0.4 '@types/load-json-file': 2.0.7 '@types/mz': 0.0.32 - '@types/node': 10.3.4 + '@types/node': 10.5.2 '@types/write-json-file': 2.2.1 cross-spawn: 6.0.5 find-down: 0.1.4 @@ -2307,6 +2321,7 @@ packages: dev: true engines: node: '>=4' + hasBin: true resolution: integrity: sha512-GQ4w5vrDXoy8UVJM+0W7oWd5MYF21/IXkdzcupGNXdfqQuMzgQT+LXde109uHaH7xyqvCzPPBSxYM/HqQOi3+w== /pako/0.2.9: @@ -2542,6 +2557,7 @@ packages: minimist: 1.2.0 strip-json-comments: 2.0.1 dev: true + hasBin: true resolution: integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw== /rcfile/1.0.3: @@ -2762,6 +2778,7 @@ packages: /rimraf/2.6.2: dependencies: glob: 7.1.2 + hasBin: true resolution: integrity: sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w== /rollup-plugin-babel/2.4.0: @@ -2790,6 +2807,7 @@ packages: minimist: 1.2.0 source-map-support: 0.3.3 dev: true + hasBin: true resolution: integrity: sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA= /run-queue/1.0.3: @@ -2814,6 +2832,7 @@ packages: resolution: integrity: sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= /semver/5.5.0: + hasBin: true resolution: integrity: sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== /shebang-command/1.2.0: @@ -2858,14 +2877,14 @@ packages: integrity: sha512-RFqinRVJVcCAL9Uh1oVqE6FZkqsyLiVOYEZ20TqIOjuX7iFVJ+zsbs4RIghnw/pTs7mZvt8ZHhvm1ZUrR4fykg== /socks-proxy-agent/4.0.1: dependencies: - agent-base: 4.2.0 - socks: 2.2.0 + agent-base: 4.2.1 + socks: 2.2.1 dev: false engines: node: '>= 6' resolution: integrity: sha512-Kezx6/VBguXOsEe5oU3lXYyKMi4+gva72TwJ7pQY5JfqUx2nMk7NXA6z/mpNqIlfQjWYVfeuNvQjexiTaTn6Nw== - /socks/2.2.0: + /socks/2.2.1: dependencies: ip: 1.1.5 smart-buffer: 4.0.1 @@ -2874,7 +2893,7 @@ packages: node: '>= 6.0.0' npm: '>= 3.0.0' resolution: - integrity: sha512-uRKV9uXQ9ytMbGm2+DilS1jB7N3AC0mmusmW5TVWjNuBZjxS8+lX38fasKVY9I4opv/bY/iqTbcpFFaTwpfwRg== + integrity: sha512-0GabKw7n9mI46vcNrVfs0o6XzWzjVa3h6GaSo2UPxtWAROXUWavfJWh1M4PR5tnE0dcnQXZIDFP4yrAysLze/w== /sort-keys/1.1.2: dependencies: is-plain-obj: 1.1.0 @@ -3027,6 +3046,7 @@ packages: dev: true engines: node: '>=0.10.0' + hasBin: true resolution: integrity: sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA= /strip-ansi/3.0.1: @@ -3056,6 +3076,7 @@ packages: dev: true engines: node: '>=0.10.0' + hasBin: true resolution: integrity: sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= /strip-indent/2.0.0: @@ -3074,6 +3095,7 @@ packages: dev: true engines: node: '>=0.10.0' + hasBin: true resolution: integrity: sha1-2S3iaU6z9nMjlz1649i1W0wiGQo= /supports-color/2.0.0: @@ -3093,7 +3115,7 @@ packages: /symlink-dir/1.1.3: dependencies: '@types/mz': 0.0.32 - '@types/node': 10.3.4 + '@types/node': 10.5.2 graceful-fs: 4.1.11 is-windows: 1.0.2 mkdirp-promise: 5.0.1 @@ -3101,6 +3123,7 @@ packages: dev: true engines: node: '>=4' + hasBin: true resolution: integrity: sha512-klQgTYk7en8A69nAzZjJdaMXbGCmfh0DU+YLaZG/stHNp00VZSS3Pos238Ua7oCKVw57UszViod4D7RVRH6XHg== /tap-parser/1.3.2: @@ -3109,6 +3132,7 @@ packages: inherits: 2.0.3 js-yaml: 3.12.0 dev: true + hasBin: true optionalDependencies: readable-stream: 2.3.6 resolution: @@ -3128,6 +3152,7 @@ packages: string.prototype.trim: 1.1.2 through: 2.3.8 dev: true + hasBin: true resolution: integrity: sha1-K7PqGb3J9SJSF7P5fL95hsxMbow= /tape/4.9.1: @@ -3146,6 +3171,7 @@ packages: string.prototype.trim: 1.1.2 through: 2.3.8 dev: true + hasBin: true resolution: integrity: sha512-6fKIXknLpoe/Jp4rzHKFPpJUHDHDqn8jus99IfPnHIjyz78HYlefTGD3b5EkbQzuLfaEvmfPK3IolLgq2xT3kw== /tar-fs/1.16.3: @@ -3269,6 +3295,7 @@ packages: dev: true engines: node: '>=4.2.0' + hasBin: true resolution: integrity: sha512-klJsfswHP0FuOLsvBZ/zzCfUvakOSSxds78mVeK7I+qP76YWtxf16hEZsp3U+b0kIo82R5UatGFeblYMqabb2Q== /tslib/1.9.3: @@ -3280,7 +3307,7 @@ packages: babel-code-frame: 6.26.0 builtin-modules: 1.1.1 chalk: 2.4.1 - commander: 2.15.1 + commander: 2.16.0 diff: 3.5.0 glob: 7.1.2 js-yaml: 3.12.0 @@ -3288,22 +3315,23 @@ packages: resolve: 1.8.1 semver: 5.5.0 tslib: 1.9.3 - tsutils: 2.27.1 + tsutils: 2.27.2 dev: true engines: node: '>=4.8.0' + hasBin: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev' resolution: integrity: sha1-EeJrzLiK+gLdDZlWyuPUVAtfVMM= - /tsutils/2.27.1: + /tsutils/2.27.2: dependencies: tslib: 1.9.3 dev: true peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev' resolution: - integrity: sha512-AE/7uzp32MmaHvNNFES85hhUDHFdFZp6OAiZcd6y4ZKKIg6orJTm8keYWBhIhrJQH3a4LzNKat7ZPXZt5aTf6w== + integrity: sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg== /type-detect/4.0.8: dev: true engines: @@ -3318,6 +3346,7 @@ packages: dev: true engines: node: '>=4.2.0' + hasBin: true resolution: integrity: sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== /unbzip2-stream/1.2.5: @@ -3371,7 +3400,7 @@ packages: integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== /unpack-stream/3.0.3: dependencies: - '@types/node': 10.3.4 + '@types/node': 10.5.2 decompress-maybe: 1.0.0 ssri: 5.3.0 tar-fs: 1.16.3 @@ -3435,6 +3464,7 @@ packages: dependencies: isexe: 2.0.0 dev: true + hasBin: true resolution: integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== /widest-line/1.0.0: @@ -3524,10 +3554,10 @@ packages: resolution: integrity: sha1-5a2ryKz0CPY4X8dklWhMiOavaJo= registry: 'https://registry.npmjs.org/' -shrinkwrapMinorVersion: 7 +shrinkwrapMinorVersion: 8 shrinkwrapVersion: 3 specifiers: - '@pnpm/logger': ^1.0.0 + '@pnpm/logger': ^2.0.1 '@pnpm/resolver-base': ^1.1.0 '@pnpm/types': ^1.2.0 '@types/load-json-file': ^2.0.7 diff --git a/src/index.ts b/src/index.ts index ef83fb7b87..a6ad631e7e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -2,8 +2,6 @@ import {ResolveResult} from '@pnpm/resolver-base' import getCredentialsByURI = require('credentials-by-uri') import createRegFetcher from 'fetch-from-npm-registry' import mem = require('mem') -import path = require('path') -import semver = require('semver') import ssri = require('ssri') import createPkgId from './createNpmPkgId' import parsePref, { diff --git a/src/parsePref.ts b/src/parsePref.ts index f088061e31..abbda41967 100644 --- a/src/parsePref.ts +++ b/src/parsePref.ts @@ -1,4 +1,3 @@ -import semver = require('semver') import getVersionSelectorType = require('version-selector-type') export interface RegistryPackageSpec { diff --git a/src/pickPackage.ts b/src/pickPackage.ts index 8269ba7dbd..f347ddde0e 100644 --- a/src/pickPackage.ts +++ b/src/pickPackage.ts @@ -130,7 +130,7 @@ export default async ( const meta = await loadMeta(pkgMirror, ctx.metaFileName) // TODO: add test for this usecase if (!meta) throw err logger.error(err) - logger.info(`Using cached meta from ${pkgMirror}`) + logger.debug({message: `Using cached meta from ${pkgMirror}`}) return { meta, pickedPackage: pickPackageFromMeta(spec, opts.preferredVersionSelector, meta),