mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-19 16:02:14 +00:00
Ruben Fiszel
86d1d160f0
* fix(cli): fall back to esbuild-wasm on native host/binary mismatch Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(cli): guard tarball extraction, extend esbuild-wasm fallback to script bundling Address CI review: prevent tar-slip in esbuild-wasm package extraction, route codebase/script and inline-rawscript bundling through getEsbuild() too, and move the loader to utils. Add a unit test for the tar-slip guard. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(cli): make esbuild-wasm fallback concurrency-safe Address CI review (P1): memoize getEsbuild() on an in-flight promise so concurrent first callers (parallel wmill sync push) share one probe/download instead of racing, and give each extraction a unique temp dir so concurrent extractions can't clobber each other. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
94 lines
3.0 KiB
TypeScript
94 lines
3.0 KiB
TypeScript
import { VERSION } from "./src/main.ts";
|
|
import { readFileSync, writeFileSync, rmSync, cpSync } from "node:fs";
|
|
import { join } from "node:path";
|
|
|
|
const outDir = "./npm";
|
|
|
|
// Parser npm packages — used as externals and added to generated package.json
|
|
const parserPackages = [
|
|
"windmill-parser-wasm-py", "windmill-parser-wasm-ts",
|
|
"windmill-parser-wasm-regex", "windmill-parser-wasm-go",
|
|
"windmill-parser-wasm-php", "windmill-parser-wasm-rust",
|
|
"windmill-parser-wasm-yaml", "windmill-parser-wasm-csharp",
|
|
"windmill-parser-wasm-nu", "windmill-parser-wasm-java",
|
|
"windmill-parser-wasm-ruby",
|
|
"windmill-parser-wasm-py-imports",
|
|
];
|
|
const parserExternals = parserPackages.flatMap(p => ["--external", p]);
|
|
|
|
// Forward parser specs from the dev package.json so the published CLI pins
|
|
// to the same versions devs install/test against. Falls back to "*" if not
|
|
// listed locally.
|
|
const cliDeps: Record<string, string> =
|
|
JSON.parse(readFileSync("./package.json", "utf-8")).dependencies ?? {};
|
|
|
|
// Clean output directory
|
|
rmSync(outDir, { recursive: true, force: true });
|
|
|
|
// Build with bun — bundle everything except esbuild (platform-specific binary),
|
|
// svelte (optional, only needed for `wmill app bundle/dev`), and parser packages
|
|
// (loaded at runtime via init() with readFileSync for the .wasm binary).
|
|
// esbuild-wasm is not a dependency at all: the host/binary-mismatch fallback in
|
|
// esbuild_loader.ts downloads and caches the whole esbuild-wasm package at
|
|
// runtime, so it stays out of the bundle and the published dependencies.
|
|
console.log("Bundling with bun build...");
|
|
const buildResult = Bun.spawnSync([
|
|
"bun", "build", "src/main.ts",
|
|
"--outdir", join(outDir, "esm"),
|
|
"--target", "node",
|
|
"--format", "esm",
|
|
"--external", "esbuild",
|
|
"--external", "svelte",
|
|
"--external", "svelte/compiler",
|
|
...parserExternals,
|
|
], { cwd: import.meta.dir, stdout: "inherit", stderr: "inherit" });
|
|
|
|
if (buildResult.exitCode !== 0) {
|
|
console.error("Build failed");
|
|
process.exit(1);
|
|
}
|
|
|
|
// Add shebang to main.js
|
|
const mainJsPath = join(outDir, "esm", "main.js");
|
|
const mainJs = readFileSync(mainJsPath, "utf-8");
|
|
writeFileSync(mainJsPath, "#!/usr/bin/env node\n" + mainJs, "utf-8");
|
|
|
|
// Copy LICENSE and README
|
|
cpSync("../LICENSE", join(outDir, "LICENSE"));
|
|
cpSync("README.md", join(outDir, "README.md"));
|
|
|
|
// Generate package.json
|
|
const packageJson = {
|
|
name: "windmill-cli",
|
|
version: VERSION,
|
|
description: "CLI for Windmill",
|
|
license: "Apache 2.0",
|
|
type: "module",
|
|
main: "esm/main.js",
|
|
bin: {
|
|
wmill: "esm/main.js",
|
|
},
|
|
repository: {
|
|
type: "git",
|
|
url: "git+https://github.com/windmill-labs/windmill.git",
|
|
},
|
|
bugs: {
|
|
url: "https://github.com/windmill-labs/windmill/issues",
|
|
},
|
|
dependencies: {
|
|
esbuild: "0.28.0",
|
|
...Object.fromEntries(parserPackages.map(p => [p, cliDeps[p] ?? "*"])),
|
|
},
|
|
optionalDependencies: {
|
|
svelte: "^5.0.0",
|
|
},
|
|
};
|
|
|
|
writeFileSync(
|
|
join(outDir, "package.json"),
|
|
JSON.stringify(packageJson, null, 2) + "\n",
|
|
"utf-8"
|
|
);
|
|
|
|
console.log(`Built npm package v${VERSION} to ${outDir}/`);
|