@bookshop/hugo-engine 3.3.1-beta.9 → 3.3.2

package/.nyc_output/processinfo/396c364e-fec4-4f27-9ff2-8b236061ef8f.json

@@ -0,0 +1 @@
+{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","pid":3463,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669766791163,"ppid":3424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/396c364e-fec4-4f27-9ff2-8b236061ef8f.json","externalId":"","uuid":"396c364e-fec4-4f27-9ff2-8b236061ef8f","files":[]}

package/.nyc_output/processinfo/4ef43740-059b-4329-96cd-0643fd8fe8d8.json

@@ -0,0 +1 @@
+{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","pid":3435,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669766790775,"ppid":3424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/4ef43740-059b-4329-96cd-0643fd8fe8d8.json","externalId":"","uuid":"4ef43740-059b-4329-96cd-0643fd8fe8d8","files":[]}

package/.nyc_output/processinfo/656275f4-66d6-4d27-bfab-c2f7a3087670.json

@@ -0,0 +1 @@
+{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","pid":3441,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669766790781,"ppid":3424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/656275f4-66d6-4d27-bfab-c2f7a3087670.json","externalId":"","uuid":"656275f4-66d6-4d27-bfab-c2f7a3087670","files":[]}

package/.nyc_output/processinfo/6aec5420-0b83-4260-b300-4d595dfd0660.json

