Merge pull request #16 from RechInformatica/ficha_274845

Fixed security vulnerabilities, updated some packages and fixed a type
RechInformatica · Jul 23, 2022 · 00212d5 · 00212d5
2 parents fb371cf + 9dab60a
commit 00212d5
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
 	"name": "rech-cobol-debugger",
 	"displayName": "Rech COBOL Debugger",
 	"description": "Debug COBOL files with Visual Studio Code",
-	"version": "1.0.40",
+	"version": "1.0.41",
 	"publisher": "rechinformatica",
 	"engines": {
 		"vscode": "^1.47.0"
@@ -26,28 +26,28 @@
 		"vscode:prepublish": "npm run compile",
 		"package": "vsce package --out F:/DIV/VSCode/extension/market/rech-cobol-debugger/rech-cobol-debugger.vsix",
 		"compile": "npm run tslint && tsc -p ./",
-		"postinstall": "node ./node_modules/vscode/bin/install",
 		"test": "npm run compile && mocha -r ts-node/register ./src/test/**/*.test.ts",
 		"tslint": "tslint --project tsconfig.json --config tslint.json"
 	},
 	"dependencies": {
 		"@types/q": "^1.0.0",
+		"@vscode/debugadapter": "^1.56.1",
 		"await-notify": "1.0.1",
-		"q": "^1.4.1",
-		"vscode-debugadapter": "1.38.0-pre.4"
+		"q": "^1.4.1"
 	},
 	"devDependencies": {
-		"@types/node": "10.12.12",
-		"@types/mocha": "5.2.7",
 		"@types/chai": "4.1.6",
+		"@types/mocha": "5.2.7",
+		"@types/node": "^10.12.12",
+		"@types/vscode": "^1.69.0",
+		"@vscode/debugadapter-testsupport": "^1.56.1",
+		"@vscode/debugprotocol": "^1.56.1",
 		"chai": "4.2.0",
+		"mocha": "^10.0.0",
 		"ts-node": "^7.0.1",
-		"typescript": "3.5.3",
-		"mocha": "6.2.0",
-		"vscode": "1.1.37",
-		"vscode-debugadapter-testsupport": "1.37.0",
 		"tslint": "5.18.0",
-		"vsce": "1.66.0"
+		"typescript": "4.7.4",
+		"vsce": "^2.10.0"
 	},
 	"main": "./out/extension",
 	"activationEvents": [

diff --git a/src/CobolDebug.ts b/src/CobolDebug.ts
@@ -4,9 +4,9 @@
 
 import {
 	InitializedEvent, TerminatedEvent, StoppedEvent, OutputEvent,
-	Source, DebugSession, Thread, Scope, Handles, ContinuedEvent, Variable
-} from 'vscode-debugadapter';
-import { DebugProtocol } from 'vscode-debugprotocol';
+	Source, DebugSession, Thread, Scope, Handles, ContinuedEvent
+} from '@vscode/debugadapter';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { basename } from 'path';
 import { EventEmitter } from 'events';
 import { DebugInterface } from './debugProcess/DebugInterface';

diff --git a/src/breakpoint/BreakpointManager.ts b/src/breakpoint/BreakpointManager.ts
@@ -1,4 +1,4 @@
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { DebugInterface } from "../debugProcess/DebugInterface";
 import { window } from 'vscode';
 import Q from 'q';

diff --git a/src/breakpoint/SourceUtils.ts b/src/breakpoint/SourceUtils.ts
@@ -1,4 +1,4 @@
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 
 /** Position within String where colon is located */
 const WINDOWS_COLON_DRIVE_POSITION = 2;
@@ -66,4 +66,4 @@ export class SourceUtils {
 		return false;
 	}
 
-}
+}
diff --git a/src/debugProcess/SyncProcess.ts b/src/debugProcess/SyncProcess.ts
@@ -231,7 +231,7 @@ export class SyncProcess {
 					fs.appendFileSync(this.traceFilePath, buffer);
 				}
 			} catch (err) {
-				const errorMessage = err ? err.toString() : "Unknown error detected on SyncProcess while writing trace";
+				const errorMessage = err ? (err as Error).toString() : "Unknown error detected on SyncProcess while writing trace";
 				this.redirectOutput("Error detected while writing trace to file " + this.traceFilePath + ": " + errorMessage + "\n");
 			}
 		}

diff --git a/src/extension.ts b/src/extension.ts
@@ -103,7 +103,7 @@ function registerConfigurationProvider(context: ExtensionContext): void {
  * Register an adapter factory for 'COBOL' debug type
  */
 function registerDescriptorFactory(context: ExtensionContext, cobolStack: CobolStack): void {
-	const factory: DebugAdapterDescriptorFactory = new CobolDebugAdapterDescriptorFactory(cobolStack);
+	const factory: CobolDebugAdapterDescriptorFactory = new CobolDebugAdapterDescriptorFactory(cobolStack);
 	context.subscriptions.push(debug.registerDebugAdapterDescriptorFactory('COBOL', factory));
 	if ('dispose' in factory) {
 		context.subscriptions.push(factory);

diff --git a/src/parser/VariableParser.ts b/src/parser/VariableParser.ts
@@ -1,4 +1,4 @@
-import { DebugProtocol } from 'vscode-debugprotocol';
+import { DebugProtocol } from '@vscode/debugprotocol';
 import { DebugInterface } from '../debugProcess/DebugInterface';
 import Q from "q";