@pnpm/engine.runtime.node-resolver 1001.0.5 → 1100.0.1

package/lib/getNodeMirror.d.ts

@@ -1,2 +1 @@
-import type { Config } from '@pnpm/config.reader';
-export declare function getNodeMirror(rawConfig: Config['rawConfig'], releaseChannel: string): string;
+export declare function getNodeMirror(nodeDownloadMirrors: Record<string, string> | undefined, releaseChannel: string): string;

package/lib/getNodeMirror.js

@@ -1,7 +1,5 @@
-export function getNodeMirror(rawConfig, releaseChannel) {
-    // This is a dynamic lookup since the 'use-node-version' option is allowed to be '<releaseChannel>/<version>'
-    const configKey = `node-mirror:${releaseChannel}`;
-    const nodeMirror = rawConfig[configKey] ?? `https://nodejs.org/download/${releaseChannel}/`;
+export function getNodeMirror(nodeDownloadMirrors, releaseChannel) {
+    const nodeMirror = nodeDownloadMirrors?.[releaseChannel] ?? `https://nodejs.org/download/${releaseChannel}/`;
     return normalizeNodeMirror(nodeMirror);
 }
 function normalizeNodeMirror(nodeMirror) {

package/lib/index.d.ts

@@ -12,7 +12,7 @@ export interface NodeRuntimeResolveResult extends ResolveResult {
 }
 export declare function resolveNodeRuntime(ctx: {
     fetchFromRegistry: FetchFromRegistry;
-    rawConfig: Record<string, string>;
+    nodeDownloadMirrors?: Record<string, string>;
     offline?: boolean;
 }, wantedDependency: WantedDependency, opts?: Partial<ResolveOptions>): Promise<NodeRuntimeResolveResult | null>;
 export declare function resolveNodeVersion(fetch: FetchFromRegistry, versionSpec: string, nodeMirrorBaseUrl?: string): Promise<string | null>;

package/lib/index.js

@@ -1,4 +1,3 @@
-import { getNodeBinsForCurrentOS } from '@pnpm/constants';
 import { fetchShasumsFile } from '@pnpm/crypto.shasums-file';
 import { PnpmError } from '@pnpm/error';
 import semver from 'semver';
@@ -23,7 +22,7 @@ export async function resolveNodeRuntime(ctx, wantedDependency, opts) {
         throw new PnpmError('NO_OFFLINE_NODEJS_RESOLUTION', 'Offline Node.js resolution is not supported');
     const versionSpec = wantedDependency.bareSpecifier.substring('runtime:'.length);
     const { releaseChannel, versionSpecifier } = parseNodeSpecifier(versionSpec);
-    const nodeMirrorBaseUrl = getNodeMirror(ctx.rawConfig, releaseChannel);
+    const nodeMirrorBaseUrl = getNodeMirror(ctx.nodeDownloadMirrors, releaseChannel);
     const version = await resolveNodeVersion(ctx.fetchFromRegistry, versionSpecifier, nodeMirrorBaseUrl);
     if (!version) {
         throw new PnpmError('NODEJS_VERSION_NOT_FOUND', `Could not find a Node.js version that satisfies ${versionSpec}`);
@@ -141,6 +140,20 @@ async function fetchAllVersions(fetch, nodeMirrorBaseUrl) {
         lts,
     }));
 }
+function getNodeBinsForCurrentOS(platform = process.platform) {
+    if (platform === 'win32') {
+        return {
+            node: 'node.exe',
+            npm: 'node_modules/npm/bin/npm-cli.js',
+            npx: 'node_modules/npm/bin/npx-cli.js',
+        };
+    }
+    return {
+        node: 'bin/node',
+        npm: 'lib/node_modules/npm/bin/npm-cli.js',
+        npx: 'lib/node_modules/npm/bin/npx-cli.js',
+    };
+}
 function filterVersions(versions, versionSelector) {
     if (versionSelector === 'lts') {
         return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/engine.runtime.node-resolver",
-  "version": "1001.0.5",
+  "version": "1100.0.1",
   "description": "Resolves a Node.js version specifier to an exact Node.js version",
   "keywords": [
     "pnpm",
@@ -28,18 +28,17 @@
   "dependencies": {
     "semver": "^7.7.2",
     "version-selector-type": "^3.0.0",
-    "@pnpm/config.reader": "1004.4.2",
-    "@pnpm/crypto.shasums-file": "1001.0.2",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/fetching.types": "1000.2.0",
-    "@pnpm/types": "1000.9.0",
-    "@pnpm/resolving.resolver-base": "1005.1.0"
+    "@pnpm/config.reader": "1100.0.1",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/resolving.resolver-base": "1100.0.1",
+    "@pnpm/types": "1101.0.0",
+    "@pnpm/fetching.types": "1100.0.0",
+    "@pnpm/crypto.shasums-file": "1100.0.0"
   },
   "devDependencies": {
     "@types/semver": "7.7.1",
-    "@pnpm/engine.runtime.node-resolver": "1001.0.5",
-    "@pnpm/network.fetch": "1000.2.6"
+    "@pnpm/engine.runtime.node-resolver": "1100.0.1",
+    "@pnpm/network.fetch": "1100.0.1"
   },
   "engines": {
     "node": ">=22.13"
@@ -49,8 +48,8 @@
   },
   "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",
-    "compile": "tsgo --build && pnpm run lint --fix"
+    "test": "pn compile && pn .test",
+    "compile": "tsgo --build && pn lint --fix",
+    ".test": "cross-env NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules --disable-warning=ExperimentalWarning --disable-warning=DEP0169\" jest"
   }
 }