From 3a4680be4ac42a6e84bb4bc0ff58c238b37cc8bd Mon Sep 17 00:00:00 2001 From: Tomer Epstein Date: Sun, 8 Dec 2019 15:40:26 +0200 Subject: [PATCH] call 'webview.asWebviewUri' when we have a theia verion contains PR - https://github.com/eclipse-theia/theia/pull/6465 --- backend/package.json | 2 +- backend/src/extension.ts | 3 +-- generator-foodq/generators/app/index.js | 8 ++++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/package.json b/backend/package.json index 8eed4e48..843f011f 100644 --- a/backend/package.json +++ b/backend/package.json @@ -5,7 +5,7 @@ "license": "Apache 2.0", "description": "Provide rich user experience for Yeoman generators using VSCode extension or the browser", "repository": "https://github.com/SAP/yeoman-ui", - "version": "0.0.9", + "version": "0.0.10", "engines": { "vscode": "^1.38.0" }, diff --git a/backend/src/extension.ts b/backend/src/extension.ts index ed872a5d..17f1abd6 100644 --- a/backend/src/extension.ts +++ b/backend/src/extension.ts @@ -139,8 +139,7 @@ export class YeomanUIPanel { const scriptPathOnDisk = vscode.Uri.file( path.join(this.extensionPath, 'dist', 'media', path.sep) ); - // TODO: call 'webview.asWebviewUri' when we have a theia verion contains PR - https://github.com/eclipse-theia/theia/pull/6465 - const scriptUri = /* webview.asWebviewUri(scriptPathOnDisk) */ "vscode-resource:" + scriptPathOnDisk.path; + const scriptUri = this.panel.webview.asWebviewUri(scriptPathOnDisk); // TODO: very fragile: assuming double quotes and src is first attribute // specifically, doesn't work when building vue for development (vue-cli-service build --mode development) diff --git a/generator-foodq/generators/app/index.js b/generator-foodq/generators/app/index.js index 777929e8..f30f68bf 100644 --- a/generator-foodq/generators/app/index.js +++ b/generator-foodq/generators/app/index.js @@ -70,9 +70,13 @@ module.exports = class extends Generator { message: "What beer would you like?", choices: [ "Chimay Trappist Ales", - "Paulaner Salvator", + "Paulaner Salvator Doppel Bock", "Weihenstephaner Korbinian", - "Hoegaarden Belguim White" + "Hoegaarden Belguim White", + "Allagash White Ale", + "ST. FEUILLIEN BLONDE", + "HOUBLON CHOUFFE DOBBELEN IPA TRIPEL", + "Augustiner Hell" ] }, {