Merge branch 'connor4312/import-cli' into build-integrated-cli

anyscale · Sep 20, 2022 · 5e2ce13 · 5e2ce13
2 parents e028959 + 5b24e93
commit 5e2ce13
Show file tree

Hide file tree

Showing 52 changed files with 49 additions and 68 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -28,4 +28,3 @@
 **/src/vs/loader.js
 **/test/unit/assert.js
 **/typings/**
-**/src/cli/**
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,4 @@ yarn-error.log
 vscode.lsif
 vscode.db
 /.profile-oss
-/src/cli/target
+/cli/target
diff --git a/build/filters.js b/build/filters.js
@@ -22,7 +22,7 @@ module.exports.all = [
  'scripts/**/*',
  'src/**/*',
  'test/**/*',
- '!src/cli/**/*',
+ '!cli/**/*',
  '!out*/**',
  '!test/**/out/**',
  '!**/node_modules/**',

diff --git a/build/hygiene.js b/build/hygiene.js
@@ -10,6 +10,7 @@ const vfs = require('vinyl-fs');
 const path = require('path');
 const fs = require('fs');
 const pall = require('p-all');
+
 const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter } = require('./filters');
 
 const copyrightHeaderLines = [
@@ -291,7 +292,7 @@ if (require.main === module) {
  .then(
  (vinyls) =>
  new Promise((c, e) =>
- hygiene(es.readArray(vinyls))
+ hygiene(es.readArray(vinyls).pipe(filter(all)))
  .on('end', () => c())
  .on('error', e)
  )

diff --git a/src/cli/CONTRIBUTING.md → cli/CONTRIBUTING.md b/src/cli/CONTRIBUTING.md → cli/CONTRIBUTING.md