feat(node): add e2e project generator (#14429)

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

@@ -104,6 +104,12 @@
         "default": false,
         "hidden": true,
         "x-priority": "internal"
+      },
+      "e2eTestRunner": {
+        "type": "string",
+        "enum": ["jest", "none"],
+        "description": "Test runner to use for end to end (e2e) tests",
+        "default": "jest"
       }
     },
     "required": [],

e2e/node/src/node-server.test.ts

@@ -0,0 +1,63 @@
+import {
+  checkFilesDoNotExist,
+  cleanupProject,
+  killPort,
+  newProject,
+  promisifiedTreeKill,
+  runCLI,
+  runCommandUntil,
+  uniq,
+} from '@nrwl/e2e/utils';
+
+describe('Node Applications + webpack', () => {
+  beforeEach(() => newProject());
+
+  afterEach(() => cleanupProject());
+
+  async function runE2eTests(appName: string) {
+    process.env.PORT = '5000';
+    const childProcess = await runCommandUntil(`serve ${appName}`, (output) => {
+      return output.includes('http://localhost:5000');
+    });
+    const result = runCLI(`e2e ${appName}-e2e`);
+    expect(result).toContain('Setting up...');
+    expect(result).toContain('Tearing down..');
+    expect(result).toContain('Successfully ran target e2e');
+
+    await promisifiedTreeKill(childProcess.pid, 'SIGKILL');
+    await killPort(5000);
+    process.env.PORT = '';
+  }
+
+  it('should generate an app using webpack', async () => {
+    const expressApp = uniq('expressapp');
+    const fastifyApp = uniq('fastifyapp');
+    const koaApp = uniq('koaapp');
+
+    runCLI(
+      `generate @nrwl/node:app ${expressApp} --framework=express --no-interactive`
+    );
+    runCLI(
+      `generate @nrwl/node:app ${fastifyApp} --framework=fastify --no-interactive`
+    );
+    runCLI(
+      `generate @nrwl/node:app ${koaApp} --framework=koa --no-interactive`
+    );
+
+    // Use esbuild by default
+    checkFilesDoNotExist(`apps/${expressApp}/webpack.config.js`);
+    checkFilesDoNotExist(`apps/${fastifyApp}/webpack.config.js`);
+    checkFilesDoNotExist(`apps/${koaApp}/webpack.config.js`);
+
+    expect(() => runCLI(`lint ${expressApp}`)).not.toThrow();
+    expect(() => runCLI(`lint ${fastifyApp}`)).not.toThrow();
+    expect(() => runCLI(`lint ${koaApp}`)).not.toThrow();
+    expect(() => runCLI(`lint ${expressApp}-e2e`)).not.toThrow();
+    expect(() => runCLI(`lint ${fastifyApp}-e2e`)).not.toThrow();
+    expect(() => runCLI(`lint ${koaApp}-e2e`)).not.toThrow();
+
+    await runE2eTests(expressApp);
+    await runE2eTests(fastifyApp);
+    await runE2eTests(koaApp);
+  }, 300_000);
+});

packages/node/package.json

@@ -37,7 +37,6 @@
     "@nrwl/linter": "file:../linter",
     "@nrwl/webpack": "file:../webpack",
     "@nrwl/workspace": "file:../workspace",
-    "enquirer": "~2.3.6",
     "tslib": "^2.3.0"
   },
   "publishConfig": {

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

@@ -87,9 +87,9 @@ describe('app', () => {
           lintFilePatterns: ['my-node-app/**/*.ts'],
         },
       });
