tombi 1.1.4 → 1.1.6

package/bin/tombi

@@ -43,29 +43,43 @@ const binPath =
     : PLATFORMS?.[platform]?.[arch]);
 
 if (binPath) {
-  const packageManager = detectPackageManager();
-  const result = require("node:child_process").spawnSync(
-    require.resolve(binPath),
-    process.argv.slice(2),
-    {
-      shell: false,
-      stdio: "inherit",
-      env: {
-        ...env,
-        JS_RUNTIME_VERSION: version,
-        JS_RUNTIME_NAME: release.name,
-        ...(packageManager != null
-          ? { NODE_PACKAGE_MANAGER: packageManager }
-          : {}),
+  let resolvedBinPath;
+  try {
+    resolvedBinPath = require.resolve(binPath);
+  } catch {
+    console.error(
+      `The Tombi CLI binary "${binPath}" could not be found. ` +
+        "The platform-specific optional package may not be installed. " +
+        "Please reinstall tombi with optional dependencies enabled.",
+    );
+    process.exitCode = 1;
+  }
+
+  if (resolvedBinPath) {
+    const packageManager = detectPackageManager();
+    const result = require("node:child_process").spawnSync(
+      resolvedBinPath,
+      process.argv.slice(2),
+      {
+        shell: false,
+        stdio: "inherit",
+        env: {
+          ...env,
+          JS_RUNTIME_VERSION: version,
+          JS_RUNTIME_NAME: release.name,
+          ...(packageManager != null
+            ? { NODE_PACKAGE_MANAGER: packageManager }
+            : {}),
+        },
       },
-    },
-  );
+    );
 
-  if (result.error) {
-    throw result.error;
-  }
+    if (result.error) {
+      throw result.error;
+    }
 
-  process.exitCode = result.status;
+    process.exitCode = result.status;
+  }
 } else {
   console.error(
     "The Tombi CLI package doesn't ship with prebuilt binaries for your platform yet. " +

package/package.json

@@ -1,19 +1,15 @@
 {
   "name": "tombi",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "🦅 TOML Toolkit 🦅",
   "bin": {
     "tombi": "bin/tombi"
   },
   "files": [
     "bin/tombi",
-    "scripts/postinstall.js",
     "README.md",
     "LICENSE"
   ],
-  "scripts": {
-    "postinstall": "node ./scripts/postinstall.js"
-  },
   "keywords": [
     "toml",
     "cli",
@@ -40,13 +36,13 @@
     "provenance": true
   },
   "optionalDependencies": {
-    "@tombi-toml/cli-win32-x64": "1.1.4",
-    "@tombi-toml/cli-win32-arm64": "1.1.4",
-    "@tombi-toml/cli-darwin-x64": "1.1.4",
-    "@tombi-toml/cli-darwin-arm64": "1.1.4",
-    "@tombi-toml/cli-linux-x64": "1.1.4",
-    "@tombi-toml/cli-linux-arm64": "1.1.4",
-    "@tombi-toml/cli-linux-x64-musl": "1.1.4",
-    "@tombi-toml/cli-linux-arm64-musl": "1.1.4"
+    "@tombi-toml/cli-win32-x64": "1.1.6",
+    "@tombi-toml/cli-win32-arm64": "1.1.6",
+    "@tombi-toml/cli-darwin-x64": "1.1.6",
+    "@tombi-toml/cli-darwin-arm64": "1.1.6",
+    "@tombi-toml/cli-linux-x64": "1.1.6",
+    "@tombi-toml/cli-linux-arm64": "1.1.6",
+    "@tombi-toml/cli-linux-x64-musl": "1.1.6",
+    "@tombi-toml/cli-linux-arm64-musl": "1.1.6"
   }
 }

package/scripts/postinstall.js

@@ -1,59 +0,0 @@
-const { platform, arch } = process;
-// tombi-ignore lint/style/useNodejsImportProtocol: would be a breaking change, consider bumping node version next major version
-const { execSync } = require("child_process");
-
-function isMusl() {
-	let stderr;
-	try {
-		stderr = execSync("ldd --version", {
-			stdio: ["pipe", "pipe", "pipe"],
-		});
-	} catch (err) {
-		stderr = err.stderr;
-	}
-	if (stderr.indexOf("musl") > -1) {
-		return true;
-	}
-	return false;
-}
-
-const PLATFORMS = {
-	win32: {
-		x64: "@tombi-toml/cli-win32-x64/tombi.exe",
-		arm64: "@tombi-toml/cli-win32-arm64/tombi.exe",
-	},
-	darwin: {
-		x64: "@tombi-toml/cli-darwin-x64/tombi",
-		arm64: "@tombi-toml/cli-darwin-arm64/tombi",
-	},
-	linux: {
-		x64: "@tombi-toml/cli-linux-x64/tombi",
-		arm64: "@tombi-toml/cli-linux-arm64/tombi",
-	},
-	"linux-musl": {
-		x64: "@tombi-toml/cli-linux-x64-musl/tombi",
-		arm64: "@tombi-toml/cli-linux-arm64-musl/tombi",
-	},
-};
-
-const binName =
-	platform === "linux" && isMusl()
-		? PLATFORMS?.["linux-musl"]?.[arch]
-		: PLATFORMS?.[platform]?.[arch];
-
-if (binName) {
-	let binPath;
-	try {
-		binPath = require.resolve(binName);
-	} catch {
-		console.warn(
-			`The Tombi CLI postinstall script failed to resolve the binary file "${binName}". Running Tombi from the npm package will probably not work correctly.`,
-		);
-	}
-} else {
-	console.warn(
-		"The Tombi CLI package doesn't ship with prebuilt binaries for your platform yet. " +
-			"You can still use the CLI by cloning the tombi-toml/tombi repo from GitHub, " +
-			"and follow the instructions there to build the CLI for your platform.",
-	);
-}