npm-pkgbuild 14.2.4 → 14.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "14.2.4",
+  "version": "14.2.6",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/extract-from-package.mjs

@@ -56,7 +56,7 @@ function mergeArchs(a, b) {
     }
     return a;
   }
-  return b || 'noarch';
+  return b;
 }
 
 /**
@@ -367,6 +367,12 @@ export async function* extractFromPackage(options = {}, env = {}) {
       }
 
       for (const [name, output] of Object.entries(result.output)) {
+
+        const arch = mergeArchs(result.properties?.arch, output.properties?.arch);
+        if(arch !== undefined) {
+          result.properties.arch = arch;
+        }
+
         yield {
           ...result,
           variant: { ...result.variant, output: name },
@@ -379,8 +385,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
           properties: {
             type: name,
             ...result.properties,
-            ...output.properties,
-            arch: mergeArchs(result.properties?.arch, output.properties?.arch)
+            ...output.properties
           }
         };
       }

package/src/util.mjs

@@ -190,12 +190,14 @@ export async function* copyEntries(
   expander = v => v
 ) {
   for await (const entry of source) {
+    // @ts-ignore
     const d = entry.destination;
 
     const name = expander(
       d === undefined ? entry.name : d.endsWith("/") ? join(d, entry.name) : d
     ).replace(/^\//, "");
 
+    // @ts-ignore
     entry.destination = name;
     const destination = join(destinationDirectory, name);
     await mkdir(dirname(destination), { recursive: true });