Skip to content

Commit bdb4bb6

Browse files
committed
Use @roo-code/build in src/esbuild.mjs
1 parent 1146f5b commit bdb4bb6

File tree

11 files changed

+226
-336
lines changed

11 files changed

+226
-336
lines changed

.github/workflows/nightly-publish.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ name: Nightly Publish
33
on:
44
push:
55
branches: [main, cte/monorepo]
6+
# workflow_run:
7+
# workflows: ["Code QA Roo Code"]
8+
# types:
9+
# - completed
10+
# branches: [main]
611
workflow_dispatch: # Allows manual triggering.
712

813
env:
@@ -12,6 +17,7 @@ env:
1217
jobs:
1318
publish-nightly:
1419
runs-on: ubuntu-latest
20+
# if: ${{ github.event.workflow_run.conclusion == 'success' }}
1521

1622
permissions:
1723
contents: read # No tags pushed → read is enough.
@@ -34,7 +40,7 @@ jobs:
3440
run: pnpm install --frozen-lockfile
3541
- name: Count commits
3642
id: count
37-
run: echo "total=$(git rev-list --count HEAD)" >> $GITHUB_OUTPUT
43+
run: echo "total=$(git rev-list --all --count)" >> $GITHUB_OUTPUT
3844
- name: Patch package.json version
3945
env:
4046
COMMIT_COUNT: ${{ steps.count.outputs.total }}

apps/vscode-nightly/esbuild.mjs

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,40 @@ async function main() {
4848
*/
4949
const plugins = [
5050
{
51-
name: "copy-src",
51+
name: "copy-files",
5252
setup(build) {
5353
build.onEnd(() => {
54-
const paths = [
55-
["../README.md", "README.md"],
56-
["../CHANGELOG.md", "CHANGELOG.md"],
57-
["../LICENSE", "LICENSE"],
58-
[".vscodeignore", ".vscodeignore"],
59-
["assets", "assets"],
60-
["integrations", "integrations"],
61-
["node_modules/vscode-material-icons/generated", "assets/vscode-material-icons"],
62-
["../webview-ui/audio", "webview-ui/audio"],
63-
]
64-
65-
copyPaths(paths, srcDir, buildDir)
54+
copyPaths(
55+
[
56+
["../README.md", "README.md"],
57+
["../CHANGELOG.md", "CHANGELOG.md"],
58+
["../LICENSE", "LICENSE"],
59+
[".vscodeignore", ".vscodeignore"],
60+
["assets", "assets"],
61+
["integrations", "integrations"],
62+
["node_modules/vscode-material-icons/generated", "assets/vscode-material-icons"],
63+
["../webview-ui/audio", "webview-ui/audio"],
64+
],
65+
srcDir,
66+
buildDir,
67+
)
68+
})
69+
},
70+
},
71+
{
72+
name: "generate-package-json",
73+
setup(build) {
74+
build.onEnd(() => {
75+
const packageJson = JSON.parse(fs.readFileSync(path.join(srcDir, "package.json"), "utf8"))
76+
77+
const generatedPackageJson = generatePackageJson({
78+
packageJson,
79+
overrideJson,
80+
substitution: ["roo-cline", "roo-code-nightly"],
81+
})
82+
83+
fs.writeFileSync(path.join(buildDir, "package.json"), JSON.stringify(generatedPackageJson, null, 2))
84+
console.log(`[generate-package-json] Generated package.json`)
6685

6786
let count = 0
6887

@@ -86,41 +105,20 @@ async function main() {
86105
JSON.stringify({ ...nlsPkg, ...nlsNightlyPkg }, null, 2),
87106
)
88107

89-
console.log(`[copy-src] Merged production and nightly package.nls.json files`)
90-
})
91-
},
92-
},
93-
{
94-
name: "generate-package-json",
95-
setup(build) {
96-
build.onEnd(() => {
97-
const packageJson = JSON.parse(fs.readFileSync(path.join(srcDir, "package.json"), "utf8"))
98-
99-
const generatedPackageJson = generatePackageJson({
100-
packageJson,
101-
overrideJson,
102-
substitution: ["roo-cline", "roo-code-nightly"],
103-
})
104-
105-
fs.writeFileSync(path.join(buildDir, "package.json"), JSON.stringify(generatedPackageJson, null, 2))
106-
console.log(`[generate-package-json] Generated package.json`)
108+
console.log(`[copy-src] Generated package.nls.json`)
107109
})
108110
},
109111
},
110112
{
111113
name: "copy-wasms",
112114
setup(build) {
113-
build.onEnd(() => {
114-
copyWasms(srcDir, distDir)
115-
})
115+
build.onEnd(() => copyWasms(srcDir, distDir))
116116
},
117117
},
118118
{
119119
name: "copy-locales",
120120
setup(build) {
121-
build.onEnd(() => {
122-
copyLocales(srcDir, distDir)
123-
})
121+
build.onEnd(() => copyLocales(srcDir, distDir))
124122
},
125123
},
126124
]

apps/vscode-nightly/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
"private": true,
55
"packageManager": "[email protected]",
66
"scripts": {
7-
"build": "rimraf build && pnpm --filter @roo-code/build build && node esbuild.mjs --production && pnpm --filter @roo-code/vscode-webview build --mode nightly",
7+
"build": "pnpm clean && pnpm --filter @roo-code/build build && node esbuild.mjs --production && pnpm --filter @roo-code/vscode-webview build --mode nightly",
88
"vsix": "pnpm build && cd build && mkdirp ../../../bin && npx vsce package --no-dependencies --out ../../../bin",
9-
"clean": "rimraf build"
9+
"clean": "rimraf build .turbo"
1010
},
11-
"dependencies": {
11+
"devDependencies": {
1212
"@roo-code/build": "workspace:^"
1313
}
1414
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"check-types": "turbo check-types --log-order grouped --output-logs new-only",
1212
"test": "turbo test --log-order grouped --output-logs new-only",
1313
"format": "turbo format --log-order grouped --output-logs new-only",
14+
"clean": "turbo clean --log-order grouped --output-logs new-only && rimraf bin .vite-port .turbo",
1415
"build": "pnpm --filter roo-cline vsix",
1516
"build:nightly": "pnpm --filter @roo-code/vscode-nightly vsix",
1617
"changeset": "changeset",

packages/build/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"type": "module",
66
"exports": "./dist/index.js",
77
"scripts": {
8-
"build": "tsc"
8+
"build": "tsc",
9+
"clean": "rimraf dist .turbo"
910
},
1011
"devDependencies": {
1112
"@types/node": "^22.15.20",

pnpm-lock.yaml

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)