build: update chalk to 2.2

filipesilva · hansl · commit fd82e1870e35 · 2017-10-24T12:03:55.000-07:00
`chalk@2.2` is incompatible with `@types/chalk`.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "@angular-devkit/schematics": "~0.0.34",
     "@schematics/angular": "~0.0.48",
     "autoprefixer": "^6.5.3",
-    "chalk": "^2.0.1",
+    "chalk": "~2.2.0",
     "circular-dependency-plugin": "^3.0.0",
     "common-tags": "^1.3.1",
     "copy-webpack-plugin": "^4.1.1",
@@ -106,7 +106,6 @@
     "@angular/compiler": "^4.0.0",
     "@angular/compiler-cli": "^4.0.0",
     "@angular/core": "^4.0.0",
-    "@types/chalk": "^0.4.28",
     "@types/common-tags": "^1.2.4",
     "@types/copy-webpack-plugin": "^4.0.0",
     "@types/denodeify": "^1.2.30",
diff --git a/packages/@angular/cli/commands/easter-egg.ts b/packages/@angular/cli/commands/easter-egg.ts
@@ -1,6 +1,6 @@
 const Command = require('../ember-cli/lib/models/command');
 const stringUtils = require('ember-cli-string-utils');
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 
 function pickOne(of: string[]): string {
diff --git a/packages/@angular/cli/commands/generate.ts b/packages/@angular/cli/commands/generate.ts
@@ -1,4 +1,4 @@
-import { cyan, yellow } from 'chalk';
+import chalk from 'chalk';
 const stringUtils = require('ember-cli-string-utils');
 import { oneLine } from 'common-tags';
 import { CliConfig } from '../models/config';
@@ -17,6 +17,7 @@ import { SchematicAvailableOptions } from '../tasks/schematic-get-options';
 const Command = require('../ember-cli/lib/models/command');
 const SilentError = require('silent-error');
 
+const { cyan, yellow } = chalk;
 const separatorRegEx = /[\/\\]/g;
 
 
diff --git a/packages/@angular/cli/commands/new.ts b/packages/@angular/cli/commands/new.ts
@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 import { CliConfig } from '../models/config';
 import { validateProjectName } from '../utilities/validate-project-name';
diff --git a/packages/@angular/cli/commands/set.ts b/packages/@angular/cli/commands/set.ts
@@ -1,9 +1,9 @@
 import * as fs from 'fs';
+import chalk from 'chalk';
 import { CliConfig } from '../models/config';
 import { oneLine } from 'common-tags';
 
 const SilentError = require('silent-error');
-const chalk = require('chalk');
 const Command = require('../ember-cli/lib/models/command');
 
 export interface SetOptions {
diff --git a/packages/@angular/cli/commands/version.ts b/packages/@angular/cli/commands/version.ts
@@ -3,7 +3,7 @@ import { stripIndents } from 'common-tags';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as child_process from 'child_process';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { CliConfig } from '../models/config';
 
 
diff --git a/packages/@angular/cli/models/config.ts b/packages/@angular/cli/models/config.ts
@@ -1,7 +1,7 @@
 import {CliConfig as CliConfigBase} from './config/config';
 import {CliConfig as ConfigInterface} from '../lib/config/schema';
 import { oneLine } from 'common-tags';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as fs from 'fs';
 import * as path from 'path';
 import { homedir } from 'os';
diff --git a/packages/@angular/cli/tasks/eject.ts b/packages/@angular/cli/tasks/eject.ts
@@ -2,13 +2,13 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 import * as webpack from 'webpack';
+import chalk from 'chalk';
 
 import { getAppFromConfig } from '../utilities/app-utils';
 import { EjectTaskOptions } from '../commands/eject';
 import { NgCliWebpackConfig } from '../models/webpack-config';
 import { CliConfig } from '../models/config';
 import { AotPlugin, AngularCompilerPlugin } from '@ngtools/webpack';
-import { yellow } from 'chalk';
 import { LicenseWebpackPlugin } from 'license-webpack-plugin';
 
 import denodeify = require('denodeify');
@@ -34,6 +34,7 @@ const ProgressPlugin = require('webpack/lib/ProgressPlugin');
 export const pluginArgs = Symbol('plugin-args');
 export const postcssArgs = Symbol('postcss-args');
 
+const yellow = chalk.yellow;
 const pree2eNpmScript = `webdriver-manager update --standalone false --gecko false --quiet`;
 
 
diff --git a/packages/@angular/cli/tasks/git-init.ts b/packages/@angular/cli/tasks/git-init.ts
@@ -1,4 +1,5 @@
 import { oneLine } from 'common-tags';
+import chalk from 'chalk';
 import denodeify = require('denodeify');
 
 const exec: any = denodeify(require('child_process').exec);
@@ -21,7 +22,6 @@ const gitEnvironmentVariables = {
 
 module.exports = Task.extend({
   run: function (commandOptions: any) {
-    const chalk = require('chalk');
     const ui = this.ui;
 
     if (commandOptions.skipGit) {
diff --git a/packages/@angular/cli/tasks/init.ts b/packages/@angular/cli/tasks/init.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import LinkCli from '../tasks/link-cli';
 import NpmInstall from '../tasks/npm-install';
 import { validateProjectName } from '../utilities/validate-project-name';
diff --git a/packages/@angular/cli/tasks/link-cli.ts b/packages/@angular/cli/tasks/link-cli.ts
@@ -1,5 +1,5 @@
 const Task = require('../ember-cli/lib/models/task');
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import {exec} from 'child_process';
 
 export default Task.extend({
diff --git a/packages/@angular/cli/tasks/lint.ts b/packages/@angular/cli/tasks/lint.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import * as fs from 'fs';
 import * as glob from 'glob';
 import * as path from 'path';
diff --git a/packages/@angular/cli/tasks/npm-install.ts b/packages/@angular/cli/tasks/npm-install.ts
@@ -1,5 +1,5 @@
 const Task = require('../ember-cli/lib/models/task');
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { exec } from 'child_process';
 
 
diff --git a/packages/@angular/cli/tasks/schematic-run.ts b/packages/@angular/cli/tasks/schematic-run.ts
@@ -10,13 +10,13 @@ import {
 import { FileSystemHost } from '@angular-devkit/schematics/tools';
 import { Observable } from 'rxjs/Observable';
 import * as path from 'path';
-import { green, red, yellow } from 'chalk';
+import chalk from 'chalk';
 import { CliConfig } from '../models/config';
 import 'rxjs/add/operator/concatMap';
 import 'rxjs/add/operator/map';
 import { getCollection, getSchematic } from '../utilities/schematics';
 
-
+const { green, red, yellow } = chalk;
 const Task = require('../ember-cli/lib/models/task');
 
 export interface SchematicRunOptions {
diff --git a/packages/@angular/cli/tasks/serve.ts b/packages/@angular/cli/tasks/serve.ts
@@ -1,8 +1,8 @@
 import * as fs from 'fs-extra';
 import * as path from 'path';
-import * as chalk from 'chalk';
 import * as webpack from 'webpack';
 import * as url from 'url';
+import chalk from 'chalk';
 import { oneLine, stripIndents } from 'common-tags';
 import { getWebpackStatsConfig } from '../models/webpack-configs/utils';
 import { NgCliWebpackConfig } from '../models/webpack-config';
@@ -15,7 +15,7 @@ const WebpackDevServer = require('webpack-dev-server');
 const Task = require('../ember-cli/lib/models/task');
 const SilentError = require('silent-error');
 const opn = require('opn');
-const yellow = require('chalk').yellow;
+const yellow = chalk.yellow;
 
 function findDefaultServePath(baseHref: string, deployUrl: string): string | null {
   if (!baseHref && !deployUrl) {
diff --git a/packages/@angular/cli/upgrade/version.ts b/packages/@angular/cli/upgrade/version.ts
@@ -1,5 +1,5 @@
 import {SemVer, satisfies} from 'semver';
-import {bold, red, yellow} from 'chalk';
+import chalk from 'chalk';
 import {stripIndents, stripIndent} from 'common-tags';
 import {readFileSync, existsSync} from 'fs';
 import * as path from 'path';
@@ -11,6 +11,8 @@ import {requireProjectModule} from '../utilities/require-project-module';
 const resolve = require('resolve');
 
 
+const { bold, red, yellow } = chalk;
+
 function _hasOldCliBuildFile() {
   return existsSync(findUp('angular-cli-build.js', process.cwd()))
       || existsSync(findUp('angular-cli-build.ts', process.cwd()))
diff --git a/packages/@angular/cli/utilities/app-utils.ts b/packages/@angular/cli/utilities/app-utils.ts
@@ -1,6 +1,6 @@
 const SilentError = require('silent-error');
-const chalk = require('chalk');
 
+import chalk from 'chalk';
 import { oneLine } from 'common-tags';
 import { CliConfig } from '../models/config';
 
diff --git a/packages/@angular/cli/utilities/check-package-manager.ts b/packages/@angular/cli/utilities/check-package-manager.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import {exec} from 'child_process';
 import {CliConfig} from '../models/config';
 import denodeify = require('denodeify');
diff --git a/packages/@angular/cli/utilities/stats.ts b/packages/@angular/cli/utilities/stats.ts
@@ -1,4 +1,4 @@
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 import { stripIndents } from 'common-tags';
 
 
diff --git a/packages/@ngtools/webpack/src/type_checker.ts b/packages/@ngtools/webpack/src/type_checker.ts
@@ -1,6 +1,6 @@
 import * as process from 'process';
 import * as ts from 'typescript';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 import { WebpackCompilerHost } from './compiler_host';
 import { time, timeEnd } from './benchmark';
diff --git a/tools/publish/src/main.ts b/tools/publish/src/main.ts
@@ -1,13 +1,15 @@
 import 'reflect-metadata';
 
 import {IndentLogger, LogEntry} from '@ngtools/logger';
-import {bold, red, yellow, white} from 'chalk';
+import chalk from 'chalk';
 import * as minimist from 'minimist';
 
 
 import 'rxjs/add/operator/filter';
 
 
+const { bold, red, yellow, white } = chalk;
+
 const argv = minimist(process.argv.slice(2), {
   boolean: ['verbose']
 });
