feat: support libc field for package.json (#4605)

close #4454
pnpm · May 10, 2022 · 52b0576 · 52b0576
1 parent 325ed5c
commit 52b0576
Show file tree

Hide file tree

Showing 23 changed files with 471 additions and 43 deletions.
diff --git a/.changeset/red-feet-relax.md b/.changeset/red-feet-relax.md
@@ -0,0 +1,9 @@
+---
+"@pnpm/cli-utils": patch
+"@pnpm/filter-lockfile": patch
+"@pnpm/lockfile-file": patch
+"@pnpm/package-is-installable": patch
+"@pnpm/resolve-dependencies": patch
+---
+
+feat: support libc filed
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
       "hosted-git-info@4": "npm:@zkochan/hosted-git-info@^4.0.2",
       "http-errors": "^1.7.3",
       "istanbul-reports": "npm:@zkochan/istanbul-reports",
-      "js-yaml@^4.0.0": "npm:@zkochan/js-yaml@0.0.5",
+      "js-yaml@^4.0.0": "npm:@zkochan/js-yaml@0.0.6",
       "lodash@<4.17.19": "^4.17.9",
       "nopt@5": "npm:@pnpm/nopt@^0.2.1",
       "pkg-fetch": "3.1.1",

diff --git a/packages/cli-utils/src/packageIsInstallable.ts b/packages/cli-utils/src/packageIsInstallable.ts
@@ -8,6 +8,7 @@ export function packageIsInstallable (
     engines?: WantedEngine
     cpu?: string[]
     os?: string[]
+    libc?: string[]
   },
   opts: {
     engineStrict?: boolean

diff --git a/packages/exportable-manifest/src/overridePublishConfig.ts b/packages/exportable-manifest/src/overridePublishConfig.ts
@@ -21,6 +21,7 @@ const PUBLISH_CONFIG_WHITELIST = new Set([
   // These are useful to hide in order to avoid warnings during local development
   'os',
   'cpu',
+  'libc',
   // https://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html#version-selection-with-typesversions
   'typesVersions',
 ])

diff --git a/packages/filter-lockfile/package.json b/packages/filter-lockfile/package.json
@@ -39,7 +39,8 @@
     "@types/ramda": "0.27.39",
     "tempy": "^1.0.0",
     "write-yaml-file": "^4.2.0",
-    "yaml-tag": "1.1.0"
+    "yaml-tag": "1.1.0",
+    "detect-libc": "^2.0.1"
   },
   "dependencies": {
     "@pnpm/constants": "workspace:6.1.0",

diff --git a/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts b/packages/filter-lockfile/src/filterLockfileByImportersAndEngine.ts
@@ -137,6 +137,7 @@ function pkgAllDeps (
         cpu: pkgSnapshot.cpu,
         engines: pkgSnapshot.engines,
         os: pkgSnapshot.os,
+        libc: pkgSnapshot.libc,
       }
       // TODO: depPath is not the package ID. Should be fixed
       installable = opts.includeIncompatiblePackages || packageIsInstallable(pkgSnapshot.id ?? depPath, pkg, {