build: move clang formating out of gulp stream for cldr (#33699)

PR Close #33699
angular · Nov 11, 2019 · cdceb60 · cdceb60
1 parent 4613639
commit cdceb60
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 18 deletions.
diff --git a/tools/gulp-tasks/cldr/closure.js b/tools/gulp-tasks/cldr/closure.js
@@ -8,6 +8,7 @@
 
 const fs = require('fs');
 const yargs = require('yargs').argv;
+const shelljs = require('shelljs');
 const {I18N_DATA_FOLDER, RELATIVE_I18N_DATA_FOLDER, HEADER} = require('./extract');
 const OUTPUT_NAME = `closure-locale.ts`;
 
@@ -57,11 +58,8 @@ module.exports = (gulp, done) => {
       `${RELATIVE_I18N_DATA_FOLDER}/${OUTPUT_NAME}`, generateAllLocalesFile(GOOG_LOCALES, ALIASES));
 
   console.log(`Formatting ${I18N_DATA_FOLDER}/${OUTPUT_NAME}..."`);
-  const format = require('gulp-clang-format');
-  const clangFormat = require('clang-format');
-  return gulp.src([`${I18N_DATA_FOLDER}/${OUTPUT_NAME}`], {base: '.'})
-      .pipe(format.format('file', clangFormat))
-      .pipe(gulp.dest('.'));
+  shelljs.exec(`yarn clang-format -i ${I18N_DATA_FOLDER}/${OUTPUT_NAME}`, {silent: true});
+  done();
 };
 
 /**

diff --git a/tools/gulp-tasks/cldr/extract.js b/tools/gulp-tasks/cldr/extract.js
@@ -13,6 +13,8 @@ const stringify = require('./util').stringify;
 const cldr = require('cldr');
 // used to extract all other cldr data
 const cldrJs = require('cldrjs');
+// used to call to clang-format
+const shelljs = require('shelljs');
 
 const COMMON_PACKAGE = 'packages/common';
 const CORE_PACKAGE = 'packages/core';
@@ -94,19 +96,10 @@ module.exports = (gulp, done) => {
   console.log(`${LOCALES.length} locale files generated.`);
 
   console.log(`All i18n cldr files have been generated, formatting files..."`);
-  const format = require('gulp-clang-format');
-  const clangFormat = require('clang-format');
-  return gulp
-      .src(
-          [
-            `${I18N_DATA_FOLDER}/**/*.ts`,
-            `${I18N_FOLDER}/currencies.ts`,
-            `${I18N_CORE_FOLDER}/locale_en.ts`,
-            `${I18N_GLOBAL_FOLDER}/*.js`,
-          ],
-          {base: '.'})
-      .pipe(format.format('file', clangFormat))
-      .pipe(gulp.dest('.'));
+  shelljs.exec(
+    `yarn clang-format -i ${I18N_DATA_FOLDER}/**/*.ts ${I18N_DATA_FOLDER}/*.ts ${I18N_FOLDER}/currencies.ts ${I18N_CORE_FOLDER}/locale_en.ts ${I18N_GLOBAL_FOLDER}/*.js`,
+    {silent: true});
+  done();
 };
 
 /**