Merge branch 'joao/build/single-compile-job'

2021-01-07 10:59:12 +01:00 · 2021-01-07 10:59:12 +01:00 · 5e673678eb
parent 575f87306f d944b91cd1
commit 5e673678eb
12 changed files with 267 additions and 339 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -42,7 +42,7 @@
        "no-var": "warn",
        "jsdoc/no-types": "warn",
        "semi": "off",
-        "mocha/no-exclusive-tests": "warn",
+        // "mocha/no-exclusive-tests": "warn",
        "@typescript-eslint/semi": "warn",
        "@typescript-eslint/naming-convention": [
            "warn",
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@ -119,12 +119,6 @@ stages:
          VSCODE_ARCH: x64
        steps:
          - template: product-compile.yml
-      - job: Hygiene
-        pool: compile
-        variables:
-          VSCODE_ARCH: x64
-        steps:
-          - template: product-hygiene.yml

  - ${{ if and(eq(parameters.VSCODE_COMPILE_ONLY, false), eq(variables['VSCODE_BUILD_STAGE_WINDOWS'], true)) }}:
    - stage: Windows
--- a/build/azure-pipelines/product-compile.yml
+++ b/build/azure-pipelines/product-compile.yml
@ -101,9 +101,8 @@ steps:

  - script: |
      set -e
-      yarn npm-run-all -lp compile-build compile-extensions-build
-      yarn npm-run-all -lp minify-vscode minify-vscode-reh minify-vscode-reh-web
-    displayName: Compile
+      yarn npm-run-all -lp core-ci extensions-ci hygiene eslint monaco-compile-check valid-layers-check
+    displayName: Compile & Hygiene

  - script: |
      set -e
@ -112,6 +111,19 @@ steps:
    displayName: Upload sourcemaps
    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))

+  - script: |
+      set -
+      ./build/azure-pipelines/common/extract-telemetry.sh
+    displayName: Extract Telemetry
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
+  - script: |
+      set -e
+      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
+      ./build/azure-pipelines/common/publish-webview.sh
+    displayName: Publish Webview
+    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
+
  - script: |
      set -e
      VERSION=`node -p "require(\"./package.json\").version"`
