Merge branch 'main' into dependabot/npm_and_yarn/cross-spawn-6.0.6

JoeRobich · web-flow · commit e9300b36356c · 2025-01-07T22:27:17.000-08:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -136,8 +136,8 @@
     "@types/uuid": "^9.0.1",
     "@types/vscode": "1.93.0",
     "@types/yauzl": "2.10.0",
-    "@typescript-eslint/eslint-plugin": "^8.5.0",
-    "@typescript-eslint/parser": "^8.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
     "@vscode/l10n-dev": "^0.0.35",
     "@vscode/test-electron": "2.3.8",
     "@vscode/vsce": "3.0.0",
diff --git a/src/lsptoolshost/onAutoInsertFeature.ts b/src/lsptoolshost/onAutoInsertFeature.ts
@@ -22,7 +22,7 @@ import {
 } from 'vscode-languageserver-protocol';
 
 import * as RoslynProtocol from './roslynProtocol';
-import * as UUID from 'vscode-languageclient/lib/common/utils/uuid';
+import { generateUuid } from 'vscode-languageclient/lib/common/utils/uuid';
 
 export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAutoInsertRegistrationOptions> {
     private readonly _client: LanguageClient;
@@ -92,7 +92,7 @@ export class OnAutoInsertFeature implements DynamicFeature<RoslynProtocol.OnAuto
             return;
         }
         this.register({
-            id: UUID.generateUuid(),
+            id: generateUuid(),
             registerOptions: options,
         });
     }
