npm-pkgbuild 11.5.0 → 11.5.2

package/package.json

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

package/src/npm-pkgbuild-cli.mjs

@@ -86,7 +86,7 @@ program
           try {
             Object.assign(
               properties,
-              output,
+              output[outputFactory.name],
               {
                 type: outputFactory.name,
                 "user-agent": `npm-pkgbuild-${version}`

package/src/output/docker.mjs

@@ -44,31 +44,22 @@ export class DOCKER extends Packager {
     options,
     expander = v => v
   ) {
-    const { properties, staging, destination } = await this.prepareExecute(
-      options
-    );
+    const { properties, staging } = await this.prepareExecute(options);
 
     async function* trailingLines() {
-      for (const [k, v] of Object.entries(dependencies)) {
-        if (dependenciesToFrom[k]) {
-          yield `
-FROM ${dependenciesToFrom[k]}:${v.replace(/[>=]*/, "")}
-`;
-        }
+      for (const [k, v] of Object.entries({
+        ...options.from,
+        ...Object.fromEntries(
+          Object.entries(dependencies)
+            .filter(([k, v]) => dependenciesToFrom[k])
+            .map(([k, v]) => [dependenciesToFrom[k], v.replace(/[>=]*/, "")])
+        )
+      })) {
+        yield `FROM ${k}:${v}\n`;
       }
 
-      if (options.from) {
-        for (const [k, v] of Object.entries(options.from)) {
-          yield `
-FROM ${k}:${v}
-`;
-        }
-
-        if (options.entrypoints) {
-          yield `
-ENTRYPOINT ["node", ${Object.values(options.entrypoints)[0]}]
-`;
-        }
+      if (options.entrypoints) {
+        yield `ENTRYPOINT ["node", ${Object.values(options.entrypoints)[0]}]\n`;
       }
     }