Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

call 'webview.asWebviewUri' when we have a theia verion contains PR -… #47

Merged
merged 1 commit into from
Dec 8, 2019
Merged

call 'webview.asWebviewUri' when we have a theia verion contains PR -… #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
3 changes: 1 addition & 2 deletions backend/src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 6 additions & 2 deletions generator-foodq/generators/app/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
{
Expand Down