diff --git a/src/lsptoolshost/optionNameConverter.ts b/src/lsptoolshost/optionNameConverter.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import assert = require('node:assert');
+import assert from 'node:assert';
 
 export function convertServerOptionNameToClientConfigurationName(section: string): string | null {
     // Server name would be in format {languageName}|{grouping}.{name} or
diff --git a/src/lsptoolshost/restore.ts b/src/lsptoolshost/restore.ts
@@ -12,7 +12,7 @@ import {
     RestoreRequest,
     ProjectNeedsRestoreRequest,
 } from './roslynProtocol';
-import path = require('path');
+import path from 'path';
 import { showErrorMessage } from '../shared/observers/utils/showMessage';
 import { getCSharpDevKit } from '../utils/getCSharpDevKit';
 
diff --git a/src/packageManager/proxy.ts b/src/packageManager/proxy.ts
@@ -4,8 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Url } from 'url';
-import HttpProxyAgent = require('http-proxy-agent');
-import HttpsProxyAgent = require('https-proxy-agent');
+import HttpProxyAgent from 'http-proxy-agent';
+import HttpsProxyAgent from 'https-proxy-agent';
 import { Agent } from 'http';
 
 function getSystemProxyURL(requestURL: Url): string | undefined {
diff --git a/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts b/src/razor/src/blazorDebug/blazorDebugConfigurationProvider.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import execa = require('execa');
+import execa from 'execa';
 import { promises, readFileSync } from 'fs';
 import { join } from 'path';
 import { fileURLToPath } from 'url';
diff --git a/src/razor/src/blazorDebug/terminateDebugHandler.ts b/src/razor/src/blazorDebug/terminateDebugHandler.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as psList from 'ps-list';
+import psList from 'ps-list';
 import { DebugSession } from 'vscode';
 import { RazorLogger } from '../razorLogger';
 import { JS_DEBUG_NAME, SERVER_APP_NAME } from './constants';
diff --git a/src/utils/removeBom.ts b/src/utils/removeBom.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import removeBomBuffer = require('strip-bom-buf');
+import removeBomBuffer from 'strip-bom-buf';
 import removeBomString from 'strip-bom';
 
 export function removeBOMFromBuffer(buffer: Buffer): Buffer {
diff --git a/tasks/commandLineArguments.ts b/tasks/commandLineArguments.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import * as path from 'path';
 
 const argv = minimist(process.argv.slice(2));
diff --git a/tasks/createTagsTasks.ts b/tasks/createTagsTasks.ts
@@ -5,7 +5,7 @@
 
 import * as gulp from 'gulp';
 import * as fs from 'fs';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import { Octokit } from '@octokit/rest';
 
 interface Options {
diff --git a/tasks/localizationTasks.ts b/tasks/localizationTasks.ts
@@ -5,7 +5,7 @@
 
 import * as gulp from 'gulp';
 import * as process from 'node:process';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import { spawnSync } from 'node:child_process';
 import * as path from 'path';
 import * as util from 'node:util';
diff --git a/tasks/offlinePackagingTasks.ts b/tasks/offlinePackagingTasks.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as cp from 'child_process';
-import * as del from 'del';
+import del from 'del';
 import * as fs from 'fs';
 import * as fsextra from 'fs-extra';
 import * as gulp from 'gulp';
@@ -31,7 +31,7 @@ import {
 import { getPackageJSON } from '../tasks/packageJson';
 import { createPackageAsync, generateVsixManifest } from '../tasks/vsceTasks';
 import { isValidDownload } from '../src/packageManager/isValidDownload';
-import path = require('path');
+import path from 'path';
 import { CancellationToken } from 'vscode';
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/tasks/signingTasks.ts b/tasks/signingTasks.ts
@@ -7,7 +7,7 @@ import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as gulp from 'gulp';
 import { rootPath } from './projectPaths';
-import path = require('path');
+import path from 'path';
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 //const argv = require('yargs').argv;
diff --git a/tasks/testTasks.ts b/tasks/testTasks.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as fs from 'fs';
+import fs from 'fs';
 import * as gulp from 'gulp';
 import * as path from 'path';
 import { codeExtensionPath, rootPath, outPath } from './projectPaths';
diff --git a/test/lsptoolshost/integrationTests/buildDiagnostics.integration.test.ts b/test/lsptoolshost/integrationTests/buildDiagnostics.integration.test.ts
@@ -8,7 +8,7 @@ import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } fr
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { AnalysisSetting, BuildDiagnosticsService } from '../../../src/lsptoolshost/buildDiagnosticsService';
 import * as integrationHelpers from './integrationHelpers';
-import path = require('path');
+import path from 'path';
 describe(`Build and live diagnostics dedupe`, () => {
     beforeAll(async () => {
         await integrationHelpers.activateCSharpExtension();
diff --git a/test/lsptoolshost/integrationTests/documentDiagnostics.integration.test.ts b/test/lsptoolshost/integrationTests/documentDiagnostics.integration.test.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { describe, test, beforeAll, afterAll, expect, beforeEach, afterEach } from '@jest/globals';
 import testAssetWorkspace from './testAssets/testAssetWorkspace';
 import { AnalysisSetting } from '../../../src/lsptoolshost/buildDiagnosticsService';
-import path = require('path');
+import path from 'path';
 import { getCode, setBackgroundAnalysisScopes, waitForExpectedDiagnostics } from './diagnosticsHelpers';
 import {
     activateCSharpExtension,
diff --git a/test/lsptoolshost/unitTests/migrateOptions.test.ts b/test/lsptoolshost/unitTests/migrateOptions.test.ts
@@ -18,6 +18,9 @@ import { getVSCodeWithConfig } from '../../fakes';
 import { CSharpExtensionId } from '../../../src/constants/csharpExtensionId';
 import { ConfigurationTarget } from '../../../src/vscodeAdapter';
 
+// Necessary when spying on module members.
+jest.mock('fs', () => ({ __esModule: true, ...(<any>jest.requireActual('fs')) }));
+
 describe('Migrate configurations', () => {
     const packageJson = JSON.parse(fs.readFileSync('package.json').toString());
     const configuration = packageJson.contributes.configuration;
diff --git a/test/omnisharp/omnisharpUnitTests/features/reportIssue.test.ts b/test/omnisharp/omnisharpUnitTests/features/reportIssue.test.ts
@@ -62,11 +62,7 @@ describe(`${reportIssue.name}`, () => {
             issueBody = rest[0].issueBody;
             return {} as any;
         });
-        jest.replaceProperty(vscode, 'extensions', {
-            all: [extension1, extension2],
-            getExtension: jest.fn(),
-            onDidChange: jest.fn(),
-        } as typeof vscode.extensions);
+        jest.replaceProperty(vscode.extensions, 'all', [extension1, extension2] as readonly vscode.Extension<any>[]);
 
         fakeMonoResolver = new FakeMonoResolver();
         fakeDotnetResolver = new FakeDotnetResolver();
diff --git a/test/omnisharp/omnisharpUnitTests/packages/packageFilterer.test.ts b/test/omnisharp/omnisharpUnitTests/packages/packageFilterer.test.ts
@@ -11,6 +11,9 @@ import { MockedFunction } from 'jest-mock';
 import * as fs from 'fs';
 import { join } from 'path';
 
+// Necessary when spying on module members.
+jest.mock('fs', () => ({ __esModule: true, ...(<any>jest.requireActual('fs')) }));
+
 describe(`${getNotInstalledPackagesForPlatform.name}`, () => {
     let absolutePathPackages: AbsolutePathPackage[];
     const extensionPath = '/ExtensionPath';
diff --git a/test/omnisharp/omnisharpUnitTests/testAssets/mockHttpsServer.ts b/test/omnisharp/omnisharpUnitTests/testAssets/mockHttpsServer.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as fs from 'async-file';
-import * as getPort from 'get-port';
+import getPort from 'get-port';
 
 // There are no typings for this library.
 // eslint-disable-next-line @typescript-eslint/no-var-requires
diff --git a/test/omnisharp/omnisharpUnitTests/testAssets/testZip.ts b/test/omnisharp/omnisharpUnitTests/testAssets/testZip.ts
@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as archiver from 'archiver';
+import archiver from 'archiver';
 import { TestFile } from './testFile';
 
 export default class TestZip {
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,7 +1,8 @@
 {
     "compilerOptions": {
-        "target": "es6",
-        "module": "commonjs",
+        "esModuleInterop": true,
+        "target": "ES2022",
+        "module": "CommonJS",
         "outDir": "out",
         "lib": [
             "ES2021"
@@ -20,7 +21,6 @@
         "src",
         "tasks",
         "test",
-        "omnisharptest",
         "typings",
         "__mocks__",
         "jest.config.ts",
