@nx/node 23.0.0-beta.12 → 23.0.0-beta.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/node",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.13",
   "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.12",
-    "@nx/jest": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
-    "@nx/eslint": "23.0.0-beta.12",
-    "@nx/docker": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.13",
+    "@nx/jest": "23.0.0-beta.13",
+    "@nx/js": "23.0.0-beta.13",
+    "@nx/eslint": "23.0.0-beta.13",
+    "@nx/docker": "23.0.0-beta.13",
     "tcp-port-used": "^1.0.2",
     "kill-port": "^1.6.1"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.13"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -39,8 +39,7 @@ const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const jest_1 = require("@nx/jest");
 const js_1 = require("@nx/js");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
+const internal_2 = require("@nx/js/internal");
 const versions_1 = require("../../utils/versions");
 const e2e_project_1 = require("../e2e-project/e2e-project");
 const init_1 = require("../init/init");
@@ -83,7 +82,7 @@ async function applicationGenerator(tree, schema) {
 }
 async function applicationGeneratorInternal(tree, schema) {
     const tasks = [];
-    const addTsPlugin = (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
+    const addTsPlugin = (0, internal_2.shouldConfigureTsSolutionSetup)(tree, schema.addPlugin, schema.useTsSolution);
     const jsInitTask = await (0, js_1.initGenerator)(tree, {
         ...schema,
         tsConfigName: schema.rootProject ? 'tsconfig.json' : 'tsconfig.base.json',
@@ -142,7 +141,7 @@ async function applicationGeneratorInternal(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) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     updateTsConfigOptions(tree, options);
     if (options.linter === 'eslint') {
@@ -206,14 +205,14 @@ async function applicationGeneratorInternal(tree, schema) {
         tasks.push(dockerTask);
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
+        (0, internal_2.updateTsconfigFiles)(tree, options.appProjectRoot, 'tsconfig.app.json', {
             module: 'nodenext',
             moduleResolution: 'nodenext',
         }, options.linter === 'eslint'
             ? ['eslint.config.js', 'eslint.config.cjs', 'eslint.config.mjs']
             : undefined);
     }
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.appProjectRoot);
+    (0, internal_2.sortPackageJsonFields)(tree, options.appProjectRoot);
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/src/generators/application/lib/add-dependencies.js

@@ -2,49 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProjectDependencies = addProjectDependencies;
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("@nx/js/src/utils/versions");
-const versions_2 = require("../../../utils/versions");
+const internal_1 = require("@nx/js/internal");
+const versions_1 = require("../../../utils/versions");
 function addProjectDependencies(tree, options) {
     const bundlers = {
         webpack: {
-            '@nx/webpack': versions_2.nxVersion,
+            '@nx/webpack': versions_1.nxVersion,
         },
         esbuild: {
-            '@nx/esbuild': versions_2.nxVersion,
-            esbuild: (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'esbuild') ?? versions_1.esbuildVersion,
+            '@nx/esbuild': versions_1.nxVersion,
+            esbuild: (0, devkit_1.getDependencyVersionFromPackageJson)(tree, 'esbuild') ?? internal_1.esbuildVersion,
         },
     };
     const frameworkDependencies = {
         express: {
-            express: versions_2.expressVersion,
+            express: versions_1.expressVersion,
         },
         koa: {
-            koa: versions_2.koaVersion,
+            koa: versions_1.koaVersion,
         },
         fastify: {
-            fastify: versions_2.fastifyVersion,
-            'fastify-plugin': versions_2.fastifyPluginVersion,
-            '@fastify/autoload': versions_2.fastifyAutoloadVersion,
-            '@fastify/sensible': versions_2.fastifySensibleVersion,
+            fastify: versions_1.fastifyVersion,
+            'fastify-plugin': versions_1.fastifyPluginVersion,
+            '@fastify/autoload': versions_1.fastifyAutoloadVersion,
+            '@fastify/sensible': versions_1.fastifySensibleVersion,
         },
     };
     const frameworkDevDependencies = {
         express: {
-            '@types/express': versions_2.expressTypingsVersion,
+            '@types/express': versions_1.expressTypingsVersion,
         },
         koa: {
-            '@types/koa': versions_2.koaTypingsVersion,
+            '@types/koa': versions_1.koaTypingsVersion,
         },
         fastify: {},
     };
     return {
         installTask: (0, devkit_1.addDependenciesToPackageJson)(tree, {
             ...frameworkDependencies[options.framework],
-            tslib: versions_2.tslibVersion,
+            tslib: versions_1.tslibVersion,
         }, {
             ...frameworkDevDependencies[options.framework],
             ...bundlers[options.bundler],
-            '@types/node': versions_2.typesNodeVersion,
+            '@types/node': versions_1.typesNodeVersion,
         }),
         frameworkDependencies: frameworkDependencies[options.framework],
     };

package/src/generators/application/lib/create-project.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addProject = addProject;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 const has_webpack_plugin_1 = require("../../../utils/has-webpack-plugin");
 const create_targets_1 = require("./create-targets");
 function addProject(tree, options, frameworkDependencies) {
@@ -16,14 +16,14 @@ function addProject(tree, options, frameworkDependencies) {
     };
     if (options.bundler === 'esbuild') {
         (0, internal_1.addBuildTargetDefaults)(tree, '@nx/esbuild:esbuild', 'build', [
-            ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+            internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
         ]);
         project.targets.build = (0, create_targets_1.getEsBuildConfig)(tree, project, options);
     }
     else if (options.bundler === 'webpack') {
         if (!(0, has_webpack_plugin_1.hasWebpackPlugin)(tree) && options.addPlugin === false) {
             (0, internal_1.addBuildTargetDefaults)(tree, `@nx/webpack:webpack`, 'build', [
-                ts_solution_setup_1.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
+                internal_2.TS_SOLUTION_SETUP_TSCONFIG_INPUT,
             ]);
             project.targets.build = (0, create_targets_1.getWebpackBuildConfig)(tree, project, options);
         }

package/src/generators/application/lib/create-targets.js

@@ -6,10 +6,10 @@ exports.getServeConfig = getServeConfig;
 exports.getNestWebpackBuildConfig = getNestWebpackBuildConfig;
 exports.getPruneTargets = getPruneTargets;
 const devkit_1 = require("@nx/devkit");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const js_1 = require("@nx/js");
 function getWebpackBuildConfig(tree, project, options) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     return {
         executor: `@nx/webpack:webpack`,
         outputs: ['{options.outputPath}'],
@@ -35,7 +35,7 @@ function getWebpackBuildConfig(tree, project, options) {
     };
 }
 function getEsBuildConfig(tree, project, options) {
-    const sourceRoot = (0, ts_solution_setup_1.getProjectSourceRoot)(project, tree);
+    const sourceRoot = (0, internal_1.getProjectSourceRoot)(project, tree);
     return {
         executor: '@nx/esbuild:esbuild',
         outputs: ['{options.outputPath}'],

package/src/generators/application/lib/normalize-options.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizeOptions = normalizeOptions;
 const devkit_1 = require("@nx/devkit");
 const internal_1 = require("@nx/devkit/internal");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 async function normalizeOptions(host, options) {
     await (0, internal_1.ensureRootProjectName)(options, 'application');
     const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
@@ -22,7 +22,7 @@ async function normalizeOptions(host, options) {
     const addPlugin = options.addPlugin ??
         (process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false);
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const swcJest = options.swcJest ?? isUsingTsSolutionConfig;
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;

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

@@ -12,9 +12,8 @@ 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 ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_2 = require("@nx/js/internal");
 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,
@@ -149,7 +148,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
         host.rename(jestConfigPath, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'jest.config.cts'));
     }
     if (options.isUsingTsSolutionConfig) {
-        (0, add_swc_config_1.addSwcTestConfig)(host, options.e2eProjectRoot, 'es6');
+        (0, internal_2.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),
@@ -202,7 +201,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, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -226,7 +225,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, ts_solution_setup_1.isUsingTsSolutionSetup)(tree);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree);
     return {
         addPlugin,
         ...options,

package/src/generators/library/library.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAOpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAQlC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA2ExE;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"library.d.ts","sourceRoot":"","sources":["../../../../../../packages/node/src/generators/library/library.ts"],"names":[],"mappings":"AAKA,OAAO,EAIL,iBAAiB,EAUjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAapB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,MAAM,WAAW,gBAAiB,SAAQ,MAAM;IAC9C,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,KAAK,GAAG,KAAK,CAAC;IACxB,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAMhE;AAED,wBAAsB,wBAAwB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BA2ExE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/library/library.js

@@ -5,13 +5,10 @@ exports.libraryGeneratorInternal = libraryGeneratorInternal;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const add_swc_config_1 = require("@nx/js/src/utils/swc/add-swc-config");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
-const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
@@ -24,7 +21,7 @@ async function libraryGeneratorInternal(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) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
     }
     const tasks = [];
     if (options.publishable === true && !schema.importPath) {
@@ -66,7 +63,7 @@ async function libraryGeneratorInternal(tree, schema) {
     if (options.isUsingTsSolutionConfig) {
         tasks.push(() => (0, devkit_1.installPackagesTask)(tree, true));
     }
-    (0, sort_fields_1.sortPackageJsonFields)(tree, options.projectRoot);
+    (0, internal_2.sortPackageJsonFields)(tree, options.projectRoot);
     if (!schema.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }
@@ -94,8 +91,8 @@ async function normalizeOptions(tree, options) {
     // this helper is called before the jsLibraryGenerator is called, so, if the
     // TS solution setup is not configured, we additionally check if the TS
     // solution setup will be configured by the jsLibraryGenerator
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ||
-        (0, ts_solution_setup_1.shouldConfigureTsSolutionSetup)(tree, options.addPlugin);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(tree) ||
+        (0, internal_2.shouldConfigureTsSolutionSetup)(tree, options.addPlugin);
     return {
         ...options,
         fileName,
@@ -152,8 +149,8 @@ function updateProject(tree, options) {
         };
     }
     if (options.compiler === 'swc') {
-        (0, add_swc_dependencies_1.addSwcDependencies)(tree);
-        (0, add_swc_config_1.addSwcConfig)(tree, options.projectRoot);
+        (0, internal_2.addSwcDependencies)(tree);
+        (0, internal_2.addSwcConfig)(tree, options.projectRoot);
     }
     if (options.rootDir) {
         project.targets.build.options.srcRootForCompilationRoot = options.rootDir;