@nx/docker 22.1.0-beta.0 → 22.1.0-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nx/docker",
   "description": "The Nx Plugin for Docker to aid in containerizing projects.",
-  "version": "22.1.0-beta.0",
+  "version": "22.1.0-beta.2",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"
@@ -47,12 +47,12 @@
   "executors": "./executors.json",
   "generators": "./generators.json",
   "dependencies": {
-    "@nx/devkit": "22.1.0-beta.0",
+    "@nx/devkit": "22.1.0-beta.2",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.1.0-beta.0"
+    "nx": "22.1.0-beta.2"
   },
   "types": "./src/index.d.ts"
 }

package/src/executors/release-publish/release-publish.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAEpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAI3D,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,QAAiB,CAAC;AAE3C,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,eAAe;;GAmBzB"}
+{"version":3,"file":"release-publish.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/executors/release-publish/release-publish.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,eAAe,EAIrB,MAAM,YAAY,CAAC;AAGpB,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC;AAI3D,MAAM,WAAW,oCAAoC;IACnD,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,eAAO,MAAM,YAAY,QAAiB,CAAC;AAE3C,wBAA8B,oBAAoB,CAChD,MAAM,EAAE,0BAA0B,EAClC,OAAO,EAAE,eAAe;;GAmBzB"}

package/src/executors/release-publish/release-publish.impl.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LARGE_BUFFER = void 0;
 exports.default = dockerReleasePublish;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const version_utils_1 = require("../../release/version-utils");
