Skip to content

fix(amazonq): remove the depedency of the CDN js script. #7587

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

Merged
merged 1 commit into from
Jul 1, 2025
Merged

fix(amazonq): remove the depedency of the CDN js script. #7587

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
5 changes: 5 additions & 0 deletions packages/core/scripts/build/copyFiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ const tasks: CopyTask[] = [
{ target: path.join('src', 'testFixtures') },
{ target: 'src/auth/sso/vue' },

// Vue.js for webviews
{
target: path.join('../../node_modules', 'vue', 'dist', 'vue.global.prod.js'),
Copy link
Contributor

@leigaol leigaol Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please test both Q and toolkit

Copy link
Contributor Author

@grl-wang grl-wang Jul 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verified both Q and toolkit can login of the generated vsix. following is the toolkit login, Q login pasted in the pr description
image

destination: path.join('libs', 'vue.min.js'),
},
// SSM
{
target: path.join('../../node_modules', 'aws-ssm-document-language-service', 'dist', 'server.js'),
Expand Down
6 changes: 5 additions & 1 deletion packages/core/src/login/webview/commonAuthViewProvider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
const entrypoint =
serverHostname !== undefined ? Uri.parse(serverHostname).with({ path: `/${this.source}` }) : scriptUri

// Get Vue.js from dist/libs directory
const vueUri = Uri.joinPath(assetsPath, 'dist', 'libs', 'vue.min.js')
const vueScript = webview.asWebviewUri(vueUri)

return `
<!DOCTYPE html>
<html lang="en">
Expand All @@ -158,7 +162,7 @@ export class CommonAuthViewProvider implements WebviewViewProvider {
<title>Base View Extension</title>
</head>
<body>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/3.4.4/vue.global.prod.min.js"></script>
<script src="${vueScript.toString()}"></script>
Copy link
Contributor

@jguoamz jguoamz Jun 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does the version (3.4.4) matter? If the version changes, would it break?

Copy link
Contributor Author

@grl-wang grl-wang Jun 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so, did local tested with the generated vsix for the amazon Q sign in and sign out, didn't see any issue for the login ux with vue.js file in [3.3.4 which is used in the toolkit package](

aws-toolkit-vscode/packages/core/package.json

Line 576 in bfdb0eb

"vue": "^3.3.4",
).

<script>
const vscode = acquireVsCodeApi();
</script>
Expand Down
Loading