feat(node): add support for new TS solution setup in Node

docs/generated/packages/express/generators/application.json

@@ -33,14 +33,17 @@
       "linter": {
         "description": "The tool to use for running lint checks.",
         "type": "string",
-        "enum": ["eslint"],
-        "default": "eslint"
+        "enum": ["eslint", "none"],
+        "default": "none",
+        "x-prompt": "Which linter would you like to use?",
+        "x-priority": "important"
       },
       "unitTestRunner": {
         "type": "string",
         "enum": ["jest", "none"],
         "description": "Test runner to use for unit tests.",
-        "default": "jest"
+        "default": "none",
+        "x-prompt": "Which unit test runner would you like to use?"
       },
       "tags": {
         "type": "string",

docs/generated/packages/nest/generators/application.json

@@ -37,13 +37,16 @@
         "description": "The tool to use for running lint checks.",
         "type": "string",
         "enum": ["eslint", "none"],
-        "default": "eslint"
+        "default": "none",
+        "x-prompt": "Which linter would you like to use?",
+        "x-priority": "important"
       },
       "unitTestRunner": {
         "description": "Test runner to use for unit tests.",
         "type": "string",
         "enum": ["jest", "none"],
-        "default": "jest"
+        "default": "none",
+        "x-prompt": "Which unit test runner would you like to use?"
       },
       "e2eTestRunner": {
         "type": "string",

docs/generated/packages/nest/generators/library.json

@@ -31,13 +31,17 @@
         "description": "The tool to use for running lint checks.",
         "type": "string",
         "enum": ["eslint", "none"],
-        "default": "eslint"
+        "default": "none",
+        "x-prompt": "Which linter would you like to use?",
+        "x-priority": "important"
       },
       "unitTestRunner": {
         "description": "Test runner to use for unit tests.",
         "type": "string",
         "enum": ["jest", "none"],
-        "default": "jest"
+        "default": "none",
+        "x-prompt": "Which unit test runner would you like to use?",
+        "x-priority": "important"
       },
       "tags": {
         "description": "Add tags to the library (used for linting).",

docs/generated/packages/node/generators/application.json

@@ -36,14 +36,26 @@
       "linter": {
         "description": "The tool to use for running lint checks.",
         "type": "string",
-        "enum": ["eslint"],
-        "default": "eslint"
+        "enum": ["eslint", "none"],
+        "default": "none",
+        "x-prompt": "Which linter would you like to use?",
+        "x-priority": "important"
       },
       "unitTestRunner": {
         "type": "string",
         "enum": ["jest", "none"],
         "description": "Test runner to use for unit tests.",
-        "default": "jest"
+        "default": "none",
+        "x-priority": "important",
+        "x-prompt": "Which unit test runner would you like to use?"
+      },
+      "e2eTestRunner": {
+        "type": "string",
+        "enum": ["jest", "none"],
+        "description": "Test runner to use for end-to-end tests",
+        "default": "none",
+        "x-priority": "important",
+        "x-prompt": "Which end-to-end test runner would you like to use?"
       },
       "tags": {
         "type": "string",
@@ -109,12 +121,6 @@
         "hidden": true,
         "x-priority": "internal"
       },
-      "e2eTestRunner": {
-        "type": "string",
-        "enum": ["jest", "none"],
-        "description": "Test runner to use for end to end (e2e) tests",
-        "default": "jest"
-      },
       "docker": {
         "type": "boolean",
         "description": "Add a docker build target"

docs/generated/packages/node/generators/library.json

@@ -36,14 +36,18 @@
       "linter": {
         "description": "The tool to use for running lint checks.",
         "type": "string",
-        "enum": ["eslint"],
-        "default": "eslint"
+        "enum": ["eslint", "none"],
+        "default": "none",
+        "x-prompt": "Which linter would you like to use?",
+        "x-priority": "important"
       },
       "unitTestRunner": {
         "type": "string",
         "enum": ["jest", "none"],
         "description": "Test runner to use for unit tests.",
-        "default": "jest"
+        "default": "none",
+        "x-prompt": "Which unit test runner would you like to use?",
+        "x-priority": "important"
       },
       "tags": {
         "type": "string",
@@ -69,7 +73,7 @@
       },
       "buildable": {
         "type": "boolean",
-        "default": false,
+        "default": true,
         "description": "Generate a buildable library.",
         "x-priority": "important"
       },

packages/create-nx-workspace/bin/create-nx-workspace.ts

@@ -988,6 +988,10 @@ async function determineNodeOptions(
   let appName: string;
   let framework: 'express' | 'fastify' | 'koa' | 'nest' | 'none';
   let docker: boolean;
+  let linter: undefined | 'none' | 'eslint';
+  let formatter: undefined | 'none' | 'prettier';
+
+  const workspaces = parsedArgs.workspaces ?? false;
 
   if (parsedArgs.preset) {
     preset = parsedArgs.preset;
@@ -1010,7 +1014,9 @@ async function determineNodeOptions(
   } else {
     framework = await determineNodeFramework(parsedArgs);
 
-    const workspaceType = await determineStandaloneOrMonorepo();
+    const workspaceType = workspaces
+      ? 'monorepo'
+      : await determineStandaloneOrMonorepo();
     if (workspaceType === 'standalone') {
       preset = Preset.NodeStandalone;
       appName = parsedArgs.name;
@@ -1045,11 +1051,22 @@ async function determineNodeOptions(
     docker = reply.docker === 'Yes';
   }
 
+  if (workspaces) {
+    linter = await determineLinterOptions(parsedArgs);
+    formatter = await determineFormatterOptions(parsedArgs);
+  } else {
+    linter = 'eslint';
+    formatter = 'prettier';
+  }
+
   return {
     preset,
     appName,
     framework,
     docker,
+    linter,
+    formatter,
+    workspaces,
   };
 }
 

packages/express/package.json

@@ -32,7 +32,6 @@
   },
   "dependencies": {
     "@nx/devkit": "file:../devkit",
-    "@nx/js": "file:../js",
     "@nx/node": "file:../node",
     "tslib": "^2.3.0"
   },

packages/express/src/generators/application/application.spec.ts

@@ -1,4 +1,4 @@
-import { readJson, Tree } from '@nx/devkit';
+import { readJson, Tree, updateJson, writeJson } from '@nx/devkit';
 import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
 import { applicationGenerator } from './application';
 import { Schema } from './schema';
@@ -134,4 +134,179 @@ describe('app', () => {
       ]);
     });
   });