-      expect(() => readProjectConfiguration(tree, 'my-node-app-e2e')).toThrow(
-        /Cannot find/
-      );
+      expect(() =>
+        readProjectConfiguration(tree, 'my-node-app-e2e')
+      ).not.toThrow();
     });
 
     it('should update tags', async () => {

packages/node/src/generators/application/application.ts

@@ -27,7 +27,7 @@ import { Linter, lintProjectGenerator } from '@nrwl/linter';
 import { jestProjectGenerator } from '@nrwl/jest';
 import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial';
 
-import { NodeJsFrameWorks, Schema } from './schema';
+import { Schema } from './schema';
 import { initGenerator } from '../init/init';
 import { getRelativePathToRootTsConfig } from '@nrwl/workspace/src/utilities/typescript';
 import {
@@ -41,9 +41,9 @@ import {
   koaVersion,
   nxVersion,
 } from '../../utils/versions';
-import { prompt } from 'enquirer';
 
 import * as shared from '@nrwl/workspace/src/utils/create-ts-config';
+import { e2eProjectGenerator } from '../e2e-project/e2e-project';
 
 export interface NormalizedSchema extends Schema {
   appProjectRoot: string;
@@ -318,15 +318,16 @@ function updateTsConfigOptions(tree: Tree, options: NormalizedSchema) {
 
 export async function applicationGenerator(tree: Tree, schema: Schema) {
   const options = normalizeOptions(tree, schema);
-
   const tasks: GeneratorCallback[] = [];
+
   const initTask = await initGenerator(tree, {
     ...options,
     skipFormat: true,
   });
   tasks.push(initTask);
 
-  addProjectDependencies(tree, options);
+  const installTask = addProjectDependencies(tree, options);
+  tasks.push(installTask);
   addAppFiles(tree, options);
   addProject(tree, options);
 
@@ -347,12 +348,24 @@ export async function applicationGenerator(tree: Tree, schema: Schema) {
       setupFile: 'none',
       skipSerializers: true,
       supportTsx: options.js,
-      babelJest: options.babelJest,
       testEnvironment: 'node',
+      compiler: 'tsc',
       skipFormat: true,
     });
     tasks.push(jestTask);
   }
+
+  if (options.e2eTestRunner === 'jest') {
+    const e2eTask = await e2eProjectGenerator(tree, {
+      ...options,
+      projectType: options.framework === 'none' ? 'cli' : 'server',
+      name: options.rootProject ? 'e2e' : `${options.name}-e2e`,
+      project: options.name,
+      port: options.port,
+    });
+    tasks.push(e2eTask);
+  }
+
   if (options.js) {
     updateTsConfigsToJs(tree, { projectRoot: options.appProjectRoot });
   }
@@ -385,6 +398,7 @@ function normalizeOptions(host: Tree, options: Schema): NormalizedSchema {
     : joinPathFragments(appsDir, appDirectory);
 
   options.bundler = options.bundler ?? 'esbuild';
+  options.e2eTestRunner = options.e2eTestRunner ?? 'jest';
 
   const parsedTags = options.tags
     ? options.tags.split(',').map((s) => s.trim())
@@ -400,6 +414,7 @@ function normalizeOptions(host: Tree, options: Schema): NormalizedSchema {
     parsedTags,
     linter: options.linter ?? Linter.EsLint,
     unitTestRunner: options.unitTestRunner ?? 'jest',
+    rootProject: options.rootProject ?? false,
     port: options.port ?? 3000,
   };
 }

packages/node/src/generators/application/files/connect/src/main.ts__tmpl__

@@ -1,11 +1,13 @@
 import connect from 'connect';
 
+const port = process.env.PORT ? Number(process.env.PORT) : <%= port %>;
+
 const app = connect();
 
 app.use((req, res) => {
      res.end(JSON.stringify({ 'message': 'Hello API' }));
 });
 
-app.listen(<%= port %>, () => {
-    // Server is running
-})
+app.listen(port, () => {
+    console.log(`[ ready ] http://localhost:${port}`);
+})

packages/node/src/generators/application/files/express/src/main.ts__tmpl__

@@ -1,11 +1,13 @@
 import express from 'express';
-const app = express();
 
+const port = process.env.PORT ? Number(process.env.PORT) : <%= port %>;
+
+const app = express();
 
 app.get('/', (req, res) => {
     res.send({ 'message': 'Hello API'});
 });
 
-app.listen(<%= port %>, () => {
-    // Server is running
-});
+app.listen(port, () => {
+    console.log(`[ ready ] http://localhost:${port}`);
+});

packages/node/src/generators/application/files/fastify/src/main.ts__tmpl__

@@ -1,5 +1,7 @@
 import fastify from 'fastify';
 
+const port = process.env.PORT ? Number(process.env.PORT) : <%= port %>;
+
 const app = fastify();
 
 app.get('/', async (req, res) => {
@@ -8,11 +10,12 @@ app.get('/', async (req, res) => {
 
 const start = async() => {
     try {
-        await app.listen({ port: <%= port %> })
+        await app.listen({ port });
+        console.log(`[ ready ] http://localhost:${port}`);
     } catch (err) {
         // Errors are logged here
         process.exit(1);
     }
 }
 
-start();
+start();

packages/node/src/generators/application/files/koa/src/main.ts__tmpl__

@@ -1,11 +1,13 @@
 import koa from 'koa';
 
+const port = process.env.PORT ? Number(process.env.PORT) : <%= port %>;
+
 const app = new koa();
 
 app.use(async ctx =>{
     ctx.body = { 'message': 'Hello API'};
 });
 
-app.listen(<%= port %>, () => {
-    // Server is running
-});
+app.listen(port, () => {
+    console.log(`[ ready ] http://localhost:${port}`);
+});

packages/node/src/generators/application/schema.d.ts

@@ -6,6 +6,7 @@ export interface Schema {
   skipPackageJson?: boolean;
   directory?: string;
   unitTestRunner?: 'jest' | 'none';
+  e2eTestRunner?: 'jest' | 'none';
   linter?: Linter;
   tags?: string;
   frontendProject?: string;

packages/node/src/generators/application/schema.json

@@ -104,6 +104,12 @@
       "default": false,
       "hidden": true,
       "x-priority": "internal"
+    },
+    "e2eTestRunner": {
+      "type": "string",
+      "enum": ["jest", "none"],
+      "description": "Test runner to use for end to end (e2e) tests",
+      "default": "jest"
     }
   },
   "required": []