@nx/node 0.0.0-pr-32149-2d2cbf3 → 0.0.0-pr-32117-f006df9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "0.0.0-pr-32149-2d2cbf3",
+  "version": "0.0.0-pr-32117-f006df9",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,15 +32,16 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-32149-2d2cbf3",
-    "@nx/jest": "0.0.0-pr-32149-2d2cbf3",
-    "@nx/js": "0.0.0-pr-32149-2d2cbf3",
-    "@nx/eslint": "0.0.0-pr-32149-2d2cbf3",
+    "@nx/devkit": "0.0.0-pr-32117-f006df9",
+    "@nx/jest": "0.0.0-pr-32117-f006df9",
+    "@nx/js": "0.0.0-pr-32117-f006df9",
+    "@nx/eslint": "0.0.0-pr-32117-f006df9",
+    "@nx/docker": "0.0.0-pr-32117-f006df9",
     "tcp-port-used": "^1.0.2",
     "kill-port": "^1.6.1"
   },
   "devDependencies": {
-    "nx": "0.0.0-pr-32149-2d2cbf3"
+    "nx": "0.0.0-pr-32117-f006df9"
   },
   "publishConfig": {
     "access": "public"

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

@@ -1 +1 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA+K5E;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwClC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAgL5E;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/application/application.js

@@ -167,6 +167,7 @@ async function applicationGeneratorInternal(tree, schema) {
             ...options,
             project: options.name,
             skipFormat: true,
+            skipDockerPlugin: options.skipDockerPlugin ?? false,
         });
         tasks.push(dockerTask);
     }