--- a/build/azure-pipelines/product-hygiene.yml
+++ b/build/azure-pipelines/product-hygiene.yml
@ -1,121 +0,0 @@
-steps:
-  - task: NodeTool@0
-    inputs:
-      versionSpec: "12.x"
-
-  - task: geeklearningio.gl-vsts-tasks-yarn.yarn-installer-task.YarnInstaller@2
-    inputs:
-      versionSpec: "1.x"
-
-  - task: AzureKeyVault@1
-    displayName: "Azure Key Vault: Get Secrets"
-    inputs:
-      azureSubscription: "vscode-builds-subscription"
-      KeyVaultName: vscode
-
-  - script: |
-      set -e
-      cat << EOF > ~/.netrc
-      machine github.com
-      login vscode
-      password $(github-distro-mixin-password)
-      EOF
-
-      git config user.email "vscode@microsoft.com"
-      git config user.name "VSCode"
-    displayName: Prepare tooling
-
-  - script: |
-      set -e
-      git pull --no-rebase https://github.com/$(VSCODE_MIXIN_REPO).git $(node -p "require('./package.json').distro")
-    displayName: Merge distro
-
-  - script: |
-      mkdir -p .build
-      node build/azure-pipelines/common/computeNodeModulesCacheKey.js $VSCODE_ARCH $ENABLE_TERRAPIN > .build/yarnlockhash
-    displayName: Prepare yarn cache flags
-
-  # using `genericNodeModules` instead of `nodeModules` here to avoid sharing the cache with builds running inside containers
-  - task: Cache@2
-    inputs:
-      key: 'genericNodeModules | $(Agent.OS) | .build/yarnlockhash'
-      path: .build/node_modules_cache
-      cacheHitVar: NODE_MODULES_RESTORED
-    displayName: Restore node_modules cache
-
-  - script: |
-      set -e
-      tar -xzf .build/node_modules_cache/cache.tgz
-    condition: and(succeeded(), eq(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Extract node_modules cache
-
-  - script: |
-      set -e
-      sudo apt update -y
-      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
-    displayName: Install build tools
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      npx https://aka.ms/enablesecurefeed standAlone
-    timeoutInMinutes: 5
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'), eq(variables['ENABLE_TERRAPIN'], 'true'))
-    displayName: Switch to Terrapin packages
-
-  - script: |
-      set -e
-      sudo apt update -y
-      sudo apt install -y build-essential pkg-config libx11-dev libx11-xcb-dev libxkbfile-dev libsecret-1-dev libnotify-bin
-    displayName: Install build tools
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      for i in {1..3}; do # try 3 times, for Terrapin
-        yarn --frozen-lockfile && break
-        if [ $i -eq 3 ]; then
-          echo "Yarn failed too many times" >&2
-          exit 1
-        fi
-        echo "Yarn failed $i, trying again..."
-      done
-    env:
-      ELECTRON_SKIP_BINARY_DOWNLOAD: 1
-      PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
-    displayName: Install dependencies
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-
-  - script: |
-      set -e
-      node build/azure-pipelines/common/listNodeModules.js .build/node_modules_list.txt
-      mkdir -p .build/node_modules_cache
-      tar -czf .build/node_modules_cache/cache.tgz --files-from .build/node_modules_list.txt
-    condition: and(succeeded(), ne(variables.NODE_MODULES_RESTORED, 'true'))
-    displayName: Create node_modules archive
-
-  # Mixin must run before optimize, because the CSS loader will inline small SVGs
-  - script: |
-      set -e
-      node build/azure-pipelines/mixin
-    displayName: Mix in quality
-
-  - script: |
-      set -e
-      yarn gulp hygiene
-      yarn monaco-compile-check
-      yarn valid-layers-check
-    displayName: Run hygiene, monaco compile & valid layers checks
-    condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-
-  - script: |
-      set -
-      ./build/azure-pipelines/common/extract-telemetry.sh
-    displayName: Extract Telemetry
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
-
-  - script: |
-      set -e
-      AZURE_WEBVIEW_STORAGE_ACCESS_KEY="$(vscode-webview-storage-key)" \
-      ./build/azure-pipelines/common/publish-webview.sh
-    displayName: Publish Webview
-    condition: and(succeeded(), ne(variables['VSCODE_PUBLISH'], 'false'))
--- a/build/eslint.js
+++ b/build/eslint.js
@ -0,0 +1,36 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+const es = require('event-stream');
+const vfs = require('vinyl-fs');
+const { jsHygieneFilter, tsHygieneFilter } = require('./filters');
+
+function eslint() {
+	const gulpeslint = require('gulp-eslint');
+	return vfs
+		.src([...jsHygieneFilter, ...tsHygieneFilter], { base: '.', follow: true, allowEmpty: true })
+		.pipe(
+			gulpeslint({
+				configFile: '.eslintrc.json',
+				rulePaths: ['./build/lib/eslint'],
+			})
+		)
+		.pipe(gulpeslint.formatEach('compact'))
+		.pipe(
+			gulpeslint.results((results) => {
+				if (results.warningCount > 0 || results.errorCount > 0) {
+					throw new Error('eslint failed with warnings and/or errors');
+				}
+			})
+		).pipe(es.through(function () { /* noop, important for the stream to end */ }));
+}
+
+if (require.main === module) {
+	eslint().on('error', (err) => {
+		console.error();
+		console.error(err);
+		process.exit(1);
+	});
+}
--- a/build/filters.js
+++ b/build/filters.js
@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+/**
+ * Hygiene works by creating cascading subsets of all our files and
+ * passing them through a sequence of checks. Here are the current subsets,
+ * named according to the checks performed on them. Each subset contains
+ * the following one, as described in mathematical notation:
+ *
+ * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
+ */
+
+module.exports.all = [
+	'*',
+	'build/**/*',
+	'extensions/**/*',
+	'scripts/**/*',
+	'src/**/*',
+	'test/**/*',
+	'!out*/**',
+	'!test/**/out/**',
+	'!**/node_modules/**',
+];
+
+module.exports.indentationFilter = [
+	'**',
+
+	// except specific files
+	'!**/ThirdPartyNotices.txt',
+	'!**/LICENSE.{txt,rtf}',
+	'!LICENSES.chromium.html',
+	'!**/LICENSE',
+	'!src/vs/nls.js',
+	'!src/vs/nls.build.js',
+	'!src/vs/css.js',
+	'!src/vs/css.build.js',
+	'!src/vs/loader.js',
+	'!src/vs/base/common/insane/insane.js',
+	'!src/vs/base/common/marked/marked.js',
+	'!src/vs/base/common/semver/semver.js',
+	'!src/vs/base/node/terminateProcess.sh',
+	'!src/vs/base/node/cpuUsage.sh',
+	'!test/unit/assert.js',
+	'!resources/linux/snap/electron-launch',
+
+	// except specific folders
+	'!test/automation/out/**',
+	'!test/monaco/out/**',
+	'!test/smoke/out/**',
+	'!extensions/typescript-language-features/test-workspace/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!build/monaco/**',
+	'!build/win32/**',
+
+	// except multiple specific files
+	'!**/package.json',
+	'!**/yarn.lock',
+	'!**/yarn-error.log',
+
+	// except multiple specific folders
+	'!**/codicon/**',
+	'!**/fixtures/**',
+	'!**/lib/**',
+	'!extensions/**/dist/**',
+	'!extensions/**/out/**',
+	'!extensions/**/snippets/**',
+	'!extensions/**/syntaxes/**',
+	'!extensions/**/themes/**',
+	'!extensions/**/colorize-fixtures/**',
+
+	// except specific file types
+	'!src/vs/*/**/*.d.ts',
+	'!src/typings/**/*.d.ts',
+	'!extensions/**/*.d.ts',
+	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
+	'!build/{lib,download,darwin}/**/*.js',
+	'!build/**/*.sh',
+	'!build/azure-pipelines/**/*.js',
+	'!build/azure-pipelines/**/*.config',
+	'!**/Dockerfile',
+	'!**/Dockerfile.*',
+	'!**/*.Dockerfile',
+	'!**/*.dockerfile',
+	'!extensions/markdown-language-features/media/*.js',
+	'!extensions/simple-browser/media/*.js',
+];
+
+module.exports.copyrightFilter = [
+	'**',
+	'!**/*.desktop',
+	'!**/*.json',
+	'!**/*.html',
+	'!**/*.template',
+	'!**/*.md',
+	'!**/*.bat',
+	'!**/*.cmd',
+	'!**/*.ico',
+	'!**/*.icns',
+	'!**/*.xml',
+	'!**/*.sh',
+	'!**/*.txt',
+	'!**/*.xpm',
+	'!**/*.opts',
+	'!**/*.disabled',
+	'!**/*.code-workspace',
+	'!**/*.js.map',
+	'!build/**/*.init',
+	'!resources/linux/snap/snapcraft.yaml',
+	'!resources/win32/bin/code.js',
+	'!resources/web/code-web.js',
+	'!resources/completions/**',
+	'!extensions/configuration-editing/build/inline-allOf.ts',
+	'!extensions/markdown-language-features/media/highlight.css',
+	'!extensions/html-language-features/server/src/modes/typescript/*',
+	'!extensions/*/server/bin/*',
+	'!src/vs/editor/test/node/classification/typescript-test.ts',
+];
+
+module.exports.jsHygieneFilter = [
+	'src/**/*.js',
+	'build/gulpfile.*.js',
+	'!src/vs/loader.js',
+	'!src/vs/css.js',
+	'!src/vs/nls.js',
+	'!src/vs/css.build.js',
+	'!src/vs/nls.build.js',
+	'!src/**/insane.js',
+	'!src/**/marked.js',
+	'!src/**/semver.js',
+	'!**/test/**',
+];
+
+module.exports.tsHygieneFilter = [
+	'src/**/*.ts',
+	'test/**/*.ts',
+	'extensions/**/*.ts',
+	'!src/vs/*/**/*.d.ts',
+	'!src/typings/**/*.d.ts',
+	'!extensions/**/*.d.ts',
+	'!**/fixtures/**',
+	'!**/typings/**',
+	'!**/node_modules/**',
+	'!extensions/typescript-basics/test/colorize-fixtures/**',
+	'!extensions/vscode-api-tests/testWorkspace/**',
+	'!extensions/vscode-api-tests/testWorkspace2/**',
+	'!extensions/**/*.test.ts',
+	'!extensions/html-language-features/server/lib/jquery.d.ts',
+];
--- a/build/gulpfile.compile.js
+++ b/build/gulpfile.compile.js
@ -11,6 +11,11 @@ const task = require('./lib/task');
 const compilation = require('./lib/compilation');

 // Full compile, including nls and inline sources in sourcemaps, for build
-const compileBuildTask = task.define('compile-build', task.series(util.rimraf('out-build'), compilation.compileTask('src', 'out-build', true)));
+const compileBuildTask = task.define('compile-build',
+	task.series(
+		util.rimraf('out-build'),
+		compilation.compileTask('src', 'out-build', true)
+	)
+);
 gulp.task(compileBuildTask);
-exports.compileBuildTask = compileBuildTask;
+exports.compileBuildTask = compileBuildTask;
--- a/build/gulpfile.extensions.js
+++ b/build/gulpfile.extensions.js
@ -210,6 +210,8 @@ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.
 ));

 gulp.task(compileExtensionsBuildTask);
