Fix module type issues in scripts

Signed-off-by: Roberto Raggi <roberto.raggi@gmail.com>

Author: robertoraggi

package-lock.json

@@ -3,6 +3,7 @@
  "version": "1.1.27",
  "description": "A compiler frontend for C++23",
  "private": true,
+ "type": "module",
  "keywords": [
  "c++",
  "compiler",
@@ -25,6 +26,7 @@
  },
  "devDependencies": {
  "@types/node": "^24.8.1",
+ "jsonc-parser": "^3.3.1",
  "zx": "^8.8.5"
  },
  "workspaces": [
@@ -34,14 +36,14 @@
  "build:cxx-frontend": "npm run build -w cxx-frontend",
  "build:playground": "npm run build -w @robertoraggi/cxx-playground",
  "build:emscripten": "npm run build -w cxx-frontend",
- "build:wasi": "zx scripts/build-wasi.mjs",
- "build:mlir": "zx scripts/build-mlir.mjs",
+ "build:wasi": "node scripts/build-wasi.js",
+ "build:mlir": "node scripts/build-mlir.js",
  "playground": "npm run dev -w @robertoraggi/cxx-playground",
- "setup-venv": "zx scripts/setup-venv.mjs",
- "update-tests": "zx scripts/update-tests.mjs",
+ "setup-venv": "node scripts/setup-venv.js",
+ "update-tests": "node scripts/update-tests.js",
  "cxx-gen-ast": "node --no-warnings packages/cxx-gen-ast/src/gen.ts",
  "cxx-gen-lsp": "node --no-warnings packages/cxx-gen-lsp/src/main.ts packages/cxx-gen-lsp/metaModel.json packages/cxx-gen-lsp -o src/lsp/cxx/lsp",
- "download-lsp-model": "zx scripts/download-lsp-model.mjs",
+ "download-lsp-model": "node scripts/download-lsp-model.js",
  "download-mlir": "gh run download -n mlir --dir build.em/llvm-project/install/"
  }
 }

package.json

@@ -19,6 +19,7 @@
  "@tanstack/react-query": "^5.90.5",
  "@types/react": "^19.2.2",
  "@types/react-dom": "^19.2.2",
+ "@types/react-window": "^1.8.8",
  "@vitejs/plugin-react": "^5.0.4",
  "birpc": "^2.6.1",
  "class-variance-authority": "^0.7.1",
@@ -35,7 +36,7 @@
  "react-dom": "^19.2.0",
  "react-resizable-panels": "^3.0.6",
  "react-virtualized-auto-sizer": "^1.0.26",
- "react-window": "^2.2.1",
+ "react-window": "^1.8.8",
  "tailwind-merge": "^3.3.1",
  "tailwindcss": "^4.1.14",
  "tw-animate-css": "^1.4.0",

packages/cxx-playground/package.json

@@ -96,6 +96,15 @@ async function main() {
  await zx.fs.mkdir(llvm_source_dir, { recursive: true });
  await zx.fs.writeFile(zx.path.join(llvm_source_dir, ".gitignore"), "*");
 
+ await zx.fs.writeFile(
+ zx.path.join(llvm_install_dir, "package.json"),
+ `{
+ "name": "mlir",
+ "version": "${version}",
+ "type": "commonjs"
+}`
+ );
+
  await downloadLLVM({ version, packages, outdir: llvm_source_dir });
 
  await $`emcmake cmake ${llvm_cmake_options} -S ${llvm_source_dir}/llvm -B ${llvm_build_dir}/llvm -DCMAKE_INSTALL_PREFIX=${llvm_install_dir}`;
@@ -120,7 +129,8 @@ async function main() {
 
  await zx.fs.writeFile(
  zx.path.join(llvm_install_dir, "bin", app),
- `#!/usr/bin/env node\nrequire("./${app}.js");`
+ `#!/usr/bin/env node
+require("./${app}.js");`
  );
 
  await zx.fs.chmod(zx.path.join(llvm_install_dir, "bin", app), 0o755);
@@ -154,8 +164,4 @@ async function main() {
  }
 }
 
-try {
- await main();
-} catch (e) {
- console.error(e.message);
-}
+await await main();

scripts/ast-dump.mjs renamed to scripts/ast-dump.js

@@ -20,10 +20,15 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
-import "zx/globals";
+import { $, which, argv } from "zx";
+import { fileURLToPath } from "url";
+import path from "path";
 
 $.verbose = true;
 
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
 const workspacePath = path.join(__dirname, "../");
 const docker = await which("docker");
 const uid = String(await $`id -u`).trim();

scripts/build-mlir.mjs renamed to scripts/build-mlir.js

@@ -42,7 +42,7 @@ try {
 } catch (e) {
  if (e instanceof ProcessOutput) {
  echo`${e}`;
- process.exit(e.status);
+ process.exit(e.exitCode);
  } else {
  process.exit(1);
  }