@bookshop/hugo-engine 3.6.4 → 3.7.0

package/.nyc_output/processinfo/4cfc833e-a7a5-4b39-8898-5205d5f50aa4.json

@@ -0,0 +1 @@
+{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","pid":5747,"argv":["/opt/hostedtoolcache/node/18.17.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":1695336946389,"ppid":5736,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/4cfc833e-a7a5-4b39-8898-5205d5f50aa4.json","externalId":"","uuid":"4cfc833e-a7a5-4b39-8898-5205d5f50aa4","files":[]}

package/.nyc_output/processinfo/5cd8fa18-60cf-43ac-8ed5-ece5a5c89276.json

@@ -0,0 +1 @@
+{"parent":null,"pid":5736,"argv":["/opt/hostedtoolcache/node/18.17.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":1695336945812,"ppid":5725,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/5cd8fa18-60cf-43ac-8ed5-ece5a5c89276.json","externalId":"","uuid":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","files":[]}

package/.nyc_output/processinfo/b15f245b-a738-4773-aef0-9e5c6129f1fc.json

@@ -0,0 +1 @@
+{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","pid":5748,"argv":["/opt/hostedtoolcache/node/18.17.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":1695336946431,"ppid":5736,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/b15f245b-a738-4773-aef0-9e5c6129f1fc.json","externalId":"","uuid":"b15f245b-a738-4773-aef0-9e5c6129f1fc","files":[]}

package/.nyc_output/processinfo/e5aa5254-91d5-40d4-b180-1ab5a8432edc.json

@@ -0,0 +1 @@
+{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","pid":5776,"argv":["/opt/hostedtoolcache/node/18.17.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":1695336946914,"ppid":5736,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/e5aa5254-91d5-40d4-b180-1ab5a8432edc.json","externalId":"","uuid":"e5aa5254-91d5-40d4-b180-1ab5a8432edc","files":[]}

package/.nyc_output/processinfo/f239fc67-b62d-4250-9d6d-4dd418797460.json

@@ -0,0 +1 @@
+{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","pid":5769,"argv":["/opt/hostedtoolcache/node/18.17.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":1695336946857,"ppid":5736,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/f239fc67-b62d-4250-9d6d-4dd418797460.json","externalId":"","uuid":"f239fc67-b62d-4250-9d6d-4dd418797460","files":[]}

package/.nyc_output/processinfo/index.json

@@ -1 +1 @@
-{"processes":{"4e27ec32-531e-430f-99f8-46c68e32bfe9":{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","children":[]},"4f3ff5dc-ec7c-4f15-a43d-bf447b7b6f53":{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","children":[]},"776a4f66-410c-44c8-923b-4d89e13cd196":{"parent":null,"children":["4e27ec32-531e-430f-99f8-46c68e32bfe9","4f3ff5dc-ec7c-4f15-a43d-bf447b7b6f53","8137131a-b80f-48f9-aa70-57700ccb799f","abf98bfc-9b33-4a87-8e98-92034ba4c946"]},"8137131a-b80f-48f9-aa70-57700ccb799f":{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","children":[]},"abf98bfc-9b33-4a87-8e98-92034ba4c946":{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","children":[]}},"files":{},"externalIds":{}}
+{"processes":{"4cfc833e-a7a5-4b39-8898-5205d5f50aa4":{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","children":[]},"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276":{"parent":null,"children":["4cfc833e-a7a5-4b39-8898-5205d5f50aa4","b15f245b-a738-4773-aef0-9e5c6129f1fc","e5aa5254-91d5-40d4-b180-1ab5a8432edc","f239fc67-b62d-4250-9d6d-4dd418797460"]},"b15f245b-a738-4773-aef0-9e5c6129f1fc":{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","children":[]},"e5aa5254-91d5-40d4-b180-1ab5a8432edc":{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","children":[]},"f239fc67-b62d-4250-9d6d-4dd418797460":{"parent":"5cd8fa18-60cf-43ac-8ed5-ece5a5c89276","children":[]}},"files":{},"externalIds":{}}

package/full-hugo-renderer/wasm_exec.js

@@ -2,47 +2,18 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-(() => {
-	// Map multiple JavaScript environments to a single common API,
-	// preferring web standards over Node.js API.
-	//
-	// Environments considered:
-	// - Browsers
-	// - Node.js
-	// - Electron
-	// - Parcel
-	// - Webpack
-
-	if (typeof global !== "undefined") {
-		// global already exists
-	} else if (typeof window !== "undefined") {
-		window.global = window;
-	} else if (typeof self !== "undefined") {
-		self.global = self;
-	} else {
-		throw new Error("cannot export Go (neither global, window nor self is defined)");
-	}
-
-	if (!global.require && typeof require !== "undefined") {
-		global.require = require;
-	}
-
-	if (!global.fs && global.require) {
-		const fs = require("fs");
-		if (typeof fs === "object" && fs !== null && Object.keys(fs).length !== 0) {
-			global.fs = fs;
-		}
-	}
+"use strict";
 
+(() => {
 	const enosys = () => {
 		const err = new Error("not implemented");
 		err.code = "ENOSYS";
 		return err;
 	};
 
-	if (!global.fs) {
+	if (!globalThis.fs) {
 		let outputBuf = "";
-		global.fs = {
+		globalThis.fs = {
 			constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, // unused
 			writeSync(fd, buf) {
 				outputBuf += decoder.decode(buf);
@@ -94,8 +65,8 @@
 		};
 	}
 
-	if (!global.process) {
-		global.process = {
+	if (!globalThis.process) {
+		globalThis.process = {
 			getuid() { return -1; },
 			getgid() { return -1; },
 			geteuid() { return -1; },
@@ -109,47 +80,26 @@
 		}
 	}
 
-	if (!global.crypto && global.require) {
-		const nodeCrypto = require("crypto");
-		global.crypto = {
-			getRandomValues(b) {
-				nodeCrypto.randomFillSync(b);
-			},
-		};
-	}
-	if (!global.crypto) {
-		throw new Error("global.crypto is not available, polyfill required (getRandomValues only)");
+	if (!globalThis.crypto) {
+		throw new Error("globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)");
 	}
 
-	if (!global.performance) {
-		global.performance = {
-			now() {
-				const [sec, nsec] = process.hrtime();
-				return sec * 1000 + nsec / 1000000;
-			},
-		};
+	if (!globalThis.performance) {
+		throw new Error("globalThis.performance is not available, polyfill required (performance.now only)");
 	}
 
-	if (!global.TextEncoder && global.require) {
-		global.TextEncoder = require("util").TextEncoder;
-	}
-	if (!global.TextEncoder) {
-		throw new Error("global.TextEncoder is not available, polyfill required");
+	if (!globalThis.TextEncoder) {
+		throw new Error("globalThis.TextEncoder is not available, polyfill required");
 	}
 
-	if (!global.TextDecoder && global.require) {
-		global.TextDecoder = require("util").TextDecoder;
-	}
-	if (!global.TextDecoder) {
-		throw new Error("global.TextDecoder is not available, polyfill required");
+	if (!globalThis.TextDecoder) {
+		throw new Error("globalThis.TextDecoder is not available, polyfill required");
 	}
 
-	// End of polyfills for common API.
-
 	const encoder = new TextEncoder("utf-8");
 	const decoder = new TextDecoder("utf-8");
 
-	global.Go = class {
+	globalThis.Go = class {
 		constructor() {
 			this.argv = ["js"];
 			this.env = {};
@@ -170,6 +120,10 @@
 				this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true);
 			}
 
+			const setInt32 = (addr, v) => {
+				this.mem.setUint32(addr + 0, v, true);
+			}
+
 			const getInt64 = (addr) => {
 				const low = this.mem.getUint32(addr + 0, true);
 				const high = this.mem.getInt32(addr + 4, true);
@@ -263,7 +217,10 @@
 
 			const timeOrigin = Date.now() - performance.now();
 			this.importObject = {
-				go: {
+				_gotest: {
+					add: (a, b) => a + b,
+				},
+				gojs: {
 					// Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters)
 					// may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported
 					// function. A goroutine can switch to a new stack if the current stack is too small (see morestack function).
@@ -326,7 +283,7 @@
 									this._resume();
 								}
 							},
-							getInt64(sp + 8) + 1, // setTimeout has been seen to fire up to 1 millisecond early
+							getInt64(sp + 8),
 						));
 						this.mem.setInt32(sp + 16, id, true);
 					},
@@ -506,8 +463,7 @@
 					},
 
 					"debug": (value) => {
-						// Disable all logs from the WASM side
-						// console.log(value);	
+						console.log(value);
 					},
 				}
 			};
@@ -525,7 +481,7 @@
 				null,
 				true,
 				false,
-				global,
+				globalThis,
 				this,
 			];
 			this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id
@@ -534,7 +490,7 @@
 				[null, 2],
 				[true, 3],
 				[false, 4],
-				[global, 5],
+				[globalThis, 5],
 				[this, 6],
 			]);
 			this._idPool = [];   // unused ids that have been garbage collected
@@ -577,9 +533,9 @@
 
 			// The linker guarantees global data starts from at least wasmMinDataAddr.
 			// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
-			const wasmMinDataAddr = 4096 + 4096;
+			const wasmMinDataAddr = 4096 + 8192;
 			if (offset >= wasmMinDataAddr) {
-				throw new Error("command line too long");
+				throw new Error("total length of command line and environment variables exceeds limit");
 			}
 
 			this._inst.exports.run(argc, argv);
@@ -609,36 +565,4 @@
 			};
 		}
 	}
-
-	if (
-		typeof module !== "undefined" &&
-		global.require &&
-		global.require.main === module &&
-		global.process &&
-		global.process.versions &&
-		!global.process.versions.electron
-	) {
-		if (process.argv.length < 3) {
-			console.error("usage: go_js_wasm_exec [wasm binary] [arguments]");
-			process.exit(1);
-		}
-
-		const go = new Go();
-		go.argv = process.argv.slice(2);
-		go.env = Object.assign({ TMPDIR: require("os").tmpdir() }, process.env);
-		go.exit = process.exit;
-		WebAssembly.instantiate(fs.readFileSync(process.argv[2]), go.importObject).then((result) => {
-			process.on("exit", (code) => { // Node.js exits if no event handler is pending
-				if (code === 0 && !go.exited) {
-					// deadlock, make Go print error and stack traces
-					go._pendingEvent = { id: 0 };
-					go._resume();
-				}
-			});
-			return go.run(result.instance);
-		}).catch((err) => {
-			console.error(err);
-			process.exit(1);
-		});
-	}
 })();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bookshop/hugo-engine",
   "packageManager": "yarn@3.0.0",
-  "version": "3.6.4",
+  "version": "3.7.0",
   "description": "Bookshop frontend Hugo renderer",
   "type": "module",
   "sideEffects": false,
@@ -31,8 +31,8 @@
     "nyc": "^15.1.0"
   },
   "dependencies": {
-    "@bookshop/helpers": "3.6.4",
-    "esbuild": "^0.13.10",
+    "@bookshop/helpers": "3.7.0",
+    "esbuild": "^0.19.3",
     "fflate": "^0.7.3",
     "liquidjs": "9.28.0"
   },

package/.nyc_output/processinfo/4e27ec32-531e-430f-99f8-46c68e32bfe9.json

@@ -1 +0,0 @@
-{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","pid":5702,"argv":["/opt/hostedtoolcache/node/16.20.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":1689718015737,"ppid":5691,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/4e27ec32-531e-430f-99f8-46c68e32bfe9.json","externalId":"","uuid":"4e27ec32-531e-430f-99f8-46c68e32bfe9","files":[]}

package/.nyc_output/processinfo/4f3ff5dc-ec7c-4f15-a43d-bf447b7b6f53.json

@@ -1 +0,0 @@
-{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","pid":5724,"argv":["/opt/hostedtoolcache/node/16.20.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":1689718016214,"ppid":5691,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/4f3ff5dc-ec7c-4f15-a43d-bf447b7b6f53.json","externalId":"","uuid":"4f3ff5dc-ec7c-4f15-a43d-bf447b7b6f53","files":[]}

package/.nyc_output/processinfo/776a4f66-410c-44c8-923b-4d89e13cd196.json

@@ -1 +0,0 @@
-{"parent":null,"pid":5691,"argv":["/opt/hostedtoolcache/node/16.20.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":1689718015153,"ppid":5680,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/776a4f66-410c-44c8-923b-4d89e13cd196.json","externalId":"","uuid":"776a4f66-410c-44c8-923b-4d89e13cd196","files":[]}

package/.nyc_output/processinfo/8137131a-b80f-48f9-aa70-57700ccb799f.json

@@ -1 +0,0 @@
-{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","pid":5708,"argv":["/opt/hostedtoolcache/node/16.20.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":1689718015744,"ppid":5691,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/8137131a-b80f-48f9-aa70-57700ccb799f.json","externalId":"","uuid":"8137131a-b80f-48f9-aa70-57700ccb799f","files":[]}

package/.nyc_output/processinfo/abf98bfc-9b33-4a87-8e98-92034ba4c946.json

@@ -1 +0,0 @@
-{"parent":"776a4f66-410c-44c8-923b-4d89e13cd196","pid":5730,"argv":["/opt/hostedtoolcache/node/16.20.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":1689718016233,"ppid":5691,"coverageFilename":"/home/runner/work/bookshop/bookshop/javascript-modules/engines/hugo-engine/.nyc_output/abf98bfc-9b33-4a87-8e98-92034ba4c946.json","externalId":"","uuid":"abf98bfc-9b33-4a87-8e98-92034ba4c946","files":[]}