+gulp.task(task.define('extensions-ci', task.series(compileExtensionsBuildTask)));
+
 exports.compileExtensionsBuildTask = compileExtensionsBuildTask;

 const compileWebExtensionsTask = task.define('compile-web', () => buildWebExtensions(false));
--- a/build/gulpfile.hygiene.js
+++ b/build/gulpfile.hygiene.js
@ -4,51 +4,28 @@
 *--------------------------------------------------------------------------------------------*/

 const gulp = require('gulp');
-const filter = require('gulp-filter');
 const es = require('event-stream');
-const vfs = require('vinyl-fs');
 const path = require('path');
 const task = require('./lib/task');
-const { all, jsHygieneFilter, tsHygieneFilter, hygiene } = require('./hygiene');
-
-gulp.task('eslint', () => {
-	const gulpeslint = require('gulp-eslint');
-	return vfs
-		.src(all, { base: '.', follow: true, allowEmpty: true })
-		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
-		.pipe(
-			gulpeslint({
-				configFile: '.eslintrc.json',
-				rulePaths: ['./build/lib/eslint'],
-			})
-		)
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(
-			gulpeslint.results((results) => {
-				if (results.warningCount > 0 || results.errorCount > 0) {
-					throw new Error('eslint failed with warnings and/or errors');
-				}
-			})
-		);
-});
+const { hygiene } = require('./hygiene');

 function checkPackageJSON(actualPath) {
 	const actual = require(path.join(__dirname, '..', actualPath));
 	const rootPackageJSON = require('../package.json');
 	const checkIncluded = (set1, set2) => {
 		for (let depName in set1) {
-		const depVersion = set1[depName];
-		const rootDepVersion = set2[depName];
-		if (!rootDepVersion) {
-			// missing in root is allowed
-			continue;
-		}
-		if (depVersion !== rootDepVersion) {
-			this.emit(
-				'error',
-				`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
-			);
-		}
+			const depVersion = set1[depName];
+			const rootDepVersion = set2[depName];
+			if (!rootDepVersion) {
+				// missing in root is allowed
+				continue;
+			}
+			if (depVersion !== rootDepVersion) {
+				this.emit(
+					'error',
+					`The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`
+				);
+			}
 		}
 	};

@ -67,7 +44,5 @@ const checkPackageJSONTask = task.define('check-package-json', () => {
 });
 gulp.task(checkPackageJSONTask);

-gulp.task(
-	'hygiene',
-	task.series(checkPackageJSONTask, () => hygiene())
-);
+const hygieneTask = task.define('hygiene', task.series(checkPackageJSONTask, () => hygiene(undefined, false)));
+gulp.task(hygieneTask);
--- a/build/gulpfile.vscode.js
+++ b/build/gulpfile.vscode.js
@ -99,6 +99,16 @@ const minifyVSCodeTask = task.define('minify-vscode', task.series(
 ));
 gulp.task(minifyVSCodeTask);

+const core = task.define('core-ci', task.series(
+	gulp.task('compile-build'),
+	task.parallel(
+		gulp.task('minify-vscode'),
+		gulp.task('minify-vscode-reh'),
+		gulp.task('minify-vscode-reh-web'),
+	)
+));
+gulp.task(core);
+
 /**
 * Compute checksums for some files.
 *
--- a/build/hygiene.js
+++ b/build/hygiene.js
@ -10,152 +10,7 @@ const vfs = require('vinyl-fs');
 const path = require('path');
 const fs = require('fs');
 const pall = require('p-all');
-
-/**
- * Hygiene works by creating cascading subsets of all our files and
- * passing them through a sequence of checks. Here are the current subsets,
- * named according to the checks performed on them. Each subset contains
- * the following one, as described in mathematical notation:
- *
- * all ⊃ eol ⊇ indentation ⊃ copyright ⊃ typescript
- */
-
-const all = [
-	'*',
-	'build/**/*',
-	'extensions/**/*',
-	'scripts/**/*',
-	'src/**/*',
-	'test/**/*',
-	'!test/**/out/**',
-	'!**/node_modules/**',
-];
-module.exports.all = all;
-
-const indentationFilter = [
-	'**',
-
-	// except specific files
-	'!**/ThirdPartyNotices.txt',
-	'!**/LICENSE.{txt,rtf}',
-	'!LICENSES.chromium.html',
-	'!**/LICENSE',
-	'!src/vs/nls.js',
-	'!src/vs/nls.build.js',
-	'!src/vs/css.js',
-	'!src/vs/css.build.js',
-	'!src/vs/loader.js',
-	'!src/vs/base/common/insane/insane.js',
-	'!src/vs/base/common/marked/marked.js',
-	'!src/vs/base/common/semver/semver.js',
-	'!src/vs/base/node/terminateProcess.sh',
-	'!src/vs/base/node/cpuUsage.sh',
-	'!test/unit/assert.js',
-	'!resources/linux/snap/electron-launch',
-
-	// except specific folders
-	'!test/automation/out/**',
-	'!test/monaco/out/**',
-	'!test/smoke/out/**',
-	'!extensions/typescript-language-features/test-workspace/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!build/monaco/**',
-	'!build/win32/**',
-
-	// except multiple specific files
-	'!**/package.json',
-	'!**/yarn.lock',
-	'!**/yarn-error.log',
-
-	// except multiple specific folders
-	'!**/codicon/**',
-	'!**/fixtures/**',
-	'!**/lib/**',
-	'!extensions/**/dist/**',
-	'!extensions/**/out/**',
-	'!extensions/**/snippets/**',
-	'!extensions/**/syntaxes/**',
-	'!extensions/**/themes/**',
-	'!extensions/**/colorize-fixtures/**',
-
-	// except specific file types
-	'!src/vs/*/**/*.d.ts',
-	'!src/typings/**/*.d.ts',
-	'!extensions/**/*.d.ts',
-	'!**/*.{svg,exe,png,bmp,jpg,scpt,bat,cmd,cur,ttf,woff,eot,md,ps1,template,yaml,yml,d.ts.recipe,ico,icns,plist}',
-	'!build/{lib,download,darwin}/**/*.js',
-	'!build/**/*.sh',
-	'!build/azure-pipelines/**/*.js',
-	'!build/azure-pipelines/**/*.config',
-	'!**/Dockerfile',
-	'!**/Dockerfile.*',
-	'!**/*.Dockerfile',
-	'!**/*.dockerfile',
-	'!extensions/markdown-language-features/media/*.js',
-	'!extensions/simple-browser/media/*.js',
-];
-
-const copyrightFilter = [
-	'**',
-	'!**/*.desktop',
-	'!**/*.json',
-	'!**/*.html',
-	'!**/*.template',
-	'!**/*.md',
-	'!**/*.bat',
-	'!**/*.cmd',
-	'!**/*.ico',
-	'!**/*.icns',
-	'!**/*.xml',
-	'!**/*.sh',
-	'!**/*.txt',
-	'!**/*.xpm',
-	'!**/*.opts',
-	'!**/*.disabled',
-	'!**/*.code-workspace',
-	'!**/*.js.map',
-	'!build/**/*.init',
-	'!resources/linux/snap/snapcraft.yaml',
-	'!resources/win32/bin/code.js',
-	'!resources/web/code-web.js',
-	'!resources/completions/**',
-	'!extensions/configuration-editing/build/inline-allOf.ts',
-	'!extensions/markdown-language-features/media/highlight.css',
-	'!extensions/html-language-features/server/src/modes/typescript/*',
-	'!extensions/*/server/bin/*',
-	'!src/vs/editor/test/node/classification/typescript-test.ts',
-];
-
-const jsHygieneFilter = [
-	'src/**/*.js',
-	'build/gulpfile.*.js',
-	'!src/vs/loader.js',
-	'!src/vs/css.js',
-	'!src/vs/nls.js',
-	'!src/vs/css.build.js',
-	'!src/vs/nls.build.js',
-	'!src/**/insane.js',
-	'!src/**/marked.js',
-	'!src/**/semver.js',
-	'!**/test/**',
-];
-module.exports.jsHygieneFilter = jsHygieneFilter;
-
-const tsHygieneFilter = [
-	'src/**/*.ts',
-	'test/**/*.ts',
-	'extensions/**/*.ts',
-	'!**/fixtures/**',
-	'!**/typings/**',
-	'!**/node_modules/**',
-	'!extensions/typescript-basics/test/colorize-fixtures/**',
-	'!extensions/vscode-api-tests/testWorkspace/**',
-	'!extensions/vscode-api-tests/testWorkspace2/**',
-	'!extensions/**/*.test.ts',
-	'!extensions/html-language-features/server/lib/jquery.d.ts',
-];
-module.exports.tsHygieneFilter = tsHygieneFilter;
+const { all, copyrightFilter, indentationFilter, jsHygieneFilter, tsHygieneFilter } = require('./filters');

 const copyrightHeaderLines = [
 	'/*---------------------------------------------------------------------------------------------',
@ -164,7 +19,7 @@ const copyrightHeaderLines = [
 	' *--------------------------------------------------------------------------------------------*/',
 ];

-function hygiene(some) {
+function hygiene(some, linting = true) {
 	const gulpeslint = require('gulp-eslint');
 	const tsfmt = require('typescript-formatter');

@ -277,26 +132,32 @@ function hygiene(some) {
 		.pipe(filter(copyrightFilter))
 		.pipe(copyrights);

-	const typescript = result.pipe(filter(tsHygieneFilter)).pipe(formatting);
+	const streams = [
+		result.pipe(filter(tsHygieneFilter)).pipe(formatting)
+	];

-	const javascript = result
-		.pipe(filter(jsHygieneFilter.concat(tsHygieneFilter)))
-		.pipe(
-			gulpeslint({
-				configFile: '.eslintrc.json',
-				rulePaths: ['./build/lib/eslint'],
-			})
-		)
-		.pipe(gulpeslint.formatEach('compact'))
-		.pipe(
-			gulpeslint.results((results) => {
-				errorCount += results.warningCount;
-				errorCount += results.errorCount;
-			})
+	if (linting) {
+		streams.push(
+			result
+				.pipe(filter([...jsHygieneFilter, ...tsHygieneFilter]))
+				.pipe(
+					gulpeslint({
+						configFile: '.eslintrc.json',
+						rulePaths: ['./build/lib/eslint'],
+					})
+				)
+				.pipe(gulpeslint.formatEach('compact'))
+				.pipe(
+					gulpeslint.results((results) => {
+						errorCount += results.warningCount;
+						errorCount += results.errorCount;
+					})
+				)
 		);
+	}

 	let count = 0;
-	return es.merge(typescript, javascript).pipe(
+	return es.merge(...streams).pipe(
 		es.through(
 			function (data) {
 				count++;
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "code-oss-dev",
  "version": "1.53.0",
-  "distro": "a931eb4eaecce32bb290c9e27dc9f4a10ed6f330",
+  "distro": "8fc3bcb85e651a881b66975f5a877982f6e1aaec",
  "author": {
    "name": "Microsoft Corporation"
  },
@ -44,14 +44,17 @@
    "web": "node resources/web/code-web.js",
    "compile-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-web",
    "watch-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js watch-web",
-    "eslint": "eslint -c .eslintrc.json --rulesdir ./build/lib/eslint --ext .ts --ext .js ./src/vs ./extensions",
+    "eslint": "node build/eslint",
    "electron-rebuild": "electron-rebuild --arch=arm64 --force --version=11.1.0",
    "playwright-install": "node node_modules/playwright/install.js",
    "compile-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-build",
    "compile-extensions-build": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js compile-extensions-build",
    "minify-vscode": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode",
    "minify-vscode-reh": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh",
-    "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web"
+    "minify-vscode-reh-web": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js minify-vscode-reh-web",
+    "hygiene": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js hygiene",
+    "core-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js core-ci",
+    "extensions-ci": "node --max_old_space_size=4095 ./node_modules/gulp/bin/gulp.js extensions-ci"
  },
  "dependencies": {
    "applicationinsights": "1.0.8",