@bookshop/hugo-engine 2.4.0 → 2.4.1

package/.nyc_output/processinfo/{46dcfe75-3bbf-4f92-a6b3-8145e351ae24.json → 0285db3a-0bb1-48c5-a949-061f568eaab6.json}

@@ -1 +1 @@
-{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","pid":23488,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643594173677,"ppid":23484,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/46dcfe75-3bbf-4f92-a6b3-8145e351ae24.json","externalId":"","uuid":"46dcfe75-3bbf-4f92-a6b3-8145e351ae24","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37259,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643741988315,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/0285db3a-0bb1-48c5-a949-061f568eaab6.json","externalId":"","uuid":"0285db3a-0bb1-48c5-a949-061f568eaab6","files":[]}

package/.nyc_output/processinfo/222873c9-9975-439a-a423-1e8cdec80767.json

@@ -0,0 +1 @@
+{"parent":null,"pid":37256,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643741987817,"ppid":37255,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/222873c9-9975-439a-a423-1e8cdec80767.json","externalId":"","uuid":"222873c9-9975-439a-a423-1e8cdec80767","files":[]}

package/.nyc_output/processinfo/{67223940-25e4-4ca5-88f7-2427417305e6.json → 3abd89cc-3259-442a-a584-30ba1c47f41f.json}

@@ -1 +1 @@
-{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","pid":23487,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643594173669,"ppid":23484,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/67223940-25e4-4ca5-88f7-2427417305e6.json","externalId":"","uuid":"67223940-25e4-4ca5-88f7-2427417305e6","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37260,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643741988320,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/3abd89cc-3259-442a-a584-30ba1c47f41f.json","externalId":"","uuid":"3abd89cc-3259-442a-a584-30ba1c47f41f","files":[]}

package/.nyc_output/processinfo/{8cad51f7-2d53-4aad-9ac6-583d26278617.json → 72cd08d5-81da-4a01-af7e-b82f5c58bfe2.json}

@@ -1 +1 @@
-{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","pid":23486,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643594173664,"ppid":23484,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/8cad51f7-2d53-4aad-9ac6-583d26278617.json","externalId":"","uuid":"8cad51f7-2d53-4aad-9ac6-583d26278617","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37258,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643741988310,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/72cd08d5-81da-4a01-af7e-b82f5c58bfe2.json","externalId":"","uuid":"72cd08d5-81da-4a01-af7e-b82f5c58bfe2","files":[]}

package/.nyc_output/processinfo/{b0aa8748-7b49-40c3-a46a-4c4b89756480.json → 85ee537c-1dd7-4a62-96e1-954d77437eb0.json}

@@ -1 +1 @@
-{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","pid":23485,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643594173660,"ppid":23484,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b0aa8748-7b49-40c3-a46a-4c4b89756480.json","externalId":"","uuid":"b0aa8748-7b49-40c3-a46a-4c4b89756480","files":[]}
+{"parent":"222873c9-9975-439a-a423-1e8cdec80767","pid":37257,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/lib/worker/subprocess.js"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643741988307,"ppid":37256,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/85ee537c-1dd7-4a62-96e1-954d77437eb0.json","externalId":"","uuid":"85ee537c-1dd7-4a62-96e1-954d77437eb0","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"46dcfe75-3bbf-4f92-a6b3-8145e351ae24":{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","children":[]},"67223940-25e4-4ca5-88f7-2427417305e6":{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","children":[]},"8cad51f7-2d53-4aad-9ac6-583d26278617":{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","children":[]},"b0aa8748-7b49-40c3-a46a-4c4b89756480":{"parent":"f64c5820-5f85-4cca-a4b8-197da73a4918","children":[]},"f64c5820-5f85-4cca-a4b8-197da73a4918":{"parent":null,"children":["46dcfe75-3bbf-4f92-a6b3-8145e351ae24","67223940-25e4-4ca5-88f7-2427417305e6","8cad51f7-2d53-4aad-9ac6-583d26278617","b0aa8748-7b49-40c3-a46a-4c4b89756480"]}},"files":{},"externalIds":{}}
+{"processes":{"0285db3a-0bb1-48c5-a949-061f568eaab6":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"222873c9-9975-439a-a423-1e8cdec80767":{"parent":null,"children":["0285db3a-0bb1-48c5-a949-061f568eaab6","3abd89cc-3259-442a-a584-30ba1c47f41f","72cd08d5-81da-4a01-af7e-b82f5c58bfe2","85ee537c-1dd7-4a62-96e1-954d77437eb0"]},"3abd89cc-3259-442a-a584-30ba1c47f41f":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"72cd08d5-81da-4a01-af7e-b82f5c58bfe2":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]},"85ee537c-1dd7-4a62-96e1-954d77437eb0":{"parent":"222873c9-9975-439a-a423-1e8cdec80767","children":[]}},"files":{},"externalIds":{}}

package/hugo-renderer/build.sh

@@ -1,16 +1,57 @@
-rm -f hugo_renderer.wasm
-FILENAME="hugo_renderer_$(date +%s).wasm"
-GOOS=js GOARCH=wasm go build -tags nodeploy -o $FILENAME
-printf "Built Hugo WASM via $FILENAME : "
-ls -lh $FILENAME | awk '{print $5}'
-if [ -f hugo_renderer.wasm ]; then
-    echo "ERROR: previous hugo_renderer.wasm still in directory"
+if [[ -z "${BOOKSHOP_VERSION}" ]]; then
+    echo "ERROR: BOOKSHOP_VERSION environment variable does not exist"
     exit 1
 fi
