@fulgur-rs/cli 0.5.13 → 0.5.14

package/README.md

@@ -177,10 +177,11 @@ of the `@fulgur-rs/cli-<platform>` packages above, all declared as
 npm only installs the one that matches the current `os` / `cpu` / libc, so
 there is no per-platform bloat and no cross-compilation at install time.
 
-A small `postinstall` script copies the platform binary into the meta
-package's `bin/` directory so `fulgur` becomes available on the `PATH`. If you
-install with `--ignore-optional` or on an unsupported platform, the script
-exits with a clear error message.
+The `bin/fulgur` entry is a small JavaScript shim that, at run time, resolves
+the platform package via `require.resolve` and execs its native binary. There
+is no `postinstall` step, so `npx @fulgur-rs/cli` works on the very first run.
+If you install with `--ignore-optional` or on an unsupported platform, the
+shim exits with a clear error message.
 
 ## Links
 

package/bin/fulgur

@@ -0,0 +1,51 @@
+#!/usr/bin/env node
+'use strict';
+
+const { spawnSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+const PLATFORMS = {
+  'linux-x64':      { pkg: '@fulgur-rs/cli-linux-x64',      bin: 'fulgur' },
+  'linux-x64-musl': { pkg: '@fulgur-rs/cli-linux-x64-musl', bin: 'fulgur' },
+  'linux-arm64':    { pkg: '@fulgur-rs/cli-linux-arm64',    bin: 'fulgur' },
+  'darwin-arm64':   { pkg: '@fulgur-rs/cli-darwin-arm64',   bin: 'fulgur' },
+  'darwin-x64':     { pkg: '@fulgur-rs/cli-darwin-x64',     bin: 'fulgur' },
+  'win32-x64':      { pkg: '@fulgur-rs/cli-win32-x64',      bin: 'fulgur.exe' },
+};
+
+function isMusl() {
+  try { return fs.readFileSync('/proc/self/maps', 'utf8').includes('musl'); }
+  catch { return false; }
+}
+
+function detectPlatformKey() {
+  const { platform, arch } = process;
+  if (platform === 'linux' && arch === 'x64') return isMusl() ? 'linux-x64-musl' : 'linux-x64';
+  if (platform === 'linux' && arch === 'arm64') return 'linux-arm64';
+  if (platform === 'darwin' && arch === 'arm64') return 'darwin-arm64';
+  if (platform === 'darwin' && arch === 'x64') return 'darwin-x64';
+  if (platform === 'win32' && arch === 'x64') return 'win32-x64';
+  return null;
+}
+
+const key = detectPlatformKey();
+if (!key) {
+  process.stderr.write(`@fulgur-rs/cli: unsupported platform ${process.platform}/${process.arch}\n`);
+  process.exit(1);
+}
+
+const { pkg, bin } = PLATFORMS[key];
+let pkgDir;
+try {
+  pkgDir = path.dirname(require.resolve(`${pkg}/package.json`));
+} catch {
+  process.stderr.write(
+    `@fulgur-rs/cli: platform package ${pkg} not found.\n` +
+    `This usually means it was not installed (e.g. --ignore-optional was used).\n`
+  );
+  process.exit(1);
+}
+
+const r = spawnSync(path.join(pkgDir, 'bin', bin), process.argv.slice(2), { stdio: 'inherit' });
+process.exit(r.status ?? 1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fulgur-rs/cli",
-  "version": "0.5.13",
+  "version": "0.5.14",
   "description": "HTML to PDF conversion CLI",
   "keywords": [
     "html",
@@ -17,18 +17,14 @@
     "fulgur": "bin/fulgur"
   },
   "files": [
-    "bin/",
-    "install.js"
+    "bin/"
   ],
-  "scripts": {
-    "postinstall": "node install.js"
-  },
   "optionalDependencies": {
-    "@fulgur-rs/cli-linux-x64": "0.5.13",
-    "@fulgur-rs/cli-linux-x64-musl": "0.5.13",
-    "@fulgur-rs/cli-linux-arm64": "0.5.13",
-    "@fulgur-rs/cli-darwin-arm64": "0.5.13",
-    "@fulgur-rs/cli-darwin-x64": "0.5.13",
-    "@fulgur-rs/cli-win32-x64": "0.5.13"
+    "@fulgur-rs/cli-linux-x64": "0.5.14",
+    "@fulgur-rs/cli-linux-x64-musl": "0.5.14",
+    "@fulgur-rs/cli-linux-arm64": "0.5.14",
+    "@fulgur-rs/cli-darwin-arm64": "0.5.14",
+    "@fulgur-rs/cli-darwin-x64": "0.5.14",
+    "@fulgur-rs/cli-win32-x64": "0.5.14"
   }
 }

package/install.js

@@ -1,89 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-const fs = require('fs');
-const path = require('path');
-
-const PLATFORMS = {
-  'linux-x64':      { os: 'linux',  cpu: 'x64',   pkg: '@fulgur-rs/cli-linux-x64',      bin: 'fulgur' },
-  'linux-x64-musl': { os: 'linux',  cpu: 'x64',   pkg: '@fulgur-rs/cli-linux-x64-musl', bin: 'fulgur' },
-  'linux-arm64':    { os: 'linux',  cpu: 'arm64', pkg: '@fulgur-rs/cli-linux-arm64',    bin: 'fulgur' },
-  'darwin-arm64':   { os: 'darwin', cpu: 'arm64', pkg: '@fulgur-rs/cli-darwin-arm64',   bin: 'fulgur' },
-  'darwin-x64':     { os: 'darwin', cpu: 'x64',   pkg: '@fulgur-rs/cli-darwin-x64',     bin: 'fulgur' },
-  'win32-x64':      { os: 'win32',  cpu: 'x64',   pkg: '@fulgur-rs/cli-win32-x64',      bin: 'fulgur.exe' },
-};
-
-function isMusl() {
-  try {
-    const maps = fs.readFileSync('/proc/self/maps', 'utf8');
-    return maps.includes('musl');
-  } catch {
-    return false;
-  }
-}
-
-function detectPlatformKey() {
-  const os = process.platform;
-  const cpu = process.arch;
-
-  if (os === 'linux' && cpu === 'x64') {
-    return isMusl() ? 'linux-x64-musl' : 'linux-x64';
-  }
-  if (os === 'linux' && cpu === 'arm64') return 'linux-arm64';
-  if (os === 'darwin' && cpu === 'arm64') return 'darwin-arm64';
-  if (os === 'darwin' && cpu === 'x64') return 'darwin-x64';
-  if (os === 'win32' && cpu === 'x64') return 'win32-x64';
-  return null;
-}
-
-const platformKey = detectPlatformKey();
-if (!platformKey) {
-  process.stderr.write(
-    `@fulgur-rs/cli: unsupported platform ${process.platform}/${process.arch}\n`
-  );
-  process.exit(1);
-}
-
-const platform = PLATFORMS[platformKey];
-let pkgDir;
-try {
-  pkgDir = path.dirname(require.resolve(`${platform.pkg}/package.json`));
-} catch {
-  process.stderr.write(
-    `@fulgur-rs/cli: platform package ${platform.pkg} not found.\n` +
-    `This usually means it was not installed (e.g., --ignore-optional was used).\n`
-  );
-  process.exit(1);
-}
-
-const src = path.join(pkgDir, 'bin', platform.bin);
-const destDir = path.join(__dirname, 'bin');
-const dest = path.join(destDir, platform.bin);
-
-if (!fs.existsSync(src)) {
-  process.stderr.write(
-    `@fulgur-rs/cli: binary not found at ${src}\n` +
-    `The platform package ${platform.pkg} may be corrupted or incomplete.\n`
-  );
-  process.exit(1);
-}
-
-fs.mkdirSync(destDir, { recursive: true });
-fs.copyFileSync(src, dest);
-if (process.platform !== 'win32') {
-  fs.chmodSync(dest, 0o755);
-} else {
-  // Windows: npm の bin フィールドは拡張子なし "bin/fulgur" を参照するため、
-  // .exe を起動する JS シムを書き込む
-  const shimPath = path.join(destDir, 'fulgur');
-  const shimContent = [
-    '#!/usr/bin/env node',
-    "'use strict';",
-    "const { spawnSync } = require('child_process');",
-    "const path = require('path');",
-    "const r = spawnSync(path.join(__dirname, 'fulgur.exe'), process.argv.slice(2), { stdio: 'inherit' });",
-    'process.exit(r.status ?? 1);',
-    '',
-  ].join('\n');
-  fs.writeFileSync(shimPath, shimContent, { encoding: 'utf8' });
-}