@@ -93,7 +94,9 @@ async function dockerPush(imageReference, quiet) {
             childProcess.on('error', (error) => {
                 rej(error);
             });
-            childProcess.on('exit', (code) => {
+            childProcess.on('exit', (code, signal) => {
+                if (code === null)
+                    code = (0, internal_1.signalToCode)(signal);
                 if (code === 0) {
                     res(result.trim());
                 }

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAOvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBAUzE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BA4B1E;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/docker/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,IAAI,EACT,KAAK,iBAAiB,EAQvB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAI/C,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,qBAUzE;AAwCD,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,mBAAmB,8BAiB1E;AAED,eAAe,aAAa,CAAC"}

package/src/generators/init/init.js

@@ -3,25 +3,47 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateDependencies = updateDependencies;
 exports.initGenerator = initGenerator;
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
-const plugin_1 = require("../../plugins/plugin");
 const versions_1 = require("../../utils/versions");
 function updateDependencies(tree, schema) {
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@nx/docker': versions_1.nxVersion,
     }, undefined, schema.keepExistingVersions);
 }
+function addPluginToNxJson(tree, updatePackageScripts) {
+    if (!tree.exists('nx.json')) {
+        devkit_1.logger.warn('"nx.json" not found. Skipping "@nx/docker" plugin registration.');
+        return;
+    }
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (!nxJson) {
+        devkit_1.logger.warn('Unable to read "nx.json" content. Skipping "@nx/docker" plugin registration.');
+        return;
+    }
+    nxJson.plugins ??= [];
+    const pluginExists = nxJson.plugins.some((plugin) => typeof plugin === 'string'
+        ? plugin === '@nx/docker'
+        : plugin?.plugin === '@nx/docker');
+    if (pluginExists) {
+        devkit_1.logger.info('"@nx/docker" plugin is already registered in "nx.json".');
+        return;
+    }
+    nxJson.plugins.push({
+        plugin: '@nx/docker',
+        options: {
+            buildTarget: { name: 'docker:build' },
+            runTarget: { name: 'docker:run' },
+        },
+    });
+    (0, devkit_1.updateNxJson)(tree, nxJson);
+    devkit_1.logger.info('Added "@nx/docker" to plugins array in "nx.json".');
+}
 async function initGenerator(tree, schema) {
     devkit_1.logger.warn(`Docker support is experimental. Breaking changes may occur and not adhere to semver versioning.`);
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    await (0, add_plugin_1.addPlugin)(tree, await (0, devkit_1.createProjectGraphAsync)(), '@nx/docker', plugin_1.createNodesV2, {
-        buildTarget: ['docker:build', 'docker-build', 'build-docker'],
-        runTarget: ['docker:run', 'docker-run', 'run-docker'],
-    }, schema.updatePackageScripts);
     const tasks = [];
-    if (!schema.skipPackageJson) {
+    if (!schema.skipPackageJson && tree.exists('package.json')) {
         tasks.push(updateDependencies(tree, schema));
     }
+    addPluginToNxJson(tree, schema.updatePackageScripts);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/plugins/plugin.d.ts

@@ -12,4 +12,5 @@ export interface DockerPluginOptions {
     runTarget?: string | DockerTargetOptions;
 }
 export declare const createNodesV2: CreateNodesV2<DockerPluginOptions>;
+export declare function getProjectNameFromPath(projectRoot: string, workspaceRoot: string): string;
 //# sourceMappingURL=plugin.d.ts.map

package/src/plugins/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAOnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CACrB,MAAM,EACN,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,GAAG,MAAM,CAAC,CACrD,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC1C;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,aAAa,EAQnB,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CACrB,MAAM,EACN,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,GAAG,MAAM,CAAC,CACrD,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,WAAW,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;IAC3C,SAAS,CAAC,EAAE,MAAM,GAAG,mBAAmB,CAAC;CAC1C;AAsBD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAmC5D,CAAC;AAmDF,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,MAAM,CAOR"}

package/src/plugins/plugin.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = void 0;
+exports.getProjectNameFromPath = getProjectNameFromPath;
 const devkit_1 = require("@nx/devkit");
 const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
@@ -58,10 +59,18 @@ function interpolateDockerTargetOptions(options, projectRoot, imageRef, context)
         imageRef,
         currentDate: new Date(),
         commitSha,
-        shortCommitSha: commitSha.slice(0, 7),
+        shortCommitSha: commitSha ? commitSha.slice(0, 7) : null,
     };
     return (0, interpolate_pattern_1.interpolateObject)(options, tokens);
 }
+function getProjectNameFromPath(projectRoot, workspaceRoot) {
+    const root = projectRoot === '.' ? workspaceRoot : projectRoot;
+    const normalized = root
+        .replace(/^[\\/]/, '')
+        .replace(/[\\/\s]+/g, '-')
+        .toLowerCase();
+    return normalized.length > 128 ? normalized.slice(-128) : normalized;
+}
 function getProjectName(projectRoot, workspaceRoot) {
     const projectJsonPath = (0, path_1.join)(workspaceRoot, projectRoot, 'project.json');
     if ((0, fs_1.existsSync)(projectJsonPath)) {
@@ -77,7 +86,7 @@ function getProjectName(projectRoot, workspaceRoot) {
             return packageJson.name;
         }
     }
-    return projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
+    return getProjectNameFromPath(projectRoot, workspaceRoot);
 }
 function buildTargetOptions(interpolatedTarget, projectRoot, imageRef, isRunTarget = false) {
     const options = {
@@ -113,7 +122,7 @@ function buildTargetConfigurations(interpolatedTarget, projectRoot, imageRef, is
     return configurations;
 }
 async function createDockerTargets(projectRoot, options, context) {
-    const imageRef = projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
+    const imageRef = getProjectNameFromPath(projectRoot, devkit_1.workspaceRoot);
     const interpolatedBuildTarget = interpolateDockerTargetOptions(options.buildTarget, projectRoot, imageRef, context);
     const interpolatedRunTarget = interpolateDockerTargetOptions(options.runTarget, projectRoot, imageRef, context);
     const namedInputs = (0, get_named_inputs_1.getNamedInputs)(projectRoot, context);
@@ -194,7 +203,7 @@ function normalizePluginOptions(options) {
         return { name: defaultName };
     };
     return {
-        buildTarget: normalizeTarget(options.buildTarget, 'docker:build'),
-        runTarget: normalizeTarget(options.runTarget, 'docker:run'),
+        buildTarget: normalizeTarget(options?.buildTarget, 'docker:build'),
+        runTarget: normalizeTarget(options?.runTarget, 'docker:run'),
     };
 }

package/src/release/version-utils.d.ts

@@ -1,4 +1,4 @@
-import type { ProjectGraphProjectNode } from '@nx/devkit';
+import { ProjectGraphProjectNode } from '@nx/devkit';
 import type { FinalConfigForProject } from 'nx/src/command-line/release/utils/release-graph';
 export declare const getDockerVersionPath: (workspaceRoot: string, projectRoot: string) => string;
 export declare function handleDockerVersion(workspaceRoot: string, projectGraphNode: ProjectGraphProjectNode, finalConfigForProject: FinalConfigForProject, dockerVersionScheme?: string, dockerVersion?: string, versionActionsVersion?: string): Promise<{

package/src/release/version-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,YAAY,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAQ7F,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,EACrB,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM,EACtB,qBAAqB,CAAC,EAAE,MAAM;;;GA6C/B"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/docker/src/release/version-utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,uBAAuB,EAAiB,MAAM,YAAY,CAAC;AACpE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iDAAiD,CAAC;AAQ7F,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,EACrB,aAAa,MAAM,WAGpB,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,uBAAuB,EACzC,qBAAqB,EAAE,qBAAqB,EAC5C,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM,EACtB,qBAAqB,CAAC,EAAE,MAAM;;;GA6C/B"}

package/src/release/version-utils.js

@@ -6,6 +6,7 @@ const child_process_1 = require("child_process");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const enquirer_1 = require("enquirer");
+const devkit_1 = require("@nx/devkit");
 const version_pattern_utils_1 = require("./version-pattern-utils");
 const DEFAULT_VERSION_SCHEMES = {
     production: '{currentDate|YYMM.DD}.{shortCommitSha}',
@@ -91,5 +92,10 @@ function getImageReference(projectRoot, repositoryName, registry) {
     return imageRef;
 }
 function getDefaultImageReference(projectRoot) {
-    return projectRoot.replace(/^[\\/]/, '').replace(/[\\/\s]+/g, '-');
+    const root = projectRoot === '.' ? devkit_1.workspaceRoot : projectRoot;
+    const normalized = root
+        .replace(/^[\\/]/, '')
+        .replace(/[\\/\s]+/g, '-')
+        .toLowerCase();
+    return normalized.length > 128 ? normalized.slice(-128) : normalized;
 }