Merge pull request #57 from Tatsinnit/fix/dependencies

Update packages, vscode engine and associated changes.

Author: carolynvs

package-lock.json

@@ -7,7 +7,7 @@
     "publisher": "getporter",
     "icon": "resources/porter.png",
     "engines": {
-        "vscode": "^1.30.0"
+        "vscode": "^1.74.0"
     },
     "license": "Apache 2.0",
     "categories": [
@@ -256,33 +256,35 @@
         "vscode:prepublish": "npm run compile",
         "compile": "tsc -p ./",
         "watch": "tsc -watch -p ./",
-        "postinstall": "node ./node_modules/vscode/bin/install",
-        "test": "npm run compile && node ./node_modules/vscode/bin/test"
+        "test": "npm run compile && mocha -V && node ./out/test/index.js"
     },
     "extensionDependencies": [
         "redhat.vscode-yaml"
     ],
     "dependencies": {
-        "@types/shelljs": "^0.8.1",
+        "@types/shelljs": "^0.8.11",
+        "@vscode/debugadapter": "^1.58.0",
+        "@vscode/extension-telemetry": "^0.6.2",
         "await-notify": "1.0.1",
         "cnabjs": "0.0.5",
+        "eslint": "^8.30.0",
         "js-levenshtein": "^1.1.6",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^1.0.4",
         "shelljs": "^0.8.5",
-        "tmp": "^0.0.33",
-        "vscode-debugadapter": "^1.37.1",
-        "vscode-extension-telemetry": "^0.1.2",
-        "yaml-ast-parser": "0.0.43"
+        "tmp": "^0.2.1",
+        "yaml-ast-parser": "0.0.43",
+        "vscode-test": "^1.5.2",
+        "tslib": "^2.4.1"
     },
     "devDependencies": {
-        "@types/js-levenshtein": "^1.1.0",
-        "@types/mkdirp": "^0.5.2",
-        "@types/mocha": "^2.2.42",
-        "@types/node": "10.12.25",
-        "@types/tmp": "0.0.33",
-        "tslint": "^5.8.0",
-        "typescript": "^3.6.4",
-        "vscode": "^1.1.37"
+        "@types/js-levenshtein": "^1.1.1",
+        "@types/mkdirp": "^0.5.1",
+        "@types/mocha": "^10.0.1",
+        "mocha": "^9.0.2",
+        "@types/node": "18.11.17",
+        "@types/tmp": "0.2.3",
+        "@types/vscode": "^1.74.0",
+        "typescript": "^4.9.4"
     },
     "repository": {
         "type": "git",

package.json

@@ -4,8 +4,8 @@ import {
     TerminatedEvent, StoppedEvent, OutputEvent,
     Scope, Source, StackFrame, Thread, Handles,
     Breakpoint, BreakpointEvent, InitializedEvent
-} from 'vscode-debugadapter';
-import { DebugProtocol } from 'vscode-debugprotocol';
+} from '@vscode/debugadapter';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { basename } from 'path';
 import { PorterInstallRuntime } from './runtime';
 import {

src/debugger/install-session.ts

@@ -21,7 +21,8 @@ class PorterCodeActionProvider implements vscode.CodeActionProvider {
             return [];
         }
 
-        const actions = linters.map((l) => l.fixes(document, manifest, context.diagnostics));
+        const diagnostics = context.diagnostics;
+        const actions = linters.map((l) => l.fixes(document, manifest, diagnostics.flat()));
         return flatten(...actions);
     }
 }

src/diagnostics/codeactionprovider.ts

@@ -38,8 +38,10 @@ export class InstallationExplorer implements vscode.TreeDataProvider<Installatio
         return installations.result.map((i) => new InstallationNode(this.shell, i));
     }
 
-    refresh(): CommandResult {
-        this.onDidChangeEmitter.fire();
+    async refresh(): Promise<CommandResult> {
+        (await this.rootNodes()).forEach((element: InstallationExplorerTreeNode) => {
+            this.onDidChangeEmitter.fire(element);
+        });
         return CommandResult.Succeeded;
     }
 }

