@nx/node 0.0.0-pr-22179-271588f → 0.0.0-pr-26482-ebe2dba

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "0.0.0-pr-22179-271588f",
+  "version": "0.0.0-pr-26482-ebe2dba",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -14,9 +14,10 @@
     "Nest",
     "Jest",
     "Cypress",
-    "CLI"
+    "CLI",
+    "Backend"
   ],
-  "main": "./index.js",
+  "main": "./index",
   "typings": "./index.d.ts",
   "author": "Victor Savkin",
   "license": "MIT",
@@ -31,11 +32,11 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "0.0.0-pr-22179-271588f",
-    "@nx/jest": "0.0.0-pr-22179-271588f",
-    "@nx/js": "0.0.0-pr-22179-271588f",
-    "@nx/eslint": "0.0.0-pr-22179-271588f",
-    "@nrwl/node": "0.0.0-pr-22179-271588f"
+    "@nx/devkit": "0.0.0-pr-26482-ebe2dba",
+    "@nx/jest": "0.0.0-pr-26482-ebe2dba",
+    "@nx/js": "0.0.0-pr-26482-ebe2dba",
+    "@nx/eslint": "0.0.0-pr-26482-ebe2dba",
+    "@nrwl/node": "0.0.0-pr-26482-ebe2dba"
   },
   "publishConfig": {
     "access": "public"

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

@@ -3,6 +3,7 @@ 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: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
+            outputPath: options.outputPath,
             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: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
+            outputPath: options.outputPath,
             // 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: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : options.appProjectRoot),
+                outputPath: options.outputPath,
                 main: './src/main' + (options.js ? '.js' : '.ts'),
                 tsConfig: './tsconfig.app.json',
                 assets: ['./src/assets'],
@@ -407,6 +407,7 @@ 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/application/files/common/webpack.config.js__tmpl__

@@ -1,5 +1,5 @@
 <% if (webpackPluginOptions) { %>
-const { NxWebpackPlugin } = require('@nx/webpack');
+const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 const { join } = require('path');
 
 module.exports = {
@@ -7,7 +7,7 @@ module.exports = {
     path: join(__dirname, '<%= offset %><%= webpackPluginOptions.outputPath %>'),
   },
   plugins: [
-    new NxWebpackPlugin({
+    new NxAppWebpackPlugin({
       target: 'node',
       compiler: 'tsc',
       main: '<%= webpackPluginOptions.main %>',

package/src/generators/e2e-project/e2e-project.js

@@ -9,6 +9,7 @@ const path = require("path");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
 const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
+const config_file_1 = require("@nx/jest/src/utils/config/config-file");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
@@ -34,14 +35,42 @@ async function e2eProjectGeneratorInternal(host, _options) {
                     jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
                     passWithNoTests: true,
                 },
+                dependsOn: [`${options.project}:build`],
             },
         },
     });
+    // TODO(@nicholas): Find a better way to get build target
+    // We remove the 'test' target from the e2e project because it is not needed
+    // The 'e2e' target is the one that should run the tests for the e2e project
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const hasPlugin = nxJson.plugins?.some((p) => {
+        if (typeof p !== 'string' && p.plugin === '@nx/jest/plugin') {
+            return true;
+        }
+    });
+    if (hasPlugin) {
+        (0, devkit_1.updateJson)(host, 'nx.json', (json) => {
+            return {
+                ...json,
+                plugins: json.plugins?.map((p) => {
+                    if (typeof p !== 'string' && p.plugin === '@nx/jest/plugin') {
+                        return {
+                            ...p,
+                            exclude: [...(p.exclude || []), `${options.e2eProjectRoot}/**/*`],
+                        };
+                    }
+                    return p;
+                }),
+            };
+        });
+    }
+    const jestPreset = (0, config_file_1.findRootJestPreset)(host) ?? 'jest.preset.js';
     if (options.projectType === 'server') {
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/server/common'), options.e2eProjectRoot, {
             ...options,
             ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            jestPreset,
             tmpl: '',
         });
         if (options.isNest) {
@@ -60,6 +89,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             ...(0, devkit_1.names)(options.rootProject ? 'cli' : options.project),
             mainFile,
             offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            jestPreset,
             tmpl: '',
         });
     }

package/src/generators/e2e-project/files/cli/jest.config.ts__tmpl__

@@ -1,7 +1,7 @@
 /* eslint-disable */
 export default {
   displayName: '<%= e2eProjectName %>',
-  preset: '<%= offsetFromRoot %>/jest.preset.js',
+  preset: '<%= offsetFromRoot %><%= jestPreset %>',
   setupFiles: ['<rootDir>/src/test-setup.ts'],
   testEnvironment: 'node',
   transform: {
@@ -10,5 +10,5 @@ export default {
     }],
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '<%= offsetFromRoot %>/coverage/<%= e2eProjectName %>',
+  coverageDirectory: '<%= offsetFromRoot %>coverage/<%= e2eProjectName %>',
 };

package/src/generators/e2e-project/files/server/common/jest.config.ts__tmpl__

@@ -1,7 +1,7 @@
 /* eslint-disable */
 export default {
   displayName: '<%= e2eProjectName %>',
-  preset: '<%= offsetFromRoot %>jest.preset.js',
+  preset: '<%= offsetFromRoot %><%= jestPreset %>',
   globalSetup: '<rootDir>/src/support/global-setup.ts',
   globalTeardown: '<rootDir>/src/support/global-teardown.ts',
   setupFiles: ['<rootDir>/src/support/test-setup.ts'],

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

@@ -14,7 +14,7 @@ WORKDIR /app
 RUN addgroup --system <%= project %> && \
           adduser --system -G <%= project %> <%= project %>
 
-COPY <%= buildLocation %> <%= project %>
+COPY <%= buildLocation %> <%= project %>/
 RUN chown -R <%= project %>:<%= project %> .
 
 # You can remove this install step if you build with `--bundle` option.

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

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

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

@@ -24,6 +24,10 @@
       "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

@@ -12,22 +12,15 @@ function normalizeOptions(tree, setupOptions) {
     };
 }
 function addDocker(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (!project || !options.targetName) {
-        return;
-    }
-    if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'DockerFile'))) {
-        devkit_1.logger.info(`Skipping setup since a Dockerfile already exists inside ${project.root}`);
-    }
-    else {
-        const outputPath = project.targets[`${options.buildTarget}`]?.options.outputPath;
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
-            tmpl: '',
-            app: project.sourceRoot,
-            buildLocation: outputPath,
-            project: options.project,
-        });
+    const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, options.project);
+    if (!projectConfig) {
+        throw new Error(`Cannot find project configuration for ${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);