deps: update to @bytecodealliance/[email protected] (#468)

Author: Guy Bedford

.github/workflows/main.yml

@@ -295,7 +295,6 @@ jobs:
     - name: Locate component resources
       run: |
         cp c-dependencies/js-compute-runtime/c-at-e.wit .
-        cp c-dependencies/js-compute-runtime/wasi_snapshot_preview1.reactor.wasm .
     - run: yarn
       shell: bash
     - run: npm test

.gitignore

@@ -16,7 +16,6 @@ node_modules/
 /c-dependencies/js-compute-runtime/obj
 tests/wpt-harness/wpt-test-runner.js
 /c-at-e.wit
-/wasi_snapshot_preview1.reactor.wasm
 wpt-runtime.wasm
 docs-app/bin/main.wasm
 docs-app/pkg/*.tar.gz

c-dependencies/js-compute-runtime/Makefile

@@ -109,7 +109,6 @@ LD_FLAGS += -L$(BUILD)/openssl/libx32 -lcrypto
 .PHONY: all
 all: $(FSM_SRC)/js-compute-runtime.wasm
 all: $(FSM_SRC)/js-compute-runtime-component.wasm
-all: wasi_snapshot_preview1.reactor.wasm
 
 # Remove just the build artifacts for the current runtime build.
 .PHONY: clean
@@ -165,10 +164,6 @@ $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz: URL=https://www.openssl.org/source/o
 $(BUILD)/openssl-$(OPENSSL_VERSION).tar.gz: | $(BUILD)
 	$(call cmd,wget,$@)
 
-wasi_snapshot_preview1.reactor.wasm: URL=https://github.com/bytecodealliance/preview2-prototyping/releases/download/latest/wasi_snapshot_preview1.reactor.wasm
-wasi_snapshot_preview1.reactor.wasm:
-	$(call cmd,wget,$@)
-
 # OpenSSL build ################################################################
 
 # Convenience target for building openssl.

c-dependencies/js-compute-runtime/wasi_snapshot_preview1.reactor.wasm

@@ -42,7 +42,7 @@
     "typescript": "^4.9"
   },
   "dependencies": {
-    "@bytecodealliance/jco": "^0.4.1",
+    "@bytecodealliance/jco": "^0.5.2",
     "@bytecodealliance/wizer": "^1.6.1-beta.4",
     "esbuild": "^0.15.16",
     "regexpu-core": "^5.3.1",

package.json

@@ -1,10 +1,10 @@
-import { componentEmbed, componentNew } from '@bytecodealliance/jco';
+import { componentEmbed, componentNew, preview1AdapterReactorPath } from '@bytecodealliance/jco';
 import { readFile, writeFile } from 'node:fs/promises';
 
 export async function compileComponent (path) {
   const coreComponent = await readFile(path);
   const wit = await readFile(new URL('../c-at-e.wit', import.meta.url), 'utf8');
   const coreComponentEmbedded = await componentEmbed(coreComponent, wit);
-  const generatedComponent = await componentNew(coreComponentEmbedded, [['wasi_snapshot_preview1', await readFile(new URL('../wasi_snapshot_preview1.reactor.wasm', import.meta.url))]]);
+  const generatedComponent = await componentNew(coreComponentEmbedded, [['wasi_snapshot_preview1', await readFile(preview1AdapterReactorPath())]]);
   await writeFile(path, generatedComponent);
 }

src/component.js

@@ -33,10 +33,10 @@
   resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@bytecodealliance/jco@^0.4.1":
-  version "0.4.1"
-  resolved "https://registry.npmjs.org/@bytecodealliance/jco/-/jco-0.4.1.tgz"
-  integrity sha512-fb7QID6CtJhBO2jj71/VqBVphPcxWi72uIZnwCHDobgiq+8TM4XFuJEYFD7OOd8u19HlXGrtTujgFPXErx4JwA==
+"@bytecodealliance/jco@^0.5.2":
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/@bytecodealliance/jco/-/jco-0.5.2.tgz#edec41d666be37c7972ac940722631a94dcf6c67"
+  integrity sha512-82Kfp8D4PkrcNwwEyYP+cAXmM4QlW8xXq6oxpBruFkZIuHMxH0QK/fdR6LvDjTeLZcalvpkjpHGQfN0eQbpkiw==
 
 "@bytecodealliance/[email protected]":
   version "1.6.1-beta.4"