@nx/node 20.5.0-rc.4 → 20.6.0-beta.0

package/package.json

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

package/src/generators/application/application.js

@@ -137,21 +137,24 @@ function addProject(tree, options) {
         }
     }
     project.targets.serve = getServeConfig(options);
-    if (options.isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-            nx: {
-                name: options.name !== options.importPath ? options.name : undefined,
-                targets: project.targets,
-                tags: project.tags?.length ? project.tags : undefined,
-            },
-        });
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        packageJson.nx = {
+            name: options.name !== options.importPath ? options.name : undefined,
+            targets: project.targets,
+            tags: project.tags?.length ? project.tags : undefined,
+        };
     }
     else {
         (0, devkit_1.addProjectConfiguration)(tree, options.name, project, options.standaloneConfig);
     }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'package.json'), packageJson);
+    }
 }
 function addAppFiles(tree, options) {
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files/common'), options.appProjectRoot, {
@@ -311,6 +314,7 @@ function updateTsConfigOptions(tree, options) {
 async function applicationGenerator(tree, schema) {
     return await applicationGeneratorInternal(tree, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -374,7 +378,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) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.appProjectRoot);
     }
     updateTsConfigOptions(tree, options);
     if (options.linter === eslint_1.Linter.EsLint) {
@@ -469,6 +473,7 @@ async function normalizeOptions(host, options) {
     const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     const swcJest = options.swcJest ?? isUsingTsSolutionConfig;
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
+    const useProjectJson = options.useProjectJson ?? !isUsingTsSolutionConfig;
     return {
         addPlugin,
         ...options,
@@ -488,6 +493,7 @@ async function normalizeOptions(host, options) {
             : (0, devkit_1.joinPathFragments)('dist', options.rootProject ? appProjectName : appProjectRoot),
         isUsingTsSolutionConfig,
         swcJest,
+        useProjectJson,
     };
 }
 exports.default = applicationGenerator;

package/src/generators/application/schema.d.ts

@@ -25,6 +25,7 @@ export interface Schema {
   isNest?: boolean;
   addPlugin?: boolean;
   useTsSolution?: boolean;
+  useProjectJson?: boolean;
 }
 
 export type NodeJsFrameWorks = 'express' | 'koa' | 'fastify' | 'nest' | 'none';

package/src/generators/application/schema.json

@@ -123,6 +123,10 @@
     "docker": {
       "type": "boolean",
       "description": "Add a docker build target"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]

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

@@ -17,6 +17,7 @@ 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,
+        useProjectJson: true,
         ...options,
     });
 }
@@ -24,31 +25,30 @@ async function e2eProjectGeneratorInternal(host, _options) {
     const tasks = [];
     const options = await normalizeOptions(host, _options);
     const appProject = (0, devkit_1.readProjectConfiguration)(host, options.project);
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
     // TODO(@ndcunningham): This is broken.. the outputs are wrong.. and this isn't using the jest generator
-    if (isUsingTsSolutionConfig) {
-        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), {
-            name: options.importPath,
-            version: '0.0.1',
-            private: true,
-            nx: {
-                name: options.e2eProjectName !== options.importPath
-                    ? options.e2eProjectName
-                    : undefined,
-                implicitDependencies: [options.project],
-                targets: {
-                    e2e: {
-                        executor: '@nx/jest:jest',
-                        outputs: ['{projectRoot}/test-output/jest/coverage'],
-                        options: {
-                            jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
-                            passWithNoTests: true,
-                        },
-                        dependsOn: [`${options.project}:build`],
+    const packageJson = {
+        name: options.importPath,
+        version: '0.0.1',
+        private: true,
+    };
+    if (!options.useProjectJson) {
+        packageJson.nx = {
+            name: options.e2eProjectName !== options.importPath
+                ? options.e2eProjectName
+                : undefined,
+            implicitDependencies: [options.project],
+            targets: {
+                e2e: {
+                    executor: '@nx/jest:jest',
+                    outputs: ['{projectRoot}/test-output/jest/coverage'],
+                    options: {
+                        jestConfig: `${options.e2eProjectRoot}/jest.config.ts`,
+                        passWithNoTests: true,
                     },
+                    dependsOn: [`${options.project}:build`],
                 },
             },
-        });
+        };
     }
     else {
         (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -68,6 +68,9 @@ async function e2eProjectGeneratorInternal(host, _options) {
             },
         });
     }
+    if (!options.useProjectJson || options.isUsingTsSolutionConfig) {
+        (0, devkit_1.writeJson)(host, (0, devkit_1.joinPathFragments)(options.e2eProjectRoot, 'package.json'), packageJson);
+    }
     // TODO(@nicholas): Find a better way to get build target
     // We remove the 'test' target from the e2e project because it is not needed
     // The 'e2e' target is the one that should run the tests for the e2e project
@@ -94,11 +97,11 @@ async function e2eProjectGeneratorInternal(host, _options) {
         });
     }
     const jestPreset = (0, config_file_1.findRootJestPreset)(host) ?? 'jest.preset.js';
