@nx/node 0.0.0-pr-29750-cc9549c → 0.0.0-pr-29860-43e1fcb

package/migrations.json

@@ -18,6 +18,35 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "20.4.0": {
+      "version": "20.4.0-beta.3",
+      "packages": {
+        "fastify": {
+          "version": "~5.2.1",
+          "alwaysAddToPackageJson": false
+        },
+        "fastify-plugin": {
+          "version": "~5.0.1",
+          "alwaysAddToPackageJson": false
+        },
+        "@fastify/autoload": {
+          "version": "~6.0.3",
+          "alwaysAddToPackageJson": false
+        },
+        "@fastify/sensible": {
+          "version": "~6.0.2",
+          "alwaysAddToPackageJson": false
+        },
+        "express": {
+          "version": "^4.21.2",
+          "alwaysAddToPackageJson": false
+        },
+        "@types/express": {
+          "version": "^4.17.21",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "0.0.0-pr-29750-cc9549c",
+  "version": "0.0.0-pr-29860-43e1fcb",
   "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": "0.0.0-pr-29750-cc9549c",
-    "@nx/jest": "0.0.0-pr-29750-cc9549c",
-    "@nx/js": "0.0.0-pr-29750-cc9549c",
-    "@nx/eslint": "0.0.0-pr-29750-cc9549c"
+    "@nx/devkit": "0.0.0-pr-29860-43e1fcb",
+    "@nx/jest": "0.0.0-pr-29860-43e1fcb",
+    "@nx/js": "0.0.0-pr-29860-43e1fcb",
+    "@nx/eslint": "0.0.0-pr-29860-43e1fcb"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -467,6 +467,8 @@ async function normalizeOptions(host, options) {
     const nxJson = (0, devkit_1.readNxJson)(host);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const swcJest = options.swcJest ?? isUsingTsSolutionConfig;
     return {
         addPlugin,
         ...options,
@@ -481,7 +483,8 @@ async function normalizeOptions(host, options) {
         rootProject: options.rootProject ?? false,
         port: options.port ?? 3000,
         outputPath: (0, devkit_1.joinPathFragments)('dist', options.rootProject ? options.name : appProjectRoot),
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host),
+        isUsingTsSolutionConfig,
+        swcJest,
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/schema.json

@@ -69,8 +69,7 @@
     },
     "swcJest": {
       "type": "boolean",
-      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation.",
-      "default": false
+      "description": "Use `@swc/jest` instead `ts-jest` for faster test compilation."
     },
     "babelJest": {
       "type": "boolean",

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 %>',
 };

package/src/generators/e2e-project/files/ts-solution/tsconfig.json__tmpl__

@@ -10,7 +10,5 @@
     "jest.config.ts",
     "src/**/*.ts"
   ],
-  "references": [
-   { "path": "<%= relativeProjectReferencePath %>" }
-  ]
+  "references": []
 }

package/src/generators/library/library.js

@@ -22,6 +22,11 @@ async function libraryGenerator(tree, schema) {
 }
 async function libraryGeneratorInternal(tree, schema) {
     const options = await normalizeOptions(tree, schema);
+    // If we are using the new TS solution
+    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
+    if (options.isUsingTsSolutionConfig) {
+        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+    }
     const tasks = [];
     if (options.publishable === true && !schema.importPath) {
         throw new Error(`For publishable libs you have to provide a proper "--importPath" which needs to be a valid npm package name (e.g. my-awesome-lib or @myorg/my-lib)`);
@@ -62,11 +67,6 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.isUsingTsSolutionConfig) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
     }
-    // If we are using the new TS solution
-    // We need to update the workspace file (package.json or pnpm-workspaces.yaml) to include the new project
-    if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
-    }
     (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -92,14 +92,17 @@ async function normalizeOptions(tree, options) {
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];
+    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
     return {
         ...options,
         fileName,
-        projectName,
+        projectName: isUsingTsSolutionConfig
+            ? (0, get_import_path_1.getImportPath)(tree, projectName)
+            : projectName,
         projectRoot,
         parsedTags,
         importPath,
-        isUsingTsSolutionConfig: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree),
+        isUsingTsSolutionConfig,
     };
 }
 function createFiles(tree, options) {

package/src/utils/versions.d.ts

@@ -1,12 +1,12 @@
 export declare const nxVersion: any;
 export declare const tslibVersion = "^2.3.0";
 export declare const typesNodeVersion = "~18.16.9";
-export declare const expressVersion = "~4.18.1";
-export declare const expressTypingsVersion = "~4.17.13";
+export declare const expressVersion = "^4.21.2";
+export declare const expressTypingsVersion = "^4.17.21";
 export declare const koaVersion = "~2.14.1";
 export declare const koaTypingsVersion = "~2.13.5";
-export declare const fastifyVersion = "~4.13.0";
-export declare const fastifyAutoloadVersion = "~5.7.1";
-export declare const fastifySensibleVersion = "~5.2.0";
-export declare const fastifyPluginVersion = "~4.5.0";
+export declare const fastifyVersion = "~5.2.1";
+export declare const fastifyAutoloadVersion = "~6.0.3";
+export declare const fastifySensibleVersion = "~6.0.2";
+export declare const fastifyPluginVersion = "~5.0.1";
 export declare const axiosVersion = "^1.6.0";

package/src/utils/versions.js

@@ -4,12 +4,12 @@ exports.axiosVersion = exports.fastifyPluginVersion = exports.fastifySensibleVer
 exports.nxVersion = require('../../package.json').version;
 exports.tslibVersion = '^2.3.0';
 exports.typesNodeVersion = '~18.16.9';
-exports.expressVersion = '~4.18.1';
-exports.expressTypingsVersion = '~4.17.13';
+exports.expressVersion = '^4.21.2';
+exports.expressTypingsVersion = '^4.17.21';
 exports.koaVersion = '~2.14.1';
 exports.koaTypingsVersion = '~2.13.5';
-exports.fastifyVersion = '~4.13.0';
-exports.fastifyAutoloadVersion = '~5.7.1';
-exports.fastifySensibleVersion = '~5.2.0';
-exports.fastifyPluginVersion = '~4.5.0';
+exports.fastifyVersion = '~5.2.1';
+exports.fastifyAutoloadVersion = '~6.0.3';
+exports.fastifySensibleVersion = '~6.0.2';
+exports.fastifyPluginVersion = '~5.0.1';
 exports.axiosVersion = '^1.6.0';