From 4dcaba58d833a7eebf06e91f50bd99789af160ea Mon Sep 17 00:00:00 2001 From: Zoltan Kochan Date: Wed, 24 Mar 2021 03:52:09 +0200 Subject: [PATCH] fix(deps): update hosted-git-info and npm-package-arg --- packages/git-resolver/package.json | 2 +- packages/git-resolver/src/index.ts | 5 ++- packages/list/package.json | 2 +- packages/pkgs-graph/package.json | 2 +- packages/plugin-commands-rebuild/package.json | 2 +- packages/supi/package.json | 2 +- pnpm-lock.yaml | 39 ++++++++++--------- 7 files changed, 30 insertions(+), 24 deletions(-) diff --git a/packages/git-resolver/package.json b/packages/git-resolver/package.json index 6b387e583d..adcfea5bcb 100644 --- a/packages/git-resolver/package.json +++ b/packages/git-resolver/package.json @@ -35,7 +35,7 @@ "@pnpm/fetch": "workspace:2.1.11", "@pnpm/resolver-base": "workspace:7.1.1", "graceful-git": "^3.0.2", - "hosted-git-info": "^3.0.8", + "hosted-git-info": "^4.0.1", "semver": "^7.3.4" }, "devDependencies": { diff --git a/packages/git-resolver/src/index.ts b/packages/git-resolver/src/index.ts index b44215e889..3c40fec202 100644 --- a/packages/git-resolver/src/index.ts +++ b/packages/git-resolver/src/index.ts @@ -15,7 +15,10 @@ export default function ( if (parsedSpec == null) return null - const commit = await resolveRef(parsedSpec.fetchSpec, parsedSpec.gitCommittish ?? 'master', parsedSpec.gitRange) + const pref = parsedSpec.gitCommittish == null || parsedSpec.gitCommittish === '' + ? 'master' + : parsedSpec.gitCommittish + const commit = await resolveRef(parsedSpec.fetchSpec, pref, parsedSpec.gitRange) let resolution if ((parsedSpec.hosted != null) && !isSsh(parsedSpec.fetchSpec)) { diff --git a/packages/list/package.json b/packages/list/package.json index dd55fb6853..6299ec27b7 100644 --- a/packages/list/package.json +++ b/packages/list/package.json @@ -38,7 +38,7 @@ "@pnpm/read-package-json": "workspace:4.0.0", "@pnpm/read-project-manifest": "workspace:1.1.7", "@pnpm/types": "workspace:6.4.0", - "@zkochan/npm-package-arg": "^1.0.2", + "@zkochan/npm-package-arg": "^2.0.1", "archy": "^1.0.0", "chalk": "^4.1.0", "cli-columns": "^3.1.2", diff --git a/packages/pkgs-graph/package.json b/packages/pkgs-graph/package.json index 141abc4f4a..38cdad9f76 100644 --- a/packages/pkgs-graph/package.json +++ b/packages/pkgs-graph/package.json @@ -31,7 +31,7 @@ }, "dependencies": { "@pnpm/resolve-workspace-range": "workspace:1.0.1", - "@zkochan/npm-package-arg": "^1.0.2", + "@zkochan/npm-package-arg": "^2.0.1", "ramda": "^0.27.1" }, "funding": "https://opencollective.com/pnpm" diff --git a/packages/plugin-commands-rebuild/package.json b/packages/plugin-commands-rebuild/package.json index 4ab141ddf9..014b96c353 100644 --- a/packages/plugin-commands-rebuild/package.json +++ b/packages/plugin-commands-rebuild/package.json @@ -63,7 +63,7 @@ "@pnpm/store-connection-manager": "workspace:1.0.3", "@pnpm/store-controller-types": "workspace:10.0.0", "@pnpm/types": "workspace:6.4.0", - "@zkochan/npm-package-arg": "^1.0.2", + "@zkochan/npm-package-arg": "^2.0.1", "camelcase-keys": "^6.2.2", "dependency-path": "workspace:5.1.1", "graph-sequencer": "2.0.0", diff --git a/packages/supi/package.json b/packages/supi/package.json index 0184a81b5f..5bf91e42be 100644 --- a/packages/supi/package.json +++ b/packages/supi/package.json @@ -46,7 +46,7 @@ "@pnpm/store-controller-types": "workspace:10.0.0", "@pnpm/symlink-dependency": "workspace:3.0.13", "@pnpm/types": "workspace:6.4.0", - "@zkochan/npm-package-arg": "^1.0.2", + "@zkochan/npm-package-arg": "^2.0.1", "@zkochan/rimraf": "^1.0.0", "dependency-path": "workspace:5.1.1", "graph-sequencer": "2.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1de63f241c..a123baa8d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -694,14 +694,14 @@ importers: '@types/is-windows': ^1.0.0 '@types/semver': ^7.3.4 graceful-git: ^3.0.2 - hosted-git-info: ^3.0.8 + hosted-git-info: ^4.0.1 is-windows: ^1.0.2 semver: ^7.3.4 dependencies: '@pnpm/fetch': link:../fetch '@pnpm/resolver-base': link:../resolver-base graceful-git: 3.0.2 - hosted-git-info: 3.0.8 + hosted-git-info: 4.0.1 semver: 7.3.5 devDependencies: '@pnpm/git-resolver': 'link:' @@ -940,7 +940,7 @@ importers: '@types/archy': 0.0.31 '@types/ramda': ^0.27.35 '@types/semver': ^7.3.4 - '@zkochan/npm-package-arg': ^1.0.2 + '@zkochan/npm-package-arg': ^2.0.1 archy: ^1.0.0 chalk: ^4.1.0 cli-columns: ^3.1.2 @@ -953,7 +953,7 @@ importers: '@pnpm/read-package-json': link:../read-package-json '@pnpm/read-project-manifest': link:../read-project-manifest '@pnpm/types': link:../types - '@zkochan/npm-package-arg': 1.0.2 + '@zkochan/npm-package-arg': 2.0.1 archy: 1.0.0 chalk: 4.1.0 cli-columns: 3.1.2 @@ -1620,13 +1620,13 @@ importers: specifiers: '@pnpm/resolve-workspace-range': workspace:1.0.1 '@types/ramda': ^0.27.35 - '@zkochan/npm-package-arg': ^1.0.2 + '@zkochan/npm-package-arg': ^2.0.1 better-path-resolve: 1.0.0 pkgs-graph: 'link:' ramda: ^0.27.1 dependencies: '@pnpm/resolve-workspace-range': link:../resolve-workspace-range - '@zkochan/npm-package-arg': 1.0.2 + '@zkochan/npm-package-arg': 2.0.1 ramda: 0.27.1 devDependencies: '@types/ramda': 0.27.39 @@ -2036,7 +2036,7 @@ importers: '@types/ramda': ^0.27.35 '@types/semver': ^7.3.4 '@types/sinon': ^9.0.11 - '@zkochan/npm-package-arg': ^1.0.2 + '@zkochan/npm-package-arg': ^2.0.1 camelcase-keys: ^6.2.2 dependency-path: workspace:5.1.1 execa: ^5.0.0 @@ -2070,7 +2070,7 @@ importers: '@pnpm/store-connection-manager': link:../store-connection-manager '@pnpm/store-controller-types': link:../store-controller-types '@pnpm/types': link:../types - '@zkochan/npm-package-arg': 1.0.2 + '@zkochan/npm-package-arg': 2.0.1 camelcase-keys: 6.2.2 dependency-path: link:../dependency-path graph-sequencer: 2.0.0 @@ -2831,7 +2831,7 @@ importers: '@types/ramda': ^0.27.35 '@types/semver': ^7.3.4 '@types/sinon': ^9.0.11 - '@zkochan/npm-package-arg': ^1.0.2 + '@zkochan/npm-package-arg': ^2.0.1 '@zkochan/rimraf': ^1.0.0 anonymous-npm-registry-client: 0.1.2 cross-spawn: ^7.0.3 @@ -2899,7 +2899,7 @@ importers: '@pnpm/store-controller-types': link:../store-controller-types '@pnpm/symlink-dependency': link:../symlink-dependency '@pnpm/types': link:../types - '@zkochan/npm-package-arg': 1.0.2 + '@zkochan/npm-package-arg': 2.0.1 '@zkochan/rimraf': 1.0.0 dependency-path: link:../dependency-path graph-sequencer: 2.0.0 @@ -5017,6 +5017,16 @@ packages: hosted-git-info: 2.8.8 semver: 6.3.0 validate-npm-package-name: 3.0.0 + dev: true + + /@zkochan/npm-package-arg/2.0.1: + resolution: {integrity: sha512-VvK3/jS9m/quSU970L5sZSvX9wmmhXnEu/GfffCz0/ZcMAUs471FFz2UJu56T/8N8hcKPODYuKHz8wL5xZZY3w==} + engines: {node: '>=10.13'} + dependencies: + hosted-git-info: 4.0.1 + semver: 7.3.5 + validate-npm-package-name: 3.0.0 + dev: false /@zkochan/retry/0.2.0: resolution: {integrity: sha512-WhB+2B/ZPlW2Xy/kMJBrMbqecWXcbDDgn0K0wKBAgO2OlBTz1iLJrRWduo+DGGn0Akvz1Lu4Xvls7dJojximWw==} @@ -8348,13 +8358,6 @@ packages: /hosted-git-info/2.8.8: resolution: {integrity: sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==} - /hosted-git-info/3.0.8: - resolution: {integrity: sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==} - engines: {node: '>=10'} - dependencies: - lru-cache: 6.0.0 - dev: false - /hosted-git-info/4.0.1: resolution: {integrity: sha512-eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg==} engines: {node: '>=10'} @@ -12004,7 +12007,7 @@ packages: resolution: {integrity: sha1-vURYp561YbdUiq7ArDdT70Kf5ws=} dependencies: any-promise: 1.3.0 - rimraf: 2.7.1 + rimraf: 2.4.5 dev: true /rimraf/2.4.5: