feat(nx): delegate to cli when command is not recognized

docs/api-workspace/npmscripts/lint-files.md → docs/api-workspace/npmscripts/workspace-lint-files.md

@@ -1,11 +1,11 @@
-# lint [files..]
+# workspace-lint [files..]
 
 Lint workspace or list of files
 
 ## Usage
 
 ```bash
-lint [files..]
+workspace-lint [files..]
 ```
 
 ## Options

e2e/schematics/command-line.test.ts

@@ -73,7 +73,7 @@ describe('Command line', () => {
       runCLI(`generate @nrwl/angular:app ${appBefore}`);
       runCommand(`mv apps/${appBefore} apps/${appAfter}`);
 
-      const stdout = runCommand('./node_modules/.bin/nx lint');
+      const stdout = runCommand('./node_modules/.bin/nx workspace-lint');
       expect(stdout).toContain(
         `Cannot find project '${appBefore}' in 'apps/${appBefore}'`
       );

e2e/schematics/delegate-to-cli.test.ts

@@ -0,0 +1,23 @@
+import { ensureProject, uniq, runCommand, checkFilesExist } from '../utils';
+
+describe('Delegate to CLI', () => {
+  it('should delegate to the Angular CLI all non-standard commands', async () => {
+    ensureProject();
+
+    const appName = uniq('app');
+    runCommand(`npm run nx -- g app ${appName}`);
+    runCommand(`npm run nx -- build ${appName}`);
+
+    checkFilesExist(
+      `dist/apps/${appName}/index.html`,
+      `dist/apps/${appName}/polyfills-es2015.js`,
+      `dist/apps/${appName}/runtime-es2015.js`,
+      `dist/apps/${appName}/main-es2015.js`,
+      `dist/apps/${appName}/styles-es2015.js`,
+      `dist/apps/${appName}/polyfills-es5.js`,
+      `dist/apps/${appName}/runtime-es5.js`,
+      `dist/apps/${appName}/main-es5.js`,
+      `dist/apps/${appName}/styles-es5.js`
+    );
+  }, 120000);
+});

e2e/schematics/ng-add.test.ts

@@ -71,10 +71,11 @@ describe('Nrwl Convert to Nx Workspace', () => {
     expect(updatedPackageJson.description).toEqual('some description');
     expect(updatedPackageJson.scripts).toEqual({
       ng: 'ng',
+      nx: 'nx',
       start: 'ng serve',
       build: 'ng build',
       test: 'ng test',
-      lint: 'nx lint && ng lint',
+      lint: 'nx workspace-lint && ng lint',
       e2e: 'ng e2e',
       'affected:apps': 'nx affected:apps',
       'affected:libs': 'nx affected:libs',

packages/workspace/migrations.json

@@ -4,6 +4,11 @@
       "version": "8.2.0-beta.1",
       "description": "Add exclusions to lint config",
       "factory": "./src/migrations/update-8-2-0/update-8-2-0"
+    },
+    "rename-lint-into-workspace-lint": {
+      "version": "8.3.0-beta.1",
+      "description": "Rename 'nx lint' into 'nx workspace-lint' to avoid confusion",
+      "factory": "./src/migrations/update-8-3-0/rename-lint"
     }
   }
 }

packages/workspace/src/command-line/nx-commands.ts

@@ -3,13 +3,31 @@ import * as yargs from 'yargs';
 
 import { affected } from './affected';
 import { format } from './format';
-import { update } from './update';
 import { lint } from './lint';
 import { workspaceSchematic } from './workspace-schematic';
 import { generateGraph, OutputType } from './dep-graph';
 
 const noop = (yargs: yargs.Argv): yargs.Argv => yargs;
 
+export const supportedNxCommands = [
+  'affected',
+  'affected:apps',
+  'affected:libs',
+  'affected:build',
+  'affected:test',
+  'affected:e2e',
+  'affected:dep-graph',
+  'affected:lint',
+  'dep-graph',
+  'format',
+  'format:check',
+  'format:write',
+  'workspace-schematic',
+  'workspace-lint',
+  '--help',
+  '--version'
+];
+
 /**
  * Exposing the Yargs commands object so the documentation generator can
  * parse it. The CLI will consume it and call the `.argv` to bootstrapped
@@ -114,15 +132,12 @@ export const commandsObject = yargs
     args => format('write', args)
   )
   .alias('format:write', 'format')
-  .command('lint [files..]', 'Lint workspace or list of files', noop, _ =>
-    lint()
-  )
-  .command('update:check', 'Check for workspace updates', noop, _ =>
-    update(['check'])
+  .command(
+    'workspace-lint [files..]',
+    'Lint workspace or list of files',
+    noop,
+    _ => lint()
   )
-  .command('update:skip', 'Skip workspace updates', noop, _ => update(['skip']))
-  .command('update', 'Update workspace', noop, _ => update([]))
-  .alias('update', 'migrates') // TODO: Remove after 1.0
   .command(
     'workspace-schematic [name]',
     'Runs a workspace schematic from the tools/schematics directory',
@@ -147,8 +162,7 @@ export const commandsObject = yargs
   )
   .help('help')
   .version()
-  .option('quiet', { type: 'boolean', hidden: true })
-  .demandCommand();
+  .option('quiet', { type: 'boolean', hidden: true });
 
 function withFormatOptions(yargs: yargs.Argv): yargs.Argv {
   return withAffectedOptions(yargs).option('apps-and-libs', {

packages/workspace/src/command-line/nx.ts

@@ -1,14 +1,17 @@
 #!/usr/bin/env node
-import { commandsObject } from '@nrwl/workspace';
+import { commandsObject, supportedNxCommands } from './nx-commands';
+import { closestCli } from '../utils/app-root';
 
 export interface GlobalNxArgs {
   help?: boolean;
   version?: boolean;
   quiet?: boolean;
 }
 
-/**
- * The commandsObject is a Yargs object declared in `nx-commands.ts`,
- * It is exposed and bootstrapped here to provide CLI features.
- */
-commandsObject.argv; // .argv bootstraps the CLI creation;
+if (supportedNxCommands.includes(process.argv[2])) {
+  // The commandsObject is a Yargs object declared in `nx-commands.ts`,
+  // It is exposed and bootstrapped here to provide CLI features.
+  commandsObject.argv; // .argv bootstraps the CLI creation;
+} else {
+  require(closestCli(__dirname));
+}