@pnpm/installing.env-installer 1000.0.19 → 1100.0.0

package/lib/installConfigDeps.d.ts

@@ -2,6 +2,7 @@ import { type EnvLockfile } from '@pnpm/lockfile.fs';
 import type { StoreController } from '@pnpm/store.controller';
 import type { ConfigDependencies, Registries } from '@pnpm/types';
 export interface InstallConfigDepsOpts {
+    frozenLockfile?: boolean;
     registries: Registries;
     rootDir: string;
     store: StoreController;

package/lib/installConfigDeps.js

@@ -9,7 +9,7 @@ import { readEnvLockfile } from '@pnpm/lockfile.fs';
 import { safeReadPackageJsonFromDir } from '@pnpm/pkg-manifest.reader';
 import { rimraf } from '@zkochan/rimraf';
 import getNpmTarballUrl from 'get-npm-tarball-url';
-import symlinkDir from 'symlink-dir';
+import { symlinkDir } from 'symlink-dir';
 import { migrateConfigDepsToLockfile } from './migrateConfigDeps.js';
 /**
  * Install config dependencies using the env lockfile.
@@ -81,6 +81,9 @@ async function normalizeForInstall(configDepsOrLockfile, opts) {
         return normalizeFromLockfile(envLockfile, opts.registries);
     }
     // No env lockfile yet — migrate from old inline integrity format
+    if (opts.frozenLockfile) {
+        throw new PnpmError('FROZEN_LOCKFILE_WITH_OUTDATED_LOCKFILE', 'Cannot migrate configDependencies with "frozen-lockfile" because the lockfile is not up to date');
+    }
     return migrateConfigDepsToLockfile(configDepsOrLockfile, opts);
 }
 function isEnvLockfile(obj) {

package/lib/resolveAndInstallConfigDeps.d.ts

@@ -1,10 +1,10 @@
 import { type CreateFetchFromRegistryOptions } from '@pnpm/network.fetch';
 import { type ResolverFactoryOptions } from '@pnpm/resolving.npm-resolver';
-import type { ConfigDependencies } from '@pnpm/types';
+import type { ConfigDependencies, RegistryConfig } from '@pnpm/types';
 import { type InstallConfigDepsOpts } from './installConfigDeps.js';
 export type ResolveAndInstallConfigDepsOpts = CreateFetchFromRegistryOptions & ResolverFactoryOptions & InstallConfigDepsOpts & {
     rootDir: string;
-    userConfig?: Record<string, string>;
+    configByUri?: Record<string, RegistryConfig>;
 };
 /**
  * Resolves any config dependencies that are missing from the env lockfile,

package/lib/resolveAndInstallConfigDeps.js

@@ -65,6 +65,9 @@ export async function resolveAndInstallConfigDeps(configDeps, opts) {
         }
         depsToResolve.push({ name, specifier });
     }
+    if (opts.frozenLockfile && (lockfileChanged || depsToResolve.length > 0)) {
+        throw new PnpmError('FROZEN_LOCKFILE_WITH_OUTDATED_LOCKFILE', 'Cannot update configDependencies with "frozen-lockfile" because the lockfile is not up to date');
+    }
     if (depsToResolve.length === 0) {
         if (lockfileChanged) {
             await writeEnvLockfile(opts.rootDir, envLockfile);
@@ -73,9 +76,8 @@ export async function resolveAndInstallConfigDeps(configDeps, opts) {
         return;
     }
     // Resolve missing deps
-    const userConfig = opts.userConfig ?? {};
     const fetch = createFetchFromRegistry(opts);
-    const getAuthHeader = createGetAuthHeaderByURI({ allSettings: userConfig, userSettings: userConfig });
+    const getAuthHeader = createGetAuthHeaderByURI(opts.configByUri ?? {}, opts.registries?.default);
     const { resolveFromNpm } = createNpmResolver(fetch, getAuthHeader, opts);
     await Promise.all(depsToResolve.map(async ({ name, specifier }) => {
         const resolution = await resolveFromNpm({ alias: name, bareSpecifier: specifier }, {

package/lib/resolveConfigDeps.d.ts

@@ -1,10 +1,10 @@
 import { type CreateFetchFromRegistryOptions } from '@pnpm/network.fetch';
 import { type ResolverFactoryOptions } from '@pnpm/resolving.npm-resolver';
-import type { ConfigDependencies } from '@pnpm/types';
+import type { ConfigDependencies, RegistryConfig } from '@pnpm/types';
 import { type InstallConfigDepsOpts } from './installConfigDeps.js';
 export type ResolveConfigDepsOpts = CreateFetchFromRegistryOptions & ResolverFactoryOptions & InstallConfigDepsOpts & {
     configDependencies?: ConfigDependencies;
     rootDir: string;
-    userConfig?: Record<string, string>;
+    configByUri?: Record<string, RegistryConfig>;
 };
 export declare function resolveConfigDeps(configDeps: string[], opts: ResolveConfigDepsOpts): Promise<void>;

package/lib/resolveConfigDeps.js

@@ -9,8 +9,11 @@ import { createNpmResolver } from '@pnpm/resolving.npm-resolver';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
 import { installConfigDeps } from './installConfigDeps.js';
 export async function resolveConfigDeps(configDeps, opts) {
+    if (opts.frozenLockfile) {
+        throw new PnpmError('FROZEN_LOCKFILE_WITH_OUTDATED_LOCKFILE', 'Cannot resolve configDependencies with "frozen-lockfile" because the lockfile is not up to date');
+    }
     const fetch = createFetchFromRegistry(opts);
-    const getAuthHeader = createGetAuthHeaderByURI({ allSettings: opts.userConfig, userSettings: opts.userConfig });
+    const getAuthHeader = createGetAuthHeaderByURI(opts.configByUri ?? {}, opts.registries?.default);
     const { resolveFromNpm } = createNpmResolver(fetch, getAuthHeader, opts);
     // Extract existing specifiers from configDependencies (handles both old and new formats)
     const configDependencySpecifiers = extractSpecifiers(opts.configDependencies);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/installing.env-installer",
-  "version": "1000.0.19",
+  "version": "1100.0.0",
   "description": "Installer for configurational dependencies",
   "keywords": [
     "pnpm",
@@ -27,39 +27,39 @@
   "dependencies": {
     "@zkochan/rimraf": "^4.0.0",
     "get-npm-tarball-url": "^2.1.0",
-    "symlink-dir": "^7.0.0",
-    "@pnpm/config.writer": "1000.0.14",
-    "@pnpm/config.pick-registry-for-package": "1000.0.11",
-    "@pnpm/constants": "1001.3.1",
-    "@pnpm/core-loggers": "1001.0.4",
-    "@pnpm/error": "1000.0.5",
-    "@pnpm/installing.deps-resolver": "1008.3.1",
-    "@pnpm/deps.graph-hasher": "1002.0.8",
-    "@pnpm/fs.read-modules-dir": "1000.0.0",
-    "@pnpm/lockfile.fs": "1001.1.21",
-    "@pnpm/lockfile.pruner": "1001.0.17",
-    "@pnpm/lockfile.types": "1002.0.2",
-    "@pnpm/network.auth-header": "1000.0.6",
-    "@pnpm/lockfile.utils": "1003.0.3",
-    "@pnpm/network.fetch": "1000.2.6",
-    "@pnpm/pkg-manifest.reader": "1000.1.2",
-    "@pnpm/resolving.npm-resolver": "1004.4.1",
-    "@pnpm/resolving.parse-wanted-dependency": "1001.0.0",
-    "@pnpm/store.controller-types": "1004.1.0",
-    "@pnpm/store.controller": "1004.0.0",
-    "@pnpm/types": "1000.9.0"
+    "symlink-dir": "^10.0.1",
+    "@pnpm/config.pick-registry-for-package": "1100.0.0",
+    "@pnpm/core-loggers": "1100.0.0",
+    "@pnpm/config.writer": "1100.0.0",
+    "@pnpm/constants": "1100.0.0",
+    "@pnpm/deps.graph-hasher": "1100.0.0",
+    "@pnpm/fs.read-modules-dir": "1100.0.0",
+    "@pnpm/installing.deps-resolver": "1100.0.0",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/lockfile.fs": "1100.0.0",
+    "@pnpm/lockfile.types": "1100.0.0",
+    "@pnpm/network.fetch": "1100.0.0",
+    "@pnpm/network.auth-header": "1100.0.0",
+    "@pnpm/lockfile.pruner": "1100.0.0",
+    "@pnpm/pkg-manifest.reader": "1100.0.0",
+    "@pnpm/resolving.npm-resolver": "1100.0.0",
+    "@pnpm/lockfile.utils": "1100.0.0",
+    "@pnpm/store.controller": "1100.0.0",
+    "@pnpm/store.controller-types": "1100.0.0",
+    "@pnpm/resolving.parse-wanted-dependency": "1100.0.0",
+    "@pnpm/types": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": ">=1001.0.0 <1002.0.0",
-    "@pnpm/worker": "^1000.3.0"
+    "@pnpm/worker": "^1100.0.0"
   },
   "devDependencies": {
-    "@pnpm/registry-mock": "5.2.4",
+    "@pnpm/registry-mock": "6.0.0",
     "load-json-file": "^7.0.1",
     "read-yaml-file": "^3.0.0",
-    "@pnpm/installing.env-installer": "1000.0.19",
-    "@pnpm/testing.temp-store": "1000.0.23",
-    "@pnpm/prepare": "1000.0.4"
+    "@pnpm/testing.temp-store": "1100.0.0",
+    "@pnpm/prepare": "1100.0.0",
+    "@pnpm/installing.env-installer": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"
@@ -69,9 +69,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",
     "start": "tsgo --watch",
-    "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"
   }
 }