Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/gulpfile.compile.js7
-rw-r--r--build/gulpfile.editor.js37
-rw-r--r--build/gulpfile.vscode.js52
-rw-r--r--build/gulpfile.vscode.linux.js30
-rw-r--r--build/gulpfile.vscode.win32.js10
-rw-r--r--build/lib/compilation.js8
-rw-r--r--build/lib/compilation.ts8
-rw-r--r--build/lib/task.js6
-rw-r--r--build/lib/task.ts7
-rw-r--r--build/lib/util.js2
-rw-r--r--build/lib/util.ts2
-rw-r--r--gulpfile.js17
12 files changed, 75 insertions, 111 deletions
diff --git a/build/gulpfile.compile.js b/build/gulpfile.compile.js
index 17517184653..0dd2e5abf19 100644
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@@ -11,11 +11,8 @@ const compilation = require('./lib/compilation');
const { compileExtensionsBuildTask } = require('./gulpfile.extensions');
// Full compile, including nls and inline sources in sourcemaps, for build
-const compileClientBuildTask = task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true));
-compileClientBuildTask.displayName = 'compile-client-build';
+const compileClientBuildTask = task.define('compile-client-build', task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true)));
// All Build
-const compileBuildTask = task.parallel(compileClientBuildTask, compileExtensionsBuildTask);
-compileBuildTask.displayName = 'compile-build';
-
+const compileBuildTask = task.define('compile-build', task.parallel(compileClientBuildTask, compileExtensionsBuildTask));
exports.compileBuildTask = compileBuildTask; \ No newline at end of file
diff --git a/build/gulpfile.editor.js b/build/gulpfile.editor.js
index b64482da294..05c7d4fb8b5 100644
--- a/build/gulpfile.editor.js
+++ b/build/gulpfile.editor.js
@@ -61,7 +61,7 @@ var BUNDLED_FILE_HEADER = [
const languages = i18n.defaultLanguages.concat([]); // i18n.defaultLanguages.concat(process.env.VSCODE_QUALITY !== 'stable' ? i18n.extraLanguages : []);
-const extractEditorSrcTask = function () {
+const extractEditorSrcTask = task.define('extract-editor-src', () => {
console.log(`If the build fails, consider tweaking shakeLevel below to a lower value.`);
const apiusages = monacoapi.execute().usageContent;
const extrausages = fs.readFileSync(path.join(root, 'build', 'monaco', 'monaco.usage.recipe')).toString();
@@ -96,13 +96,11 @@ const extractEditorSrcTask = function () {
importIgnorePattern: /(^vs\/css!)|(promise-polyfill\/polyfill)/,
destRoot: path.join(root, 'out-editor-src')
});
-};
-extractEditorSrcTask.displayName = 'extract-editor-src';
+});
-const compileEditorAMDTask = compilation.compileTask('out-editor-src', 'out-editor-build', true);
-compileEditorAMDTask.displayName = 'compile-editor-amd';
+const compileEditorAMDTask = task.define('compile-editor-amd', compilation.compileTask('out-editor-src', 'out-editor-build', true));
-const optimizeEditorAMDTask = common.optimizeTask({
+const optimizeEditorAMDTask = task.define('optimize-editor-amd', common.optimizeTask({
src: 'out-editor-build',
entryPoints: editorEntryPoints,
resources: editorResources,
@@ -119,13 +117,11 @@ const optimizeEditorAMDTask = common.optimizeTask({
bundleInfo: true,
out: 'out-editor',
languages: languages
-});
-optimizeEditorAMDTask.displayName = 'optimize-editor-amd';
+}));
-const minifyEditorAMDTask = common.minifyTask('out-editor');
-minifyEditorAMDTask.displayName = 'minify-editor-amd';
+const minifyEditorAMDTask = task.define('minify-editor-amd', common.minifyTask('out-editor'));
-const createESMSourcesAndResourcesTask = function () {
+const createESMSourcesAndResourcesTask = task.define('extract-editor-esm', () => {
standalone.createESMSourcesAndResources2({
srcFolder: './out-editor-src',
outFolder: './out-editor-esm',
@@ -146,10 +142,9 @@ const createESMSourcesAndResourcesTask = function () {
'vs/nls.mock.ts': 'vs/nls.ts'
}
});
-};
-createESMSourcesAndResourcesTask.displayName = 'extract-editor-esm';
+});
-const compileEditorESMTask = function () {
+const compileEditorESMTask = task.define('compile-editor-esm', () => {
if (process.platform === 'win32') {
const result = cp.spawnSync(`..\\node_modules\\.bin\\tsc.cmd`, {
cwd: path.join(__dirname, '../out-editor-esm')
@@ -163,8 +158,7 @@ const compileEditorESMTask = function () {
console.log(result.stdout.toString());
console.log(result.stderr.toString());
}
-};
-compileEditorESMTask.displayName = 'compile-editor-esm';
+});
function toExternalDTS(contents) {
let lines = contents.split('\n');
@@ -210,7 +204,7 @@ function filterStream(testFunc) {
});
}
-const finalEditorResourcesTask = function () {
+const finalEditorResourcesTask = task.define('final-editor-resources', () => {
return es.merge(
// other assets
es.merge(
@@ -287,8 +281,7 @@ const finalEditorResourcesTask = function () {
return /\.js\.map$/.test(path);
})).pipe(gulp.dest('out-monaco-editor-core/min-maps'))
);
-};
-finalEditorResourcesTask.displayName = 'final-editor-resources';
+});
gulp.task('editor-distro',
task.series(
@@ -368,12 +361,10 @@ function createTscCompileTask(watch) {
};
}
-const monacoTypecheckWatchTask = createTscCompileTask(true);
-monacoTypecheckWatchTask.displayName = 'monaco-typecheck-watch';
+const monacoTypecheckWatchTask = task.define('monaco-typecheck-watch', createTscCompileTask(true));
exports.monacoTypecheckWatchTask = monacoTypecheckWatchTask;
-const monacoTypecheckTask = createTscCompileTask(false);
-monacoTypecheckTask.displayName = 'monaco-typecheck';
+const monacoTypecheckTask = task.define('monaco-typecheck', createTscCompileTask(false));
exports.monacoTypecheckTask = monacoTypecheckTask;
//#endregion
diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
index af2d78273a2..cf1af970d75 100644
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@@ -88,7 +88,7 @@ const BUNDLED_FILE_HEADER = [
' *--------------------------------------------------------*/'
].join('\n');
-const optimizeVSCodeTask = task.series(
+const optimizeVSCodeTask = task.define('optimize-vscode', task.series(
task.parallel(
util.rimraf('out-vscode'),
compileBuildTask
@@ -102,11 +102,10 @@ const optimizeVSCodeTask = task.series(
out: 'out-vscode',
bundleInfo: undefined
})
-);
-optimizeVSCodeTask.displayName = 'optimize-vscode';
+));
-const optimizeIndexJSTask = task.series(
+const optimizeIndexJSTask = task.define('optimize-index-js', task.series(
optimizeVSCodeTask,
() => {
const fullpath = path.join(process.cwd(), 'out-vscode/bootstrap-window.js');
@@ -114,18 +113,16 @@ const optimizeIndexJSTask = task.series(
const newContents = contents.replace('[/*BUILD->INSERT_NODE_MODULES*/]', JSON.stringify(nodeModules));
fs.writeFileSync(fullpath, newContents);
}
-);
-optimizeIndexJSTask.displayName = 'optimize-index-js';
+));
const sourceMappingURLBase = `https://ticino.blob.core.windows.net/sourcemaps/${commit}`;
-const minifyVSCodeTask = task.series(
+const minifyVSCodeTask = task.define('minify-vscode', task.series(
task.parallel(
util.rimraf('out-vscode-min'),
optimizeIndexJSTask
),
common.minifyTask('out-vscode', `${sourceMappingURLBase}/core`)
-);
-minifyVSCodeTask.displayName = 'minify-vscode';
+));
// Package
@@ -214,11 +211,11 @@ function getElectron(arch) {
};
}
-gulp.task('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch)));
-gulp.task('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32')));
-gulp.task('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64')));
-gulp.task('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('arm')));
-gulp.task('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64')));
+gulp.task(task.define('electron', task.series(util.rimraf('.build/electron'), getElectron(process.arch))));
+gulp.task(task.define('electron-ia32', task.series(util.rimraf('.build/electron'), getElectron('ia32'))));
+gulp.task(task.define('electron-x64', task.series(util.rimraf('.build/electron'), getElectron('x64'))));
+gulp.task(task.define('electron-arm', task.series(util.rimraf('.build/electron'), getElectron('arm'))));
+gulp.task(task.define('electron-arm64', task.series(util.rimraf('.build/electron'), getElectron('arm64'))));
/**
@@ -458,15 +455,14 @@ BUILD_TARGETS.forEach(buildTarget => {
const sourceFolderName = `out-vscode${dashed(minified)}`;
const destinationFolderName = `VSCode${dashed(platform)}${dashed(arch)}`;
- const vscodeTask = task.series(
+ const vscodeTask = task.define(`vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`, task.series(
task.parallel(
minified ? minifyVSCodeTask : optimizeVSCodeTask,
util.rimraf(path.join(buildRoot, destinationFolderName))
),
packageTask(platform, arch, sourceFolderName, destinationFolderName, opts)
- );
- vscodeTask.displayName = `vscode${dashed(platform)}${dashed(arch)}${dashed(minified)}`;
- gulp.task(vscodeTask.displayName, vscodeTask);
+ ));
+ gulp.task(vscodeTask);
});
});
@@ -491,7 +487,8 @@ const apiHostname = process.env.TRANSIFEX_API_URL;
const apiName = process.env.TRANSIFEX_API_NAME;
const apiToken = process.env.TRANSIFEX_API_TOKEN;
-gulp.task('vscode-translations-push',
+gulp.task(task.define(
+ 'vscode-translations-push',
task.series(
optimizeVSCodeTask,
function () {
@@ -507,9 +504,10 @@ gulp.task('vscode-translations-push',
).pipe(i18n.pushXlfFiles(apiHostname, apiName, apiToken));
}
)
-);
+));
-gulp.task('vscode-translations-export',
+gulp.task(task.define(
+ 'vscode-translations-export',
task.series(
optimizeVSCodeTask,
function () {
@@ -524,7 +522,7 @@ gulp.task('vscode-translations-export',
).pipe(vfs.dest('../vscode-translations-export'));
}
)
-);
+));
gulp.task('vscode-translations-pull', function () {
return es.merge([...i18n.defaultLanguages, ...i18n.extraLanguages].map(language => {
@@ -575,7 +573,7 @@ gulp.task('upload-vscode-sourcemaps', () => {
});
// This task is only run for the MacOS build
-const generateVSCodeConfigurationTask = () => {
+const generateVSCodeConfigurationTask = task.define('generate-vscode-configuration', () => {
return new Promise((resolve, reject) => {
const buildDir = process.env['AGENT_BUILDDIRECTORY'];
if (!buildDir) {
@@ -610,11 +608,11 @@ const generateVSCodeConfigurationTask = () => {
reject(err);
});
});
-};
-generateVSCodeConfigurationTask.displayName = 'generate-vscode-configuration';
+});
const allConfigDetailsPath = path.join(os.tmpdir(), 'configuration.json');
-gulp.task('upload-vscode-configuration',
+gulp.task(task.define(
+ 'upload-vscode-configuration',
task.series(
generateVSCodeConfigurationTask,
() => {
@@ -642,7 +640,7 @@ gulp.task('upload-vscode-configuration',
}));
}
)
-);
+));
function shouldSetupSettingsSearch() {
const branch = process.env.BUILD_SOURCEBRANCH;
diff --git a/build/gulpfile.vscode.linux.js b/build/gulpfile.vscode.linux.js
index 4d1bdbd825f..fc40616ef09 100644
--- a/build/gulpfile.vscode.linux.js
+++ b/build/gulpfile.vscode.linux.js
@@ -242,30 +242,24 @@ BUILD_TARGETS.forEach((buildTarget) => {
{
const debArch = getDebPackageArch(arch);
- const prepareDebTask = task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch));
- prepareDebTask.displayName = `vscode-linux-${arch}-prepare-deb`;
- // gulp.task(prepareDebTask.displayName, prepareDebTask);
- const buildDebTask = task.series(prepareDebTask, buildDebPackage(arch));
- buildDebTask.displayName = `vscode-linux-${arch}-build-deb`;
- gulp.task(buildDebTask.displayName, buildDebTask);
+ const prepareDebTask = task.define(`vscode-linux-${arch}-prepare-deb`, task.series(util.rimraf(`.build/linux/deb/${debArch}`), prepareDebPackage(arch)));
+ // gulp.task(prepareDebTask);
+ const buildDebTask = task.define(`vscode-linux-${arch}-build-deb`, task.series(prepareDebTask, buildDebPackage(arch)));
+ gulp.task(buildDebTask);
}
{
const rpmArch = getRpmPackageArch(arch);
- const prepareRpmTask = task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch));
- prepareRpmTask.displayName = `vscode-linux-${arch}-prepare-rpm`;
- // gulp.task(prepareRpmTask.displayName, prepareRpmTask);
- const buildRpmTask = task.series(prepareRpmTask, buildRpmPackage(arch));
- buildRpmTask.displayName = `vscode-linux-${arch}-build-rpm`;
- gulp.task(buildRpmTask.displayName, buildRpmTask);
+ const prepareRpmTask = task.define(`vscode-linux-${arch}-prepare-rpm`, task.series(util.rimraf(`.build/linux/rpm/${rpmArch}`), prepareRpmPackage(arch)));
+ // gulp.task(prepareRpmTask);
+ const buildRpmTask = task.define(`vscode-linux-${arch}-build-rpm`, task.series(prepareRpmTask, buildRpmPackage(arch)));
+ gulp.task(buildRpmTask);
}
{
- const prepareSnapTask = task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch));
- prepareSnapTask.displayName = `vscode-linux-${arch}-prepare-snap`;
- gulp.task(prepareSnapTask.displayName, prepareSnapTask);
- const buildSnapTask = task.series(prepareSnapTask, buildSnapPackage(arch));
- buildSnapTask.displayName = `vscode-linux-${arch}-build-snap`;
- gulp.task(buildSnapTask.displayName, buildSnapTask);
+ const prepareSnapTask = task.define(`vscode-linux-${arch}-prepare-snap`, task.series(util.rimraf(`.build/linux/snap/${arch}`), prepareSnapPackage(arch)));
+ gulp.task(prepareSnapTask);
+ const buildSnapTask = task.define(`vscode-linux-${arch}-build-snap`, task.series(prepareSnapTask, buildSnapPackage(arch)));
+ gulp.task(buildSnapTask);
}
});
diff --git a/build/gulpfile.vscode.win32.js b/build/gulpfile.vscode.win32.js
index 367065c4568..46543316de9 100644
--- a/build/gulpfile.vscode.win32.js
+++ b/build/gulpfile.vscode.win32.js
@@ -107,7 +107,7 @@ function buildWin32Setup(arch, target) {
function defineWin32SetupTasks(arch, target) {
const cleanTask = util.rimraf(setupDir(arch, target));
- gulp.task(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target)));
+ gulp.task(task.define(`vscode-win32-${arch}-${target}-setup`, task.series(cleanTask, buildWin32Setup(arch, target))));
}
defineWin32SetupTasks('ia32', 'system');
@@ -125,8 +125,8 @@ function archiveWin32Setup(arch) {
};
}
-gulp.task('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32')));
-gulp.task('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64')));
+gulp.task(task.define('vscode-win32-ia32-archive', task.series(util.rimraf(zipDir('ia32')), archiveWin32Setup('ia32'))));
+gulp.task(task.define('vscode-win32-x64-archive', task.series(util.rimraf(zipDir('x64')), archiveWin32Setup('x64'))));
function copyInnoUpdater(arch) {
return () => {
@@ -142,5 +142,5 @@ function patchInnoUpdater(arch) {
};
}
-gulp.task('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), patchInnoUpdater('ia32')));
-gulp.task('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), patchInnoUpdater('x64'))); \ No newline at end of file
+gulp.task(task.define('vscode-win32-ia32-inno-updater', task.series(copyInnoUpdater('ia32'), patchInnoUpdater('ia32'))));
+gulp.task(task.define('vscode-win32-x64-inno-updater', task.series(copyInnoUpdater('x64'), patchInnoUpdater('x64')))); \ No newline at end of file
diff --git a/build/lib/compilation.js b/build/lib/compilation.js
index 4f183bc512d..592a5d087ce 100644
--- a/build/lib/compilation.js
+++ b/build/lib/compilation.js
@@ -78,7 +78,7 @@ const typesDts = [
'!node_modules/@types/uglify-js/**/*',
];
function compileTask(src, out, build) {
- const result = function () {
+ return function () {
const compile = createCompile(src, build, true);
const srcPipe = es.merge(gulp.src(`${src}/**`, { base: `${src}` }), gulp.src(typesDts));
let generator = new MonacoGenerator(false);
@@ -90,12 +90,10 @@ function compileTask(src, out, build) {
.pipe(compile())
.pipe(gulp.dest(out));
};
- result.displayName = `compile-task-${out}${build ? '-build' : ''}`;
- return result;
}
exports.compileTask = compileTask;
function watchTask(out, build) {
- const result = function () {
+ return function () {
const compile = createCompile('src', build);
const src = es.merge(gulp.src('src/**', { base: 'src' }), gulp.src(typesDts));
const watchSrc = watch('src/**', { base: 'src' });
@@ -106,8 +104,6 @@ function watchTask(out, build) {
.pipe(util.incremental(compile, src, true))
.pipe(gulp.dest(out));
};
- result.displayName = `watch-task-${out}${build ? '-build' : ''}`;
- return result;
}
exports.watchTask = watchTask;
const REPO_SRC_FOLDER = path.join(__dirname, '../../src');
diff --git a/build/lib/compilation.ts b/build/lib/compilation.ts
index 60f65ebe381..b431a134f6c 100644
--- a/build/lib/compilation.ts
+++ b/build/lib/compilation.ts
@@ -90,7 +90,7 @@ const typesDts = [
export function compileTask(src: string, out: string, build: boolean): () => NodeJS.ReadWriteStream {
- const result = function () {
+ return function () {
const compile = createCompile(src, build, true);
const srcPipe = es.merge(
@@ -108,13 +108,11 @@ export function compileTask(src: string, out: string, build: boolean): () => Nod
.pipe(compile())
.pipe(gulp.dest(out));
};
- result.displayName = `compile-task-${out}${build ? '-build' : ''}`;
- return result;
}
export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteStream {
- const result = function () {
+ return function () {
const compile = createCompile('src', build);
const src = es.merge(
@@ -131,8 +129,6 @@ export function watchTask(out: string, build: boolean): () => NodeJS.ReadWriteSt
.pipe(util.incremental(compile, src, true))
.pipe(gulp.dest(out));
};
- result.displayName = `watch-task-${out}${build ? '-build' : ''}`;
- return result;
}
const REPO_SRC_FOLDER = path.join(__dirname, '../../src');
diff --git a/build/lib/task.js b/build/lib/task.js
index 2b78b518fb9..1f688728dce 100644
--- a/build/lib/task.js
+++ b/build/lib/task.js
@@ -24,17 +24,16 @@ function _renderTime(time) {
seconds -= minutes * 60;
return `${minutes} m and ${seconds} s`;
}
-const DONT_SHOW_PLEASE = `DONT_SHOW_PLEASE`;
async function _execute(task) {
const name = task.taskName || task.displayName || `<anonymous>`;
- if (name !== DONT_SHOW_PLEASE) {
+ if (!task._tasks) {
fancyLog('Starting', ansiColors.cyan(name), '...');
}
const startTime = process.hrtime();
await _doExecute(task);
const elapsedArr = process.hrtime(startTime);
const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
- if (name !== DONT_SHOW_PLEASE) {
+ if (!task._tasks) {
fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.green(_renderTime(elapsedNanoseconds / 1e6)));
}
}
@@ -95,7 +94,6 @@ function define(name, task) {
return define(name, series(task, () => Promise.resolve()));
}
lastTask.taskName = name;
- task.taskName = DONT_SHOW_PLEASE;
task.displayName = name;
return task;
}
diff --git a/build/lib/task.ts b/build/lib/task.ts
index 42383404ed1..b6c4f218406 100644
--- a/build/lib/task.ts
+++ b/build/lib/task.ts
@@ -45,18 +45,16 @@ function _renderTime(time: number): string {
return `${minutes} m and ${seconds} s`;
}
-const DONT_SHOW_PLEASE = `DONT_SHOW_PLEASE`;
-
async function _execute(task: Task): Promise<void> {
const name = task.taskName || task.displayName || `<anonymous>`;
- if (name !== DONT_SHOW_PLEASE) {
+ if (!task._tasks) {
fancyLog('Starting', ansiColors.cyan(name), '...');
}
const startTime = process.hrtime();
await _doExecute(task);
const elapsedArr = process.hrtime(startTime);
const elapsedNanoseconds = (elapsedArr[0] * 1e9 + elapsedArr[1]);
- if (name !== DONT_SHOW_PLEASE) {
+ if (!task._tasks) {
fancyLog(`Finished`, ansiColors.cyan(name), 'after', ansiColors.green(_renderTime(elapsedNanoseconds / 1e6)));
}
}
@@ -125,7 +123,6 @@ export function define(name: string, task: Task): Task {
}
lastTask.taskName = name;
- task.taskName = DONT_SHOW_PLEASE;
task.displayName = name;
return task;
}
diff --git a/build/lib/util.js b/build/lib/util.js
index 2ffa7123671..17edc75f65f 100644
--- a/build/lib/util.js
+++ b/build/lib/util.js
@@ -180,7 +180,7 @@ function rimraf(dir) {
return cb(err);
});
};
- retry.displayName = `clean-${path.basename(dir)}`;
+ retry.taskName = `clean-${path.basename(dir)}`;
return retry;
}
exports.rimraf = rimraf;
diff --git a/build/lib/util.ts b/build/lib/util.ts
index e614410f488..a773b2449da 100644
--- a/build/lib/util.ts
+++ b/build/lib/util.ts
@@ -233,7 +233,7 @@ export function rimraf(dir: string): (cb: any) => void {
return cb(err);
});
};
- retry.displayName = `clean-${path.basename(dir)}`;
+ retry.taskName = `clean-${path.basename(dir)}`;
return retry;
}
diff --git a/gulpfile.js b/gulpfile.js
index 2f43d0e73ed..1d13cff608c 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,20 +17,17 @@ const { monacoTypecheckTask/* , monacoTypecheckWatchTask */ } = require('./build
const { compileExtensionsTask, watchExtensionsTask } = require('./build/gulpfile.extensions');
// Fast compile for development time
-const compileClientTask = task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false));
-compileClientTask.displayName = 'compile-client';
-gulp.task(compileClientTask.displayName, compileClientTask);
+const compileClientTask = task.define('compile-client', task.series(util.rimraf('out'), compilation.compileTask('src', 'out', false)));
+gulp.task(compileClientTask);
-const watchClientTask = task.series(util.rimraf('out'), compilation.watchTask('out', false));
-watchClientTask.displayName = 'watch-client';
-gulp.task(watchClientTask.displayName, watchClientTask);
+const watchClientTask = task.define('watch-client', task.series(util.rimraf('out'), compilation.watchTask('out', false)));
+gulp.task(watchClientTask);
// All
-const compileTask = task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask);
-compileTask.displayName = 'compile';
-gulp.task(compileTask.displayName, compileTask);
+const compileTask = task.define('compile', task.parallel(monacoTypecheckTask, compileClientTask, compileExtensionsTask));
+gulp.task(compileTask);
-gulp.task('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask));
+gulp.task(task.define('watch', task.parallel(/* monacoTypecheckWatchTask, */ watchClientTask, watchExtensionsTask)));
// Default
gulp.task('default', compileTask);