Merge pull request #279240 from mjbvz/dev/mjbvz/spotty-newt

Build script cleanup

Author: mjbvz

build/azure-pipelines/upload-cdn.ts

@@ -71,7 +71,7 @@ const MimeTypesToCompress = new Set([
 function wait(stream: es.ThroughStream): Promise<void> {
 	return new Promise<void>((c, e) => {
 		stream.on('end', () => c());
-		stream.on('error', (err: any) => e(err));
+		stream.on('error', (err) => e(err));
 	});
 }
 

build/azure-pipelines/upload-sourcemaps.ts

@@ -65,7 +65,7 @@ function main(): Promise<void> {
 				prefix: `sourcemaps/${commit}/`
 			}))
 			.on('end', () => c())
-			.on('error', (err: any) => e(err));
+			.on('error', (err) => e(err));
 	});
 }
 

build/gulpfile.editor.ts

@@ -6,7 +6,7 @@
 import gulp from 'gulp';
 import path from 'path';
 import * as util from './lib/util.ts';
-import * as getVersionModule from './lib/getVersion.ts';
+import { getVersion } from './lib/getVersion.ts';
 import * as task from './lib/task.ts';
 import es from 'event-stream';
 import File from 'vinyl';
@@ -17,11 +17,9 @@ import * as compilation from './lib/compilation.ts';
 import * as monacoapi from './lib/monaco-api.ts';
 import * as fs from 'fs';
 import filter from 'gulp-filter';
-import * as reporterModule from './lib/reporter.ts';
+import { createReporter } from './lib/reporter.ts';
 import monacoPackage from './monaco/package.json' with { type: 'json' };
 
-const { getVersion } = getVersionModule;
-const { createReporter } = reporterModule;
 const root = path.dirname(import.meta.dirname);
 const sha1 = getVersion(root);
 const semver = monacoPackage.version;

build/gulpfile.extensions.ts

@@ -13,18 +13,16 @@ import * as nodeUtil from 'util';
 import es from 'event-stream';
 import filter from 'gulp-filter';
 import * as util from './lib/util.ts';
-import * as getVersionModule from './lib/getVersion.ts';
+import { getVersion } from './lib/getVersion.ts';
 import * as task from './lib/task.ts';
 import watcher from './lib/watch/index.ts';
-import * as reporterModule from './lib/reporter.ts';
+import { createReporter } from './lib/reporter.ts';
 import glob from 'glob';
 import plumber from 'gulp-plumber';
 import * as ext from './lib/extensions.ts';
 import * as tsb from './lib/tsb/index.ts';
 import sourcemaps from 'gulp-sourcemaps';
 
-const { getVersion } = getVersionModule;
-const { createReporter } = reporterModule;
 const root = path.dirname(import.meta.dirname);
 const commit = getVersion(root);
 

build/gulpfile.scan.ts

@@ -8,13 +8,11 @@ import * as path from 'path';
 import * as task from './lib/task.ts';
 import * as util from './lib/util.ts';
 import electron from '@vscode/gulp-electron';
-import * as electronConfigModule from './lib/electron.ts';
+import { config } from './lib/electron.ts';
 import filter from 'gulp-filter';
 import * as deps from './lib/dependencies.ts';
 import { existsSync, readdirSync } from 'fs';
 
-const { config } = electronConfigModule;
-
 const root = path.dirname(import.meta.dirname);
 
 const BUILD_TARGETS = [

build/gulpfile.vscode.web.ts

@@ -86,7 +86,7 @@ const vscodeWebEntryPoints = [
 ].flat();
 
 /**
- * @param extensionsRoot {string} The location where extension will be read from
+ * @param extensionsRoot The location where extension will be read from
  * @param product The parsed product.json file contents
  */
 export const createVSCodeWebFileContentMapper = (extensionsRoot: string, product: typeof import('../product.json')) => {

build/gulpfile.vscode.win32.ts

@@ -2,22 +2,22 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import gulp from 'gulp';
-import * as path from 'path';
-import * as fs from 'fs';
 import assert from 'assert';
 import * as cp from 'child_process';
-import * as util from './lib/util.ts';
-import * as getVersionModule from './lib/getVersion.ts';
-import * as task from './lib/task.ts';
+import * as fs from 'fs';
+import gulp from 'gulp';
+import * as path from 'path';
+import rcedit from 'rcedit';
+import vfs from 'vinyl-fs';
 import pkg from '../package.json' with { type: 'json' };
 import product from '../product.json' with { type: 'json' };
-import vfs from 'vinyl-fs';
-import rcedit from 'rcedit';
-import { createRequire } from 'module';
+import { getVersion } from './lib/getVersion.ts';
+import * as task from './lib/task.ts';
+import * as util from './lib/util.ts';
 
-const { getVersion } = getVersionModule;
+import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
+
 const repoPath = path.dirname(import.meta.dirname);
 const commit = getVersion(repoPath);
 const buildPath = (arch: string) => path.join(path.dirname(repoPath), `VSCode-win32-${arch}`);
@@ -58,12 +58,12 @@ function packageInnoSetup(iss: string, options: { definitions?: Record<string, u
 		});
 }
 
-function buildWin32Setup(arch: string, target: string) {
+function buildWin32Setup(arch: string, target: string): task.CallbackTask {
 	if (target !== 'system' && target !== 'user') {
 		throw new Error('Invalid setup target');
 	}
 
-	return (cb?: (err?: any) => void) => {
+	return (cb) => {
 		const x64AppId = target === 'system' ? product.win32x64AppId : product.win32x64UserAppId;
 		const arm64AppId = target === 'system' ? product.win32arm64AppId : product.win32arm64UserAppId;
 

build/lib/compilation.ts

@@ -247,7 +247,7 @@ class MonacoGenerator {
 		return r;
 	}
 
-	private _log(message: any, ...rest: unknown[]): void {
+	private _log(message: string, ...rest: unknown[]): void {
 		fancyLog(ansiColors.cyan('[monaco.d.ts]'), message, ...rest);
 	}
 

build/lib/extensions.ts

@@ -131,7 +131,7 @@ function fromLocalWebpack(extensionPath: string, webpackConfigFileName: string,
 		) as string[]);
 		const webpackStreams = webpackConfigLocations.flatMap(webpackConfigPath => {
 
-			const webpackDone = (err: any, stats: any) => {
+			const webpackDone = (err: Error | undefined, stats: any) => {
 				fancyLog(`Bundled extension: ${ansiColors.yellow(path.join(path.basename(extensionPath), path.relative(extensionPath, webpackConfigPath)))}...`);
 				if (err) {
 					result.emit('error', err);

build/lib/i18n.ts

@@ -80,7 +80,7 @@ interface BundledFormat {
 
 type NLSKeysFormat = [string /* module ID */, string[] /* keys */];
 
-function isNLSKeysFormat(value: any): value is NLSKeysFormat {
+function isNLSKeysFormat(value: unknown): value is NLSKeysFormat {
 	if (value === undefined) {
 		return false;
 	}
@@ -239,7 +239,7 @@ export class XLF {
 
 			const files: { messages: Record<string, string>; name: string; language: string }[] = [];
 
-			parser.parseString(xlfString, function (err: any, result: any) {
+			parser.parseString(xlfString, function (err: Error | undefined, result: any) {
 				if (err) {
 					reject(new Error(`XLF parsing error: Failed to parse XLIFF string. ${err}`));
 				}