use yarn pack

lib_dev/paths.js

@@ -83,6 +83,15 @@ export const compilerVersionFile = path.resolve(
   "bs_version.ml",
 );
 
+/**
+ * path: `<projectDir>/packages/artifacts.txt`
+ */
+export const artifactListFile = path.resolve(
+  projectDir,
+  "packages",
+  "artifacts.txt",
+);
+
 /**
  * path: `<projectDir>/_build/install/default/bin/`
  */

package.json

@@ -56,11 +56,12 @@
   },
   "files": [
     "CHANGELOG.md",
+    "COPYING",
+    "COPYING.LESSER",
     "CREDITS.md",
     "ninja.COPYING",
     "docs/docson/build-schema.json",
-    "lib/js/*.js",
-    "lib/es6/*.js",
+    "lib",
     "cli"
   ],
   "exports": {

packages/artifacts.txt

@@ -14,20 +14,6 @@ cli/rescript.js
 cli/rescript/dump.js
 cli/rescript/format.js
 cli/rewatch.js
-darwin/bsb_helper.exe
-darwin/bsc.exe
-darwin/ninja.exe
-darwin/rescript-editor-analysis.exe
-darwin/rescript-tools.exe
-darwin/rescript.exe
-darwin/rewatch.exe
-darwinarm64/bsb_helper.exe
-darwinarm64/bsc.exe
-darwinarm64/ninja.exe
-darwinarm64/rescript-editor-analysis.exe
-darwinarm64/rescript-tools.exe
-darwinarm64/rescript.exe
-darwinarm64/rewatch.exe
 docs/docson/build-schema.json
 lib/es6/Belt.js
 lib/es6/Belt_Array.js
@@ -1227,26 +1213,5 @@ lib/ocaml/Stdlib_WeakSet.cmi
 lib/ocaml/Stdlib_WeakSet.cmj
 lib/ocaml/Stdlib_WeakSet.cmt
 lib/ocaml/Stdlib_WeakSet.res
-linux/bsb_helper.exe
-linux/bsc.exe
-linux/ninja.exe
-linux/rescript-editor-analysis.exe
-linux/rescript-tools.exe
-linux/rescript.exe
-linux/rewatch.exe
-linuxarm64/bsb_helper.exe
-linuxarm64/bsc.exe
-linuxarm64/ninja.exe
-linuxarm64/rescript-editor-analysis.exe
-linuxarm64/rescript-tools.exe
-linuxarm64/rescript.exe
-linuxarm64/rewatch.exe
-ninja.COPYING
+ninja/COPYING
 package.json
-win32/bsb_helper.exe
-win32/bsc.exe
-win32/ninja.exe
-win32/rescript-editor-analysis.exe
-win32/rescript-tools.exe
-win32/rescript.exe
-win32/rewatch.exe

scripts/npmPack.js

@@ -2,89 +2,80 @@
 
 // @ts-check
 
-// NOTE:
-//   We cannot use `yarn pack` since we need to set our OCaml binaries executable.
-//   Yarn (Berry) only allow `bin` to be executable, wouldn't preserve permission bits.
-
-// This performs `npm pack` and retrieves the list of artifact files from the output.
+// This performs `yarn pack` and retrieves the list of artifact files from the output.
 //
-// In local dev, invoke it with `-updateArtifactList` to perform a dry run of `npm pack`
+// In local dev, invoke it with `-updateArtifactList` to perform a dry run of `yarn pack`
 // and recreate `packages/artifacts.txt`.
-// The exes for all platforms will then be included in the list, even if not present locally.
 //
-// In CI, the scripts is invoked without options. It then performs `npm pack` for real,
+// In CI, the scripts is invoked without options. It then performs `yarn pack` for real,
 // recreates the artifact list and verifies that it has no changes compared to the committed state.
 
-/**
- * @typedef {{
- *   path: string,
- *   size: number,
- *   mode: number,
- * }} PackOutputFile
- *
- * @typedef {{
- *   files: PackOutputFile[],
- *   entryCount: number,
- *   bundled: unknown[],
- * }} PackOutputEntry
- *
- * @typedef {[PackOutputEntry]} PackOutput
+import { spawn, execSync } from "node:child_process";
+import fs from "node:fs";
+import { parseArgs } from "node:util";
+import { artifactListFile } from "#dev/paths";
+
+/** 
+ * @typedef {(
+ *   | { "base": string }
+ *   | { "location": string }
+ *   | { "output": string }
+ * )} YarnPackOutputLine
  */
 
-import { execSync, spawnSync } from "node:child_process";
-import fs from "node:fs";
-import path from "node:path";
-import { projectDir } from "#dev/paths";
+const { values } = parseArgs({
+  args: process.argv.slice(2),
+  options: {
+    updateArtifactList: {
+      type: "boolean",
+      short: "u",
+    },
+  },
+});
 
-const mode = process.argv.includes("-updateArtifactList")
+const mode = values.updateArtifactList
   ? "updateArtifactList"
   : "package";
 
-const fileListPath = path.join(projectDir, "packages", "artifacts.txt");
-
-const output = spawnSync(
-  `npm pack --json${mode === "updateArtifactList" ? " --dry-run" : ""}`,
-  {
-    cwd: projectDir,
-    encoding: "utf8",
-    shell: true,
-  },
-).stdout;
-
-/** @type {PackOutput} */
-const parsedOutput = JSON.parse(output);
-let filePaths = parsedOutput[0].files.map(file => file.path);
-
-if (mode === "updateArtifactList") {
-  filePaths = Array.from(new Set(filePaths.concat(getFilesAddedByCI())));
+const child = spawn(
+  "yarn",
+  [
+    "workspace",
+    "rescript",
+    "pack",
+    "--json",
+    mode === "updateArtifactList" ? "--dry-run" : "",
+  ].filter(Boolean),
+);
+const exitCode = new Promise((resolve, reject) => {
+  child.once("error", reject);
+  child.once("close", code => resolve(code));
+});
+
+fs.unlinkSync(artifactListFile);
+
+for await (const chunk of child.stdout.setEncoding("utf8")) {
+  const lines = /** @type {string} */ (chunk).trim().split(/\s/);
+  for (const line of lines) {
+    /** @type {YarnPackOutputLine} */
+    const json = JSON.parse(line);
+    if ("location" in json) {
+      // Workaround for false positive reports
+      // See https://github.com/yarnpkg/berry/issues/6766
+      if (json.location.startsWith("_build")) {
+        continue;
+      }
+      fs.appendFileSync(
+        artifactListFile,
+        json.location + "\n",
+        "utf8",
+      );
+    }
+  }
 }
 
-filePaths.sort();
-fs.writeFileSync(fileListPath, filePaths.join("\n"));
+await exitCode;
 
 if (mode === "package") {
-  execSync(`git diff --exit-code ${fileListPath}`, { stdio: "inherit" });
-}
-
-function getFilesAddedByCI() {
-  const platforms = ["darwin", "darwinarm64", "linux", "linuxarm64", "win32"];
-  const exes = [
-    "bsb_helper.exe",
-    "bsc.exe",
-    "ninja.exe",
-    "rescript.exe",
-    "rescript-editor-analysis.exe",
-    "rescript-tools.exe",
-    "rewatch.exe",
-  ];
-
-  const files = ["ninja.COPYING"];
-
-  for (const platform of platforms) {
-    for (const exe of exes) {
-      files.push(`${platform}/${exe}`);
-    }
-  }
-
-  return files;
+  execSync(`git diff --exit-code ${artifactListFile}`, { stdio: "inherit" });
 }