Skip to content

Commit fdc2010

Browse files
committed
Merge branch 'master' into pTests/systemSpy
2 parents 6ecc708 + f9e4124 commit fdc2010

File tree

88 files changed

+1897
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+1897
-559
lines changed

buildspec/shared/linux-pre_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ if [ "$TOOLKITS_CODEARTIFACT_DOMAIN" ] && [ "$TOOLKITS_CODEARTIFACT_REPO" ] && [
2222
fi
2323

2424
# TODO: move this to the "install" phase?
25-
export NODE_OPTIONS=--max-old-space-size=8192
25+
export NODE_OPTIONS='--max-old-space-size=8192'
2626
npm 2>&1 ci | run_and_report 2 'npm WARN deprecated' 'Deprecated dependencies must be updated.'

docs/TESTPLAN.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ The test suite has the following categories of tests:
4242
- Live in `src/testE2E`
4343
- These tests are heavier than Integration tests.
4444
- Some E2E tests have a more complicated architecture, described in [TEST_E2E](./TEST_E2E.md)
45+
- Performance Tests: **slow** tests
46+
- Live in `src/testInteg/perf`.
47+
- A subset of integration tests focused on catching performance regressions.
48+
- Use a combination of operation counting and system usage statistics such as cpu usage, memory usage, and duration.
49+
- Each test is often repeated 10 or more times for less variant system usage statistics, then median of runs is used.
4550

4651
## Test files
4752

package-lock.json

Lines changed: 55 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
"generateNonCodeFiles": "npm run generateNonCodeFiles -w packages/ --if-present"
4040
},
4141
"devDependencies": {
42-
"@aws-toolkits/telemetry": "^1.0.267",
42+
"@aws-toolkits/telemetry": "^1.0.272",
4343
"@playwright/browser-chromium": "^1.43.1",
4444
"@types/vscode": "^1.68.0",
4545
"@types/vscode-webview": "^1.57.1",
46-
"@types/webpack-env": "^1.18.1",
46+
"@types/webpack-env": "^1.18.5",
4747
"@typescript-eslint/eslint-plugin": "^7.14.1",
4848
"@typescript-eslint/parser": "^7.14.1",
4949
"@vscode/codicons": "^0.0.33",
@@ -58,17 +58,18 @@
5858
"eslint-plugin-security-node": "^1.1.4",
5959
"eslint-plugin-unicorn": "^54.0.0",
6060
"husky": "^9.0.7",
61-
"prettier": "^3.3.2",
61+
"prettier": "^3.3.3",
6262
"prettier-plugin-sh": "^0.14.0",
6363
"pretty-quick": "^4.0.0",
6464
"ts-node": "^10.9.1",
6565
"typescript": "^5.0.4",
66-
"webpack": "^5.83.0",
66+
"webpack": "^5.95.0",
6767
"webpack-cli": "^5.1.4",
6868
"webpack-dev-server": "^4.15.1",
6969
"webpack-merge": "^5.10.0"
7070
},
7171
"dependencies": {
72+
"@types/node": "^18.19.55",
7273
"vscode-nls": "^5.2.0",
7374
"vscode-nls-dev": "^4.0.4"
7475
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"date": "2024-10-17",
3+
"version": "1.30.0",
4+
"entries": [
5+
{
6+
"type": "Bug Fix",
7+
"description": "Various fixes and changes"
8+
}
9+
]
10+
}

packages/amazonq/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.30.0 2024-10-17
2+
3+
- **Bug Fix** Various fixes and changes
4+
15
## 1.29.0 2024-10-10
26

37
- **Bug Fix** Amazon Q /dev: include telemetry for workspace usage when generating new files

0 commit comments

Comments
 (0)