npm-pkgbuild 15.1.1 → 15.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "15.1.1",
+  "version": "15.1.2",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -73,11 +73,11 @@
     "uti": "^8.4.1"
   },
   "devDependencies": {
-    "@types/node": "^20.11.26",
+    "@types/node": "^20.11.28",
     "ava": "^6.1.2",
     "c8": "^9.1.0",
     "documentation": "^14.0.3",
-    "semantic-release": "^23.0.2",
+    "semantic-release": "^23.0.4",
     "stream-buffers": "^3.0.2",
     "typescript": "^5.4.2"
   },

package/src/extract-from-package.mjs

@@ -354,16 +354,6 @@ export async function* extractFromPackage(options = {}, env = {}) {
       properties: context.expand(properties)
     };
 
-    /*
-    console.log(
-      "RESULT",
-      result.variant,
-      result.properties,
-      sources.map(s => s.toString()).join("\n"),
-      output,
-      arch
-    );*/
-
     function* forEachOutput(result) {
       if (Object.entries(result.output).length === 0) {
         yield result;
@@ -389,7 +379,7 @@ export async function* extractFromPackage(options = {}, env = {}) {
             }, []);
         }
 
-        yield {
+        const outputResult = {
           ...result,
           variant: { ...result.variant, output: name },
           output: { [name]: output },
@@ -404,6 +394,17 @@ export async function* extractFromPackage(options = {}, env = {}) {
             ...output.properties
           }
         };
+
+        /*
+        console.log(
+          "RESULT",
+          outputResult.variant,
+          outputResult.properties,
+          sources.map(s => s.toString()).join("\n"),
+          outputResult.output
+        );*/
+
+          yield outputResult;
       }
     }
 

package/src/output/docker.mjs

@@ -72,7 +72,7 @@ export class DOCKER extends Packager {
     dependencies,
     options,
     publishingDetails,
-    expander = v => v
+    expander
   ) {
     const { properties, staging } = await this.prepare(options, publishingDetails);
 
@@ -97,7 +97,7 @@ export class DOCKER extends Packager {
     }
 
     async function* trailingLines() {
-      yield `WORKDIR ${properties.workdir}\n`;
+      yield `WORKDIR ${expander(properties.workdir)}\n`;
       yield "COPY . .\n";
       if (properties.entrypoints) {
         yield `ENTRYPOINT ["node", "${

package/types/output/docker.d.mts

@@ -36,7 +36,7 @@ export class DOCKER extends Packager {
     static prepare(options: any, variant: {
         arch: string;
     }): Promise<boolean>;
-    create(sources: any, transformer: any, dependencies: any, options: any, publishingDetails: any, expander?: (v: any) => any): Promise<string>;
+    create(sources: any, transformer: any, dependencies: any, options: any, publishingDetails: any, expander: any): Promise<string>;
     publish(artifact: any, publishingDetails: any, properties: any, logger?: {
         (...data: any[]): void;
         (message?: any, ...optionalParams: any[]): void;