From bbbd0b4c3b5fbacbdfdd4357d4a869aa87d42a3f Mon Sep 17 00:00:00 2001
From: Lansana DIOMANDE <ldiomande@takima.fr>
Date: Tue, 19 Apr 2022 00:53:08 +0200
Subject: [PATCH] refactor: little correction and specify minimum vscode
version
---
.../deadlock-extension/.vscodeignore | 4 +---
.../deadlock-extension/package-lock.json | 20 +++++++++----------
.../deadlock-extension/package.json | 4 ++--
.../src/core/extensionStore.ts | 4 ++--
...keycloakOAuth2DeviceFlowConnection.test.ts | 2 +-
5 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/deadlock-plugins/deadlock-extension/.vscodeignore b/deadlock-plugins/deadlock-extension/.vscodeignore
index 7d2b7710..d626c52f 100644
--- a/deadlock-plugins/deadlock-extension/.vscodeignore
+++ b/deadlock-plugins/deadlock-extension/.vscodeignore
@@ -1,8 +1,6 @@
.vscode
-node_modules
out/
!out/main.js
src/
dev/
-tsconfig.json
-webpack.config.js
\ No newline at end of file
+tsconfig.json
\ No newline at end of file
diff --git a/deadlock-plugins/deadlock-extension/package-lock.json b/deadlock-plugins/deadlock-extension/package-lock.json
index dbdb2270..b295b766 100644
--- a/deadlock-plugins/deadlock-extension/package-lock.json
+++ b/deadlock-plugins/deadlock-extension/package-lock.json
@@ -8,7 +8,7 @@
"name": "deadlock-coding",
"version": "0.0.2",
"dependencies": {
- "@vscode/webview-ui-toolkit": "^0.9.3",
+ "@vscode/webview-ui-toolkit": "^1.0.0",
"async": "^3.2.2",
"crypto-js": "^4.1.1",
"date-fns": "^2.27.0",
@@ -37,7 +37,7 @@
"webpack-cli": "^4.9.1"
},
"engines": {
- "vscode": "^1.51.0"
+ "vscode": "^1.63.0"
}
},
"node_modules/@babel/code-frame": {
@@ -404,12 +404,12 @@
}
},
"node_modules/@vscode/webview-ui-toolkit": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-0.9.3.tgz",
- "integrity": "sha512-uEEpTVA21zkHtWMR8TPT7vbIZ1+tvfhQPThEdmmDjh0PulKPvaAVNqnGbQitU3F9GVqpq2AdIKAq6N1jFeBoXg==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-1.0.0.tgz",
+ "integrity": "sha512-/qaHYZXqvIKkao54b7bLzyNH8BC+X4rBmTUx1MvcIiCjqRMxml0BCpqJhnDpfrCb0IOxXRO8cAy1eB5ayzQfBA==",
"dependencies": {
"@microsoft/fast-element": "^1.6.2",
- "@microsoft/fast-foundation": "^2.34.0",
+ "@microsoft/fast-foundation": "^2.38.0",
"@microsoft/fast-react-wrapper": "^0.1.18"
},
"peerDependencies": {
@@ -4479,12 +4479,12 @@
}
},
"@vscode/webview-ui-toolkit": {
- "version": "0.9.3",
- "resolved": "https://registry.npmjs.org/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-0.9.3.tgz",
- "integrity": "sha512-uEEpTVA21zkHtWMR8TPT7vbIZ1+tvfhQPThEdmmDjh0PulKPvaAVNqnGbQitU3F9GVqpq2AdIKAq6N1jFeBoXg==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/@vscode/webview-ui-toolkit/-/webview-ui-toolkit-1.0.0.tgz",
+ "integrity": "sha512-/qaHYZXqvIKkao54b7bLzyNH8BC+X4rBmTUx1MvcIiCjqRMxml0BCpqJhnDpfrCb0IOxXRO8cAy1eB5ayzQfBA==",
"requires": {
"@microsoft/fast-element": "^1.6.2",
- "@microsoft/fast-foundation": "^2.34.0",
+ "@microsoft/fast-foundation": "^2.38.0",
"@microsoft/fast-react-wrapper": "^0.1.18"
}
},
diff --git a/deadlock-plugins/deadlock-extension/package.json b/deadlock-plugins/deadlock-extension/package.json
index 2e7f6146..118434ec 100644
--- a/deadlock-plugins/deadlock-extension/package.json
+++ b/deadlock-plugins/deadlock-extension/package.json
@@ -4,7 +4,7 @@
"version": "0.0.2",
"publisher": "Deadlock",
"engines": {
- "vscode": "^1.51.0"
+ "vscode": "^1.66.0"
},
"categories": [
"Other"
@@ -96,7 +96,7 @@
"watch": "tsc -w -p ./"
},
"dependencies": {
- "@vscode/webview-ui-toolkit": "^0.9.3",
+ "@vscode/webview-ui-toolkit": "^1.0.0",
"async": "^3.2.2",
"crypto-js": "^4.1.1",
"date-fns": "^2.27.0",
diff --git a/deadlock-plugins/deadlock-extension/src/core/extensionStore.ts b/deadlock-plugins/deadlock-extension/src/core/extensionStore.ts
index 0c71c62b..3563ec72 100644
--- a/deadlock-plugins/deadlock-extension/src/core/extensionStore.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/extensionStore.ts
@@ -40,11 +40,11 @@ export default class ExtensionStore {
}
getMissionWorkdir(): string | undefined {
- return this.globalStorage.get<string>(StoreKey.MissionWorkDirKey);
+ return this.globalStorage.get<string>(StoreKey.MissionWorkdirKey);
}
setMissionWorkdir(path: string) {
- this.globalStorage.update(StoreKey.MissionWorkDirKey, path);
+ this.globalStorage.update(StoreKey.MissionWorkdirKey, path);
window.showInformationMessage(`Nouveau dossier de stockage des missions: ${path}`);
}
diff --git a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
index aacc4346..006d7138 100644
--- a/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
+++ b/deadlock-plugins/deadlock-extension/src/core/keycloakOAuth2DeviceFlowConnection.test.ts
@@ -49,7 +49,7 @@ export default class KeycloakOAuth2DeviceFlowConnectionTest {
refreshedTokens.accessToken,
)};`,
);
- } catch (e: unknown) {
+ } catch (e) {
error(e);
}
}
--
GitLab