Skip to content

Commit e40b8fa

Browse files
minor fixes (aws#4743)
Fixes some things related to the downstream feature/standalone - git ignore for certain generated files - fix Amazon Q debug launch tasks - remove Amazon Q webpack web config. We'll set it up properly later - update build script Signed-off-by: Nikolas Komonen <[email protected]>
1 parent 3c0b21c commit e40b8fa

File tree

4 files changed

+31
-28
lines changed

4 files changed

+31
-28
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ packages/core/src/shared/telemetry/clienttelemetry.d.ts
3131
packages/core/src/codewhisperer/client/codewhispererclient.d.ts
3232
packages/core/src/codewhisperer/client/codewhispereruserclient.d.ts
3333
packages/core/src/amazonqFeatureDev/client/featuredevproxyclient.d.ts
34+
packages/core/src/auth/sso/oidcclientpkce.d.ts
3435

3536
# Generated by tests
3637
packages/core/src/testFixtures/**/bin
@@ -42,6 +43,7 @@ packages/*/LICENSE
4243
packages/*/NOTICE
4344
packages/toolkit/package.nls.json
4445
packages/toolkit/resources
46+
packages/amazonq/resources
4547

4648
# Icons
4749
packages/*/resources/icons/cloud9/generated/**

packages/amazonq/.vscode/tasks.json

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,37 @@
1313
"kind": "build",
1414
"isDefault": true
1515
},
16-
"dependsOn": ["serve"]
16+
"dependsOn": ["watchCore", "webpackCore", "serveVueCore"]
1717
},
1818
{
19-
"label": "serve",
20-
"type": "npm",
21-
"script": "serve",
22-
"group": "build",
19+
"label": "watchCore",
20+
"command": "npm run compileOnly -- --watch",
21+
"type": "shell",
22+
"isBackground": true,
23+
"problemMatcher": "$tsc-watch",
24+
"options": {
25+
"cwd": "../core"
26+
}
27+
},
28+
{
29+
"label": "webpackCore",
30+
"command": "npm run webpackDev -- --watch",
31+
"type": "shell",
32+
"isBackground": true,
33+
"problemMatcher": "$ts-webpack-watch",
34+
"options": {
35+
"cwd": "../core"
36+
}
37+
},
38+
{
39+
"label": "serveVueCore",
40+
"command": "npm run serveVue",
41+
"type": "shell",
42+
"detail": "Webpack + local server for Vue webview files from `core`.",
2343
"isBackground": true,
24-
"problemMatcher": {
25-
"owner": "custom",
26-
"pattern": {
27-
"regexp": ".",
28-
"file": 1,
29-
"location": 2,
30-
"message": 3
31-
},
32-
"background": {
33-
"activeOnStart": true,
34-
"beginsPattern": "Project is running at",
35-
"endsPattern": "compiled successfully"
36-
}
44+
"problemMatcher": "$ts-webpack-watch",
45+
"options": {
46+
"cwd": "../core"
3747
}
3848
},
3949
{

packages/amazonq/webpack.config.js

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
const baseConfigFactory = require('../webpack.base.config')
1111
const baseVueConfigFactory = require('../webpack.vue.config')
12-
const baseWebConfigFactory = require('../webpack.web.config')
1312

1413
module.exports = (env, argv) => {
1514
const config = {
@@ -28,12 +27,5 @@ module.exports = (env, argv) => {
2827
},
2928
}
3029

31-
const webConfig = {
32-
...baseWebConfigFactory(env, argv),
33-
entry: {
34-
'src/extensionWeb': './src/extensionWeb.ts',
35-
},
36-
}
37-
38-
return [config, vueConfig, webConfig]
30+
return [config, vueConfig]
3931
}

packages/toolkit/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
"lint": "echo 'Nothing to lint yet!'",
7272
"createRelease": "ts-node ./scripts/build/createRelease.ts",
7373
"watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
74-
"serve": "webpack serve --config-name mainServe --mode development",
7574
"copyPackageJson": "ts-node ./scripts/build/handlePackageJson",
7675
"restorePackageJson": "ts-node ./scripts/build/handlePackageJson --restore"
7776
},

0 commit comments

Comments
 (0)