Update dependencies

Author: JoeRobich

package-lock.json

@@ -63,80 +63,66 @@
   },
   "dependencies": {
     "async-file": "2.0.2",
-    "fs-extra": "7.0.1",
-    "http-proxy-agent": "2.1.0",
-    "https-proxy-agent": "^3.0.1",
+    "fs-extra": "9.1.0",
+    "http-proxy-agent": "4.0.1",
+    "https-proxy-agent": "5.0.0",
     "jsonc-parser": "3.0.0",
     "microsoft.aspnetcore.razor.vscode": "https://download.visualstudio.microsoft.com/download/pr/92748a92-32fe-4cf9-b6c2-e3d0edacf90d/d2dce097206432dfa3e47d9b09e58c93/microsoft.aspnetcore.razor.vscode-6.0.0-alpha.1.21201.19.tgz",
-    "mkdirp": "^1.0.3",
-    "node-filter-async": "1.1.1",
     "node-machine-id": "1.1.12",
-    "remove-bom-buffer": "3.0.0",
-    "request-light": "0.2.4",
-    "rxjs": "6.4.0",
+    "request-light": "0.4.0",
+    "rxjs": "6.6.7",
     "semver": "5.6.0",
     "stream": "0.0.2",
-    "strip-bom": "3.0.0",
+    "strip-bom": "5.0.0",
+    "strip-bom-buf": "2.0.0",
     "tmp": "0.0.33",
     "vscode-debugprotocol": "1.33.0",
     "vscode-extension-telemetry": "0.1.6",
     "vscode-languageserver-protocol": "3.16.0",
     "yauzl": "2.10.0"
   },
   "devDependencies": {
-    "@types/archiver": "2.1.2",
-    "@types/chai": "4.1.7",
-    "@types/chai-arrays": "1.0.2",
-    "@types/chai-as-promised": "7.1.0",
-    "@types/chai-string": "1.4.1",
+    "@types/archiver": "5.1.0",
+    "@types/chai": "4.2.16",
+    "@types/chai-arrays": "2.0.0",
+    "@types/chai-as-promised": "7.1.3",
+    "@types/chai-string": "1.4.2",
     "@types/del": "3.0.1",
     "@types/fs-extra": "5.0.4",
     "@types/gulp": "4.0.5",
-    "@types/gulp-mocha": "0.0.32",
-    "@types/minimist": "1.2.0",
-    "@types/mkdirp": "0.5.2",
+    "@types/minimist": "1.2.1",
     "@types/mocha": "5.2.5",
     "@types/node": "10.12.24",
     "@types/semver": "5.5.0",
     "@types/tmp": "0.0.33",
     "@types/unzipper": "^0.9.1",
     "@types/yauzl": "2.9.1",
-    "archiver": "3.0.0",
-    "async-child-process": "1.1.1",
-    "async-shelljs": "0.1.2",
-    "chai": "4.2.0",
-    "chai-arrays": "2.0.0",
+    "archiver": "5.3.0",
+    "chai": "4.3.4",
+    "chai-arrays": "2.2.0",
     "chai-as-promised": "7.1.1",
     "chai-fs": "2.0.0",
     "chai-string": "1.5.0",
-    "copyfiles": "^2.3.0",
-    "cross-env": "5.2.0",
     "del": "3.0.0",
-    "find-versions": "3.0.0",
-    "get-port": "4.1.0",
-    "glob-promise": "3.4.0",
-    "gulp": "4.0.0",
-    "gulp-mocha": "6.0.0",
-    "gulp-tslint": "8.1.3",
-    "ltcdr": "2.2.1",
-    "mocha": "^8.1.1",
-    "mocha-typescript": "1.1.17",
-    "mock-fs": "4.8.0",
+    "find-versions": "4.0.0",
+    "get-port": "5.1.1",
+    "glob-promise": "4.1.0",
+    "gulp": "4.0.2",
+    "gulp-tslint": "8.1.4",
+    "mocha": "8.3.2",
+    "mock-fs": "4.13.0",
     "mock-http-server": "1.4.2",
-    "natives": "1.1.6",
     "npm-run-all": "4.1.5",
-    "plist": "3.0.1",
-    "source-map-support": "0.5.10",
-    "ts-loader": "5.3.3",
-    "ts-node": "8.0.2",
+    "ts-loader": "9.0.0",
+    "ts-node": "9.1.1",
     "tslint": "5.12.1",
     "tslint-microsoft-contrib": "6.0.0",
     "tslint-no-unused-expression-chai": "0.1.4",
-    "typescript": "^3.8.3",
-    "unzipper": "0.9.10",
+    "typescript": "4.2.4",
+    "unzipper": "0.10.11",
     "vsce": "1.57.0",
     "vscode": "1.1.37",
-    "webpack": "5.30.0",
+    "webpack": "5.34.0",
     "webpack-cli": "4.6.0"
   },
   "runtimeDependencies": [

package.json

@@ -31,6 +31,21 @@ export function sum<T>(arr: T[], selector: (item: T) => number): number {
     return arr.reduce((prev, curr) => prev + selector(curr), 0);
 }
 
+export async function mapAsync<T1, T2>(
+    array: T1[],
+    selector: (value: T1, index: number, array: T1[]) => Promise<T2>,
+): Promise<T2[]> {
+    return Promise.all(array.map(selector));
+}
+
+export async function filterAsync<T>(
+    array: T[],
+    predicate: (value: T, index: number, array: T[]) => Promise<boolean>,
+): Promise<T[]> {
+    const filterMap = await mapAsync(array, predicate);
+    return array.filter((_, index) => filterMap[index]);
+}
+
 /** Retrieve the length of an array. Returns 0 if the array is `undefined`. */
 export function safeLength<T>(arr: T[] | undefined) {
     return arr ? arr.length : 0;

src/common.ts

@@ -8,8 +8,6 @@ import * as util from '../common';
 import { PackageError } from "./PackageError";
 import { AbsolutePathPackage } from "./AbsolutePathPackage";
 
-const { filterAsync } = require('node-filter-async');
-
 export async function getNotInstalledPackagesForPlatform(packages: AbsolutePathPackage[], platformInfo: PlatformInformation): Promise<AbsolutePathPackage[]> {
     let platformPackages = filterPlatformPackages(packages, platformInfo);
     return filterAlreadyInstalledPackages(platformPackages);
@@ -35,7 +33,7 @@ export function filterPlatformPackages(packages: AbsolutePathPackage[], platform
 }
 
 async function filterAlreadyInstalledPackages(packages: AbsolutePathPackage[]): Promise<AbsolutePathPackage[]> {
-    return filterAsync(packages, async (pkg: AbsolutePathPackage) => {
+    return util.filterAsync(packages, async (pkg: AbsolutePathPackage) => {
         //If the install.Lock file is present for this package then do not install it again
         let testPath = util.getInstallFilePath(pkg.installPath, util.InstallFileType.Lock);
         if (!testPath) {

src/packageManager/PackageFilterer.ts

@@ -5,8 +5,9 @@
 
 import { Url, parse as parseUrl } from 'url';
 import { isBoolean } from '../common';
-const HttpProxyAgent = require('http-proxy-agent');
-const HttpsProxyAgent = require('https-proxy-agent');
+import HttpProxyAgent = require('http-proxy-agent');
+import HttpsProxyAgent = require('https-proxy-agent');
+import { Agent } from 'http';
 
 function getSystemProxyURL(requestURL: Url): string {
     if (requestURL.protocol === 'http:') {
@@ -18,7 +19,7 @@ function getSystemProxyURL(requestURL: Url): string {
     return null;
 }
 
-export function getProxyAgent(requestURL: Url, proxy: string, strictSSL: boolean): any {
+export function getProxyAgent(requestURL: Url, proxy: string, strictSSL: boolean): Agent {
     const proxyURL = proxy || getSystemProxyURL(requestURL);
 
     if (!proxyURL) {
@@ -38,5 +39,5 @@ export function getProxyAgent(requestURL: Url, proxy: string, strictSSL: boolean
         rejectUnauthorized: isBoolean(strictSSL) ? strictSSL : true
     };
 
-    return requestURL.protocol === 'http:' ? new HttpProxyAgent(opts) : new HttpsProxyAgent(opts);
+    return requestURL.protocol === 'http:' ? HttpProxyAgent(opts) : HttpsProxyAgent(opts);
 }

src/packageManager/proxy.ts

@@ -12,7 +12,7 @@ import * as Event from "../omnisharp/loggingEvents";
 import NetworkSettings, { NetworkSettingsProvider } from '../NetworkSettings';
 import { getBufferIntegrityHash } from '../packageManager/isValidDownload';
 import { EventType } from '../omnisharp/EventType';
-const findVersions = require('find-versions');
+import findVersions = require('find-versions');
 
 interface PackageJSONFile {
     runtimeDependencies: Package[];

src/tools/UpdatePackageDependencies.ts

@@ -3,8 +3,8 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-const removeBomBuffer = require("remove-bom-buffer");
-const removeBomString = require("strip-bom");
+import removeBomBuffer = require("strip-bom-buf");
+import removeBomString from "strip-bom";
 
 export function removeBOMFromBuffer(buffer: Buffer): Buffer {
     return <Buffer>removeBomBuffer(buffer);

src/utils/removeBOM.ts

@@ -14,6 +14,7 @@ export const onlineVscodeignorePath = path.join(rootPath, 'release.vscodeignore'
 
 export const nodeModulesPath = path.join(rootPath, 'node_modules');
 export const vscePath = path.join(nodeModulesPath, 'vsce', 'out', 'vsce');
+export const mochaPath = path.join(nodeModulesPath, 'mocha', 'bin', 'mocha');
 export const vscodeTestHostPath = path.join(nodeModulesPath, 'vscode', 'bin', 'test');
 
 export const packageJsonPath = path.join(rootPath, "package.json");

tasks/projectPaths.ts

@@ -3,34 +3,29 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { SpawnOptions, spawn } from "child_process";
+import { spawnSync, SpawnSyncOptions } from "child_process";
 import { nodePath, rootPath } from "./projectPaths";
-const { join } = require("async-child-process");
 
-export default async function spawnNode(args?: string[], options?: SpawnOptions): Promise<{ code: string; signal: string; }> {
+export default async function spawnNode(args?: string[], options?: SpawnSyncOptions) {
     if (!options) {
         options = {
             env: {}
         };
     }
 
-    let optionsWithFullEnvironment = {
+    const optionsWithFullEnvironment: SpawnSyncOptions = {
         cwd: rootPath,
         ...options,
         env: {
             ...process.env,
             ...options.env
-        }
+        },
+        stdio: "inherit"
     };
 
     console.log(`starting ${nodePath} ${args.join(' ')}`);
 
-    let spawned = spawn(nodePath, args, optionsWithFullEnvironment);
-
-    spawned.stderr.pipe(process.stdout);
-    spawned.stdout.pipe(process.stdout);
+    const buffer = spawnSync(nodePath, args, optionsWithFullEnvironment);
 
-    return join(spawned);
+    return { code: buffer.status, signal: buffer.signal };
 }

tasks/spawnNode.ts

@@ -3,12 +3,9 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
 import * as gulp from 'gulp';
-import * as mocha from 'gulp-mocha';
 import * as path from 'path';
-import { codeExtensionPath, rootPath, testAssetsRootPath, testRootPath, vscodeTestHostPath } from './projectPaths';
+import { codeExtensionPath, mochaPath, rootPath, testAssetsRootPath, testRootPath, vscodeTestHostPath } from './projectPaths';
 import spawnNode from './spawnNode';
 
 gulp.task("test:feature", async () => {
@@ -24,8 +21,13 @@ gulp.task("test:feature", async () => {
 });
 
 gulp.task("test:unit", async () => {
-    return gulp.src('test/unitTests/**/*.test.ts', { read: false })
-        .pipe(mocha({ ui: 'tdd', useColors: true }));
+    return spawnNode([
+        mochaPath,
+        '--ui',
+        'tdd',
+        '-c',
+        'test/unitTests/**/*.test.ts'
+    ]);
 });
 
 gulp.task("test:integration:singleCsproj", async () => {

tasks/testTasks.ts

@@ -47,7 +47,7 @@ suite(`Tasks generation: ${testAssetWorkspace.description}`, function () {
         let result = await vscode.debug.startDebugging(vscode.workspace.workspaceFolders[0], ".NET Core Launch (console)");
         expect(result, "Debugger could not be started.");
 
-        let debugSessionTerminated = new Promise(resolve => {
+        let debugSessionTerminated = new Promise<void>(resolve => {
             const onTerminateSubscription = vscode.debug.onDidTerminateDebugSession((e) => {
                 onTerminateSubscription.dispose();
                 resolve();

test/integrationTests/launchConfiguration.integration.test.ts

@@ -3,30 +3,24 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
+import { SpawnSyncOptions, spawnSync } from "child_process";
 
-import { SpawnOptions, spawn } from "child_process";
-import { join, Result } from "async-child-process";
-
-export default async function spawnGit(args?: string[], options?: SpawnOptions): Promise<Result> {
+export default async function spawnGit(args?: string[], options?: SpawnSyncOptions) {
     if (!options) {
         options = {
             env: {}
         };
     }
 
-    let optionsWithFullEnvironment = {
+    let optionsWithFullEnvironment: SpawnSyncOptions = {
         ...options,
         env: {
             ...process.env,
             ...options.env
         }
     };
 
-    let spawned = spawn('git', args, optionsWithFullEnvironment);
-
-    //spawned.stdout.on('data', (data) => console.log(data.toString()));
-    //spawned.stderr.on('data', (data) => console.log(data.toString()));
+    const buffer = spawnSync('git', args, optionsWithFullEnvironment);
 
-    return join(spawned);
+    return { code: buffer.status, signal: buffer.signal };
 }

test/integrationTests/testAssets/spawnGit.ts

@@ -108,7 +108,7 @@ suite("OmniSharpConfigChangeObserver", () => {
                 };
 
                 doClickOk = () => {
-                    resolve(...items);
+                    resolve(items[0]);
                 };
             });
         };

test/unitTests/OptionObserver/OptionChangeObserver.test.ts

@@ -17,7 +17,7 @@ suite("Common", () => {
             let array: number[] = [];
             let items = [1, 2, 3, 4, 5];
 
-            let promise = buildPromiseChain(items, async n => new Promise((resolve, reject) => {
+            let promise = buildPromiseChain(items, async n => new Promise<void>((resolve, reject) => {
                 array.push(n);
                 resolve();
             }));

test/unitTests/common.test.ts

@@ -92,7 +92,7 @@ suite("InformationMessageObserver", () => {
                 };
 
                 doClickOk = () => {
-                    resolve(...items);
+                    resolve(items[0]);
                 };
             });
         };