Skip to content

Commit 0568422

Browse files
authored
Merge master into feature/standalone aws#4747
2 parents baac384 + e40765c commit 0568422

File tree

2 files changed

+20
-39
lines changed

2 files changed

+20
-39
lines changed

packages/amazonq/.vscode/tasks.json

Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,35 @@
1313
"kind": "build",
1414
"isDefault": true
1515
},
16-
"dependsOn": ["watchCore", "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",
2322
"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"
36-
}
37-
},
23+
"problemMatcher": "$tsc-watch",
3824
"options": {
39-
"env": {
40-
"NODE_OPTIONS": "--max_old_space_size=5120"
41-
}
25+
"cwd": "../core"
4226
}
4327
},
4428
{
45-
"label": "watchCore",
46-
"command": "npm run compileLite -- --watch",
29+
"label": "webpackCore",
30+
"command": "npm run webpackDev -- --watch",
4731
"type": "shell",
4832
"isBackground": true,
49-
"problemMatcher": {
50-
"owner": "custom",
51-
"pattern": {
52-
"regexp": ".",
53-
"file": 1,
54-
"location": 2,
55-
"message": 3
56-
},
57-
"background": {
58-
"activeOnStart": true,
59-
"beginsPattern": "Starting compilation",
60-
"endsPattern": "Watching for file changes."
61-
}
62-
},
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`.",
43+
"isBackground": true,
44+
"problemMatcher": "$ts-webpack-watch",
6345
"options": {
6446
"cwd": "../core"
6547
}

packages/toolkit/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
"createRelease": "ts-node ../../scripts/createRelease.ts",
7171
"newChange": "ts-node ../../scripts/newChange.ts",
7272
"watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
73-
"serve": "webpack serve --config-name mainServe --mode development",
7473
"copyPackageJson": "ts-node ./scripts/build/handlePackageJson",
7574
"restorePackageJson": "ts-node ./scripts/build/handlePackageJson --restore"
7675
},

0 commit comments

Comments
 (0)