+
+  describe('TS solution setup', () => {
+    beforeEach(() => {
+      appTree = createTreeWithEmptyWorkspace();
+      updateJson(appTree, 'package.json', (json) => {
+        json.workspaces = ['packages/*', 'apps/*'];
+        return json;
+      });
+      writeJson(appTree, 'tsconfig.base.json', {
+        compilerOptions: {
+          composite: true,
+          declaration: true,
+        },
+      });
+      writeJson(appTree, 'tsconfig.json', {
+        extends: './tsconfig.base.json',
+        files: [],
+        references: [],
+      });
+    });
+
+    it('should add project references when using TS solution', async () => {
+      await applicationGenerator(appTree, {
+        directory: 'myapp',
+      } as Schema);
+
+      expect(readJson(appTree, 'tsconfig.json').references)
+        .toMatchInlineSnapshot(`
+        [
+          {
+            "path": "./myapp-e2e",
+          },
+          {
+            "path": "./myapp",
+          },
+        ]
+      `);
+      expect(readJson(appTree, 'myapp/package.json')).toMatchInlineSnapshot(`
+        {
+          "name": "@proj/myapp",
+          "nx": {
+            "name": "myapp",
+            "projectType": "application",
+            "sourceRoot": "myapp/src",
+            "tags": [],
+            "targets": {
+              "build": {
+                "configurations": {
+                  "development": {},
+                  "production": {},
+                },
+                "defaultConfiguration": "production",
+                "executor": "@nx/webpack:webpack",
+                "options": {
+                  "assets": [
+                    "myapp/src/assets",
+                  ],
+                  "compiler": "tsc",
+                  "main": "myapp/src/main.ts",
+                  "outputPath": "dist/myapp",
+                  "target": "node",
+                  "tsConfig": "myapp/tsconfig.app.json",
+                  "webpackConfig": "myapp/webpack.config.js",
+                },
+                "outputs": [
+                  "{options.outputPath}",
+                ],
+              },
+              "lint": {
+                "executor": "@nx/eslint:lint",
+              },
+              "serve": {
+                "configurations": {
+                  "development": {
+                    "buildTarget": "myapp:build:development",
+                  },
+                  "production": {
+                    "buildTarget": "myapp:build:production",
+                  },
+                },
+                "defaultConfiguration": "development",
+                "dependsOn": [
+                  "build",
+                ],
+                "executor": "@nx/js:node",
+                "options": {
+                  "buildTarget": "myapp:build",
+                  "runBuildTargetDependencies": false,
+                },
+              },
+              "test": {
+                "options": {
+                  "passWithNoTests": true,
+                },
+              },
+            },
+          },
+          "private": true,
+          "version": "0.0.1",
+        }
+      `);
+      expect(readJson(appTree, 'myapp/tsconfig.json')).toMatchInlineSnapshot(`
+        {
+          "compilerOptions": {
+            "esModuleInterop": true,
+          },
+          "extends": "../tsconfig.base.json",
+          "files": [],
+          "include": [],
+          "references": [
+            {
+              "path": "./tsconfig.app.json",
+            },
+            {
+              "path": "./tsconfig.spec.json",
+            },
+          ],
+        }
+      `);
+      expect(readJson(appTree, 'myapp/tsconfig.app.json'))
+        .toMatchInlineSnapshot(`
+        {
+          "compilerOptions": {
+            "module": "nodenext",
+            "moduleResolution": "nodenext",
+            "outDir": "out-tsc/myapp",
+            "rootDir": "src",
+            "types": [
+              "node",
+              "express",
+            ],
+          },
+          "exclude": [
+            "dist",
+            "jest.config.ts",
+            "src/**/*.spec.ts",
+            "src/**/*.test.ts",
+            "eslint.config.js",
+            "eslint.config.cjs",
+            "eslint.config.mjs",
+          ],
+          "extends": "../tsconfig.base.json",
+          "include": [
+            "src/**/*.ts",
+          ],
+        }
+      `);
+      expect(readJson(appTree, 'myapp/tsconfig.spec.json'))
+        .toMatchInlineSnapshot(`
+        {
+          "compilerOptions": {
+            "module": "nodenext",
+            "moduleResolution": "nodenext",
+            "outDir": "./out-tsc/jest",
+            "types": [
+              "jest",
+              "node",
+            ],
+          },
+          "extends": "../tsconfig.base.json",
+          "include": [
+            "jest.config.ts",
+            "src/**/*.test.ts",
+            "src/**/*.spec.ts",
+            "src/**/*.d.ts",
+          ],
+          "references": [
+            {
+              "path": "./tsconfig.app.json",
+            },
+          ],
+        }
+      `);
+    });
+  });
 });

packages/express/src/generators/application/application.ts

@@ -11,7 +11,6 @@ import {
   determineProjectNameAndRootOptions,
   ensureProjectName,
 } from '@nx/devkit/src/generators/project-name-and-root-utils';
-import { assertNotUsingTsSolutionSetup } from '@nx/js/src/utils/typescript/ts-solution-setup';
 import { applicationGenerator as nodeApplicationGenerator } from '@nx/node';
 import { tslibVersion } from '@nx/node/src/utils/versions';
 import { join } from 'path';
@@ -75,8 +74,6 @@ export async function applicationGenerator(tree: Tree, schema: Schema) {
 }
 
 export async function applicationGeneratorInternal(tree: Tree, schema: Schema) {
-  assertNotUsingTsSolutionSetup(tree, 'express', 'application');
-
   const options = await normalizeOptions(tree, schema);
 
   const tasks: GeneratorCallback[] = [];