Skip to content

Commit 67a26c4

Browse files
nkomonen-amazonjpinkney-awsdogusatasannicm
authored
merge master in to feature/standalone (#4709)
* refactor: webpack/build scripts (#4670) * test: fix core tests prompting build task Problem: When we run the core tests they prompt for a build task before running. We should not have to do this. Solution: Create a specific build task and explicitly use that. I think due to our recent changes the "defaultBuildTask" cannot be appropriately resolved which is why this change was needed. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: remove index files in core Problem: We had index files in the core package which we used to expose certain methods once we packaged core in to a node module for use by the toolkit and amazonq package. We don't need it. Solution: Stop using the index files and go back to using the extension*.ts files Signed-off-by: Nikolas Komonen <[email protected]> * refactor: dynamically build webpack configs Now we can dynamically build webpack configs by exporting a function instead of the config. This will allow us to check for the 'development' mode at creation and from there we can modify the webpack config that we return. So now if we have `webpack --mode development`, we can recognize we are in development mode and incrementally change our config to our liking. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: webpack/build scripts This commit: - Adds some comments to certain parts of the build process - Fixes our build tasks so that `core` will build all of the required artifacts for `toolkit` will run properly. Before there were cases where running the `Extension (toolkit)` would fail due to a missing `dist/vue` folder - Fixes webviews not reflecting updated code when we refresh the webview during debugging. This was due to the `webview serve` not being utilized correctly. Now if you change `.vue` code and reload the webview the changes should be seen. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: remove vue hot reload This feature doesn't seem to work, or just isn't worth the effort to get working. This removes use of it, but we can always look to add it in if we have a need for it. Signed-off-by: Nikolas Komonen <[email protected]> * fix: post debug task not found We had multiple debug tasks with the same name, so when we tried to run them it didn't know which one to use. Solution: Rename one of them so the names are unique Signed-off-by: Nikolas Komonen <[email protected]> * refactor: webpack web configs + scripts This commit: - Updates the webpack web config to be dynamic, exporting a function which is used to create the config. Previously we exported the final object. - As a result the users of the config had to update to work with this change. - Now we can tweak the config depending on input arguments - Update the tasks in the launch.json to improve the debug mode in VS Code. - Remove the `serve` configs from the main webpack. - We previously used these for hot reloading but since we do not have a use for them anymore we are getting rid of them and simplifying things. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: browser test output unique file Problem: We need to both compile all source code + webpack a web extension when running the Web unit tests so that we do not have type errors + have an executable file (webpacked file) The problem is that the name extensionWeb.js is shared by both the compiled output AND webpacked output. So one gets overwritten. Solution: Change the name of the webpacked output so that it does not get overwritten. Now in unit tests we target that specifically. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: clean up VS Code Debug menu Problem: The VS Code Debug launch menu is cluttered with lots of different launch configs. It is confusing and there are many rarely used configs. Solution: Clean it up and reorder the configs so they are more relevant. Signed-off-by: Nikolas Komonen <[email protected]> * refactor: web mode webpack Before we had a custom flag to not build certain Web mode bundles. But it is instead easier to always build it, but output the bundle with a different name. We did this due to overlapping output files with the same name, but with this new change it does not happen anymore. Signed-off-by: Nikolas Komonen <[email protected]> * upgrade @vscode/test-web module Signed-off-by: Nikolas Komonen <[email protected]> * PR comment fixes: - Update CONTRIBUTING regarding webview dev server - Change the script name for web development compilation Signed-off-by: Nikolas Komonen <[email protected]> --------- Signed-off-by: Nikolas Komonen <[email protected]> * deps: Update Mynah UI to 4.5.5 Problem: - we are seeing multiple "Generating your answer..." cards in featureDev Solution: - update mynah ui to 4.5.5 * web: make shared crypto.randomUUID() function (#4693) * refactor: globalThis.crypto.randomUUID() Before, `crypto.randomUUID()` broke web mode since it is not available in the polyfill `crypto-browserify`. Solution: Use `globalThis.crypto.randomUUID()` as it works in both node + browser since each environment provides an implementation at runtime. In the long term we will want a better solution, but this commit quickly gets web mode working. Signed-off-by: Nikolas Komonen <[email protected]> * use randomUUID in existing places Signed-off-by: Nikolas Komonen <[email protected]> * add tests Signed-off-by: Nikolas Komonen <[email protected]> * add documentation Signed-off-by: Nikolas Komonen <[email protected]> --------- Signed-off-by: Nikolas Komonen <[email protected]> * fix(amazonq): Quick Action commands in new tabs are coming disabled (#4707) * fixed quick actions in new tabs are coming disabled * Release 2.19.0 * Update version to snapshot version: 2.20.0-SNAPSHOT * fix(amazonFeatureDev): accepted files telemetry #4689 Problem File acceptance telemetry was not counting deleted files, i.e. the files that code generation marked to be deleted, even if they were rejected or not. Solution Count deleted files for the metric and add tests to assure this. --------- Signed-off-by: Nikolas Komonen <[email protected]> Co-authored-by: Joshua Pinkney <[email protected]> Co-authored-by: Josh Pinkney <[email protected]> Co-authored-by: Dogus Atasoy <[email protected]> Co-authored-by: aws-toolkit-automation <> Co-authored-by: Santiago Martin <[email protected]>
1 parent f4b80ea commit 67a26c4

Some content is hidden

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

44 files changed

+749
-673
lines changed

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,13 @@ requests just from the model/types.
517517

518518
### Webview dev-server
519519

520-
Webviews can be hot-reloaded (updated without restarting the extension) by running a developer server provided by webpack. This server is started automatically when running the `Extension` launch configuration. You can also start it by running `npm serve`. Note that only frontend components will be updated; if you change backend code you will still need to restart the development extension.
520+
Webviews can be refreshed to show changes to `.vue` code when running in Debug mode. You do not have to
521+
reload the Debug VS Code window.
522+
523+
- Use `Command Palette` -> `Reload Webviews`
524+
- Only the frontend `.vue` changes will be reflected. If changing any backend code you must restart Debug mode.
525+
526+
This works by continuously building the final Vue webview files (`webpack watch`) and then serving them through a local server (`webpack serve`). Whenever a webview is loaded it will grab the latest build from the server.
521527

522528
### Font generation
523529

‎aws-toolkit-vscode.code-workspace‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"path": "."
55
},
66
{
7-
"path": "packages/core"
7+
"path": "packages/toolkit"
88
},
99
{
10-
"path": "packages/toolkit"
10+
"path": "packages/core"
1111
},
1212
{
1313
"path": "packages/amazonq"

‎package-lock.json‎

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

‎packages/amazonq/webpack.config.js‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,25 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6-
const path = require('path')
7-
const currentDir = process.cwd()
6+
const baseConfigFactory = require('../webpack.base.config')
7+
const baseVueConfigFactory = require('../webpack.vue.config')
88

9-
const baseConfig = require('../webpack.base.config')
9+
module.exports = (env, argv) => {
10+
const config = {
11+
...baseConfigFactory(env, argv),
12+
entry: {
13+
'src/extension': './src/extension.ts',
14+
},
15+
}
1016

11-
const devServer = {
12-
static: {
13-
directory: path.resolve(currentDir, 'dist'),
14-
},
15-
headers: {
16-
'Access-Control-Allow-Origin': '*',
17-
},
18-
allowedHosts: 'all',
19-
}
20-
21-
const config = {
22-
...baseConfig,
23-
entry: {
24-
'src/extension': './src/extension.ts',
25-
},
26-
}
17+
const vue = baseVueConfigFactory(env, argv)
18+
const vueConfig = {
19+
...vue.config,
20+
entry: {
21+
...vue.createVueEntries(),
22+
//'src/amazonq/webview/ui/amazonq-ui': './src/amazonq/webview/ui/main.ts',
23+
},
24+
}
2725

28-
const serveConfig = {
29-
...config,
30-
name: 'mainServe',
31-
devServer,
32-
externals: {
33-
vscode: 'commonjs vscode',
34-
},
26+
return [config, vueConfig]
3527
}
36-
37-
module.exports = process.env.npm_lifecycle_event === 'serve' ? [serveConfig] : [config]

‎packages/core/.vscode/launch.json‎

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"AWS_TOOLKIT_AUTOMATION": "local"
2222
},
2323
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
24-
"preLaunchTask": "watch"
24+
"preLaunchTask": "build"
2525
},
2626
{
2727
"name": "Extension Tests (current file)",
@@ -40,7 +40,7 @@
4040
"AWS_TOOLKIT_AUTOMATION": "local"
4141
},
4242
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
43-
"preLaunchTask": "watch"
43+
"preLaunchTask": "build"
4444
},
4545
{
4646
"name": "Extension Tests (web)",
@@ -51,12 +51,11 @@
5151
"--disable-extension=amazonwebservices.aws-toolkit-vscode",
5252
"--extensionDevelopmentPath=${workspaceFolder}",
5353
"--extensionDevelopmentKind=web",
54-
"--extensionTestsPath=${workspaceFolder}/dist/src/testWeb/testRunner",
54+
"--extensionTestsPath=${workspaceFolder}/dist/src/testWeb/testRunnerWebCore",
5555
"${workspaceRoot}/dist/src/testFixtures/workspaceFolder"
5656
],
5757
"outFiles": ["${workspaceFolder}/dist/src/**/*.js"],
58-
"preLaunchTask": "webWatch",
59-
"postDebugTask": "webRunTerminate"
58+
"preLaunchTask": "testsBuildWatch"
6059
},
6160
{
6261
"name": "Integration Tests",
@@ -74,7 +73,7 @@
7473
"AWS_TOOLKIT_AUTOMATION": "local"
7574
},
7675
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
77-
"preLaunchTask": "watch"
76+
"preLaunchTask": "build"
7877
},
7978
{
8079
"name": "Integration Tests (current file)",
@@ -93,7 +92,7 @@
9392
"AWS_TOOLKIT_AUTOMATION": "local"
9493
},
9594
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
96-
"preLaunchTask": "watch"
95+
"preLaunchTask": "build"
9796
},
9897
{
9998
"name": "E2E Test (current file)",
@@ -112,37 +111,39 @@
112111
"AWS_TOOLKIT_AUTOMATION": "local"
113112
},
114113
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
115-
"preLaunchTask": "watch"
114+
"preLaunchTask": "build"
116115
},
117116
{
118117
"name": "Test Lint",
119118
"type": "node",
120119
"request": "launch",
121120
"program": "${workspaceFolder}/scripts/lint/testLint.ts",
122121
"outFiles": ["${workspaceFolder}/dist/**/*.js"],
123-
"preLaunchTask": "watch"
124-
},
125-
{
126-
"name": "Attach to ASL Server",
127-
"type": "node",
128-
"request": "attach",
129-
"port": 6009,
130-
"restart": true,
131-
"outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
132-
},
133-
{
134-
"name": "Attach to SSM Document Language Server",
135-
"type": "node",
136-
"request": "attach",
137-
"port": 6010,
138-
"restart": true,
139-
"outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
122+
"preLaunchTask": "build"
140123
}
124+
// ---- We do not need the following currently, and we want to reduce clutter. Re-enable if necessary ----
125+
// {
126+
// "name": "Attach to ASL Server",
127+
// "type": "node",
128+
// "request": "attach",
129+
// "port": 6009,
130+
// "restart": true,
131+
// "outFiles": ["${workspaceRoot}/dist/src/stepFunctions/asl/**.js"]
132+
// },
133+
// {
134+
// "name": "Attach to SSM Document Language Server",
135+
// "type": "node",
136+
// "request": "attach",
137+
// "port": 6010,
138+
// "restart": true,
139+
// "outFiles": ["${workspaceRoot}/dist/src/ssmDocument/ssm/ssmServer.js"]
140+
// }
141141
],
142142
"compounds": [
143-
{
144-
"name": "Extension + Attach to SSM Document Language Server",
145-
"configurations": ["Extension", "Attach to SSM Document Language Server"]
146-
}
143+
// ---- We do not need the following currently, and we want to reduce clutter. Re-enable if necessary ----
144+
// {
145+
// "name": "Extension + Attach to SSM Document Language Server",
146+
// "configurations": ["Extension", "Attach to SSM Document Language Server"]
147+
// }
147148
]
148149
}

0 commit comments

Comments
 (0)