@vamship/build-utils 2.3.2 → 2.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vamship/build-utils",
-    "version": "2.3.2",
+    "version": "2.4.1",
     "description": "Utility library for build tooling",
     "type": "module",
     "main": "src/index.js",

package/src/task-builders/publish-container-task-builder.js

@@ -31,7 +31,7 @@ export class PublishContainerTaskBuilder extends TaskBuilder {
         super(
             // When specifying the container target, if it is not called default, this
             // will create a named task
-            `publish-container${target === 'default' ? '' : '-' + target}`,
+            `publish-container${target === 'default' ? '' : '-' + target}-${tag}`,
             `Publish container image for ${target}:${tag}`,
         );
 
@@ -61,7 +61,7 @@ export class PublishContainerTaskBuilder extends TaskBuilder {
                 // Per docker docs `docker tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG]`
                 _execa(
                     'docker',
-                    ['tag', definition.name, `${definition.name}:${tag}`],
+                    ['tag', definition.repo, `${definition.repo}:${tag}`],
                     {
                         stdio: 'inherit',
                     },
@@ -71,12 +71,13 @@ export class PublishContainerTaskBuilder extends TaskBuilder {
                      * crashing with an unhandled error.
                      */
                 });
+            tagTask.displayName = `tag-${definition.name}-${tag}`;
             return tagTask;
         });
         const pushTaskList = semverComponents.map((tag) => {
             const pushTask = () =>
-                // Per docker docs `docker push [OPTIONS] NAME[:TAG]`
-                _execa('docker', ['push', `${definition.name}:${tag}`], {
+                // Per docker docs `docker push [OPTIONS] REPO[:TAG]`
+                _execa('docker', ['push', `${definition.repo}:${tag}`], {
                     stdio: 'inherit',
                 }).then(undefined, (err) => {
                     /*
@@ -84,6 +85,7 @@ export class PublishContainerTaskBuilder extends TaskBuilder {
                      * crashing with an unhandled error.
                      */
                 });
+            pushTask.displayName = `push-${definition.name}-${tag}`;
             return pushTask;
         });
 

package/src/task-builders/publish-task-builder.js

@@ -80,19 +80,25 @@ export class PublishTaskBuilder extends TaskBuilder {
         }
         // Type container
         else if (type === 'container') {
-            return [new PublishContainerTaskBuilder('default')];
+            return [
+                new PublishContainerTaskBuilder('default', project.version),
+            ];
         }
         // Type cli
         else if (type === 'cli') {
             if (containerTargetList.length > 0) {
-                return [new PublishContainerTaskBuilder('default')];
+                return [
+                    new PublishContainerTaskBuilder('default', project.version),
+                ];
             } else {
                 return [new PublishNpmTaskBuilder()];
             }
         }
         // Type api
         else if (type === 'api') {
-            return [new PublishContainerTaskBuilder('default')];
+            return [
+                new PublishContainerTaskBuilder('default', project.version),
+            ];
         }
         // Type ui (and potentially others that are not supported)
         else {

package/src/task-factories/api-task-factory.js

@@ -42,13 +42,9 @@ export class ApiTaskFactory extends TaskFactory {
         const additionalTaskList = (target) => {
             return [
                 new PackageContainerTaskBuilder(target),
-                new PublishContainerTaskBuilder(target),
+                new PublishContainerTaskBuilder(target, this._project.version),
             ];
         };
-        const additionalTasks = generateAdditionalContainerTasks(
-            this._project,
-            additionalTaskList,
-        );
 
         return [
             new CleanTaskBuilder(),
@@ -62,6 +58,11 @@ export class ApiTaskFactory extends TaskFactory {
             new BuildTaskBuilder(this._project),
             new PackageTaskBuilder(this._project),
             new PublishTaskBuilder(this._project),
-        ].concat(additionalTasks);
+            new PublishContainerTaskBuilder('default'),
+        ].concat(
+            generateAdditionalContainerTasks(this._project, additionalTaskList),
+        ); // Note: Instantiating the additional container tasks in a different
+        // order will break tests. This is less than ideal, but it will have
+        // to do for now.
     }
 }

package/src/task-factories/cli-task-factory.js

@@ -44,13 +44,11 @@ export class CliTaskFactory extends TaskFactory {
         const additionalTaskList = (target) => {
             return [
                 new PackageContainerTaskBuilder(target),
-                new PublishContainerTaskBuilder(target),
+                new PublishContainerTaskBuilder(target, this._project.version),
             ];
         };
-        const additionalTasks = generateAdditionalContainerTasks(
-            this._project,
-            additionalTaskList,
-        );
+
+        const hasContainer = this._project.getContainerTargets().length > 0;
 
         return [
             new CleanTaskBuilder(),
@@ -63,6 +61,19 @@ export class CliTaskFactory extends TaskFactory {
             new BuildTaskBuilder(this._project),
             new PackageTaskBuilder(this._project),
             new PublishTaskBuilder(this._project),
-        ].concat(additionalTasks);
+            hasContainer
+                ? new PublishContainerTaskBuilder('default')
+                : undefined,
+            // Note: Instantiating the additional container tasks in a different
+            // order will break tests. This is less than ideal, but it will have
+            // to do for now.
+        ]
+            .concat(
+                generateAdditionalContainerTasks(
+                    this._project,
+                    additionalTaskList,
+                ),
+            )
+            .filter(Boolean);
     }
 }

package/src/task-factories/container-task-factory.js

@@ -42,13 +42,9 @@ export class ContainerTaskFactory extends TaskFactory {
         const additionalTaskList = (target) => {
             return [
                 new PackageContainerTaskBuilder(target),
-                new PublishContainerTaskBuilder(target),
+                new PublishContainerTaskBuilder(target, this._project.version),
             ];
         };
-        const additionalTasks = generateAdditionalContainerTasks(
-            this._project,
-            additionalTaskList,
-        );
 
         return [
             new CleanTaskBuilder(),
@@ -59,6 +55,11 @@ export class ContainerTaskFactory extends TaskFactory {
             new DocsTaskBuilder(this._project),
             new PackageTaskBuilder(this._project),
             new PublishTaskBuilder(this._project),
-        ].concat(additionalTasks);
+            new PublishContainerTaskBuilder('default'),
+        ].concat(
+            generateAdditionalContainerTasks(this._project, additionalTaskList),
+        ); // Note: Instantiating the additional container tasks in a different
+        // order will break tests. This is less than ideal, but it will have
+        // to do for now.
     }
 }