From af7099d4ebcd35f09533d137a5f3a6ea2c009796 Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 22 Aug 2018 21:52:59 +0300 Subject: [PATCH] fix: if a package version is not on registry, try to find it locally --- packages/default-resolver/package.json | 2 +- packages/default-resolver/shrinkwrap.yaml | 8 ++++---- packages/package-requester/package.json | 2 +- packages/package-requester/shrinkwrap.yaml | 8 ++++---- packages/package-store/package.json | 2 +- packages/package-store/shrinkwrap.yaml | 8 ++++---- packages/pnpm/shrinkwrap.yaml | 6 +++--- packages/pnpm/test/monorepo/index.ts | 10 +++++----- packages/server/package.json | 2 +- packages/server/shrinkwrap.yaml | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/default-resolver/package.json b/packages/default-resolver/package.json index f1701870a2..1a5d710ae5 100644 --- a/packages/default-resolver/package.json +++ b/packages/default-resolver/package.json @@ -32,7 +32,7 @@ "dependencies": { "@pnpm/git-resolver": "^0.3.4", "@pnpm/local-resolver": "^1.0.0", - "@pnpm/npm-resolver": "^2.2.2", + "@pnpm/npm-resolver": "^2.2.3", "@pnpm/tarball-resolver": "^1.0.0" }, "devDependencies": { diff --git a/packages/default-resolver/shrinkwrap.yaml b/packages/default-resolver/shrinkwrap.yaml index 13fc7899b7..805245d49f 100644 --- a/packages/default-resolver/shrinkwrap.yaml +++ b/packages/default-resolver/shrinkwrap.yaml @@ -2,7 +2,7 @@ dependencies: '@pnpm/default-resolver': 'link:../../../__package_previews__/default-resolver/@pnpm/default-resolver' '@pnpm/git-resolver': 0.3.8 '@pnpm/local-resolver': 1.0.0 - '@pnpm/npm-resolver': 2.2.2 + '@pnpm/npm-resolver': 2.2.3 '@pnpm/tarball-resolver': 1.0.0 devDependencies: '@pnpm/logger': 2.1.0 @@ -70,7 +70,7 @@ packages: node: '>=6' resolution: integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== - /@pnpm/npm-resolver/2.2.2: + /@pnpm/npm-resolver/2.2.3: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -97,7 +97,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== + integrity: sha512-/57JkQq0SKZEBRcgcXD9j9AyMm0LL6ljTkHZDNAs//NjbkTMsvhdLY9v7rbFMq3Wx+vwMtYvdvc/T0ZvpbXqqQ== /@pnpm/resolver-base/1.2.0: dependencies: '@pnpm/types': 1.7.0 @@ -3796,7 +3796,7 @@ specifiers: '@pnpm/git-resolver': ^0.3.4 '@pnpm/local-resolver': ^1.0.0 '@pnpm/logger': ^2.0.0 - '@pnpm/npm-resolver': ^2.2.2 + '@pnpm/npm-resolver': ^2.2.3 '@pnpm/tarball-resolver': ^1.0.0 '@types/tape': ^4.2.31 mos: ^2.0.0-alpha.3 diff --git a/packages/package-requester/package.json b/packages/package-requester/package.json index 349758ec12..7a31084093 100644 --- a/packages/package-requester/package.json +++ b/packages/package-requester/package.json @@ -59,7 +59,7 @@ }, "devDependencies": { "@pnpm/logger": "^2.1.0", - "@pnpm/npm-resolver": "^2.2.2", + "@pnpm/npm-resolver": "^2.2.3", "@pnpm/tarball-fetcher": "^1.0.0", "@types/nock": "^9.1.3", "@types/sinon": "^5.0.1", diff --git a/packages/package-requester/shrinkwrap.yaml b/packages/package-requester/shrinkwrap.yaml index 38c5846128..1bf6f54e00 100644 --- a/packages/package-requester/shrinkwrap.yaml +++ b/packages/package-requester/shrinkwrap.yaml @@ -24,7 +24,7 @@ dependencies: write-json-file: 2.3.0 devDependencies: '@pnpm/logger': 2.1.0 - '@pnpm/npm-resolver': 2.2.2 + '@pnpm/npm-resolver': 2.2.3 '@pnpm/tarball-fetcher': 1.0.0 '@types/nock': 9.3.0 '@types/sinon': 5.0.1 @@ -81,7 +81,7 @@ packages: node: '>=6' resolution: integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== - /@pnpm/npm-resolver/2.2.2: + /@pnpm/npm-resolver/2.2.3: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -108,7 +108,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== + integrity: sha512-/57JkQq0SKZEBRcgcXD9j9AyMm0LL6ljTkHZDNAs//NjbkTMsvhdLY9v7rbFMq3Wx+vwMtYvdvc/T0ZvpbXqqQ== /@pnpm/pkgid-to-filename/1.0.1: dependencies: normalize-path: 3.0.0 @@ -3855,7 +3855,7 @@ specifiers: '@pnpm/check-package': ^2.0.0 '@pnpm/fetcher-base': ^1.0.0 '@pnpm/logger': ^2.1.0 - '@pnpm/npm-resolver': ^2.2.2 + '@pnpm/npm-resolver': ^2.2.3 '@pnpm/pkgid-to-filename': ^1.0.0 '@pnpm/resolver-base': ^1.2.0 '@pnpm/tarball-fetcher': ^1.0.0 diff --git a/packages/package-store/package.json b/packages/package-store/package.json index 5789185574..74ae5cbf29 100644 --- a/packages/package-store/package.json +++ b/packages/package-store/package.json @@ -45,7 +45,7 @@ }, "devDependencies": { "@pnpm/logger": "^2.1.0", - "@pnpm/npm-resolver": "^2.2.2", + "@pnpm/npm-resolver": "^2.2.3", "@pnpm/tarball-fetcher": "^2.0.0", "@types/tape": "^4.2.30", "@types/tempy": "^0.1.0", diff --git a/packages/package-store/shrinkwrap.yaml b/packages/package-store/shrinkwrap.yaml index 0636ad4464..bf016acfa6 100644 --- a/packages/package-store/shrinkwrap.yaml +++ b/packages/package-store/shrinkwrap.yaml @@ -25,7 +25,7 @@ dependencies: write-json-file: 2.3.0 devDependencies: '@pnpm/logger': 2.1.0 - '@pnpm/npm-resolver': 2.2.2 + '@pnpm/npm-resolver': 2.2.3 '@pnpm/tarball-fetcher': 2.0.0 '@types/tape': 4.2.32 '@types/tempy': 0.1.0 @@ -64,7 +64,7 @@ packages: node: '>=6' resolution: integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== - /@pnpm/npm-resolver/2.2.2: + /@pnpm/npm-resolver/2.2.3: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -91,7 +91,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== + integrity: sha512-/57JkQq0SKZEBRcgcXD9j9AyMm0LL6ljTkHZDNAs//NjbkTMsvhdLY9v7rbFMq3Wx+vwMtYvdvc/T0ZvpbXqqQ== /@pnpm/resolver-base/1.2.0: dependencies: '@pnpm/types': 1.7.0 @@ -1874,7 +1874,7 @@ specifiers: '@pnpm/fetcher-base': ^1.0.0 '@pnpm/fs-locker': ^1.0.0 '@pnpm/logger': ^2.1.0 - '@pnpm/npm-resolver': ^2.2.2 + '@pnpm/npm-resolver': ^2.2.3 '@pnpm/package-requester': ^4.0.0 '@pnpm/resolver-base': ^1.1.0 '@pnpm/tarball-fetcher': ^2.0.0 diff --git a/packages/pnpm/shrinkwrap.yaml b/packages/pnpm/shrinkwrap.yaml index b3c55d6573..59d6d52a6f 100644 --- a/packages/pnpm/shrinkwrap.yaml +++ b/packages/pnpm/shrinkwrap.yaml @@ -180,7 +180,7 @@ packages: node: '>=4' resolution: integrity: sha512-bl9TPt2UObSEpGPQHZ2soXSSwz+/0XZqK+afBRJ4L78NKV41oZTUnrLjeNbeNEVwIG9icrQ3ZeSslIvQy4L+Dw== - /@pnpm/npm-resolver/2.2.2: + /@pnpm/npm-resolver/2.2.3: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -207,10 +207,10 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== + integrity: sha512-/57JkQq0SKZEBRcgcXD9j9AyMm0LL6ljTkHZDNAs//NjbkTMsvhdLY9v7rbFMq3Wx+vwMtYvdvc/T0ZvpbXqqQ== /@pnpm/outdated/0.4.1: dependencies: - '@pnpm/npm-resolver': 2.2.2 + '@pnpm/npm-resolver': 2.2.3 '@pnpm/read-package-json': 1.0.0 '@pnpm/store-path': 1.0.3 '@types/node': 10.7.1 diff --git a/packages/pnpm/test/monorepo/index.ts b/packages/pnpm/test/monorepo/index.ts index 430ed94f34..5a74644fd9 100644 --- a/packages/pnpm/test/monorepo/index.ts +++ b/packages/pnpm/test/monorepo/index.ts @@ -103,7 +103,7 @@ test('linking a package inside a monorepo with --link-workspace-packages', async 'project-2': '2.0.0', }, devDependencies: { - 'project-3': '3.0.0', + 'is-negative': '100.0.0', }, optionalDependencies: { 'is-positive': '1.0.0', @@ -123,8 +123,8 @@ test('linking a package inside a monorepo with --link-workspace-packages', async }, }, { - name: 'project-3', - version: '3.0.0', + name: 'is-negative', + version: '100.0.0', }, { name: 'is-positive', @@ -143,13 +143,13 @@ test('linking a package inside a monorepo with --link-workspace-packages', async t.deepEqual(outputs, ['project-2', 'project-1']) await projects['project-1'].has('project-2') - await projects['project-1'].has('project-3') + await projects['project-1'].has('is-negative') await projects['project-1'].has('is-positive') { const shr = await projects['project-1'].loadShrinkwrap() t.equal(shr.dependencies['project-2'], 'link:../project-2') - t.equal(shr.devDependencies['project-3'], 'link:../project-3') + t.equal(shr.devDependencies['is-negative'], 'link:../is-negative') t.equal(shr.optionalDependencies['is-positive'], 'link:../is-positive') } diff --git a/packages/server/package.json b/packages/server/package.json index a90c0f4788..3f0e9adb44 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -33,7 +33,7 @@ }, "devDependencies": { "@pnpm/logger": "^2.1.0", - "@pnpm/npm-resolver": "^2.2.2", + "@pnpm/npm-resolver": "^2.2.3", "@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 10c40fe103..d0c59775fe 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': 2.2.2 + '@pnpm/npm-resolver': 2.2.3 '@pnpm/tarball-fetcher': 1.0.0 '@types/mz': 0.0.32 '@types/tape': 4.2.32 @@ -46,7 +46,7 @@ packages: node: '>=6' resolution: integrity: sha512-BL4Laf6b50LjdcpOUWPukx2XJtb3mo2OpJjHdRNSDJu9YS2tRBeP14H2bNqGjCjfeml8z3KufI3Km6VQemVXNw== - /@pnpm/npm-resolver/2.2.2: + /@pnpm/npm-resolver/2.2.3: dependencies: '@pnpm/resolver-base': 1.2.0 '@pnpm/types': 1.7.0 @@ -73,7 +73,7 @@ packages: peerDependencies: '@pnpm/logger': ^1.0.0 || ^2.0.0 resolution: - integrity: sha512-3G1WA6hLug1ylkSUnaINhNYpFBDdS0xfVn/vdD21/hQLc20EsYJCaaBcudO4l9PHHLis2MPMOoS/taUptyZUBA== + integrity: sha512-/57JkQq0SKZEBRcgcXD9j9AyMm0LL6ljTkHZDNAs//NjbkTMsvhdLY9v7rbFMq3Wx+vwMtYvdvc/T0ZvpbXqqQ== /@pnpm/resolver-base/1.2.0: dependencies: '@pnpm/types': 1.7.0 @@ -3520,7 +3520,7 @@ shrinkwrapMinorVersion: 9 shrinkwrapVersion: 3 specifiers: '@pnpm/logger': ^2.1.0 - '@pnpm/npm-resolver': ^2.2.2 + '@pnpm/npm-resolver': ^2.2.3 '@pnpm/package-requester': ^4.0.0 '@pnpm/resolver-base': ^1.1.0 '@pnpm/tarball-fetcher': ^1.0.0