npm-pkgbuild 11.1.3 → 11.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "11.1.3",
+  "version": "11.1.4",
   "publishConfig": {
     "access": "public"
   },

package/src/extract-from-package.mjs

@@ -111,7 +111,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
   const fragments = {};
   let root, parent;
 
-  await packageWalker(async (packageContent, base, modulePath) => {
+  await packageWalker(async (packageContent, dir, modulePath) => {
     let i = 0;
     for (const pkgbuild of Array.isArray(packageContent.pkgbuild)
       ? packageContent.pkgbuild
@@ -156,8 +156,10 @@ export async function* extractFromPackage(options = {}, env = {}) {
           continue;
         }
       }
+      else {
+        console.log(`${name}: load`);
+      }
 
-      console.log(`${name}: load`);
       const fragment = {
         name,
         priority,
@@ -185,7 +187,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
 
       for (const k of ["hooks"]) {
         if (pkgbuild[k]) {
-          pkgbuild[k] = resolve(base, pkgbuild[k]);
+          pkgbuild[k] = resolve(dir, pkgbuild[k]);
         }
       }
 
@@ -238,8 +240,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
       }
 
       fragment.properties = Object.assign(properties, pkgbuild);
-      fragment.dir = join(base, ...modulePath.map(p => `node_modules/${p}`));
-
+      fragment.dir = dir;
       fragments[fragment.name] = fragment;
 
       if (pkgbuild.variant) {
@@ -304,7 +305,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
       "RESULT",
       result.variant,
       result.properties,
-      sources,
+      sources.map(s =>s.toString()).join('\n'),
       output,
       arch
     );