Fix: Pagefind's npm wrapper should be using pagefind_extended

.github/workflows/release.yml

@@ -193,7 +193,7 @@ jobs:
       - name: Extract Binary
         working-directory: build-artifacts
         run: |
-          tar xzf pagefind-v$GIT_VERSION-${{ matrix.target }}.tar.gz
+          tar xzf pagefind_extended-v$GIT_VERSION-${{ matrix.target }}.tar.gz
           rm *.tar.gz
           mv * ../${{ matrix.package }}/bin/
       - name: Prepare package

CHANGELOG.md

@@ -9,6 +9,8 @@
 
 ## Unreleased
 
+* Fixed the new `pagefind` npm wrapper to use the `pagefind_extended` release, as documented.
+
 ## v1.0.0 (September 13, 2023)
 
 Pagefind 1.0 is here! This release has been many months in the making, and we're thrilled to be bringing some great new features and improvements.

wrappers/node/lib/resolveBinary.js

@@ -4,28 +4,33 @@ import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
 
 /**
- * @param {string} execname 
+ * @param {string[]} execnames 
  * @returns {string}
  */
-export function resolveBinaryPath(execname) {
-    const env_var = process.env[`${execname.toUpperCase()}_BINARY_PATH`];
-    if (env_var) return env_var;
+export function resolveBinaryPath(execnames = []) {
+    for (const execname of execnames) {
+        const env_var = process.env[`${execname.toUpperCase()}_BINARY_PATH`];
+        if (env_var) return env_var;
+    }
+
 
     const cpu = process.env.npm_config_arch || os.arch();
     const platform = process.platform === 'win32' ? 'windows' : process.platform;
 
-    const executable = platform === 'windows' ? `${execname}.exe` : execname;
+    for (const execname of execnames) {
+        const executable = platform === 'windows' ? `${execname}.exe` : execname;
 
-    try {
-        return require.resolve(`@${execname}/${platform}-${cpu}/bin/${executable}`);
-    } catch (e) {
-        throw new Error(
-            [
-                `Failed to install ${execname}. Most likely the platform ${platform}-${cpu} is not yet a supported architecture.`,
-                `Please open an issue at https://github.com/CloudCannon/${execname} and paste this error message in full.`,
-                `If you believe this package should be compatible with your system,`,
-                `you can try downloading a release binary directly from https://github.com/CloudCannon/${execname}/releases`
-            ].join('\n')
-        );
+        try {
+            return require.resolve(`@${execname}/${platform}-${cpu}/bin/${executable}`);
+        } catch (e) { }
     }
+
+    throw new Error(
+        [
+            `Failed to install either of [${execnames.join(', ')}]. Most likely the platform ${platform}-${cpu} is not yet a supported architecture.`,
+            `Please open an issue at https://github.com/CloudCannon/pagefind and paste this error message in full.`,
+            `If you believe this package should be compatible with your system,`,
+            `you can try downloading a release binary directly from https://github.com/CloudCannon/pagefind/releases`
+        ].join('\n')
+    );
 }

wrappers/node/lib/runner/bin.cjs

@@ -2,12 +2,13 @@
 const { spawnSync } = require('child_process');
 
 const execname = 'pagefind';
+const execnames = ["pagefind_extended", "pagefind"];
 
 (async () => {
     try {
         const { resolveBinaryPath } = await import("../resolveBinary.js");
         const args = process.argv.slice(2);
-        const binaryPath = resolveBinaryPath(execname);
+        const binaryPath = resolveBinaryPath(execnames);
         const verbose = args.filter(a => /verbose|-v$/i.test(a)).length;
         if (verbose) {
             console.log(`${execname} npm wrapper: Running the executable at ${binaryPath}`);

wrappers/node/lib/service.js

@@ -19,7 +19,7 @@ export class PagefindService {
         /**
          * @type {child_process.ChildProcessByStdio<import('stream').Writable, import('stream').Readable, null> | null}
          */
-        this.backend = child_process.spawn(resolveBinaryPath("pagefind"), [`--service`], {
+        this.backend = child_process.spawn(resolveBinaryPath(["pagefind_extended", "pagefind"]), [`--service`], {
             windowsHide: true,
             stdio: ['pipe', 'pipe', 'inherit'],
             cwd: process.cwd(),