Skip to content

Commit

Permalink
Fix chalk 2.3 incompatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
johnnyreilly committed Oct 24, 2017
1 parent d3cb684 commit e50d5cd
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 9 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog

## v3.0.6

- [Chore release; upgraded chalk dependency in `package.json` to 2.3, as 2.3 is another breaking changes release (from a TypeScript perspective).](https://github.com/TypeStrong/ts-loader/issues/664), see [here](https://github.com/chalk/chalk/issues/215) for context - thanks @johnnyreilly

## v3.0.5

- [Chore release; upgraded chalk dependency in `package.json` to 2.2, as 2.2 appears to be a breaking changes release.](https://github.com/TypeStrong/ts-loader/issues/664) - thanks @lmk123 for reporting
Expand Down
4 changes: 2 additions & 2 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "ts-loader",
"version": "3.0.5",
"version": "3.0.6",
"description": "TypeScript loader for webpack",
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -36,7 +36,7 @@
},
"homepage": "https://github.com/TypeStrong/ts-loader",
"dependencies": {
"chalk": "^2.2.0",
"chalk": "^2.3.0",
"enhanced-resolve": "^3.0.0",
"loader-utils": "^1.0.2",
"semver": "^5.0.1"
Expand Down
4 changes: 2 additions & 2 deletions src/instances.ts
@@ -1,7 +1,7 @@
import * as typescript from 'typescript';
import * as path from 'path';
import * as fs from 'fs';
import chalk from 'chalk';
import chalk, { Chalk } from 'chalk';

import { makeAfterCompile } from './after-compile';
import { getConfigFile, getConfigParseResult } from './config';
Expand Down Expand Up @@ -55,7 +55,7 @@ function successfulTypeScriptInstance(
loaderOptions: LoaderOptions,
loader: Webpack,
log: logger.Logger,
colors: typeof chalk,
colors: Chalk,
compiler: typeof typescript,
compilerCompatible: boolean,
compilerDetailsLogMessage: string
Expand Down
10 changes: 5 additions & 5 deletions src/logger.ts
@@ -1,6 +1,6 @@
import { Console } from 'console';
import { LoaderOptions } from './interfaces';
import chalk from 'chalk';
import { Chalk } from 'chalk';

type InternalLoggerFunc = (whereToLog: any, message: string) => void;

Expand Down Expand Up @@ -33,23 +33,23 @@ const makeExternalLogger = (loaderOptions: LoaderOptions, logger: InternalLogger
(message: string) =>
logger(loaderOptions.logInfoToStdOut ? stdoutConsole : stderrConsole, message);

const makeLogInfo = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, green: typeof chalk) =>
const makeLogInfo = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, green: Chalk) =>
LogLevel[loaderOptions.logLevel] <= LogLevel.INFO
? (message: string) =>
logger(loaderOptions.logInfoToStdOut ? stdoutConsole : stderrConsole, green(message))
: doNothingLogger;

const makeLogError = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, red: typeof chalk) =>
const makeLogError = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, red: Chalk) =>
LogLevel[loaderOptions.logLevel] <= LogLevel.ERROR
? (message: string) => logger(stderrConsole, red(message))
: doNothingLogger;

const makeLogWarning = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, yellow: typeof chalk) =>
const makeLogWarning = (loaderOptions: LoaderOptions, logger: InternalLoggerFunc, yellow: Chalk) =>
LogLevel[loaderOptions.logLevel] <= LogLevel.WARN
? (message: string) => logger(stderrConsole, yellow(message))
: doNothingLogger;

export function makeLogger(loaderOptions: LoaderOptions, colors: typeof chalk): Logger {
export function makeLogger(loaderOptions: LoaderOptions, colors: Chalk): Logger {
const logger = makeLoggerFunc(loaderOptions);
return {
log: makeExternalLogger(loaderOptions, logger),
Expand Down
8 changes: 8 additions & 0 deletions yarn.lock
Expand Up @@ -978,6 +978,14 @@ chalk@^2.0.1, chalk@^2.1.0:
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

chalk@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.0.tgz#b5ea48efc9c1793dccc9b4767c93914d3f2d52ba"
dependencies:
ansi-styles "^3.1.0"
escape-string-regexp "^1.0.5"
supports-color "^4.0.0"

chokidar@^1.4.1, chokidar@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
Expand Down

0 comments on commit e50d5cd

Please sign in to comment.