deps: package-json-from-dist@1.0.1

wraithgar · wraithgar · commit b25712e1888d · 2024-11-20T10:13:11.000-08:00
diff --git a/node_modules/package-json-from-dist/dist/commonjs/index.js b/node_modules/package-json-from-dist/dist/commonjs/index.js
@@ -5,6 +5,8 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const node_url_1 = require("node:url");
 const NM = `${node_path_1.sep}node_modules${node_path_1.sep}`;
+const STORE = `.store${node_path_1.sep}`;
+const PKG = `${node_path_1.sep}package${node_path_1.sep}`;
 const DIST = `${node_path_1.sep}dist${node_path_1.sep}`;
 /**
  * Find the package.json file, either from a TypeScript file somewhere not
@@ -59,8 +61,16 @@ const findPackageJson = (from, pathFromSrc = '../package.json') => {
         // inside of node_modules. find the dist directly under package name.
         const nm = __dirname.substring(0, nms + NM.length);
         const pkgDir = __dirname.substring(nms + NM.length);
+        // affordance for yarn berry, which puts package contents in
+        // '.../node_modules/.store/${id}-${hash}/package/...'
+        if (pkgDir.startsWith(STORE)) {
+            const pkg = pkgDir.indexOf(PKG, STORE.length);
+            if (pkg) {
+                return (0, node_path_1.resolve)(nm, pkgDir.substring(0, pkg + PKG.length), 'package.json');
+            }
+        }
         const pkgName = pkgDir.startsWith('@') ?
-            pkgDir.split(node_path_1.sep).slice(0, 2).join(node_path_1.sep)
+            pkgDir.split(node_path_1.sep, 2).join(node_path_1.sep)
             : String(pkgDir.split(node_path_1.sep)[0]);
         return (0, node_path_1.resolve)(nm, pkgName, 'package.json');
     }
diff --git a/node_modules/package-json-from-dist/dist/esm/index.js b/node_modules/package-json-from-dist/dist/esm/index.js
@@ -2,6 +2,8 @@ import { readFileSync } from 'node:fs';
 import { dirname, resolve, sep } from 'node:path';
 import { fileURLToPath } from 'node:url';
 const NM = `${sep}node_modules${sep}`;
+const STORE = `.store${sep}`;
+const PKG = `${sep}package${sep}`;
 const DIST = `${sep}dist${sep}`;
 /**
  * Find the package.json file, either from a TypeScript file somewhere not
@@ -56,8 +58,16 @@ export const findPackageJson = (from, pathFromSrc = '../package.json') => {
         // inside of node_modules. find the dist directly under package name.
         const nm = __dirname.substring(0, nms + NM.length);
         const pkgDir = __dirname.substring(nms + NM.length);
+        // affordance for yarn berry, which puts package contents in
+        // '.../node_modules/.store/${id}-${hash}/package/...'
+        if (pkgDir.startsWith(STORE)) {
+            const pkg = pkgDir.indexOf(PKG, STORE.length);
+            if (pkg) {
+                return resolve(nm, pkgDir.substring(0, pkg + PKG.length), 'package.json');
+            }
+        }
         const pkgName = pkgDir.startsWith('@') ?
-            pkgDir.split(sep).slice(0, 2).join(sep)
+            pkgDir.split(sep, 2).join(sep)
             : String(pkgDir.split(sep)[0]);
         return resolve(nm, pkgName, 'package.json');
     }
diff --git a/node_modules/package-json-from-dist/package.json b/node_modules/package-json-from-dist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "package-json-from-dist",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Load the local package.json from either src or dist folder",
   "main": "./dist/commonjs/index.js",
   "exports": {
@@ -28,7 +28,7 @@
     "presnap": "npm run prepare",
     "test": "tap",
     "snap": "tap",
-    "format": "prettier --write . --loglevel warn --ignore-path ../../.prettierignore --cache",
+    "format": "prettier --write . --log-level warn",
     "typedoc": "typedoc"
   },
   "author": "Isaac Z. Schlueter <i@izs.me> (https://izs.me)",
diff --git a/package-lock.json b/package-lock.json
@@ -12205,9 +12205,9 @@
       }
     },
     "node_modules/package-json-from-dist": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "inBundle": true,
       "license": "BlueOak-1.0.0"
     },
