deps: migrate pnpm internals to v11 (1100.x)

babel.config.js

@@ -12,6 +12,7 @@ module.exports = function (api) {
         },
         useBuiltIns: 'usage',
         corejs: 3,
+        exclude: ['@babel/plugin-transform-dynamic-import'],
       },
     ],
   ];

components/legacy/e2e-helper/npm-ci-registry.ts

@@ -1,7 +1,6 @@
 /* eslint no-console: 0 */
 import { addUser, REGISTRY_MOCK_PORT, start as startRegistryMock, prepare } from '@pnpm/registry-mock';
 import type { ChildProcess } from 'child_process';
-import { fetch } from '@pnpm/fetch';
 import fs from 'fs-extra';
 import execa from 'execa';
 import * as path from 'path';
@@ -79,6 +78,7 @@ export class NpmCiRegistry {
           resolved = true;
           let fetchResults;
           try {
+            const { fetch } = await import('@pnpm/network.fetch');
             fetchResults = await fetch(`http://localhost:${REGISTRY_MOCK_PORT}/is-odd`, {
               retry: {
                 minTimeout: 1000,

e2e/harmony/dependency-resolver.e2e.ts

@@ -1,8 +1,7 @@
 import chai, { expect } from 'chai';
 import path from 'path';
 import fs from 'fs-extra';
-import type { Modules } from '@pnpm/modules-yaml';
-import { readModulesManifest } from '@pnpm/modules-yaml';
+import type { Modules } from '@pnpm/installing.modules-yaml';
 import { generateRandomStr } from '@teambit/toolbox.string.random';
 import rimraf from 'rimraf';
 import { Extensions } from '@teambit/legacy.constants';
@@ -13,6 +12,11 @@ chai.use(chaiFs);
 
 chai.use(assertArrays);
 
+async function readModulesManifest(modulesDir: string): Promise<Modules | null> {
+  const m = await import('@pnpm/installing.modules-yaml');
+  return m.readModulesManifest(modulesDir);
+}
+
 describe('dependency-resolver extension', function () {
   let helper: Helper;
   this.timeout(0);

e2e/harmony/pkg-manager-config.e2e.ts

@@ -1,15 +1,14 @@
 import path from 'path';
 import chai, { expect } from 'chai';
-import { readModulesManifest } from '@pnpm/modules-yaml';
 import chaiString from 'chai-string';
-
-import { Helper, NpmCiRegistry, supportNpmCiRegistryTesting } from '@teambit/legacy.e2e-helper';
 import chaiFs from 'chai-fs';
+import { Helper, NpmCiRegistry, supportNpmCiRegistryTesting } from '@teambit/legacy.e2e-helper';
+
 chai.use(chaiFs);
 chai.use(chaiString);
 
 (supportNpmCiRegistryTesting ? describe : describe.skip)(
-  'package manager rc file is read from the workspace directory when installation is in a capsule',
+  'workspace .yarnrc.yml is read by Yarn when installation is in a capsule',
   function () {
     this.timeout(0);
     let helper: Helper;
@@ -66,29 +65,6 @@ chai.use(chaiString);
         expect(isPositivePath).to.be.a.path();
       });
     });
-    describe('using pnpm', () => {
-      before(() => {
-        helper.scopeHelper.reInitWorkspace({
-          npmrcConfig: {
-            'hoist-pattern[]': 'foo',
-          },
-        });
-        helper.extensions.workspaceJsonc.addKeyValToDependencyResolver('packageManager', `teambit.dependencies/pnpm`);
-        helper.scopeHelper.addRemoteScope();
-        helper.workspaceJsonc.setupDefault();
-        helper.fixtures.populateComponents(1);
-        helper.extensions.addExtensionToVariant('comp1', `${envId1}@0.0.1`);
-        helper.capsules.removeScopeAspectCapsules();
-        helper.command.status(); // populate capsules.
-      });
-      it('workspace .npmrc is taken into account when running install in the capsule', async () => {
-        const { scopeAspectsCapsulesRootDir } = helper.command.capsuleListParsed();
-        const modulesState = await readModulesManifest(
-          path.join(scopeAspectsCapsulesRootDir, `${helper.scopes.remote}_node-env-1@0.0.1/node_modules`)
-        );
-        expect(modulesState?.hoistPattern?.[0]).to.eq('foo');
-      });
-    });
     after(() => {
       npmCiRegistry.destroy();
     });

e2e/harmony/pnpm-default-hoisting.e2e.ts

@@ -1,9 +1,13 @@
 import { expect } from 'chai';
 import path from 'path';
-import type { Modules } from '@pnpm/modules-yaml';
-import { readModulesManifest } from '@pnpm/modules-yaml';
+import type { Modules } from '@pnpm/installing.modules-yaml';
 import { Helper } from '@teambit/legacy.e2e-helper';
 
+async function readModulesManifest(modulesDir: string): Promise<Modules | null> {
+  const m = await import('@pnpm/installing.modules-yaml');
+  return m.readModulesManifest(modulesDir);
+}
+
 describe('pnpm install with default settings', function () {
   let helper: Helper;
   let modulesState: Modules | null;

scopes/component/modules/merge-helper/merge-files.ts

@@ -81,6 +81,5 @@ export async function mergeFiles({
 ${chalk.bold('command:')} ${err.command}
 ${chalk.bold('message:')} ${err.message}
 ${chalk.bold('original error:')} ${err.stderr}`);
-    throw err;
   }
 }

scopes/dependencies/dependency-resolver/dependency-resolver.main.runtime.ts

@@ -41,7 +41,7 @@ import fs from 'fs-extra';
 import { assign, parse } from 'comment-json';
 import { ComponentID } from '@teambit/component-id';
 import { readCAFileSync } from '@pnpm/network.ca-file';
-import { parseBareSpecifier } from '@pnpm/npm-resolver';
+import { parseBareSpecifier } from '@pnpm/resolving.npm-resolver';
 import type { SourceFile } from '@teambit/component.sources';
 import type { ProjectManifest, DependencyManifest } from '@pnpm/types';
 import semver, { SemVer } from 'semver';

scopes/dependencies/dependency-resolver/package-manager.ts

@@ -1,4 +1,4 @@
-import { PeerDependencyIssuesByProjects } from '@pnpm/core';
+import type { PeerDependencyIssuesByProjects } from '@pnpm/installing.deps-installer';
 import type { PeerDependencyRules, ProjectManifest, DependencyManifest } from '@pnpm/types';
 import type { ComponentID, ComponentMap, Component } from '@teambit/component';
 import { type DependenciesGraph } from '@teambit/objects';

scopes/dependencies/pnpm/get-proxy-config.ts

@@ -1,13 +1,13 @@
 import type { PackageManagerProxyConfig } from '@teambit/dependency-resolver';
-import type { Config } from '@pnpm/config';
+import type { Config } from '@pnpm/config.reader';
 
 export function getProxyConfig(config: Config): PackageManagerProxyConfig {
   const httpProxy = config.httpProxy;
   const httpsProxy = config.httpsProxy || httpProxy;
   const proxyConfig: PackageManagerProxyConfig = {
     httpProxy,
     httpsProxy,
-    noProxy: config.rawConfig.noproxy,
+    noProxy: config.authConfig.noproxy,
   };
   return proxyConfig;
 }

scopes/dependencies/pnpm/get-registries.ts

@@ -1,7 +1,7 @@
 import getCredentialsByURI from 'credentials-by-uri';
 import type { RegistriesMap } from '@teambit/dependency-resolver';
 import { stripTrailingChar } from '@teambit/toolbox.string.strip-trailing-char';
-import type { Config } from '@pnpm/config';
+import type { Config } from '@pnpm/config.reader';
 import { isEmpty } from 'lodash';
 import toNerfDart from 'nerf-dart';
 
@@ -15,11 +15,11 @@ export function getRegistries(config: Config): RegistriesMap {
 
   Object.keys(config.registries).forEach((regName) => {
     const uri = config.registries[regName];
-    let credentials = getCredentialsByURI(config.rawConfig, uri);
-    let originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, uri);
+    let credentials = getCredentialsByURI(config.authConfig, uri);
+    let originalAuthConfig = getOriginalAuthConfigByUri(config.authConfig, uri);
     if (isEmpty(credentials)) {
-      credentials = getCredentialsByURI(config.rawConfig, switchTrailingSlash(uri));
-      originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, switchTrailingSlash(uri));
+      credentials = getCredentialsByURI(config.authConfig, switchTrailingSlash(uri));
+      originalAuthConfig = getOriginalAuthConfigByUri(config.authConfig, switchTrailingSlash(uri));
     }
     registriesMap[regName] = {
       uri,

scopes/dependencies/pnpm/load-pnpm-esm.cjs

@@ -0,0 +1,12 @@
+'use strict';
+
+// Native CJS so Babel's modules-commonjs transform leaves the import() alone.
+// @pnpm/deps.path and @pnpm/lockfile.fs are ESM-only and must go through
+// Node's ESM loader.
+exports.loadEsm = async () => {
+  const [dp, lockfileFs] = await Promise.all([
+    import('@pnpm/deps.path'),
+    import('@pnpm/lockfile.fs'),
+  ]);
+  return { dp, getLockfileImporterId: lockfileFs.getLockfileImporterId };
+};

scopes/dependencies/pnpm/lockfile-deps-graph-converter.spec.ts

@@ -1,10 +1,18 @@
 import path from 'path';
 import { ComponentID } from '@teambit/component';
 import { DependenciesGraph, type PackagesMap, type DependencyEdge } from '@teambit/objects';
-import { convertLockfileToGraph, convertGraphToLockfile } from './lockfile-deps-graph-converter';
+import {
+  convertLockfileToGraph,
+  convertGraphToLockfile,
+  init as initLockfileDepsGraphConverter,
+} from './lockfile-deps-graph-converter';
 import { type BitLockfileFile } from './lynx';
 import { expect } from 'chai';
 
+before(async () => {
+  await initLockfileDepsGraphConverter();
+});
+
 describe('convertLockfileToGraph simple case', () => {
   const lockfile: BitLockfileFile = {
     bit: {
@@ -108,14 +116,17 @@ describe('convertLockfileToGraph simple case', () => {
       },
     },
   };
-  const graph = convertLockfileToGraph(lockfile, {
-    pkgName: 'comp1',
-    componentRelativeDir: 'comps/comp1',
-    componentRootDir: 'node_modules/.bit_roots/env',
-    componentIdByPkgName: new Map([
-      ['comp1', ComponentID.fromString('my-scope/comp1@1.0.0')],
-      ['comp2', ComponentID.fromString('my-scope/comp2@1.0.0')],
-    ]),
+  let graph: DependenciesGraph;
+  before(() => {
+    graph = convertLockfileToGraph(lockfile, {
+      pkgName: 'comp1',
+      componentRelativeDir: 'comps/comp1',
+      componentRootDir: 'node_modules/.bit_roots/env',
+      componentIdByPkgName: new Map([
+        ['comp1', ComponentID.fromString('my-scope/comp1@1.0.0')],
+        ['comp2', ComponentID.fromString('my-scope/comp2@1.0.0')],
+      ]),
+    });
   });
   const expected = {
     schemaVersion: '2.0',

scopes/dependencies/pnpm/lockfile-deps-graph-converter.ts

@@ -1,8 +1,9 @@
 import path from 'path';
 import { type ProjectManifest } from '@pnpm/types';
 import { type LockfileFileProjectResolvedDependencies } from '@pnpm/lockfile.types';
-import { type ResolveFunction } from '@pnpm/client';
-import * as dp from '@pnpm/dependency-path';
+import { type ResolveFunction } from '@pnpm/installing.client';
+import type * as Dp from '@pnpm/deps.path';
+import type { getLockfileImporterId as GetLockfileImporterId } from '@pnpm/lockfile.fs';
 import { pick, partition } from 'lodash';
 import { BitError } from '@teambit/bit-error';
 import { snapToSemver } from '@teambit/component-package-version';
@@ -18,10 +19,29 @@ import {
   type CalcDepsGraphForComponentOptions,
   type ComponentIdByPkgName,
 } from '@teambit/dependency-resolver';
-import { getLockfileImporterId } from '@pnpm/lockfile.fs';
 import normalizePath from 'normalize-path';
 import { type BitLockfileFile } from './lynx';
 
+// @pnpm/deps.path and @pnpm/lockfile.fs are ESM-only; load them through a .cjs
+// shim so the require() chain in the build capsule's mocha runner doesn't trip
+// on the transitive ESM import. Call `init()` once before invoking the public
+// converters; helpers reach for these module-level slots synchronously.
+let dp!: typeof Dp;
+let getLockfileImporterId!: typeof GetLockfileImporterId;
+let loading: Promise<void> | undefined;
+
+export function init(): Promise<void> {
+  loading ??= (async () => {
+    const { loadEsm } = require('./load-pnpm-esm.cjs') as {
+      loadEsm: () => Promise<{ dp: typeof Dp; getLockfileImporterId: typeof GetLockfileImporterId }>;
+    };
+    const m = await loadEsm();
+    dp = m.dp;
+    getLockfileImporterId = m.getLockfileImporterId;
+  })();
+  return loading;
+}
+
 function convertLockfileToGraphFromCapsule(
   lockfile: BitLockfileFile,
   {
@@ -376,7 +396,7 @@ export async function convertGraphToLockfile(
         const { resolution } = resolveResult;
         if ('integrity' in resolution && resolution.integrity) {
           lockfile.packages[pkgToResolve.pkgId].resolution = {
-            integrity: resolution.integrity,
+            integrity: resolution.integrity as string,
           };
         }
       }
@@ -464,7 +484,7 @@ function getPkgsToResolve(lockfile: BitLockfileFile, manifests: Record<string, P
   return pkgsToResolve;
 }
 
-function depPathToRef(depPath: dp.DependencyPath): string {
+function depPathToRef(depPath: Dp.DependencyPath): string {
   return `${depPath.version}${depPath.patchHash ?? ''}${depPath.peerDepGraphHash ?? ''}`;
 }