From d05df16f9f663e5a0f0d8cbb7dcbd43551bee2f9 Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Wed, 10 Jul 2019 08:58:49 +0200
Subject: [PATCH] remove mixin from gulp

---
 build/azure-pipelines/darwin/product-build-darwin.yml    | 2 +-
 .../linux/product-build-linux-multiarch.yml              | 2 +-
 build/azure-pipelines/linux/product-build-linux.yml      | 2 +-
 build/{gulpfile.mixin.js => azure-pipelines/mixin.js}    | 9 +++++----
 build/azure-pipelines/product-compile.yml                | 2 +-
 build/azure-pipelines/win32/product-build-win32.yml      | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)
 rename build/{gulpfile.mixin.js => azure-pipelines/mixin.js} (93%)

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index cdf7eb2f1df..d8b2c009c4a 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -79,7 +79,7 @@ steps:
 
 - script: |
     set -e
-    yarn gulp mixin
+    node build/azure-pipelines/mixin
   displayName: Mix in quality
 
 - script: |
diff --git a/build/azure-pipelines/linux/product-build-linux-multiarch.yml b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
index 66b6bbff713..c4e1e05e502 100644
--- a/build/azure-pipelines/linux/product-build-linux-multiarch.yml
+++ b/build/azure-pipelines/linux/product-build-linux-multiarch.yml
@@ -88,7 +88,7 @@ steps:
 
 - script: |
     set -e
-    yarn gulp mixin
+    node build/azure-pipelines/mixin
   displayName: Mix in quality
 
 - script: |
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 1e48713cd86..76c86e32323 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -80,7 +80,7 @@ steps:
 
 - script: |
     set -e
-    yarn gulp mixin
+    node build/azure-pipelines/mixin
   displayName: Mix in quality
 
 - script: |
diff --git a/build/gulpfile.mixin.js b/build/azure-pipelines/mixin.js
similarity index 93%
rename from build/gulpfile.mixin.js
rename to build/azure-pipelines/mixin.js
index a2b61d33ad3..efb7d4d1ca9 100644
--- a/build/gulpfile.mixin.js
+++ b/build/azure-pipelines/mixin.js
@@ -5,7 +5,6 @@
 
 'use strict';
 
-const gulp = require('gulp');
 const json = require('gulp-json-editor');
 const buffer = require('gulp-buffer');
 const filter = require('gulp-filter');
@@ -14,7 +13,7 @@ const vfs = require('vinyl-fs');
 const fancyLog = require('fancy-log');
 const ansiColors = require('ansi-colors');
 
-gulp.task('mixin', function () {
+function main() {
 	const quality = process.env['VSCODE_QUALITY'];
 
 	if (!quality) {
@@ -36,5 +35,7 @@ gulp.task('mixin', function () {
 			fancyLog(ansiColors.blue('[mixin]'), f.relative, ansiColors.green('✔︎'));
 			return f;
 		}))
-		.pipe(gulp.dest('.'));
-});
\ No newline at end of file
+		.pipe(vfs.dest('.'));
+}
+
+main();
\ No newline at end of file
diff --git a/build/azure-pipelines/product-compile.yml b/build/azure-pipelines/product-compile.yml
index cc2639f139c..25ba5a3e9bb 100644
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@@ -82,7 +82,7 @@ steps:
 # inline small SVGs
 - script: |
     set -e
-    yarn gulp mixin
+    node build/azure-pipelines/mixin
   displayName: Mix in quality
   condition: and(succeeded(), ne(variables['CacheRestored-Compilation'], 'true'))
 
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 66d8bf4af32..fc14cc0abec 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -89,7 +89,7 @@ steps:
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
     $ErrorActionPreference = "Stop"
-    exec { yarn gulp mixin }
+    exec { node build/azure-pipelines/mixin }
   displayName: Mix in quality
 
 - powershell: |
-- 
GitLab