src/explorer/installation/installation-explorer.ts

@@ -1,4 +1,4 @@
-import TelemetryReporter from 'vscode-extension-telemetry';
+import TelemetryReporter from '@vscode/extension-telemetry';
 import vscode = require('vscode');
 
 export let reporter: TelemetryReporter | undefined;

src/telemetry/telemetry.ts

@@ -1,22 +1,22 @@
-//
-// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING
-//
-// This file is providing the test runner to use when running extension tests.
-// By default the test runner in use is Mocha based.
-//
-// You can provide your own test runner if you want to override it by exporting
-// a function run(testRoot: string, clb: (error:Error) => void) that the extension
-// host can call to run the tests. The test runner is expected to use console.log
-// to report the results back to the caller. When the tests are finished, return
-// a possible error to the callback or null if none.
+import * as path from 'path';
+import { runTests } from 'vscode-test';
 
-import * as testRunner from 'vscode/lib/testrunner';
+ async function main() {
+ 	try {
+ 		// The folder containing the Extension Manifest package.json
+ 		// Passed to `--extensionDevelopmentPath`
+ 		const extensionDevelopmentPath = path.resolve(__dirname, '../../');
 
-// You can directly control Mocha options by uncommenting the following lines
-// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info
-testRunner.configure({
-    ui: 'tdd', 		// the TDD UI is being used in extension.test.ts (suite, test, etc.)
-    useColors: true // colored output from test results
-});
+ 		// The path to test runner
+ 		// Passed to --extensionTestsPath
+ 		const extensionTestsPath = path.resolve(__dirname, './suite/index');
 
-module.exports = testRunner;
+ 		// Download VS Code, unzip it and run the integration test
+ 		await runTests({ extensionDevelopmentPath, extensionTestsPath });
+ 	} catch (err) {
+ 		console.error('Failed to run tests');
+ 		process.exit(1);
+ 	}
+ }
+
+ main();

src/test/extension.test.ts

@@ -0,0 +1,41 @@
+import * as path from 'path';
+import * as Mocha from 'mocha';
+import * as glob from 'glob';
+
+export function run(): Promise<void> {
+	// Create the mocha test
+	const mocha = new Mocha({
+		ui: 'tdd'
+	});
+
+	const testsRoot = path.resolve(__dirname);
+
+	return new Promise((c, e) => {
+		glob('**/**.test.js', { cwd: testsRoot }, (err, files) => {
+			if (err) {
+				return e(err);
+			}
+
+			// Add files to the test suite
+			files.forEach((f) => {
+				mocha.addFile(path.resolve(testsRoot, f));
+				console.log(`Added file : ${f} to the test suite.`);
+			});
+
+			try {
+				// Run the mocha test
+				mocha.run((failures) => {
+					if (failures > 0) {
+						e(new Error(`${failures} tests failed.`));
+					} else {
+						console.log("Test passed.");
+						c();
+					}
+				});
+			} catch (err) {
+				console.error(err);
+				e(err);
+			}
+		});
+	});
+}

src/test/index.ts

@@ -41,6 +41,6 @@ async function porterFolders(): Promise<readonly string[]> {
         return [];
     }
 
-    const matches = await folders.filterAsync(async (f) => await fs.exists(path.join(f.uri.fsPath, 'porter.yaml')));
-    return matches.map((f) => f.uri.fsPath);
+    const matches = folders.filter(async (f: { uri: { fsPath: string; }; }) => await fs.exists(path.join(f.uri.fsPath, 'porter.yaml')));
+    return matches.map((f: { uri: { fsPath: any; }; }) => f.uri.fsPath);
 }

src/test/suite/index.ts

@@ -136,7 +136,7 @@ function execCore(cmd: string, opts: any, stdin?: string): Promise<ShellResult>
     return new Promise<ShellResult>((resolve, reject) => {
         const proc = shelljs.exec(cmd, opts, (code, stdout, stderr) => resolve({ code: code, stdout: stdout, stderr: stderr }));
         if (stdin) {
-            proc.stdin.end(stdin);
+            proc.stdin?.end(stdin);
         }
     });
 }