@nx/node 19.1.0-beta.0 → 19.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "19.1.0-beta.0",
+  "version": "19.1.0-beta.2",
   "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": "19.1.0-beta.0",
-    "@nx/jest": "19.1.0-beta.0",
-    "@nx/js": "19.1.0-beta.0",
-    "@nx/eslint": "19.1.0-beta.0",
-    "@nrwl/node": "19.1.0-beta.0"
+    "@nx/devkit": "19.1.0-beta.2",
+    "@nx/jest": "19.1.0-beta.2",
+    "@nx/js": "19.1.0-beta.2",
+    "@nx/eslint": "19.1.0-beta.2",
+    "@nrwl/node": "19.1.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

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,
@@ -63,11 +64,13 @@ async function e2eProjectGeneratorInternal(host, _options) {
             };
         });
     }
+    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) {
@@ -86,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/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,18 +14,33 @@ function normalizeOptions(tree, setupOptions) {
     };
 }
 function addDocker(tree, options) {
-    const project = (0, devkit_1.readProjectConfiguration)(tree, options.project);
-    if (!project || !options.targetName) {
+    // 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;
     }
-    if (tree.exists((0, devkit_1.joinPathFragments)(project.root, 'DockerFile'))) {
-        devkit_1.logger.info(`Skipping setup since a Dockerfile already exists inside ${project.root}`);
+    // 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 = project.targets[`${options.buildTarget}`]?.options.outputPath;
-        (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), project.root, {
+        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: project.sourceRoot,
+            app: projectConfig.sourceRoot,
             buildLocation: outputPath,
             project: options.project,
         });