@nx/node 23.0.0-beta.15 → 23.0.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "23.0.0-beta.15",
+  "version": "23.0.0-beta.17",
   "private": false,
   "description": "The Node Plugin for Nx contains generators to manage Node applications within an Nx workspace.",
   "repository": {
@@ -33,16 +33,16 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-beta.15",
-    "@nx/jest": "23.0.0-beta.15",
-    "@nx/js": "23.0.0-beta.15",
-    "@nx/eslint": "23.0.0-beta.15",
-    "@nx/docker": "23.0.0-beta.15",
+    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/jest": "23.0.0-beta.17",
+    "@nx/js": "23.0.0-beta.17",
+    "@nx/eslint": "23.0.0-beta.17",
+    "@nx/docker": "23.0.0-beta.17",
     "tcp-port-used": "^1.0.2",
     "kill-port": "^1.6.1"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.15"
+    "nx": "23.0.0-beta.17"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/e2e-project/e2e-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"e2e-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/e2e-project/e2e-project.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAgBlC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAMpE;AAED,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,8BAyPjB;AAgDD,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"e2e-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/e2e-project/e2e-project.ts"],"names":[],"mappings":"AAIA,OAAO,EAKL,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAalC,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,8BAMpE;AAED,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,IAAI,EACV,QAAQ,EAAE,MAAM,8BAyPjB;AAgDD,eAAe,mBAAmB,CAAC"}

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

@@ -6,13 +6,11 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const eslint_1 = require("@nx/eslint");
-const global_eslint_config_1 = require("@nx/eslint/src/generators/init/global-eslint-config");
+const internal_2 = require("@nx/eslint/internal");
 const path = tslib_1.__importStar(require("path"));
 const versions_1 = require("../../utils/versions");
-const eslint_file_1 = require("@nx/eslint/src/generators/utils/eslint-file");
-const config_file_1 = require("@nx/jest/src/utils/config/config-file");
-const versions_2 = require("@nx/jest/src/utils/versions");
-const internal_2 = require("@nx/js/internal");
+const internal_3 = require("@nx/jest/internal");
+const internal_4 = require("@nx/js/internal");
 const posix_1 = require("node:path/posix");
 async function e2eProjectGenerator(host, options) {
     return await e2eProjectGeneratorInternal(host, {
@@ -26,7 +24,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const options = await normalizeOptions(host, _options);
     const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
     // Detect Jest 30+ to use .cts config files (CommonJS TypeScript)
-    const jestMajorVersion = (0, versions_2.getInstalledJestMajorVersion)(host);
+    const jestMajorVersion = (0, internal_3.getInstalledJestMajorVersion)(host);
     const useCommonJsConfig = jestMajorVersion === null || jestMajorVersion >= 30;
     const jestConfigExt = useCommonJsConfig ? 'cts' : 'ts';
     // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
@@ -100,7 +98,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             };
         });
     }
-    const jestPreset = (0, config_file_1.findRootJestPreset)(host) ?? 'jest.preset.js';
+    const jestPreset = (0, internal_3.findRootJestPreset)(host) ?? 'jest.preset.js';
     const tsConfigFile = options.isUsingTsSolutionConfig
         ? 'tsconfig.json'
         : 'tsconfig.spec.json';
@@ -148,7 +146,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
         host.rename(jestConfigPath, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'jest.config.cts'));
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, internal_2.addSwcTestConfig)(host, options.e2eProjectRoot, 'es6');
+        (0, internal_4.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),
@@ -180,11 +178,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
             addPlugin: options.addPlugin,
         });
         tasks.push(linterTask);
-        if (options.rootProject && (0, eslint_file_1.isEslintConfigSupported)(host)) {
-            (0, eslint_file_1.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
-            (0, eslint_file_1.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
-                global_eslint_config_1.typeScriptOverride,
-                global_eslint_config_1.javaScriptOverride,
+        if (options.rootProject && (0, internal_2.isEslintConfigSupported)(host)) {
+            (0, internal_2.addPluginsToLintConfig)(host, options.e2eProjectRoot, '@nx');
+            (0, internal_2.replaceOverridesInLintConfig)(host, options.e2eProjectRoot, [
+                internal_2.typeScriptOverride,
+                internal_2.javaScriptOverride,
             ]);
         }
     }
@@ -201,7 +199,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
     // 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) {
-        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+        await (0, internal_4.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -225,7 +223,7 @@ async function normalizeOptions(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPlugin = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
-    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_4.isUsingTsSolutionSetup)(tree);
     return {
         addPlugin,
         ...options,