refactor(@angular/cli): remove common-tags usage

Author: clydin

package-lock.json

@@ -47,7 +47,6 @@
     "@schematics/angular": "0.5.0",
     "@schematics/update": "0.5.0",
     "chalk": "~2.2.0",
-    "common-tags": "^1.3.1",
     "ember-cli-string-utils": "^1.0.0",
     "fs-extra": "^4.0.0",
     "lodash": "^4.11.1",
@@ -73,6 +72,7 @@
     "@types/request": "~2.0.0",
     "@types/semver": "^5.3.30",
     "ajv": "^6.1.1",
+    "common-tags": "^1.3.1",
     "conventional-changelog": "1.1.0",
     "eslint": "^3.11.0",
     "express": "^4.14.0",

package.json

@@ -5,7 +5,7 @@ import {
   getCollection,
   getEngineHost
 } from '../utilities/schematics';
-import { oneLine } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import { SchematicCommand } from '../models/schematic-command';
 
 const { cyan } = chalk;
@@ -41,7 +41,7 @@ export default class GenerateCommand extends SchematicCommand {
 
   validate(options: any): boolean | Promise<boolean> {
     if (!options._[0]) {
-      this.logger.error(oneLine`
+      this.logger.error(tags.oneLine`
         The "ng generate" command requires a
         schematic name to be specified.
         For more details, use "ng help".`);

packages/@angular/cli/commands/generate.ts

@@ -1,5 +1,5 @@
 import { Command, Option } from '../models/command';
-import { stripIndents } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as child_process from 'child_process';
@@ -66,7 +66,7 @@ export default class VersionCommand extends Command {
                |___/
     `;
 
-    this.logger.info(stripIndents`
+    this.logger.info(tags.stripIndents`
     ${chalk.red(asciiArt)}
     Angular CLI: ${ngCliVersion}
     Node: ${process.versions.node}

packages/@angular/cli/commands/version.ts

@@ -13,7 +13,7 @@ const fs = require('fs');
 const packageJson = require('../package.json');
 const path = require('path');
 const resolve = require('resolve');
-const stripIndents = require('common-tags').stripIndents;
+const stripIndents = require('@angular-devkit/core').tags.stripIndents;
 const yellow = require('chalk').yellow;
 const SemVer = require('semver').SemVer;
 const events = require('events');

packages/@angular/cli/lib/init.ts

@@ -6,7 +6,6 @@ import {
   CommandScope,
   ArgumentStrategy
 } from '../models/command';
-import { oneLine } from 'common-tags';
 import { logging, normalize, tags } from '@angular-devkit/core';
 import { camelize } from '@angular-devkit/core/src/utils/strings';
 import { findUp } from '../utilities/find-up';
@@ -60,7 +59,7 @@ export async function runCommand(commandMap: CommandMap,
   }
 
   if (!Cmd) {
-    logger.error(oneLine`The specified command (${commandName}) is invalid.
+    logger.error(tags.oneLine`The specified command (${commandName}) is invalid.
     For a list of available options, run \`ng help\`.`);
     throw '';
   }

packages/@angular/cli/models/command-runner.ts

@@ -33,7 +33,6 @@
     "@schematics/angular": "0.5.0",
     "@schematics/update": "0.5.0",
     "chalk": "~2.2.0",
-    "common-tags": "^1.3.1",
     "ember-cli-string-utils": "^1.0.0",
     "fs-extra": "^4.0.0",
     "lodash": "^4.11.1",

packages/@angular/cli/package.json

@@ -1,6 +1,6 @@
 import { SemVer, satisfies } from 'semver';
 import chalk from 'chalk';
-import { stripIndents, stripIndent } from 'common-tags';
+import { tags } from '@angular-devkit/core';
 import * as path from 'path';
 import { isWarningEnabled } from '../utilities/config';
 import { requireProjectModule } from '../utilities/require-project-module';
@@ -64,14 +64,14 @@ export class Version {
       angularPkgJson = requireProjectModule(projectRoot, '@angular/core/package.json');
       rxjsPkgJson = requireProjectModule(projectRoot, 'rxjs/package.json');
     } catch {
-      console.error(bold(red(stripIndents`
+      console.error(bold(red(tags.stripIndents`
         You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
       `)));
       process.exit(2);
     }
 
     if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
-      console.error(bold(red(stripIndents`
+      console.error(bold(red(tags.stripIndents`
         Cannot determine versions of "@angular/core" and/or "rxjs".
         This likely means your local installation is broken. Please reinstall your packages.
       `)));
@@ -87,7 +87,7 @@ export class Version {
     }
 
     if (!angularVersion.isGreaterThanOrEqualTo(new SemVer('5.0.0'))) {
-      console.error(bold(red(stripIndents`
+      console.error(bold(red(tags.stripIndents`
           This version of CLI is only compatible with Angular version 5.0.0 or higher.
 
           Please visit the link below to find instructions on how to update Angular.
@@ -99,7 +99,7 @@ export class Version {
       && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('5.6.0-forward-compat.0'))
       && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
     ) {
-      console.error(bold(red(stripIndents`
+      console.error(bold(red(tags.stripIndents`
           This project uses version ${rxjsVersion} of RxJs, which is not supported by Angular v6.
           The official RxJs version that is supported is 5.6.0-forward-compat.0 and greater.
 
@@ -111,7 +111,7 @@ export class Version {
       angularVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-rc.0'))
       && !rxjsVersion.isGreaterThanOrEqualTo(new SemVer('6.0.0-beta.0'))
     ) {
-      console.warn(bold(red(stripIndents`
+      console.warn(bold(red(tags.stripIndents`
           This project uses a temporary compatibility version of RxJs (${rxjsVersion}.
 
           Please visit the link below to find instructions on how to update RxJs.
@@ -129,7 +129,7 @@ export class Version {
       compilerVersion = requireProjectModule(projectRoot, '@angular/compiler-cli').VERSION.full;
       tsVersion = requireProjectModule(projectRoot, 'typescript').version;
     } catch {
-      console.error(bold(red(stripIndents`
+      console.error(bold(red(tags.stripIndents`
         Versions of @angular/compiler-cli and typescript could not be determined.
         The most common reason for this is a broken npm install.
 
@@ -153,7 +153,7 @@ export class Version {
 
     if (currentCombo && !satisfies(tsVersion, currentCombo.typescript)) {
       // First line of warning looks weird being split in two, disable tslint for it.
-      console.log((yellow('\n' + stripIndent`
+      console.log((yellow('\n' + tags.stripIndent`
         @angular/compiler-cli@${compilerVersion} requires typescript@'${
         currentCombo.typescript}' but ${tsVersion} was found instead.
         Using this version can result in undefined behaviour and difficult to debug problems.

packages/@angular/cli/upgrade/version.ts

@@ -1,4 +1,4 @@
-import {oneLine, stripIndent} from 'common-tags';
+import { tags } from '@angular-devkit/core';
 
 const SilentError = require('silent-error');
 
@@ -22,12 +22,12 @@ function getRegExpFailPosition(str: string): number | null {
 export function validateProjectName(projectName: string) {
   const errorIndex = getRegExpFailPosition(projectName);
   if (errorIndex !== null) {
-    const firstMessage = oneLine`
+    const firstMessage = tags.oneLine`
       Project name "${projectName}" is not valid. New project names must
       start with a letter, and must contain only alphanumeric characters or dashes.
       When adding a dash the segment after the dash must also start with a letter.
     `;
-    const msg = stripIndent`
+    const msg = tags.stripIndent`
       ${firstMessage}
       ${projectName}
       ${Array(errorIndex + 1).join(' ') + '^'}