Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
61bf08e
Added functionality of node scripts with usage of vsix file scripting…
surajrdy-aws Jul 14, 2025
1c7b855
Removed Javascript file for npm script and made it all through CLI ar…
surajrdy-aws Jul 15, 2025
1127842
Resolve .gitignore
surajrdy-aws Jul 15, 2025
d14bcd5
Delete vsix.log
surajrdy-aws Jul 15, 2025
2f1ea4e
feat(amazonq): add setup for ui-tests (#7597)
laura-codess Jul 8, 2025
74c5770
Added functionality of node scripts with usage of vsix file scripting…
surajrdy-aws Jul 14, 2025
b4af3b4
Removed Javascript file for npm script and made it all through CLI ar…
surajrdy-aws Jul 15, 2025
e63ac47
Merge remote-tracking branch 'fork/featureUI' into featureUI
surajrdy-aws Jul 15, 2025
4b464ca
Fix git ignore
surajrdy-aws Jul 15, 2025
9f01f9e
chore: rebase onto mainline
surajrdy-aws Jul 16, 2025
e902fc0
fix: undo changes to unrelated file
surajrdy-aws Jul 16, 2025
1940c99
fix: removing unrelated files
surajrdy-aws Jul 16, 2025
0a24c10
fix: removing unrelated files
surajrdy-aws Jul 16, 2025
7ac44f5
fix: removing files that shouldnt be changed
surajrdy-aws Jul 16, 2025
9d53f2a
fix: accidently removed package.ts file
surajrdy-aws Jul 16, 2025
7865392
fix: package.ts from master branch to fix linter issues
surajrdy-aws Jul 16, 2025
85aad28
fix: rebase from master branch to fix package.json changes
surajrdy-aws Jul 16, 2025
0c0b550
create new npm scripts which avoids the setup-tests process
surajrdy-aws Jul 21, 2025
5277991
fix: outdated npm scripts
surajrdy-aws Jul 21, 2025
9fa3eb7
fix: packaging issues
surajrdy-aws Jul 22, 2025
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
70 changes: 24 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
"test": "npm run test -w packages/ --if-present",
"testWeb": "npm run testWeb -w packages/ --if-present",
"testE2E": "npm run testE2E -w packages/ --if-present",
"setupE2E": "cd packages/amazonq && npm run package > ../../vsix.log 2>&1 && cd ../.. && node_modules/.bin/extest install-vsix --vsix_file amazon-q-vscode-$(node scripts/get-vsix-version.js).vsix",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it worth making this setupUI to match the testUI below?

Copy link
Contributor

Choose a reason for hiding this comment

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

Is there a way we can do this without creating a temporary file (i.e. keeping the contents in memory).

If we do need the file, then we have to worry about conflicts with existing files as well as cleaning it up properly.

Copy link
Author

Choose a reason for hiding this comment

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

Good idea, I just implemented that in the new PR

"testUI": "npm run testCompile && node_modules/.bin/extest run-tests packages/amazonq/dist/test/e2e/amazonq/VET.test.js -u",
"testInteg": "npm run testInteg -w packages/ --if-present",
"package": "npm run package -w packages/toolkit -w packages/amazonq",
"newChange": "echo 'Must specify subproject/workspace with -w packages/<subproject>' && false",
Expand Down Expand Up @@ -71,7 +73,7 @@
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
"util": "^0.12.5",
"vscode-extension-tester": "^8.15.0",
"vscode-extension-tester": "^8.16.2",
"webpack": "^5.95.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^4.15.2",
Expand Down
32 changes: 32 additions & 0 deletions packages/amazonq/.vscodeignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Source files
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think you meant to commit this file.

src/**
test/**
*.ts
*.map

# Build artifacts
node_modules/**
out/test/**
coverage/**
.nyc_output/**

# Development files
.vscode/**
.github/**
scripts/**
docs/**
*.md
!README.md

# Config files
.eslintrc*
.prettierrc*
tsconfig*.json
webpack*.js
jest.config*
.gitignore

# Logs and temp files
*.log
.DS_Store
Thumbs.db
23 changes: 19 additions & 4 deletions packages/amazonq/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "amazon-q-vscode",
"displayName": "Amazon Q",
"description": "The most capable generative AI-powered assistant for building, operating, and transforming software, with advanced capabilities for managing data and AI",
"version": "1.83.0-SNAPSHOT",
Copy link
Contributor

Choose a reason for hiding this comment

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

I believe this must stay as SNAPSHOT. Is there we reason we want to change it here?

"version": "1.83.0-g8500b1e",
"extensionKind": [
"workspace"
],
Expand All @@ -13,6 +13,7 @@
"type": "git",
"url": "https://github.com/aws/aws-toolkit-vscode"
},
"homepage": "https://github.com/aws/aws-toolkit-vscode",
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this change still necessary since we are no longer running the setup-test command?

"bugs": {
"url": "https://github.com/aws/aws-toolkit-vscode/issues"
},
Expand Down Expand Up @@ -1322,26 +1323,40 @@
"fontCharacter": "\\f1de"
}
},
"aws-schemas-registry": {
"aws-sagemaker-code-editor": {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you'll have to rebase to remove these changes. Solved this issue with Laura, so she is an expert now :)

"description": "AWS Contributed Icon",
"default": {
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
"fontCharacter": "\\f1df"
}
},
"aws-schemas-schema": {
"aws-sagemaker-jupyter-lab": {
"description": "AWS Contributed Icon",
"default": {
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
"fontCharacter": "\\f1e0"
}
},
"aws-stepfunctions-preview": {
"aws-schemas-registry": {
"description": "AWS Contributed Icon",
"default": {
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
"fontCharacter": "\\f1e1"
}
},
"aws-schemas-schema": {
"description": "AWS Contributed Icon",
"default": {
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
"fontCharacter": "\\f1e2"
}
},
"aws-stepfunctions-preview": {
"description": "AWS Contributed Icon",
"default": {
"fontPath": "./resources/fonts/aws-toolkit-icons.woff",
"fontCharacter": "\\f1e3"
}
}
},
"walkthroughs": [
Expand Down
Loading