feat(@angular/cli): transfer CLI to devkit

Author: clydin

.monorepo.json

@@ -49,6 +49,17 @@
       "version": "0.7.0-beta.1",
       "hash": "84924cc4aa8c0961e0f64d862d478549"
     },
+    "@angular/cli": {
+      "name": "Angular CLI",
+      "links": [
+        {
+          "label": "README",
+          "url": "https://github.com/angular/devkit/blob/master/packages/angular/cli/README.md"
+        }
+      ],
+      "version": "6.1.0-beta.0",
+      "snapshotRepo": "angular/cli-builds"
+    },
     "@angular/pwa": {
       "name": "Angular PWA Schematics",
       "section": "Schematics",

packages/angular/cli/bin/ng

@@ -0,0 +1,19 @@
+#!/usr/bin/env node
+'use strict';
+
+// Provide a title to the process in `ps`.
+// Due to an obscure Mac bug, do not start this title with any symbol.
+process.title = 'ng';
+
+var version = process.version.substr(1).split('.');
+if (Number(version[0]) < 8 || (Number(version[0]) === 8 && Number(version[1]) < 9)) {
+  process.stderr.write(
+    'You are running version ' + process.version + ' of Node.js, which is not supported by Angular CLI v6.\n' +
+    'The official Node.js version that is supported is 8.9 and greater.\n\n' +
+    'Please visit https://nodejs.org/en/ to find instructions on how to update Node.js.\n'
+  );
+
+  process.exit(3);
+}
+
+require('../lib/init');

packages/angular/cli/bin/ng-update-message.js

@@ -0,0 +1,44 @@
+#!/usr/bin/env node
+'use strict';
+
+// Check if the current directory contains '.angular-cli.json'. If it does, show a message to the user that they
+// should use the migration script.
+
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+
+let found = false;
+let current = path.dirname(path.dirname(__dirname));
+while (current !== path.dirname(current)) {
+  if (fs.existsSync(path.join(current, 'angular-cli.json'))
+      || fs.existsSync(path.join(current, '.angular-cli.json'))) {
+    found = os.homedir() !== current || fs.existsSync(path.join(current, 'package.json'));
+    break;
+  }
+  if (fs.existsSync(path.join(current, 'angular.json'))
+      || fs.existsSync(path.join(current, '.angular.json'))
+      || fs.existsSync(path.join(current, 'package.json'))) {
+    break;
+  }
+
+  current = path.dirname(current);
+}
+
+
+if (found) {
+  // ------------------------------------------------------------------------------------------
+  // If changing this message, please update the same message in
+  // `packages/@angular/cli/models/command-runner.ts`
+
+  // eslint-disable-next-line no-console
+  console.error(`\u001b[31m
+    ${'='.repeat(80)}
+    The Angular CLI configuration format has been changed, and your existing configuration can
+    be updated automatically by running the following command:
+
+      ng update @angular/cli
+    ${'='.repeat(80)}
+    \u001b[39m`.replace(/^ {4}/gm, ''));
+}

packages/angular/cli/commands/add.ts

@@ -0,0 +1,110 @@
+// tslint:disable:no-any
+import { tags, terminal } from '@angular-devkit/core';
+import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
+import { CommandScope, Option } from '../models/command';
+import { parseOptions } from '../models/command-runner';
+import { SchematicCommand } from '../models/schematic-command';
+import { NpmInstall } from '../tasks/npm-install';
+import { getPackageManager } from '../utilities/config';
+
+
+export default class AddCommand extends SchematicCommand {
+  readonly name = 'add';
+  readonly description = 'Add support for a library to your project.';
+  readonly allowPrivateSchematics = true;
+  scope = CommandScope.inProject;
+  arguments = ['collection'];
+  options: Option[] = [];
+
+  private async _parseSchematicOptions(collectionName: string): Promise<any> {
+    const schematicOptions = await this.getOptions({
+      schematicName: 'ng-add',
+      collectionName,
+    });
+
+    const options = this.options.concat(schematicOptions.options);
+    const args = schematicOptions.arguments.map(arg => arg.name);
+
+    return parseOptions(this._rawArgs, options, args, this.argStrategy);
+  }
+
+  validate(options: any) {
+    const collectionName = options._[0];
+
+    if (!collectionName) {
+      this.logger.fatal(
+        `The "ng ${this.name}" command requires a name argument to be specified eg. `
+        + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
+      );
+
+      return false;
+    }
+
+    return true;
+  }
+
+  async run(options: any) {
+    const firstArg = options._[0];
+
+    if (!firstArg) {
+      this.logger.fatal(
+        `The "ng ${this.name}" command requires a name argument to be specified eg. `
+        + `${terminal.yellow('ng add [name] ')}. For more details, use "ng help".`,
+      );
+
+      return 1;
+    }
+
+    const packageManager = getPackageManager();
+
+    const npmInstall: NpmInstall = require('../tasks/npm-install').default;
+
+    const packageName = firstArg.startsWith('@')
+      ? firstArg.split('/', 2).join('/')
+      : firstArg.split('/', 1)[0];
+
+    // Remove the tag/version from the package name.
+    const collectionName = (
+      packageName.startsWith('@')
+        ? packageName.split('@', 2).join('@')
+        : packageName.split('@', 1).join('@')
+    ) + firstArg.slice(packageName.length);
+
+    // We don't actually add the package to package.json, that would be the work of the package
+    // itself.
+    await npmInstall(
+      packageName,
+      this.logger,
+      packageManager,
+      this.project.root,
+    );
+
+    // Reparse the options with the new schematic accessible.
+    options = await this._parseSchematicOptions(collectionName);
+
+    const runOptions = {
+      schematicOptions: options,
+      workingDir: this.project.root,
+      collectionName,
+      schematicName: 'ng-add',
+      allowPrivate: true,
+      dryRun: false,
+      force: false,
+    };
+
+    try {
+      return await this.runSchematic(runOptions);
+    } catch (e) {
+      if (e instanceof NodePackageDoesNotSupportSchematics) {
+        this.logger.error(tags.oneLine`
+          The package that you are trying to add does not support schematics. You can try using
+          a different version of the package or contact the package author to add ng-add support.
+        `);
+
+        return 1;
+      }
+
+      throw e;
+    }
+  }
+}

packages/angular/cli/commands/build.ts

@@ -0,0 +1,28 @@
+import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
+import { CommandScope, Option } from '../models/command';
+import { Version } from '../upgrade/version';
+
+export default class BuildCommand extends ArchitectCommand {
+  public readonly name = 'build';
+  public readonly target = 'build';
+  public readonly description =
+    'Builds your app and places it into the output path (dist/ by default).';
+  public static aliases = ['b'];
+  public scope = CommandScope.inProject;
+  public options: Option[] = [
+    this.prodOption,
+    this.configurationOption,
+  ];
+
+  public validate(options: ArchitectCommandOptions) {
+    // Check Angular and TypeScript versions.
+    Version.assertCompatibleAngularVersion(this.project.root);
+    Version.assertTypescriptVersion(this.project.root);
+
+    return super.validate(options);
+  }
+
+  public async run(options: ArchitectCommandOptions) {
+    return this.runArchitectTarget(options);
+  }
+}