@nx/node 20.4.4 → 20.5.0-beta.1

package/package.json

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

package/src/generators/application/application.js

@@ -166,9 +166,7 @@ function addAppFiles(tree, options) {
         rootTsConfigPath: (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot),
         webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
             ? {
-                outputPath: options.isUsingTsSolutionConfig
-                    ? 'dist'
-                    : (0, devkit_1.joinPathFragments)((0, devkit_1.offsetFromRoot)(options.appProjectRoot), 'dist', options.rootProject ? options.name : options.appProjectRoot),
+                outputPath: options.outputPath,
                 main: './src/main' + (options.js ? '.js' : '.ts'),
                 tsConfig: './tsconfig.app.json',
                 assets: ['./src/assets'],
@@ -484,9 +482,7 @@ async function normalizeOptions(host, options) {
         unitTestRunner: options.unitTestRunner ?? 'jest',
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,
-        outputPath: isUsingTsSolutionConfig
-            ? (0, devkit_1.joinPathFragments)(appProjectRoot, 'dist')
-            : (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
+        outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
         isUsingTsSolutionConfig,
         swcJest,
     };

package/src/generators/application/files/common/webpack.config.js__tmpl__

@@ -4,7 +4,7 @@ const { join } = require('path');
 
 module.exports = {
   output: {
-    path: join(__dirname, '<%= webpackPluginOptions.outputPath %>'),
+    path: join(__dirname, '<%= offset %><%= webpackPluginOptions.outputPath %>'),
   },
   plugins: [
     new NxAppWebpackPlugin({

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

@@ -14,6 +14,7 @@ const config_file_1 = require("@nx/jest/src/utils/config/config-file");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 const get_import_path_1 = require("@nx/js/src/utils/get-import-path");
 const posix_1 = require("node:path/posix");
+const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
         addPlugin: false,
@@ -96,13 +97,19 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const tsConfigFile = isUsingTsSolutionConfig
         ? 'tsconfig.json'
         : 'tsconfig.spec.json';
+    const rootOffset = (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot);
+    const coverageDirectory = isUsingTsSolutionConfig
+        ? 'test-output/jest/coverage'
+        : (0, devkit_1.joinPathFragments)(rootOffset, 'coverage', options.e2eProjectName);
     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),
             tsConfigFile,
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            offsetFromRoot: rootOffset,
             jestPreset,
+            coverageDirectory,
+            isUsingTsSolutionConfig,
             tmpl: '',
         });
         if (options.isNest) {
@@ -110,7 +117,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
                 ...options,
                 ...(0, devkit_1.names)(options.rootProject ? 'server' : options.project),
                 tsConfigFile,
-                offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+                offsetFromRoot: rootOffset,
                 tmpl: '',
             });
         }
@@ -122,23 +129,26 @@ async function e2eProjectGeneratorInternal(host, _options) {
             ...(0, devkit_1.names)(options.rootProject ? 'cli' : options.project),
             mainFile,
             tsConfigFile,
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            offsetFromRoot: rootOffset,
             jestPreset,
+            coverageDirectory,
+            isUsingTsSolutionConfig,
             tmpl: '',
         });
     }
     if (isUsingTsSolutionConfig) {
+        (0, add_swc_config_1.addSwcTestConfig)(host, options.e2eProjectRoot, 'es6');
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/ts-solution'), options.e2eProjectRoot, {
             ...options,
             relativeProjectReferencePath: (0, posix_1.relative)(options.e2eProjectRoot, appProject.root),
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            offsetFromRoot: rootOffset,
             tmpl: '',
         });
     }
     else {
         (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files/non-ts-solution'), options.e2eProjectRoot, {
             ...options,
-            offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot),
+            offsetFromRoot: rootOffset,
             tmpl: '',
         });
     }

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

@@ -1,13 +1,26 @@
+<%_ if (isUsingTsSolutionConfig) { _%>
+/* eslint-disable */
+import { readFileSync } from 'fs';
+
+// Reading the SWC compilation config for the spec files
+const swcJestConfig = JSON.parse(
+  readFileSync(`${__dirname}/.spec.swcrc`, 'utf-8')
+);
+
+// Disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves
+swcJestConfig.swcrc = false;
+
+<%_ } _%>
 export default {
   displayName: '<%= e2eProjectName %>',
   preset: '<%= offsetFromRoot %><%= jestPreset %>',
   setupFiles: ['<rootDir>/src/test-setup.ts'],
   testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]s$': ['ts-jest', {
+    '^.+\\.[tj]s$': <% if (isUsingTsSolutionConfig) { %>['@swc/jest', swcJestConfig]<% } else { %>['ts-jest', {
       tsconfig: '<rootDir>/<%= tsConfigFile %>',
-    }],
+    }]<% } %>,
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '<%= offsetFromRoot %>coverage/<%= e2eProjectName %>',
+  coverageDirectory: '<%= coverageDirectory %>',
 };

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

@@ -1,3 +1,16 @@
+<%_ if (isUsingTsSolutionConfig) { _%>
+/* eslint-disable */
+import { readFileSync } from 'fs';
+
+// Reading the SWC compilation config for the spec files
+const swcJestConfig = JSON.parse(
+  readFileSync(`${__dirname}/.spec.swcrc`, 'utf-8')
+);
+
+// Disable .swcrc look-up by SWC core because we're passing in swcJestConfig ourselves
+swcJestConfig.swcrc = false;
+
+<%_ } _%>
 export default {
   displayName: '<%= e2eProjectName %>',
   preset: '<%= offsetFromRoot %><%= jestPreset %>',
@@ -6,10 +19,10 @@ export default {
   setupFiles: ['<rootDir>/src/support/test-setup.ts'],
   testEnvironment: 'node',
   transform: {
-    '^.+\\.[tj]s$': ['ts-jest', {
+    '^.+\\.[tj]s$': <% if (isUsingTsSolutionConfig) { %>['@swc/jest', swcJestConfig]<% } else { %>['ts-jest', {
       tsconfig: '<rootDir>/<%= tsConfigFile %>',
-    }],
+    }]<% } %>,
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
-  coverageDirectory: '<%= offsetFromRoot %>coverage/<%= e2eProjectName %>',
+  coverageDirectory: '<%= coverageDirectory %>',
 };