Skip to content

Commit 8491dd3

Browse files
committed
fix(build): address PR review feedback
- runBuild() rethrows after catching so Promise.allSettled can detect rejections - download-assets: handle rejected promises in allSettled, not just ok:false - esbuild.cli.mjs: fix plugin order so envVarReplacement runs after unicode transform - build.mjs: fix watch mode error message to use fallback exit code 1 - package.json: fix e2e:sea indentation
1 parent 4236076 commit 8491dd3

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

packages/cli/.config/esbuild.cli.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ const config = {
8282
},
8383

8484
plugins: [
85+
unicodeTransformPlugin(),
8586
// Environment variable replacement must run AFTER unicode transform.
8687
envVarReplacementPlugin(inlinedEnvVars),
87-
unicodeTransformPlugin(),
8888
{
8989
name: 'resolve-socket-lib-internals',
9090
setup(build) {

packages/cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"dev:npx": "cross-env SOCKET_CLI_MODE=npx node --experimental-strip-types src/cli-dispatch.mts",
5151
"e2e-tests": "dotenvx -q run -f .env.test -- vitest run --config vitest.e2e.config.mts",
5252
"e2e:js": "node scripts/e2e.mjs --js",
53-
"e2e:sea": "node scripts/e2e.mjs --sea",
53+
"e2e:sea": "node scripts/e2e.mjs --sea",
5454
"e2e:all": "node scripts/e2e.mjs --all",
5555
"test": "run-s check test:*",
5656
"test:prepare": "dotenvx -q run -f .env.test -- pnpm build && del-cli 'test/**/node_modules'",

packages/cli/scripts/build.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ async function main() {
143143

144144
if (!watchResult || watchResult.code !== 0) {
145145
process.exitCode = watchResult?.code ?? 1
146-
throw new Error(`Watch mode failed with exit code ${watchResult?.code}`)
146+
throw new Error(`Watch mode failed with exit code ${watchResult?.code ?? 1}`)
147147
}
148148
return
149149
}

packages/cli/scripts/download-assets.mjs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,12 +336,14 @@ async function downloadAssets(assetNames, parallel = true) {
336336
)
337337

338338
const failed = settled.filter(
339-
r => r.status === 'fulfilled' && !r.value.ok,
339+
r => r.status === 'rejected' || (r.status === 'fulfilled' && !r.value.ok),
340340
)
341341
if (failed.length > 0) {
342342
logger.error(`\n${failed.length} asset(s) failed:`)
343343
for (const r of failed) {
344-
logger.error(` - ${r.value.name}`)
344+
logger.error(
345+
` - ${r.status === 'rejected' ? r.reason?.message ?? r.reason : r.value.name}`,
346+
)
345347
}
346348
process.exitCode = 1
347349
}

packages/cli/scripts/esbuild-utils.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,5 +158,6 @@ export async function runBuild(config, description = 'Build') {
158158
logger.error(`Build failed: ${description || 'Unknown'}`)
159159
logger.error(e)
160160
process.exitCode = 1
161+
throw e
161162
}
162163
}

0 commit comments

Comments
 (0)