-mv $FILENAME hugo_renderer.wasm
-if [ ! -f hugo_renderer.wasm ]; then
+
+TMPFILENAME="hugo_renderer_$(date +%s).wasm"
+OUTPUTFILENAME="hugo_renderer.wasm"
+CDNFILENAME="../../../../../bookshopcdn/hugo/hugo_renderer_$BOOKSHOP_VERSION.wasm"
+
+# Clean
+rm -f $OUTPUTFILENAME
+if [ -f $OUTPUTFILENAME ]; then
+    echo "ERROR: previous $OUTPUTFILENAME still in directory"
+    exit 1
+fi
+
+# Build temp module
+GOOS=js GOARCH=wasm go build -tags nodeploy -o $TMPFILENAME
+printf "Built Hugo WASM via $TMPFILENAME : "
+ls -lh $TMPFILENAME | awk '{print $5}'
+
+# Link repo module
+mv $TMPFILENAME $OUTPUTFILENAME
+if [ ! -f $OUTPUTFILENAME ]; then
     echo "ERROR: hugo_renderer.wasm not complete"
     exit 1
 fi
-echo "Done. Hugo WASM available at hugo_renderer.wasm"
+echo "Done. Repo Hugo WASM available at hugo_renderer.wasm"
+
+# 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."
+    exit 0
+fi
+
+# Check CDN
+if [ ! -d ../../../../../bookshopcdn/hugo ]; then
+    echo "ERROR: bookshopcdn repo does not exist alongside bookshop repo"
+    exit 1
+fi
+
+# Link CDN module
+cp $OUTPUTFILENAME $CDNFILENAME
+if [ ! -f $CDNFILENAME ]; then
+    echo "ERROR: $CDNFILENAME not complete"
+    exit 1
+fi
+echo "Done. CDN Hugo WASM available at $CDNFILENAME"
+
+cd ../../../../../bookshopcdn
+
+git add -A \
+&& git commit -m "build: releasing $BOOKSHOP_VERSION" \
+&& git tag -a v$BOOKSHOP_VERSION -m "build: releasing $BOOKSHOP_VERSION" \
+&& git push --tags && git push
+
 exit 0

package/lib/engine.js

@@ -1,6 +1,7 @@
 import hugoWasm from "../hugo-renderer/hugo_renderer.wasm";
 import translateTextTemplate from './translateTextTemplate.js';
 import { IdentifierParser } from './hugoIdentifierParser.js';
+import { version } from '../package.json';
 
 const sleep = (ms = 0) => {
     return new Promise(r => setTimeout(r, ms));
@@ -24,18 +25,17 @@ export class Engine {
         this.key = 'hugo';
         this.name = options.name;
         this.files = options.files;
+        this.origin = document.currentScript?.src || `/bookshop.js`;
 
         this.initializeHugo();
     }
 
     async initializeHugo() {
-        const scriptOrigin = document.currentScript?.src || `/bookshop.js`;
-        const wasmOrigin = scriptOrigin.replace(/\/[^\.\/]+\.js$/, hugoWasm.replace(/^\./, ''));
-        const go = new Go();
-        const response = await fetch(wasmOrigin);
-        const buffer = await response.arrayBuffer();
-        const result = await WebAssembly.instantiate(buffer, go.importObject);
-        go.run(result.instance)
+        if (window.CloudCannon?.isMocked) {
+            await this.initializeLocalHugo();
+        } else {
+            await this.initializeRemoteHugo();
+        }
 
         // TODO: Tidy
         const mappedFiles = {};
@@ -48,6 +48,33 @@ export class Engine {
         const success = window.loadHugoBookshopPartials(JSON.stringify(mappedFiles));
     }
 
+    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);
+        } catch (e) {
+            await this.initializeLocalHugo();
+        }
+    }
+
+    async initializeLocalHugo() {
+        const go = new Go();
+        const wasmOrigin = this.origin.replace(/\/[^\.\/]+\.js$/, hugoWasm.replace(/^\./, ''));
+        const response = await fetch(wasmOrigin);
+        const buffer = await response.arrayBuffer();
+        const result = await WebAssembly.instantiate(buffer, go.importObject);
+        go.run(result.instance);
+    }
+
     getShared(name) {
         const key = `shared/hugo/${name}.hugo.html`
         return this.files?.[key];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bookshop/hugo-engine",
   "packageManager": "yarn@3.0.0",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -29,7 +29,7 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "2.4.0",
+    "@bookshop/helpers": "2.4.1",
     "esbuild": "^0.13.10",
     "liquidjs": "9.28.0"
   },

package/.nyc_output/processinfo/f64c5820-5f85-4cca-a4b8-197da73a4918.json

@@ -1 +0,0 @@
-{"parent":null,"pid":23484,"argv":["/Users/liambigelow/.nvm/versions/node/v14.16.0/bin/node","/Users/liambigelow/Projects/CC/bookshop/javascript-modules/node_modules/ava/cli.js","-v"],"execArgv":[],"cwd":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine","time":1643594173128,"ppid":23483,"coverageFilename":"/Users/liambigelow/Projects/CC/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/f64c5820-5f85-4cca-a4b8-197da73a4918.json","externalId":"","uuid":"f64c5820-5f85-4cca-a4b8-197da73a4918","files":[]}