Skip to content

Commit b4445a9

Browse files
alexdimaalexdima
committed
Move away from deprecated gulp-util
1 parent 84bebd0 commit b4445a9

19 files changed

Lines changed: 109 additions & 72 deletions

‎build/lib/builtInExtensions.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ const es = require('event-stream');
1414
const rename = require('gulp-rename');
1515
const vfs = require('vinyl-fs');
1616
const ext = require('./extensions');
17-
const util = require('gulp-util');
17+
const fancyLog = require('fancy-log');
18+
const ansiColors = require('ansi-colors');
1819

1920
const root = path.dirname(path.dirname(__dirname));
2021
const builtInExtensions = require('../builtInExtensions.json');
@@ -43,7 +44,7 @@ function isUpToDate(extension) {
4344

4445
function syncMarketplaceExtension(extension) {
4546
if (isUpToDate(extension)) {
46-
util.log(util.colors.blue('[marketplace]'), `${extension.name}@${extension.version}`, util.colors.green('✔︎'));
47+
fancyLog(ansiColors.blue('[marketplace]'), `${extension.name}@${extension.version}`, ansiColors.green('✔︎'));
4748
return es.readArray([]);
4849
}
4950

@@ -52,29 +53,29 @@ function syncMarketplaceExtension(extension) {
5253
return ext.fromMarketplace(extension.name, extension.version, extension.metadata)
5354
.pipe(rename(p => p.dirname = `${extension.name}/${p.dirname}`))
5455
.pipe(vfs.dest('.build/builtInExtensions'))
55-
.on('end', () => util.log(util.colors.blue('[marketplace]'), extension.name, util.colors.green('✔︎')));
56+
.on('end', () => fancyLog(ansiColors.blue('[marketplace]'), extension.name, ansiColors.green('✔︎')));
5657
}
5758

5859
function syncExtension(extension, controlState) {
5960
switch (controlState) {
6061
case 'disabled':
61-
util.log(util.colors.blue('[disabled]'), util.colors.gray(extension.name));
62+
fancyLog(ansiColors.blue('[disabled]'), ansiColors.gray(extension.name));
6263
return es.readArray([]);
6364

6465
case 'marketplace':
6566
return syncMarketplaceExtension(extension);
6667

6768
default:
6869
if (!fs.existsSync(controlState)) {
69-
util.log(util.colors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
70+
fancyLog(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but that path does not exist.`));
7071
return es.readArray([]);
7172

7273
} else if (!fs.existsSync(path.join(controlState, 'package.json'))) {
73-
util.log(util.colors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
74+
fancyLog(ansiColors.red(`Error: Built-in extension '${extension.name}' is configured to run from '${controlState}' but there is no 'package.json' file in that directory.`));
7475
return es.readArray([]);
7576
}
7677

77-
util.log(util.colors.blue('[local]'), `${extension.name}: ${util.colors.cyan(controlState)}`, util.colors.green('✔︎'));
78+
fancyLog(ansiColors.blue('[local]'), `${extension.name}: ${ansiColors.cyan(controlState)}`, ansiColors.green('✔︎'));
7879
return es.readArray([]);
7980
}
8081
}
@@ -93,8 +94,8 @@ function writeControlFile(control) {
9394
}
9495

9596
function main() {
96-
util.log('Syncronizing built-in extensions...');
97-
util.log(`You can manage built-in extensions with the ${util.colors.cyan('--builtin')} flag`);
97+
fancyLog('Syncronizing built-in extensions...');
98+
fancyLog(`You can manage built-in extensions with the ${ansiColors.cyan('--builtin')} flag`);
9899

99100
const control = readControlFile();
100101
const streams = [];

‎build/lib/compilation.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ const monacodts = require("../monaco/api");
1616
const nls = require("./nls");
1717
const reporter_1 = require("./reporter");
1818
const util = require("./util");
19-
const util2 = require("gulp-util");
19+
const fancyLog = require("fancy-log");
20+
const ansiColors = require("ansi-colors");
2021
const watch = require('./watch');
2122
const reporter = reporter_1.createReporter();
2223
function getTypeScriptCompilerOptions(src) {
@@ -179,7 +180,7 @@ class MonacoGenerator {
179180
return r;
180181
}
181182
_log(message, ...rest) {
182-
util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
183+
fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
183184
}
184185
execute() {
185186
const startTime = Date.now();

‎build/lib/compilation.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import * as monacodts from '../monaco/api';
1717
import * as nls from './nls';
1818
import { createReporter } from './reporter';
1919
import * as util from './util';
20-
import * as util2 from 'gulp-util';
20+
import * as fancyLog from 'fancy-log';
21+
import * as ansiColors from 'ansi-colors';
22+
2123
const watch = require('./watch');
2224

2325
const reporter = createReporter();
@@ -218,7 +220,7 @@ class MonacoGenerator {
218220
}
219221

220222
private _log(message: any, ...rest: any[]): void {
221-
util2.log(util2.colors.cyan('[monaco.d.ts]'), message, ...rest);
223+
fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
222224
}
223225

224226
public execute(): void {

‎build/lib/extensions.js‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const remote = require("gulp-remote-src");
1717
const vzip = require('gulp-vinyl-zip');
1818
const filter = require("gulp-filter");
1919
const rename = require("gulp-rename");
20-
const util = require('gulp-util');
20+
const fancyLog = require("fancy-log");
21+
const ansiColors = require("ansi-colors");
2122
const buffer = require('gulp-buffer');
2223
const json = require("gulp-json-editor");
2324
const webpack = require('webpack');
@@ -79,7 +80,7 @@ function fromLocalWebpack(extensionPath, sourceMappingURLBase) {
7980
.pipe(packageJsonFilter.restore);
8081
const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
8182
const webpackDone = (err, stats) => {
82-
util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
83+
fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
8384
if (err) {
8485
result.emit('error', err);
8586
}
@@ -157,7 +158,7 @@ const baseHeaders = {
157158
function fromMarketplace(extensionName, version, metadata) {
158159
const [publisher, name] = extensionName.split('.');
159160
const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
160-
util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');
161+
fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...');
161162
const options = {
162163
base: url,
163164
requestOptions: {

‎build/lib/extensions.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ import remote = require('gulp-remote-src');
1717
const vzip = require('gulp-vinyl-zip');
1818
import filter = require('gulp-filter');
1919
import rename = require('gulp-rename');
20-
const util = require('gulp-util');
20+
import * as fancyLog from 'fancy-log';
21+
import * as ansiColors from 'ansi-colors';
2122
const buffer = require('gulp-buffer');
2223
import json = require('gulp-json-editor');
2324
const webpack = require('webpack');
@@ -93,7 +94,7 @@ function fromLocalWebpack(extensionPath: string, sourceMappingURLBase: string |
9394
const webpackStreams = webpackConfigLocations.map(webpackConfigPath => () => {
9495

9596
const webpackDone = (err: any, stats: any) => {
96-
util.log(`Bundled extension: ${util.colors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
97+
fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
9798
if (err) {
9899
result.emit('error', err);
99100
}
@@ -187,7 +188,7 @@ export function fromMarketplace(extensionName: string, version: string, metadata
187188
const [publisher, name] = extensionName.split('.');
188189
const url = `https://marketplace.visualstudio.com/_apis/public/gallery/publishers/${publisher}/vsextensions/${name}/${version}/vspackage`;
189190

190-
util.log('Downloading extension:', util.colors.yellow(`${extensionName}@${version}`), '...');
191+
fancyLog('Downloading extension:', ansiColors.yellow(`${extensionName}@${version}`), '...');
191192

192193
const options = {
193194
base: url,

‎build/lib/i18n.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@ const xml2js = require("xml2js");
1313
const glob = require("glob");
1414
const https = require("https");
1515
const gulp = require("gulp");
16-
const util = require("gulp-util");
16+
const fancyLog = require("fancy-log");
17+
const ansiColors = require("ansi-colors");
1718
const iconv = require("iconv-lite");
1819
const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
1920
function log(message, ...rest) {
20-
util.log(util.colors.green('[i18n]'), message, ...rest);
21+
fancyLog(ansiColors.green('[i18n]'), message, ...rest);
2122
}
2223
exports.defaultLanguages = [
2324
{ id: 'zh-tw', folderName: 'cht', transifexId: 'zh-hant' },

‎build/lib/i18n.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ import * as xml2js from 'xml2js';
1313
import * as glob from 'glob';
1414
import * as https from 'https';
1515
import * as gulp from 'gulp';
16-
17-
import * as util from 'gulp-util';
16+
import * as fancyLog from 'fancy-log';
17+
import * as ansiColors from 'ansi-colors';
1818
import * as iconv from 'iconv-lite';
1919

2020
const NUMBER_OF_CONCURRENT_DOWNLOADS = 4;
2121

2222
function log(message: any, ...rest: any[]): void {
23-
util.log(util.colors.green('[i18n]'), message, ...rest);
23+
fancyLog(ansiColors.green('[i18n]'), message, ...rest);
2424
}
2525

2626
export interface Language {

‎build/lib/optimize.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ const flatmap = require("gulp-flatmap");
1313
const sourcemaps = require("gulp-sourcemaps");
1414
const uglify = require("gulp-uglify");
1515
const composer = require("gulp-uglify/composer");
16-
const gulpUtil = require("gulp-util");
16+
const fancyLog = require("fancy-log");
17+
const ansiColors = require("ansi-colors");
1718
const path = require("path");
1819
const pump = require("pump");
1920
const uglifyes = require("uglify-es");
@@ -24,7 +25,7 @@ const stats_1 = require("./stats");
2425
const util = require("./util");
2526
const REPO_ROOT_PATH = path.join(__dirname, '../..');
2627
function log(prefix, message) {
27-
gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
28+
fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
2829
}
2930
function loaderConfig(emptyPaths) {
3031
const result = {

‎build/lib/optimize.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ import * as flatmap from 'gulp-flatmap';
1414
import * as sourcemaps from 'gulp-sourcemaps';
1515
import * as uglify from 'gulp-uglify';
1616
import * as composer from 'gulp-uglify/composer';
17-
import * as gulpUtil from 'gulp-util';
17+
import * as fancyLog from 'fancy-log';
18+
import * as ansiColors from 'ansi-colors';
1819
import * as path from 'path';
1920
import * as pump from 'pump';
2021
import * as sm from 'source-map';
@@ -28,7 +29,7 @@ import * as util from './util';
2829
const REPO_ROOT_PATH = path.join(__dirname, '../..');
2930

3031
function log(prefix: string, message: string): void {
31-
gulpUtil.log(gulpUtil.colors.cyan('[' + prefix + ']'), message);
32+
fancyLog(ansiColors.cyan('[' + prefix + ']'), message);
3233
}
3334

3435
export function loaderConfig(emptyPaths?: string[]) {

‎build/lib/reporter.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
Object.defineProperty(exports, "__esModule", { value: true });
77
const es = require("event-stream");
88
const _ = require("underscore");
9-
const util = require("gulp-util");
9+
const fancyLog = require("fancy-log");
10+
const ansiColors = require("ansi-colors");
1011
const fs = require("fs");
1112
const path = require("path");
1213
const allErrors = [];
@@ -17,7 +18,7 @@ function onStart() {
1718
return;
1819
}
1920
startTime = new Date().getTime();
20-
util.log(`Starting ${util.colors.green('compilation')}...`);
21+
fancyLog(`Starting ${ansiColors.green('compilation')}...`);
2122
}
2223
function onEnd() {
2324
if (--count > 0) {
@@ -38,7 +39,7 @@ function log() {
3839
errors.map(err => {
3940
if (!seen.has(err)) {
4041
seen.add(err);
41-
util.log(`${util.colors.red('Error')}: ${err}`);
42+
fancyLog(`${ansiColors.red('Error')}: ${err}`);
4243
}
4344
});
4445
const regex = /^([^(]+)\((\d+),(\d+)\): (.*)$/;
@@ -53,7 +54,7 @@ function log() {
5354
catch (err) {
5455
//noop
5556
}
56-
util.log(`Finished ${util.colors.green('compilation')} with ${errors.length} errors after ${util.colors.magenta((new Date().getTime() - startTime) + ' ms')}`);
57+
fancyLog(`Finished ${ansiColors.green('compilation')} with ${errors.length} errors after ${ansiColors.magenta((new Date().getTime() - startTime) + ' ms')}`);
5758
}
5859
function createReporter() {
5960
const errors = [];

0 commit comments

Comments
 (0)