@pnpm/resolving.default-resolver 1100.0.10 → 1100.1.0

package/lib/index.d.ts

@@ -5,14 +5,14 @@ import type { FetchFromRegistry, GetAuthHeader } from '@pnpm/fetching.types';
 import { type CustomResolver } from '@pnpm/hooks.types';
 import { type GitResolveResult } from '@pnpm/resolving.git-resolver';
 import { type LocalResolveResult } from '@pnpm/resolving.local-resolver';
-import { type JsrResolveResult, type NpmResolveResult, type PackageMeta, type PackageMetaCache, type ResolverFactoryOptions, type WorkspaceResolveResult } from '@pnpm/resolving.npm-resolver';
+import { type JsrResolveResult, type NamedRegistryResolveResult, type NpmResolveResult, type PackageMeta, type PackageMetaCache, type ResolverFactoryOptions, type WorkspaceResolveResult } from '@pnpm/resolving.npm-resolver';
 import type { ResolveFunction, ResolveOptions, ResolveResult, WantedDependency } from '@pnpm/resolving.resolver-base';
 import { type TarballResolveResult } from '@pnpm/resolving.tarball-resolver';
 export type { PackageMeta, PackageMetaCache, ResolveFunction, ResolverFactoryOptions, };
 export interface CustomResolverResolveResult extends ResolveResult {
     resolvedVia: 'custom-resolver';
 }
-export type DefaultResolveResult = NpmResolveResult | JsrResolveResult | GitResolveResult | LocalResolveResult | TarballResolveResult | WorkspaceResolveResult | NodeRuntimeResolveResult | DenoRuntimeResolveResult | BunRuntimeResolveResult | CustomResolverResolveResult;
+export type DefaultResolveResult = NpmResolveResult | JsrResolveResult | NamedRegistryResolveResult | GitResolveResult | LocalResolveResult | TarballResolveResult | WorkspaceResolveResult | NodeRuntimeResolveResult | DenoRuntimeResolveResult | BunRuntimeResolveResult | CustomResolverResolveResult;
 export type DefaultResolver = (wantedDependency: WantedDependency, opts: ResolveOptions) => Promise<DefaultResolveResult>;
 export declare function createResolver(fetchFromRegistry: FetchFromRegistry, getAuthHeader: GetAuthHeader, pnpmOpts: ResolverFactoryOptions & {
     nodeDownloadMirrors?: Record<string, string>;

package/lib/index.js

@@ -34,7 +34,7 @@ async function resolveFromCustomResolvers(customResolvers, wantedDependency, opt
     return null;
 }
 export function createResolver(fetchFromRegistry, getAuthHeader, pnpmOpts) {
-    const { resolveFromNpm, resolveFromJsr, clearCache } = createNpmResolver(fetchFromRegistry, getAuthHeader, pnpmOpts);
+    const { resolveFromNpm, resolveFromJsr, resolveFromNamedRegistry, clearCache } = createNpmResolver(fetchFromRegistry, getAuthHeader, pnpmOpts);
     const resolveFromGit = createGitResolver(pnpmOpts);
     const _resolveFromLocal = resolveFromLocal.bind(null, {
         preserveAbsolutePaths: pnpmOpts.preserveAbsolutePaths,
@@ -55,7 +55,12 @@ export function createResolver(fetchFromRegistry, getAuthHeader, pnpmOpts) {
                     await _resolveFromLocal(wantedDependency, opts))) ??
                 await _resolveNodeRuntime(wantedDependency, opts) ??
                 await _resolveDenoRuntime(wantedDependency, opts) ??
-                await _resolveBunRuntime(wantedDependency, opts);
+                await _resolveBunRuntime(wantedDependency, opts) ??
+                // Named-registry resolution runs last so that built-in schemes
+                // (`npm:`, `jsr:`, `git:`/`github:`/`gitlab:`/…, `file:`, `link:`,
+                // tarball URLs, etc.) are always claimed by their dedicated resolver
+                // before a user-configured alias gets a chance to shadow them.
+                await resolveFromNamedRegistry(wantedDependency, opts);
             if (!resolution) {
                 let specifier = `${wantedDependency.alias ? wantedDependency.alias + '@' : ''}${wantedDependency.bareSpecifier ?? ''}`;
                 if (specifier !== '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/resolving.default-resolver",
-  "version": "1100.0.10",
+  "version": "1100.1.0",
   "description": "pnpm's default package resolver",
   "keywords": [
     "pnpm",
@@ -26,25 +26,25 @@
     "!*.map"
   ],
   "dependencies": {
-    "@pnpm/engine.runtime.bun-resolver": "1101.0.3",
-    "@pnpm/engine.runtime.deno-resolver": "1101.0.3",
-    "@pnpm/engine.runtime.node-resolver": "1101.0.5",
+    "@pnpm/engine.runtime.bun-resolver": "1101.0.5",
+    "@pnpm/engine.runtime.deno-resolver": "1101.0.5",
     "@pnpm/error": "1100.0.0",
     "@pnpm/fetching.types": "1100.0.1",
-    "@pnpm/hooks.types": "1100.0.5",
-    "@pnpm/resolving.git-resolver": "1100.0.4",
-    "@pnpm/resolving.npm-resolver": "1101.0.2",
-    "@pnpm/resolving.resolver-base": "1100.1.2",
-    "@pnpm/resolving.local-resolver": "1100.0.5",
-    "@pnpm/resolving.tarball-resolver": "1100.0.4",
-    "@pnpm/types": "1101.0.0"
+    "@pnpm/hooks.types": "1100.0.6",
+    "@pnpm/engine.runtime.node-resolver": "1101.0.7",
+    "@pnpm/resolving.git-resolver": "1100.0.6",
+    "@pnpm/resolving.local-resolver": "1100.0.6",
+    "@pnpm/resolving.resolver-base": "1100.1.3",
+    "@pnpm/resolving.npm-resolver": "1101.1.0",
+    "@pnpm/resolving.tarball-resolver": "1100.0.5",
+    "@pnpm/types": "1101.1.0"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/fetching.fetcher-base": "1100.1.2",
-    "@pnpm/fetching.tarball-fetcher": "1101.0.2",
-    "@pnpm/network.fetch": "1100.0.2",
-    "@pnpm/resolving.default-resolver": "1100.0.10",
+    "@pnpm/fetching.fetcher-base": "1100.1.3",
+    "@pnpm/fetching.tarball-fetcher": "1101.0.5",
+    "@pnpm/network.fetch": "1100.0.3",
+    "@pnpm/resolving.default-resolver": "1100.1.0",
     "@pnpm/store.cafs-types": "1100.0.1"
   },
   "engines": {