Skip to content

Commit d720720

Browse files
committed
refactor scripts
1 parent e36e338 commit d720720

File tree

5 files changed

+69
-23
lines changed

5 files changed

+69
-23
lines changed

.vscode/tasks.json

Lines changed: 51 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
"version": "2.0.0",
33
"tasks": [
44
{
5-
"label": "watch",
5+
"label": "dev",
66
"dependsOn": [
7-
"npm: watch:localstack-web-mock-server",
8-
"npm: watch:esbuild"
7+
"npm: dev:localstack-web-mock-server",
8+
"npm: dev:extension",
9+
"npm: dev:appinspector-webview"
910
],
1011
"presentation": {
1112
"reveal": "never"
@@ -17,7 +18,7 @@
1718
},
1819
{
1920
"type": "npm",
20-
"script": "watch:esbuild",
21+
"script": "dev:extension",
2122
"group": "build",
2223
"problemMatcher": {
2324
"severity": "error",
@@ -40,23 +41,23 @@
4041
"background": {
4142
"activeOnStart": true,
4243
"beginsPattern": {
43-
"regexp": "\\[watch\\] build started"
44+
"regexp": "\\[dev\\] build started"
4445
},
4546
"endsPattern": {
46-
"regexp": "\\[watch\\] build finished"
47+
"regexp": "\\[dev\\] build finished"
4748
}
4849
}
4950
},
5051
"isBackground": true,
51-
"label": "npm: watch:esbuild",
52+
"label": "npm: dev:extension",
5253
"presentation": {
53-
"group": "watch",
54+
"group": "dev",
5455
"reveal": "never"
5556
}
5657
},
5758
{
5859
"type": "npm",
59-
"script": "watch:localstack-web-mock-server",
60+
"script": "dev:localstack-web-mock-server",
6061
"group": "build",
6162
"isBackground": true,
6263
"problemMatcher": {
@@ -86,9 +87,48 @@
8687
}
8788
}
8889
},
89-
"label": "npm: watch:localstack-web-mock-server",
90+
"label": "npm: dev:localstack-web-mock-server",
9091
"presentation": {
91-
"group": "watch",
92+
"group": "dev",
93+
"reveal": "never"
94+
}
95+
},
96+
{
97+
"type": "npm",
98+
"script": "dev:appinspector-webview",
99+
"group": "build",
100+
"problemMatcher": {
101+
"severity": "error",
102+
"applyTo": "closedDocuments",
103+
"source": "vite",
104+
"fileLocation": "relative",
105+
"pattern": [
106+
{
107+
"regexp": "^[✘▲] \\[([A-Z]+)\\] (.+)",
108+
"severity": 1,
109+
"message": 2
110+
},
111+
{
112+
"regexp": "^(?:\\t| {4})(?!\\s)([^:]+)(?::([0-9]+))?(?::([0-9]+))?:$",
113+
"file": 1,
114+
"line": 2,
115+
"column": 3
116+
}
117+
],
118+
"background": {
119+
// "activeOnStart": true,
120+
"beginsPattern": {
121+
"regexp": "build started..."
122+
},
123+
"endsPattern": {
124+
"regexp": "built in"
125+
}
126+
}
127+
},
128+
"isBackground": true,
129+
"label": "npm: dev:appinspector-webview",
130+
"presentation": {
131+
"group": "dev",
92132
"reveal": "never"
93133
}
94134
}

build/extension.mjs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import esbuild from "esbuild";
22

33
const production = process.argv.includes("--production");
4-
const watch = process.argv.includes("--watch");
4+
const dev = process.argv.includes("--dev");
55

66
/**
77
* @type {import('esbuild').Plugin}
@@ -10,8 +10,7 @@ const esbuildProblemMatcherPlugin = {
1010
name: "esbuild-problem-matcher",
1111
setup(build) {
1212
build.onStart(() => {
13-
console.clear();
14-
console.log("[watch] build started");
13+
console.log("[dev] build started");
1514
});
1615
build.onEnd((result) => {
1716
result.errors.forEach(({ text, location }) => {
@@ -20,7 +19,7 @@ const esbuildProblemMatcherPlugin = {
2019
` ${location.file}:${location.line}:${location.column}:`,
2120
);
2221
});
23-
console.log("[watch] build finished");
22+
console.log("[dev] build finished");
2423
});
2524
},
2625
};
@@ -54,7 +53,7 @@ async function main() {
5453
esbuildProblemMatcherPlugin,
5554
],
5655
});
57-
if (watch) {
56+
if (dev) {
5857
await ctx.watch();
5958
} else {
6059
await ctx.rebuild();

package-lock.json

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

package.json

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,21 @@
128128
},
129129
"scripts": {
130130
"vscode:prepublish": "npm run package",
131-
"compile": "node --env-file=.env.local --env-file-if-exists=.env build/extension.mjs",
132-
"watch": "npm-run-all -p watch:esbuild watch:localstack-web-mock-server",
133-
"watch:esbuild": "node --watch --env-file=.env.local --env-file-if-exists=.env build/extension.mjs --watch",
134-
"watch:tsc": "tsc --watch",
135-
"watch:localstack-web-mock-server": "node --watch --env-file=.env.local --env-file-if-exists=.env build/localstack-web-mock-server.mjs",
131+
"compile": "npm-run-all -p compile:extension compile:appinspector-webview",
132+
"compile:appinspector-webview": "vite build",
133+
"compile:extension": "node --env-file=.env.local --env-file-if-exists=.env build/extension.mjs",
134+
"compile:font": "node build/icon-font.mjs",
135+
"dev": "npm-run-all -p dev:extension dev:localstack-web-mock-server dev:appinspector-webview",
136+
"dev:appinspector-webview": "vite build --watch --no-clear-screen",
137+
"dev:extension": "node --watch --env-file=.env.local --env-file-if-exists=.env build/extension.mjs --dev",
138+
"dev:tsc": "tsc --watch",
139+
"dev:localstack-web-mock-server": "node --watch --env-file=.env.local --env-file-if-exists=.env build/localstack-web-mock-server.mjs",
136140
"package": "node build/extension.mjs --production",
137141
"pretest": "npm run compile",
138142
"check-types": "tsc",
139143
"lint": "eslint",
140144
"format": "biome check",
141-
"test": "vscode-test",
142-
"compile:font": "node build/icon-font.mjs"
145+
"test": "vscode-test"
143146
},
144147
"devDependencies": {
145148
"@biomejs/biome": "^2.2.3",
@@ -168,6 +171,7 @@
168171
"p-min-delay": "^4.1.1",
169172
"react": "^17.0.2",
170173
"react-dom": "^17.0.2",
174+
"react-router-dom": "^6.30.1",
171175
"typescript": "^5.9.2",
172176
"typescript-eslint": "^8.43.0",
173177
"uuid": "^13.0.0",

vite.config.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@ export default defineConfig({
1010
root: path.join(import.meta.dirname, "src/app-inspector"),
1111
build: {
1212
outDir: "../../resources/app-inspector/dist",
13+
emptyOutDir: true,
1314
},
1415
});

0 commit comments

Comments
 (0)