-    const tsConfigFile = isUsingTsSolutionConfig
+    const tsConfigFile = options.isUsingTsSolutionConfig
         ? 'tsconfig.json'
         : 'tsconfig.spec.json';
     const rootOffset = (0, devkit_1.offsetFromRoot)(options.e2eProjectRoot);
-    const coverageDirectory = isUsingTsSolutionConfig
+    const coverageDirectory = options.isUsingTsSolutionConfig
         ? 'test-output/jest/coverage'
         : (0, devkit_1.joinPathFragments)(rootOffset, 'coverage', options.e2eProjectName);
     const projectSimpleName = options.project.split('/').pop();
@@ -110,7 +113,6 @@ async function e2eProjectGeneratorInternal(host, _options) {
             offsetFromRoot: rootOffset,
             jestPreset,
             coverageDirectory,
-            isUsingTsSolutionConfig,
             tmpl: '',
         });
         if (options.isNest) {
@@ -133,11 +135,10 @@ async function e2eProjectGeneratorInternal(host, _options) {
             offsetFromRoot: rootOffset,
             jestPreset,
             coverageDirectory,
-            isUsingTsSolutionConfig,
             tmpl: '',
         });
     }
-    if (isUsingTsSolutionConfig) {
+    if (options.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,
@@ -178,7 +179,7 @@ async function e2eProjectGeneratorInternal(host, _options) {
             ]);
         }
     }
-    if (isUsingTsSolutionConfig) {
+    if (options.isUsingTsSolutionConfig) {
         (0, devkit_1.updateJson)(host, 'tsconfig.json', (json) => {
             json.references ??= [];
             const e2eRef = `./${options.e2eProjectRoot}`;
@@ -190,8 +191,8 @@ 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 (isUsingTsSolutionConfig) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
+    if (options.isUsingTsSolutionConfig) {
+        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.e2eProjectRoot);
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(host);
@@ -215,6 +216,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);
     return {
         addPlugin,
         ...options,
@@ -223,6 +225,8 @@ async function normalizeOptions(tree, options) {
         importPath,
         port: options.port ?? 3000,
         rootProject: !!options.rootProject,
+        isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }
 exports.default = e2eProjectGenerator;

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

@@ -9,4 +9,5 @@ export interface Schema {
   isNest?: boolean;
   skipFormat?: boolean;
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/e2e-project/schema.json

@@ -59,6 +59,10 @@
       "default": false,
       "hidden": true,
       "x-priority": "internal"
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["project"]

package/src/generators/library/library.js

@@ -16,6 +16,7 @@ const sort_fields_1 = require("@nx/js/src/utils/package-json/sort-fields");
 async function libraryGenerator(tree, schema) {
     return await libraryGeneratorInternal(tree, {
         addPlugin: false,
+        useProjectJson: true,
         ...schema,
     });
 }
@@ -24,21 +25,21 @@ 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) {
-        (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(tree, options.projectRoot);
+        await (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)`);
     }
     // Create `package.json` first because @nx/js:lib generator will update it.
-    if (options.isUsingTsSolutionConfig ||
+    if (!options.useProjectJson ||
+        options.isUsingTsSolutionConfig ||
         options.publishable ||
         options.buildable) {
         (0, devkit_1.writeJson)(tree, (0, devkit_1.joinPathFragments)(options.projectRoot, 'package.json'), {
             name: options.importPath,
             version: '0.0.1',
             private: true,
-            files: options.publishable ? ['dist', '!**/*.tsbuildinfo'] : undefined,
         });
     }
     tasks.push(await (0, js_1.libraryGenerator)(tree, {
@@ -49,7 +50,7 @@ async function libraryGeneratorInternal(tree, schema) {
         testEnvironment: 'node',
         skipFormat: true,
         setParserOptionsProject: schema.setParserOptionsProject,
-        useProjectJson: !options.isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson,
     }));
     updatePackageJson(tree, options);
     tasks.push(await (0, init_1.initGenerator)(tree, {
@@ -100,6 +101,7 @@ async function normalizeOptions(tree, options) {
         parsedTags,
         importPath,
         isUsingTsSolutionConfig,
+        useProjectJson: options.useProjectJson ?? !isUsingTsSolutionConfig,
     };
 }
 function createFiles(tree, options) {

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

@@ -21,4 +21,5 @@ export interface Schema {
   setParserOptionsProject?: boolean;
   compiler: 'tsc' | 'swc';
   addPlugin?: boolean;
+  useProjectJson?: boolean;
 }

package/src/generators/library/schema.json

@@ -123,6 +123,10 @@
       "type": "boolean",
       "description": "Whether or not to configure the ESLint `parserOptions.project`. We do not do this by default for lint performance reasons.",
       "default": false
+    },
+    "useProjectJson": {
+      "type": "boolean",
+      "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
     }
   },
   "required": ["directory"]