From cc9eb0571978ab3040a40b02de0e282136aca5b8 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Wed, 29 Sep 2021 12:29:43 +0300 Subject: [PATCH 1/5] chore: update examples dependencies --- guided-development-types/package.json | 2 +- vscode-contrib-cake/package.json | 4 ++-- vscode-contrib1/package.json | 4 ++-- vscode-contrib2/package.json | 4 ++-- vscode-contrib3/package.json | 4 ++-- vscode-snippet-food-contrib/package.json | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/guided-development-types/package.json b/guided-development-types/package.json index 1cb5485..8fbd99c 100644 --- a/guided-development-types/package.json +++ b/guided-development-types/package.json @@ -18,7 +18,7 @@ "prepublishOnly": "npm run prep && npm run copy" }, "devDependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", + "@sap-devx/app-studio-toolkit-types": "1.2.0", "ncp": "^2.0.0" } } diff --git a/vscode-contrib-cake/package.json b/vscode-contrib-cake/package.json index 76b862a..4015547 100644 --- a/vscode-contrib-cake/package.json +++ b/vscode-contrib-cake/package.json @@ -29,8 +29,8 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", - "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/guided-development-types": "0.0.13", "comment-json": "2.1.0", "datauri": "^2.0.0" }, diff --git a/vscode-contrib1/package.json b/vscode-contrib1/package.json index 1c2a3ce..b622edf 100644 --- a/vscode-contrib1/package.json +++ b/vscode-contrib1/package.json @@ -29,8 +29,8 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", - "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/guided-development-types": "0.0.13", "comment-json": "2.1.0", "datauri": "^2.0.0", "lodash": "4.17.21" diff --git a/vscode-contrib2/package.json b/vscode-contrib2/package.json index 854019a..d363f6f 100644 --- a/vscode-contrib2/package.json +++ b/vscode-contrib2/package.json @@ -29,8 +29,8 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", - "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/guided-development-types": "0.0.13", "comment-json": "2.1.0", "lodash": "4.17.21" }, diff --git a/vscode-contrib3/package.json b/vscode-contrib3/package.json index 822b2da..cb610fa 100644 --- a/vscode-contrib3/package.json +++ b/vscode-contrib3/package.json @@ -29,8 +29,8 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", - "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/guided-development-types": "0.0.13", "comment-json": "2.1.0", "datauri": "^2.0.0", "lodash": "4.17.21" diff --git a/vscode-snippet-food-contrib/package.json b/vscode-snippet-food-contrib/package.json index 11432e1..9040f62 100644 --- a/vscode-snippet-food-contrib/package.json +++ b/vscode-snippet-food-contrib/package.json @@ -38,14 +38,14 @@ }, "dependencies": { "@sap-devx/code-snippet-types": "0.0.6", - "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/guided-development-types": "0.0.13", "comment-json": "2.1.0", "datauri": "^2.0.0", "fs-extra": "7.0.1", "lodash": "4.17.21" }, "devDependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", + "@sap-devx/app-studio-toolkit-types": "1.2.0", "@types/lodash": "^4.14.150", "@types/comment-json": "1.1.1", "@types/fs-extra": "5.0.5", From 2832c0247f21549bf75732d80ddc123f31db52d4 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Wed, 29 Sep 2021 16:54:38 +0300 Subject: [PATCH 2/5] chore: update types version --- .vscode/settings.json | 3 ++- vscode-contrib-cake/package.json | 2 +- vscode-contrib1/package.json | 2 +- vscode-contrib2/package.json | 2 +- vscode-contrib3/package.json | 2 +- vscode-simple-contrib/package.json | 2 +- vscode-snippet-food-contrib/package.json | 6 +++--- 7 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 30bf8c2..2695ef4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,5 +7,6 @@ "out": true // set this to false to include "out" folder in search results }, // Turn off tsc task auto detection since we have the necessary tasks as npm scripts - "typescript.tsc.autoDetect": "off" + "typescript.tsc.autoDetect": "off", + "actions": [] } \ No newline at end of file diff --git a/vscode-contrib-cake/package.json b/vscode-contrib-cake/package.json index 4015547..5f53bf4 100644 --- a/vscode-contrib-cake/package.json +++ b/vscode-contrib-cake/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@sap-devx/app-studio-toolkit-types": "1.2.0", - "@sap-devx/guided-development-types": "0.0.13", + "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0" }, diff --git a/vscode-contrib1/package.json b/vscode-contrib1/package.json index b622edf..1ab68b7 100644 --- a/vscode-contrib1/package.json +++ b/vscode-contrib1/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@sap-devx/app-studio-toolkit-types": "1.2.0", - "@sap-devx/guided-development-types": "0.0.13", + "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0", "lodash": "4.17.21" diff --git a/vscode-contrib2/package.json b/vscode-contrib2/package.json index d363f6f..33b6cb7 100644 --- a/vscode-contrib2/package.json +++ b/vscode-contrib2/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@sap-devx/app-studio-toolkit-types": "1.2.0", - "@sap-devx/guided-development-types": "0.0.13", + "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "lodash": "4.17.21" }, diff --git a/vscode-contrib3/package.json b/vscode-contrib3/package.json index cb610fa..4cb7f24 100644 --- a/vscode-contrib3/package.json +++ b/vscode-contrib3/package.json @@ -30,7 +30,7 @@ }, "dependencies": { "@sap-devx/app-studio-toolkit-types": "1.2.0", - "@sap-devx/guided-development-types": "0.0.13", + "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0", "lodash": "4.17.21" diff --git a/vscode-simple-contrib/package.json b/vscode-simple-contrib/package.json index f3459a1..3862517 100644 --- a/vscode-simple-contrib/package.json +++ b/vscode-simple-contrib/package.json @@ -37,6 +37,6 @@ ], "dependencies": { "@sap-devx/app-studio-toolkit-types": "1.2.0", - "@sap-devx/guided-development-types": "0.0.13" + "@sap-devx/guided-development-types": "0.0.14" } } diff --git a/vscode-snippet-food-contrib/package.json b/vscode-snippet-food-contrib/package.json index 9040f62..7a6982c 100644 --- a/vscode-snippet-food-contrib/package.json +++ b/vscode-snippet-food-contrib/package.json @@ -37,15 +37,15 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/code-snippet-types": "0.0.6", - "@sap-devx/guided-development-types": "0.0.13", + "@sap-devx/code-snippet-types": "1.1.3", + "@sap-devx/guided-development-types": "0.0.14", + "@sap-devx/app-studio-toolkit-types": "1.2.0", "comment-json": "2.1.0", "datauri": "^2.0.0", "fs-extra": "7.0.1", "lodash": "4.17.21" }, "devDependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", "@types/lodash": "^4.14.150", "@types/comment-json": "1.1.1", "@types/fs-extra": "5.0.5", From aca75a1ab82e541e0c22ab5cf3ce16bf211bf16b Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Wed, 29 Sep 2021 18:26:51 +0300 Subject: [PATCH 3/5] chore: use latest app-studio-toolkit-types --- backend/package.json | 4 ++-- guided-development-types/package.json | 2 +- vscode-contrib-cake/package.json | 2 +- vscode-contrib1/package.json | 2 +- vscode-contrib2/package.json | 2 +- vscode-contrib3/package.json | 2 +- vscode-simple-contrib/package.json | 2 +- vscode-snippet-food-contrib/package.json | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/backend/package.json b/backend/package.json index e2c3fc5..adc9fd0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -128,10 +128,10 @@ "object-hash": "2.2.0", "strip-ansi": "^6.0.0", "titleize": "^2.1.0", - "ws": "7.4.6" + "ws": "7.4.6", + "@sap-devx/app-studio-toolkit-types": "1.2.1" }, "devDependencies": { - "@sap-devx/app-studio-toolkit-types": "1.0.0", "@types/vscode": "^1.46.0", "@types/chai": "^4.2.9", "@types/fs-extra": "^9.0.11", diff --git a/guided-development-types/package.json b/guided-development-types/package.json index 8fbd99c..14317f5 100644 --- a/guided-development-types/package.json +++ b/guided-development-types/package.json @@ -18,7 +18,7 @@ "prepublishOnly": "npm run prep && npm run copy" }, "devDependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "ncp": "^2.0.0" } } diff --git a/vscode-contrib-cake/package.json b/vscode-contrib-cake/package.json index 5f53bf4..1b90ab2 100644 --- a/vscode-contrib-cake/package.json +++ b/vscode-contrib-cake/package.json @@ -29,7 +29,7 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0" diff --git a/vscode-contrib1/package.json b/vscode-contrib1/package.json index 1ab68b7..c741940 100644 --- a/vscode-contrib1/package.json +++ b/vscode-contrib1/package.json @@ -29,7 +29,7 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0", diff --git a/vscode-contrib2/package.json b/vscode-contrib2/package.json index 33b6cb7..d96d7de 100644 --- a/vscode-contrib2/package.json +++ b/vscode-contrib2/package.json @@ -29,7 +29,7 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "lodash": "4.17.21" diff --git a/vscode-contrib3/package.json b/vscode-contrib3/package.json index 4cb7f24..447fabc 100644 --- a/vscode-contrib3/package.json +++ b/vscode-contrib3/package.json @@ -29,7 +29,7 @@ "package": "vsce package ." }, "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "@sap-devx/guided-development-types": "0.0.14", "comment-json": "2.1.0", "datauri": "^2.0.0", diff --git a/vscode-simple-contrib/package.json b/vscode-simple-contrib/package.json index 3862517..1768c69 100644 --- a/vscode-simple-contrib/package.json +++ b/vscode-simple-contrib/package.json @@ -36,7 +36,7 @@ "SAPOSS.app-studio-toolkit" ], "dependencies": { - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "@sap-devx/guided-development-types": "0.0.14" } } diff --git a/vscode-snippet-food-contrib/package.json b/vscode-snippet-food-contrib/package.json index 7a6982c..0613443 100644 --- a/vscode-snippet-food-contrib/package.json +++ b/vscode-snippet-food-contrib/package.json @@ -39,7 +39,7 @@ "dependencies": { "@sap-devx/code-snippet-types": "1.1.3", "@sap-devx/guided-development-types": "0.0.14", - "@sap-devx/app-studio-toolkit-types": "1.2.0", + "@sap-devx/app-studio-toolkit-types": "1.2.1", "comment-json": "2.1.0", "datauri": "^2.0.0", "fs-extra": "7.0.1", From 8423acbd1e0341f000ff5d217c74bb5928a77e87 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Wed, 29 Sep 2021 18:33:50 +0300 Subject: [PATCH 4/5] fix: update test --- backend/tests/vscode-events.spec.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/tests/vscode-events.spec.ts b/backend/tests/vscode-events.spec.ts index 8c69823..112242b 100644 --- a/backend/tests/vscode-events.spec.ts +++ b/backend/tests/vscode-events.spec.ts @@ -89,7 +89,7 @@ const mockBasAPI: typeof bas = { return Promise.resolve(undefined); }, getAction: (id: string) => undefined, - getParameter: (key: string) => undefined, + performAction: mockPerformAction, actions: { performAction: mockPerformAction, @@ -97,7 +97,11 @@ const mockBasAPI: typeof bas = { SnippetAction: MockSnippetAction, CommandAction: MockCommandAction, FileAction: MockFileAction - } + }, + isLCAPEnabled: function (): Promise { + return Promise.resolve(true); + }, + workspaceAPI: undefined } const mockBasAPINoAction: typeof bas = { @@ -105,9 +109,12 @@ const mockBasAPINoAction: typeof bas = { return Promise.resolve(undefined); }, getAction: (id: string) => undefined, - getParameter: (key: string) => undefined, - performAction: (action: BasAction, options?: { schedule?: boolean }) => undefined, - actions: undefined + performAction: (action: BasAction, options?: { schedule?: boolean; }) => undefined, + actions: undefined, + isLCAPEnabled: function (): Promise { + return Promise.resolve(true); + }, + workspaceAPI: undefined } describe('vscode-events unit test', () => { From feb1c3295881ade8ebbf96c113a250acc1c22ea3 Mon Sep 17 00:00:00 2001 From: Stanislav Lvovsky Date: Wed, 29 Sep 2021 18:38:09 +0300 Subject: [PATCH 5/5] chore: bump extension version --- backend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index adc9fd0..cd86c29 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "guided-development", - "version": "0.1.3", + "version": "0.1.4", "displayName": "Guided Development", "publisher": "SAPOSS", "author": {