@pnpm/resolving.git-resolver 1001.1.5 → 1100.0.1

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import type { AgentOptions } from '@pnpm/network.agent';
+import type { DispatcherOptions } from '@pnpm/network.fetch';
 import type { GitResolution, ResolveOptions, ResolveResult, TarballResolution } from '@pnpm/resolving.resolver-base';
 import { createGitHostedPkgId } from './createGitHostedPkgId.js';
 import { type HostedPackageSpec } from './parseBareSpecifier.js';
@@ -12,4 +12,4 @@ export interface GitResolveResult extends ResolveResult {
 export type GitResolver = (wantedDependency: {
     bareSpecifier: string;
 }, opts?: Pick<ResolveOptions, 'currentPkg' | 'update'>) => Promise<GitResolveResult | null>;
-export declare function createGitResolver(opts: AgentOptions): GitResolver;
+export declare function createGitResolver(opts: DispatcherOptions): GitResolver;

package/lib/parseBareSpecifier.d.ts

@@ -1,4 +1,4 @@
-import type { AgentOptions } from '@pnpm/network.agent';
+import { type DispatcherOptions } from '@pnpm/network.fetch';
 export interface HostedPackageSpec {
     fetchSpec: string;
     hosted?: {
@@ -13,4 +13,4 @@ export interface HostedPackageSpec {
     gitRange?: string;
     path?: string;
 }
-export declare function parseBareSpecifier(bareSpecifier: string, opts: AgentOptions): null | (() => Promise<HostedPackageSpec>);
+export declare function parseBareSpecifier(bareSpecifier: string, opts: DispatcherOptions): null | (() => Promise<HostedPackageSpec>);

package/lib/parseBareSpecifier.js

@@ -1,6 +1,6 @@
 // cspell:ignore sshurl
 import urlLib, { URL } from 'node:url';
-import { fetchWithAgent } from '@pnpm/network.fetch';
+import { fetchWithDispatcher } from '@pnpm/network.fetch';
 import { gracefulGit as git } from 'graceful-git';
 import HostedGit from 'hosted-git-info';
 const gitProtocols = new Set([
@@ -47,11 +47,11 @@ function urlToFetchSpec(url) {
     }
     return fetchSpec;
 }
-async function fromHostedGit(hosted, agentOptions) {
+async function fromHostedGit(hosted, dispatcherOptions) {
     let fetchSpec = null;
     // try git/https url before fallback to ssh url
     const gitHttpsUrl = hosted.https({ noCommittish: true, noGitPlus: true });
-    if (gitHttpsUrl && await isRepoPublic(gitHttpsUrl, agentOptions) && await accessRepository(gitHttpsUrl)) {
+    if (gitHttpsUrl && await isRepoPublic(gitHttpsUrl, dispatcherOptions) && await accessRepository(gitHttpsUrl)) {
         fetchSpec = gitHttpsUrl;
     }
     else {
@@ -63,7 +63,7 @@ async function fromHostedGit(hosted, agentOptions) {
     if (!fetchSpec) {
         const httpsUrl = hosted.https({ noGitPlus: true, noCommittish: true });
         if (httpsUrl) {
-            if ((hosted.auth || !await isRepoPublic(httpsUrl, agentOptions)) && await accessRepository(httpsUrl)) {
+            if ((hosted.auth || !await isRepoPublic(httpsUrl, dispatcherOptions)) && await accessRepository(httpsUrl)) {
                 return {
                     fetchSpec: httpsUrl,
                     hosted: {
@@ -82,7 +82,7 @@ async function fromHostedGit(hosted, agentOptions) {
                     // this is very similar to yarn classic's behavior.
                     // npm instead tries git ls-remote directly which prompts user for login credentials.
                     // HTTP HEAD on https://domain/user/repo, strip out ".git"
-                    const response = await fetchWithAgent(httpsUrl.replace(/\.git$/, ''), { method: 'HEAD', follow: 0, retry: { retries: 0 }, agentOptions });
+                    const response = await fetchWithDispatcher(httpsUrl.replace(/\.git$/, ''), { method: 'HEAD', redirect: 'manual', retry: { retries: 0 }, dispatcherOptions });
                     if (response.ok) {
                         fetchSpec = httpsUrl;
                     }
@@ -108,9 +108,9 @@ async function fromHostedGit(hosted, agentOptions) {
         ...parseGitParams(hosted.committish),
     };
 }
-async function isRepoPublic(httpsUrl, agentOptions) {
+async function isRepoPublic(httpsUrl, dispatcherOptions) {
     try {
-        const response = await fetchWithAgent(httpsUrl.replace(/\.git$/, ''), { method: 'HEAD', follow: 0, retry: { retries: 0 }, agentOptions });
+        const response = await fetchWithDispatcher(httpsUrl.replace(/\.git$/, ''), { method: 'HEAD', redirect: 'manual', retry: { retries: 0 }, dispatcherOptions });
         return response.ok;
     }
     catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolving.git-resolver",
-  "version": "1001.1.5",
+  "version": "1100.0.1",
   "description": "Resolver for git-hosted packages",
   "keywords": [
     "pnpm",
@@ -29,18 +29,17 @@
     "graceful-git": "^5.0.0",
     "hosted-git-info": "npm:@pnpm/hosted-git-info@1.0.0",
     "semver": "^7.7.2",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/resolving.resolver-base": "1005.1.0",
-    "@pnpm/network.fetch": "1000.2.6"
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/network.fetch": "1100.0.1",
+    "@pnpm/resolving.resolver-base": "1100.0.1"
   },
   "devDependencies": {
-    "@jest/globals": "30.0.5",
-    "@pnpm/network.agent": "^2.0.3",
+    "@jest/globals": "30.3.0",
     "@types/hosted-git-info": "^3.0.5",
     "@types/is-windows": "^1.0.2",
     "@types/semver": "7.7.1",
     "is-windows": "^1.0.2",
-    "@pnpm/resolving.git-resolver": "1001.1.5"
+    "@pnpm/resolving.git-resolver": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"
@@ -50,9 +49,9 @@
   },
   "scripts": {
     "lint": "eslint \"src/**/*.ts\" \"test/**/*.ts\"",
-    "_test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest",
-    "test": "pnpm run compile && pnpm run _test",
+    "test": "pn compile && pn .test",
     "fix": "tslint -c tslint.json src/**/*.ts test/**/*.ts --fix",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }