@nx/node 19.2.2 → 19.3.0-canary.20240606-bccb2c5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "19.2.2",
+  "version": "19.3.0-canary.20240606-bccb2c5",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -32,11 +32,11 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.2.2",
-    "@nx/jest": "19.2.2",
-    "@nx/js": "19.2.2",
-    "@nx/eslint": "19.2.2",
-    "@nrwl/node": "19.2.2"
+    "@nx/devkit": "19.3.0-canary.20240606-bccb2c5",
+    "@nx/jest": "19.3.0-canary.20240606-bccb2c5",
+    "@nx/js": "19.3.0-canary.20240606-bccb2c5",
+    "@nx/eslint": "19.3.0-canary.20240606-bccb2c5",
+    "@nrwl/node": "19.3.0-canary.20240606-bccb2c5"
   },
   "publishConfig": {
     "access": "public"

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

@@ -3,7 +3,6 @@ import { Schema } from './schema';
 export interface NormalizedSchema extends Schema {
     appProjectRoot: string;
     parsedTags: string[];
-    outputPath: string;
 }
 export declare function addLintingToApplication(tree: Tree, options: NormalizedSchema): Promise<GeneratorCallback>;
 export declare function applicationGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;

package/src/generators/application/application.js

@@ -23,7 +23,7 @@ function getWebpackBuildConfig(project, options) {
         options: {
             target: 'node',
             compiler: 'tsc',
-            outputPath: options.outputPath,
+            outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
             main: (0, devkit_1.joinPathFragments)(project.sourceRoot, 'main' + (options.js ? '.js' : '.ts')),
             tsConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json'),
             assets: [(0, devkit_1.joinPathFragments)(project.sourceRoot, 'assets')],
@@ -44,7 +44,7 @@ function getEsBuildConfig(project, options) {
         defaultConfiguration: 'production',
         options: {
             platform: 'node',
-            outputPath: options.outputPath,
+            outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
             // Use CJS for Node apps for widest compatibility.
             format: ['cjs'],
             bundle: false,
@@ -120,7 +120,7 @@ function addAppFiles(tree, options) {
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
         webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
             ? {
-                outputPath: options.outputPath,
+                outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
                 main: './src/main' + (options.js ? '.js' : '.ts'),
                 tsConfig: './tsconfig.app.json',
                 assets: ['./src/assets'],
@@ -407,7 +407,6 @@ async function normalizeOptions(host, options) {
         unitTestRunner: options.unitTestRunner ?? 'jest',
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,
-        outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
     };
 }
 exports.default = applicationGenerator;

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

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

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

@@ -24,10 +24,6 @@
       "description": "The name of the build target",
       "type": "string",
       "default": "build"
-    },
-    "outputPath": {
-      "description": "The output path for the node application",
-      "type": "string"
     }
   }
 }

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupDockerGenerator = exports.updateProjectConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const utils_1 = require("nx/src/tasks-runner/utils");
+const project_graph_1 = require("nx/src/project-graph/project-graph");
 function normalizeOptions(tree, setupOptions) {
     return {
         ...setupOptions,
@@ -12,15 +14,37 @@ function normalizeOptions(tree, setupOptions) {
     };
 }
 function addDocker(tree, options) {
-    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (!projectConfig) {
-        throw new Error(`Cannot find project configuration for ${options.project}`);
+    // Inferred targets are only available in the project graph
+    const projectConfig = (0, project_graph_1.readCachedProjectConfiguration)(options.project);
+    if (!projectConfig ||
+        !projectConfig.targets ||
+        !projectConfig.targets[options.buildTarget]) {
+        return;
+    }
+    // Returns an string like {workspaceRoot}/dist/apps/{projectName}
+    // Non crystalized projects would return {options.outputPath}
+    const tokenizedOutputPath = projectConfig.targets[`${options.buildTarget}`]?.outputs?.[0];
+    const maybeBuildOptions = projectConfig.targets[`${options.buildTarget}`]?.options;
+    if (tree.exists((0, devkit_1.joinPathFragments)(projectConfig.root, 'DockerFile'))) {
+        devkit_1.logger.info(`Skipping setup since a Dockerfile already exists inside ${projectConfig.root}`);
+    }
+    else if (!tokenizedOutputPath) {
+        devkit_1.logger.error(`Skipping setup since the output path for the build target ${options.buildTarget} is not defined.`);
+    }
+    else {
+        const outputPath = (0, utils_1.interpolate)(tokenizedOutputPath, {
+            projectName: projectConfig.name,
+            projectRoot: projectConfig.root,
+            workspaceRoot: '',
+            options: maybeBuildOptions || '',
+        });
+        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectConfig.root, {
+            tmpl: '',
+            app: projectConfig.sourceRoot,
+            buildLocation: outputPath,
+            project: options.project,
+        });
     }
-    (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectConfig.root, {
-        tmpl: '',
-        buildLocation: options.outputPath,
-        project: options.project,
-    });
 }
 function updateProjectConfig(tree, options) {
     let projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);