package/src/generators/application/lib/create-targets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-targets.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CA+BrB;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CAqCrB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAuB7E;AAED,wBAAgB,yBAAyB,IAAI,mBAAmB,CAa/D;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG;IACpD,KAAK,EAAE,mBAAmB,CAAC;IAC3B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,wBAAwB,EAAE,mBAAmB,CAAC;CAC/C,CAsBA"}
+{"version":3,"file":"create-targets.d.ts","sourceRoot":"","sources":["../../../../../../../packages/node/src/generators/application/lib/create-targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,IAAI,EACJ,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CA+BrB;AAED,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,gBAAgB,GACxB,mBAAmB,CAqCrB;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,gBAAgB,GAAG,mBAAmB,CAuB7E;AAED,wBAAgB,yBAAyB,IAAI,mBAAmB,CAa/D;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG;IACpD,KAAK,EAAE,mBAAmB,CAAC;IAC3B,gBAAgB,EAAE,mBAAmB,CAAC;IACtC,wBAAwB,EAAE,mBAAmB,CAAC;CAC/C,CAwBA"}

package/src/generators/application/lib/create-targets.js

@@ -109,6 +109,7 @@ function getNestWebpackBuildConfig() {
 function getPruneTargets(buildTarget) {
     return {
         'prune-lockfile': {
+            dependsOn: ['build'],
             cache: true,
             executor: '@nx/js:prune-lockfile',
             options: {
@@ -116,6 +117,7 @@ function getPruneTargets(buildTarget) {
             },
         },
         'copy-workspace-modules': {
+            dependsOn: ['build'],
             cache: true,
             executor: '@nx/js:copy-workspace-modules',
             options: {

package/src/generators/application/schema.d.ts

@@ -22,6 +22,7 @@ export interface Schema {
   port?: number;
   rootProject?: boolean;
   docker?: boolean;
+  skipDockerPlugin?: boolean;
   isNest?: boolean;
   addPlugin?: boolean;
   useTsSolution?: boolean;

package/src/generators/application/schema.json

@@ -124,6 +124,11 @@
       "type": "boolean",
       "description": "Add a docker build target"
     },
+    "skipDockerPlugin": {
+      "type": "boolean",
+      "description": "Skip the @nx/docker plugin and use the legacy docker build target instead.",
+      "default": false
+    },
     "useProjectJson": {
       "type": "boolean",
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."

package/src/generators/setup-docker/files/Dockerfile__tmpl__

@@ -1,9 +1,11 @@
 # This file is generated by Nx.
-#
-# Build the docker image with `npx nx docker-build <%= project %>`.
-# Tip: Modify "docker-build" options in project.json to change docker build args.
-#
+# Build the docker image with `npx nx docker:build <%= project %>`.
+# Tip: Modify "docker:build" options in project.json to change docker build args.
+#<% if (skipDockerPlugin) { %>
 # Run the container with `docker run -p 3000:3000 -t <%= sanitizedProjectName %>`.
+#<% } else { %>
+# Run the container with `nx docker:run <%= project %> -p 3000:3000`.
+#<% } %>
 FROM docker.io/node:lts-alpine
 
 ENV HOST=0.0.0.0
@@ -15,7 +17,7 @@ RUN addgroup --system <%= sanitizedProjectName %> && \
           adduser --system -G <%= sanitizedProjectName %> <%= sanitizedProjectName %>
 
 COPY <%= buildLocation %> <%= sanitizedProjectName %>/
-COPY <%= projectPath %>/package.json <%= sanitizedProjectName %>/
+<% if (skipDockerPlugin) { %>COPY <%= projectPath %>/package.json <%= sanitizedProjectName %>/<% } else { %>COPY package.json <%= sanitizedProjectName %>/<% } %>
 RUN chown -R <%= sanitizedProjectName %>:<%= sanitizedProjectName %> .
 
 # You can remove this install step if you build with `--bundle` option.

package/src/generators/setup-docker/schema.d.ts

@@ -4,4 +4,5 @@ export interface SetUpDockerOptions {
   buildTarget?: string;
   skipFormat?: boolean;
   outputPath: string;
+  skipDockerPlugin?: boolean;
 }

package/src/generators/setup-docker/schema.json

@@ -18,7 +18,7 @@
     "targetName": {
       "description": "The name of the target to create",
       "type": "string",
-      "default": "docker-build"
+      "default": "docker:build"
     },
     "buildTargetName": {
       "description": "The name of the build target",
@@ -28,6 +28,11 @@
     "outputPath": {
       "description": "The output path for the node application",
       "type": "string"
+    },
+    "skipDockerPlugin": {
+      "type": "boolean",
+      "description": "Skip the @nx/docker plugin and use the legacy docker build target instead.",
+      "default": false
     }
   }
 }

package/src/generators/setup-docker/setup-docker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-docker.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/setup-docker/setup-docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAKjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAmD9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAe1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAajC;AAED,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"setup-docker.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/setup-docker/setup-docker.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAEL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AA4E9C,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,QAqB1E;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,kBAAkB,8BAcjC;AAED,eAAe,oBAAoB,CAAC"}

package/src/generators/setup-docker/setup-docker.js

@@ -3,13 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateProjectConfig = updateProjectConfig;
 exports.setupDockerGenerator = setupDockerGenerator;
 const devkit_1 = require("@nx/devkit");
+const generators_1 = require("@nx/docker/generators");
 const path_1 = require("path");
 function normalizeOptions(tree, setupOptions) {
     return {
         ...setupOptions,
         project: setupOptions.project ?? (0, devkit_1.readNxJson)(tree).defaultProject,
-        targetName: setupOptions.targetName ?? 'docker-build',
+        targetName: setupOptions.targetName ?? 'docker:build',
         buildTarget: setupOptions.buildTarget ?? 'build',
+        skipDockerPlugin: setupOptions.skipDockerPlugin ?? false,
     };
 }
 function sanitizeProjectName(projectName) {
@@ -20,7 +22,11 @@ function sanitizeProjectName(projectName) {
         .replace(/-+/g, '-')
         .replace(/^-|-$/g, '');
 }
-function addDocker(tree, options) {
+async function addDocker(tree, options) {
+    let installTask = () => { };
+    if (!options.skipDockerPlugin) {
+        installTask = await (0, generators_1.initGenerator)(tree, { skipFormat: true });
+    }
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
     const outputPath = projectConfig.targets[options.buildTarget]?.options['outputPath'];
     if (!projectConfig) {
@@ -30,29 +36,58 @@ function addDocker(tree, options) {
         throw new Error(`The output path for the project ${options.project} is not defined. Please provide it as an option to the generator.`);
     }
     const sanitizedProjectName = sanitizeProjectName(options.project);
+    const finalOutputPath = options.outputPath ?? outputPath;
+    // Calculate build location based on skipDockerPlugin flag
+    let buildLocation;
+    if (options.skipDockerPlugin) {
+        // Legacy mode: use workspace-relative paths
+        buildLocation = finalOutputPath;
+    }
+    else {
+        // New mode: use project-relative paths
+        // Remove the project root prefix from the output path
+        const projectRootWithSlash = projectConfig.root + '/';
+        buildLocation = finalOutputPath.startsWith(projectRootWithSlash)
+            ? finalOutputPath.substring(projectRootWithSlash.length)
+            : finalOutputPath.startsWith(projectConfig.root)
+                ? finalOutputPath.substring(projectConfig.root.length)
+                : 'dist';
+    }
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectConfig.root, {
         tmpl: '',
-        buildLocation: options.outputPath ?? outputPath,
+        buildLocation,
         project: options.project,
         projectPath: projectConfig.root,
         sanitizedProjectName,
+        skipDockerPlugin: options.skipDockerPlugin,
     });
+    return installTask;
 }
 function updateProjectConfig(tree, options) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    // Use sanitized project name for Docker image tag
-    const sanitizedProjectName = sanitizeProjectName(options.project);
-    projectConfig.targets[`${options.targetName}`] = {
-        dependsOn: [`${options.buildTarget}`],
-        command: `docker build -f ${(0, devkit_1.joinPathFragments)(projectConfig.root, 'Dockerfile')} . -t ${sanitizedProjectName}`,
-    };
+    if (options.skipDockerPlugin) {
+        // Use sanitized project name for Docker image tag
+        const sanitizedProjectName = sanitizeProjectName(options.project);
+        projectConfig.targets[`${options.targetName}`] = {
+            dependsOn: [`${options.buildTarget}`, 'prune'],
+            command: `docker build . -t ${sanitizedProjectName}`,
+            options: {
+                cwd: projectConfig.root,
+            },
+        };
+    }
+    else {
+        projectConfig.targets[`${options.targetName}`] = {
+            dependsOn: [`${options.buildTarget}`, 'prune'],
+        };
+    }
     (0, devkit_1.updateProjectConfiguration)(tree, options.project, projectConfig);
 }
 async function setupDockerGenerator(tree, setupOptions) {
     const tasks = [];
     const options = normalizeOptions(tree, setupOptions);
-    // Should check if the node project exists
-    addDocker(tree, options);
+    const installTask = await addDocker(tree, options);
+    tasks.push(installTask);
     updateProjectConfig(tree, options);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);