From 34949309b34269fe73f136cf7fd5b60ccca3ae22 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Mon, 20 Aug 2018 22:08:02 +0300 Subject: [PATCH] chore(deps): update dependency @pnpm/npm-resolver to v2 close #1327 --- packages/server/package.json | 2 +- packages/server/shrinkwrap.yaml | 41 ++++++++++++++++++++++++++------- packages/server/test/index.ts | 8 +++---- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/packages/server/package.json b/packages/server/package.json index d539b64412..b946f6b9d3 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@pnpm/logger": "^2.1.0", - "@pnpm/npm-resolver": "^1.0.0", + "@pnpm/npm-resolver": "^2.2.2", "@pnpm/tarball-fetcher": "^1.0.0", "@types/mz": "^0.0.32", "@types/tape": "^4.2.31", diff --git a/packages/server/shrinkwrap.yaml b/packages/server/shrinkwrap.yaml index 09aebebe45..1aa118da29 100644 --- a/packages/server/shrinkwrap.yaml +++ b/packages/server/shrinkwrap.yaml @@ -13,7 +13,7 @@ dependencies: uuid: 3.3.2 devDependencies: '@pnpm/logger': 2.1.0 - '@pnpm/npm-resolver': 1.0.2 + '@pnpm/npm-resolver': 2.2.2 '@pnpm/tarball-fetcher': 1.0.0 '@types/mz': 0.0.32 '@types/tape': 4.2.32 @@ -59,7 +59,7 @@ packages: node: '>=6' resolution: integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== - /@pnpm/npm-resolver/1.0.2: + /@pnpm/npm-resolver/2.2.2: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -73,7 +73,9 @@ packages: fetch-from-npm-registry: 1.0.0 load-json-file: 5.0.0 mem: 3.0.1 - p-limit: 1.3.0 + normalize-path: 3.0.0 + p-limit: 2.0.0 + parse-npm-tarball-url: 1.0.3 semver: 5.5.1 ssri: 6.0.0 version-selector-type: 2.0.0 @@ -82,9 +84,9 @@ packages: engines: node: '>=6' peerDependencies: - '@pnpm/logger': ^1.0.0 + '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-Vm37jaOTw+oW+lO3INjwbidXucJ4By/GuHYAXOyWAjwWiuBbcIxyoC82vFNGHTC3zGcBi1PA/4DNgJ8tbaDnwQ== + integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== /@pnpm/resolver-base/1.2.0: dependencies: '@pnpm/types': 1.7.0 @@ -178,6 +180,10 @@ packages: /@types/node/10.7.1: resolution: integrity: sha512-EGoI4ylB/lPOaqXqtzAyL8HcgOuCtH2hkEaLmkueOYufsTFWBn4VCvlCDC2HW8Q+9iF+QVC3sxjDKQYjHQeZ9w== + /@types/node/9.6.28: + dev: true + resolution: + integrity: sha512-LMSOxMKNJ8tGqUVs8lSIT8RGo1XGWYada/ZU2QZcbcD6AW9futXDE99tfQA0K6DK60GXcwplsGGK5KABRmI5GA== /@types/p-limit/2.0.0: dev: false resolution: @@ -2374,6 +2380,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= + /normalize-path/3.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== /normalize-url/2.0.1: dependencies: prepend-http: 2.0.0 @@ -2462,7 +2474,6 @@ packages: /p-limit/2.0.0: dependencies: p-try: 2.0.0 - dev: false engines: node: '>=6' resolution: @@ -2490,7 +2501,6 @@ packages: resolution: integrity: sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= /p-try/2.0.0: - dev: false engines: node: '>=6' resolution: @@ -2577,6 +2587,15 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-VjRtR0nXjyNDDKDHE4UK75GqNh0= + /parse-npm-tarball-url/1.0.3: + dependencies: + '@types/node': 9.6.28 + semver-regex: 1.0.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-LNiNoG41t4SeUu3p8aEpQatMVbfLxc600UD0urKMz09vHzz2+w0nWLs6k8rnk5eZ1tpCNkMzaMAzFTsNWMrIWg== /path-exists/2.1.0: dependencies: pinkie-promise: 2.0.1 @@ -3064,6 +3083,12 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY= + /semver-regex/1.0.0: + dev: true + engines: + node: '>=0.10.0' + resolution: + integrity: sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk= /semver/5.5.1: dev: true hasBin: true @@ -3828,7 +3853,7 @@ shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^2.1.0 - '@pnpm/npm-resolver': ^1.0.0 + '@pnpm/npm-resolver': ^2.2.2 '@pnpm/package-requester': ^4.0.0 '@pnpm/resolver-base': ^1.1.0 '@pnpm/tarball-fetcher': ^1.0.0 diff --git a/packages/server/test/index.ts b/packages/server/test/index.ts index f07ed2ad6d..ca0d127b18 100644 --- a/packages/server/test/index.ts +++ b/packages/server/test/index.ts @@ -13,7 +13,7 @@ import { } from '@pnpm/package-requester' import got = require('got') import isPortReachable = require('is-port-reachable') -import createResolver from '@pnpm/npm-resolver' +import createResolver, {PackageMetaCache} from '@pnpm/npm-resolver' import createFetcher from '@pnpm/tarball-fetcher' import createStore from 'package-store' @@ -25,7 +25,7 @@ async function createStoreController () { const resolve = createResolver({ rawNpmConfig, store, - metaCache: new Map(), + metaCache: new Map() as PackageMetaCache, }) const fetchers = createFetcher({ alwaysAuth: true, @@ -147,8 +147,8 @@ test('server errors should arrive to the client', async t => { ) } catch (e) { caught = true - t.equal(e.message, '404 Not Found: not-an-existing-package', 'error message delivered correctly') - t.equal(e.code, 'E404', 'error code delivered correctly') + t.equal(e.message, '404 Not Found: not-an-existing-package (via https://registry.npmjs.org/not-an-existing-package)', 'error message delivered correctly') + t.equal(e.code, 'ERR_PNPM_REGISTRY_META_RESPONSE_404', 'error code delivered correctly') t.ok(e.uri, 'error uri field delivered') t.ok(e.response, 'error response field delivered') t.ok(e.package, 'error package field delivered')