@@ -0,0 +1 @@
+{"parent":null,"pid":3424,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669766790333,"ppid":3413,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/6aec5420-0b83-4260-b300-4d595dfd0660.json","externalId":"","uuid":"6aec5420-0b83-4260-b300-4d595dfd0660","files":[]}

package/.nyc_output/processinfo/874bd79b-45da-4726-9afc-1f6cab44be1f.json

@@ -0,0 +1 @@
+{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","pid":3457,"argv":["/opt/hostedtoolcache/node/16.18.1/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669766791137,"ppid":3424,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/874bd79b-45da-4726-9afc-1f6cab44be1f.json","externalId":"","uuid":"874bd79b-45da-4726-9afc-1f6cab44be1f","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"3d7b2afe-f130-478e-82ed-2a0379ecdfff":{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","children":[]},"8b92bece-b7fa-4f0d-a2c6-11e46127ccc8":{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","children":[]},"ad32106f-bbf1-46e2-a408-326af8789f63":{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","children":[]},"b56df138-4974-4883-9070-3179d5d423bd":{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","children":[]},"b6ed24db-60f5-41e2-959d-ae65b62309aa":{"parent":null,"children":["3d7b2afe-f130-478e-82ed-2a0379ecdfff","8b92bece-b7fa-4f0d-a2c6-11e46127ccc8","ad32106f-bbf1-46e2-a408-326af8789f63","b56df138-4974-4883-9070-3179d5d423bd"]}},"files":{},"externalIds":{}}
+{"processes":{"396c364e-fec4-4f27-9ff2-8b236061ef8f":{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","children":[]},"4ef43740-059b-4329-96cd-0643fd8fe8d8":{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","children":[]},"656275f4-66d6-4d27-bfab-c2f7a3087670":{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","children":[]},"6aec5420-0b83-4260-b300-4d595dfd0660":{"parent":null,"children":["396c364e-fec4-4f27-9ff2-8b236061ef8f","4ef43740-059b-4329-96cd-0643fd8fe8d8","656275f4-66d6-4d27-bfab-c2f7a3087670","874bd79b-45da-4726-9afc-1f6cab44be1f"]},"874bd79b-45da-4726-9afc-1f6cab44be1f":{"parent":"6aec5420-0b83-4260-b300-4d595dfd0660","children":[]}},"files":{},"externalIds":{}}

package/hugo-renderer/build.sh

@@ -23,6 +23,9 @@ if [ ! -f $OUTPUTFILENAME ]; then
 fi
 echo "Done. Repo Hugo WASM available at hugo_renderer.wasm"
 
+gzip --keep $OUTPUTFILENAME
+echo "Repo Hugo WASM also available at hugo_renderer.wasm.gz"
+
 # If we're just in a test run we don't want to touch the CDN repo
 if [[ -z "${PUBLISH_BOOKSHOP_CDN}" ]]; then
     echo "Not publishing to CDN."

package/lib/builder.js

@@ -10,7 +10,8 @@ export const esbuildConfigFn = (esbuildConfig, options) => {
     esbuildConfig.loader = {
         ...esbuildConfig.loader,
         ".hugo.html": "text",
-        ".wasm": options?.hosted ? "file" : "binary"
+        ".wasm": options?.hosted ? "file" : "binary",
+        ".wasm.gz": options?.hosted ? "file" : "binary",
     };
 
     const wasm_exec_banner = fs.readFileSync(path.join(__dirname, "../hugo-renderer/wasm_exec.js"));

package/lib/engine.js

@@ -1,4 +1,5 @@
 import hugoWasm from "../hugo-renderer/hugo_renderer.wasm";
+import compressedHugoWasm from "../hugo-renderer/hugo_renderer.wasm.gz";
 import { gunzipSync } from 'fflate';
 import translateTextTemplate from './translateTextTemplate.js';
 import { IdentifierParser } from './hugoIdentifierParser.js';
@@ -32,16 +33,11 @@ export class Engine {
     }
 
     async initializeHugo() {
-        const useLocalHugo = window.CloudCannon?.isMocked || /localhost|127\.0\.0\.1/i.test(window.location.host);
         // When this script is run locally, the hugo wasm is loaded as binary rather than output as a file.
         if (hugoWasm?.constructor === Uint8Array) {
             await this.initializeInlineHugo();
         } else {
-            if (useLocalHugo) {
-                await this.initializeLocalHugo();
-            } else {
-                await this.initializeRemoteCompressedHugo();
-            }
+            await this.initializeLocalCompressedHugo();
         }
 
         // TODO: Tidy
@@ -55,38 +51,20 @@ export class Engine {
         const success = window.loadHugoBookshopPartials(JSON.stringify(mappedFiles));
     }
 
-    async initializeRemoteCompressedHugo() {
+    async initializeLocalCompressedHugo() {
         try {
             const go = new Go();
-            const remoteWasmOrigin = `https://cdn.bookshop.build/hugo/hugo_renderer_${version}.wasm.gz`;
-            const remoteResponse = await fetch(remoteWasmOrigin);
-            const remoteBuffer = await remoteResponse.arrayBuffer();
-            const renderer = gunzipSync(new Uint8Array(remoteBuffer));
+            const compressedWasmOrigin = this.origin.replace(/\/[^\.\/]+\.(min\.)?js/, compressedHugoWasm.replace(/^\./, ''));
+            const compressedResponse = await fetch(compressedWasmOrigin);
+            const compressedBuffer = await compressedResponse.arrayBuffer();
+            const renderer = gunzipSync(new Uint8Array(compressedBuffer));
 
             // Check the magic word at the start of the buffer as a way to verify the CDN download worked.
             const isWasm = ([...renderer.slice(0, 4)]).map(g => g.toString(16).padStart(2, '0')).join('') === "0061736d";
             if (!isWasm) throw "Not WASM";
 
-            const remoteResult = await WebAssembly.instantiate(renderer, go.importObject);
-            go.run(remoteResult.instance);
-        } catch (e) {
-            await this.initializeRemoteHugo();
-        }
-    }
-
-    async initializeRemoteHugo() {
-        try {
-            const go = new Go();
-            const remoteWasmOrigin = `https://cdn.bookshop.build/hugo/hugo_renderer_${version}.wasm`;
-            const remoteResponse = await fetch(remoteWasmOrigin);
-            const remoteBuffer = await remoteResponse.arrayBuffer();
-
-            // Check the magic word at the start of the buffer as a way to verify the CDN download worked.
-            const isWasm = ([...new Uint8Array(remoteBuffer, 0, 4)]).map(g => g.toString(16).padStart(2, '0')).join('') === "0061736d";
-            if (!isWasm) throw "Not WASM";
-
-            const remoteResult = await WebAssembly.instantiate(remoteBuffer, go.importObject);
-            go.run(remoteResult.instance);
+            const compressedResult = await WebAssembly.instantiate(renderer, go.importObject);
+            go.run(compressedResult.instance);
         } catch (e) {
             await this.initializeLocalHugo();
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bookshop/hugo-engine",
   "packageManager": "yarn@3.0.0",
-  "version": "3.3.1-beta.9",
+  "version": "3.3.2",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -14,7 +14,8 @@
     "*.js",
     "lib/*.js",
     "!**/*.test.js",
-    "hugo-renderer/hugo_renderer.wasm"
+    "hugo-renderer/hugo_renderer.wasm",
+    "hugo-renderer/hugo_renderer.wasm.gz"
   ],
   "scripts": {
     "test": "nyc ava -v"
@@ -29,7 +30,7 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "3.3.1-beta.9",
+    "@bookshop/helpers": "3.3.2",
     "esbuild": "^0.13.10",
     "fflate": "^0.7.3",
     "liquidjs": "9.28.0"

package/.nyc_output/processinfo/3d7b2afe-f130-478e-82ed-2a0379ecdfff.json

@@ -1 +0,0 @@
-{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","pid":3709,"argv":["/opt/hostedtoolcache/node/16.18.0/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669268627436,"ppid":3676,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/3d7b2afe-f130-478e-82ed-2a0379ecdfff.json","externalId":"","uuid":"3d7b2afe-f130-478e-82ed-2a0379ecdfff","files":[]}

package/.nyc_output/processinfo/8b92bece-b7fa-4f0d-a2c6-11e46127ccc8.json

@@ -1 +0,0 @@
-{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","pid":3710,"argv":["/opt/hostedtoolcache/node/16.18.0/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669268627437,"ppid":3676,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/8b92bece-b7fa-4f0d-a2c6-11e46127ccc8.json","externalId":"","uuid":"8b92bece-b7fa-4f0d-a2c6-11e46127ccc8","files":[]}

package/.nyc_output/processinfo/ad32106f-bbf1-46e2-a408-326af8789f63.json

@@ -1 +0,0 @@
-{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","pid":3687,"argv":["/opt/hostedtoolcache/node/16.18.0/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669268627080,"ppid":3676,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/ad32106f-bbf1-46e2-a408-326af8789f63.json","externalId":"","uuid":"ad32106f-bbf1-46e2-a408-326af8789f63","files":[]}

package/.nyc_output/processinfo/b56df138-4974-4883-9070-3179d5d423bd.json

@@ -1 +0,0 @@
-{"parent":"b6ed24db-60f5-41e2-959d-ae65b62309aa","pid":3693,"argv":["/opt/hostedtoolcache/node/16.18.0/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669268627084,"ppid":3676,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b56df138-4974-4883-9070-3179d5d423bd.json","externalId":"","uuid":"b56df138-4974-4883-9070-3179d5d423bd","files":[]}

package/.nyc_output/processinfo/b6ed24db-60f5-41e2-959d-ae65b62309aa.json

@@ -1 +0,0 @@
-{"parent":null,"pid":3676,"argv":["/opt/hostedtoolcache/node/16.18.0/x64/bin/node","/home/runner/work/bookshop/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine","time":1669268626662,"ppid":3665,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b6ed24db-60f5-41e2-959d-ae65b62309aa.json","externalId":"","uuid":"b6ed24db-60f5-41e2-959d-ae65b62309aa","files":[]}