deps: toolchain alignment Wasmtime 15 (#281)

* various

* deps: toolchain alignment for wasmtime 15

* tweak intrinsics instantiation

Cargo.toml

@@ -30,15 +30,15 @@ indexmap = "2.0"
 js-component-bindgen = { path = "./crates/js-component-bindgen" }
 structopt = "0.3.26"
 tempdir = "0.3.7"
-wasm-encoder = "0.36.2"
-wasm-metadata = "0.10.11"
-wasmparser = "0.116.1"
-wasmprinter = "0.2.72"
-wasmtime-environ = { version = "14.0.4", features = ["component-model"] }
-wat = "1.0.79"
-wit-bindgen = { version = "0.14.0" }
-wit-bindgen-core = { version = "0.14.0" }
-wit-component = { version = "0.18.0", features = ["dummy-module"] }
+wasm-encoder = "0.38.1"
+wasm-metadata = "0.10.14"
+wasmparser = "0.118.1"
+wasmprinter = "0.2.75"
+wasmtime-environ = { version = "15.0.0", features = ["component-model"] }
+wat = "1.0.82"
+wit-bindgen = "0.15.0"
+wit-bindgen-core = "0.15.0"
+wit-component = { version = "0.19.0", features = ["dummy-module"] }
 wit-parser = "0.13.0"
 xshell = "0.2.5"
 

crates/js-component-bindgen/src/intrinsics.rs

@@ -1,5 +1,4 @@
 use crate::source::Source;
-use crate::transpile_bindgen::InstantiationMode;
 use crate::uwrite;
 use std::collections::BTreeSet;
 use std::fmt::Write;
@@ -57,7 +56,7 @@ pub enum Intrinsic {
 pub fn render_intrinsics(
     intrinsics: &mut BTreeSet<Intrinsic>,
     no_nodejs_compat: bool,
-    instantiation: Option<InstantiationMode>,
+    instantiation: bool,
 ) -> Source {
     let mut output = Source::default();
 
@@ -171,7 +170,7 @@ pub fn render_intrinsics(
                 const i64ToF64 = i => (i64ToF64I[0] = i, i64ToF64F[0]);
             "),
 
-            Intrinsic::InstantiateCore => if instantiation.is_none() {
+            Intrinsic::InstantiateCore => if !instantiation {
                 output.push_str("
                     const instantiateCore = WebAssembly.instantiate;
                 ")

crates/js-component-bindgen/src/transpile_bindgen.rs

@@ -223,7 +223,7 @@ impl<'a> JsBindgen<'a> {
         let js_intrinsics = render_intrinsics(
             &mut self.all_intrinsics,
             self.opts.no_nodejs_compat,
-            self.opts.instantiation.clone(),
+            self.opts.instantiation.is_some(),
         );
 
         match self.opts.instantiation {

package.json

@@ -52,7 +52,6 @@
   "homepage": "https://github.com/bytecodealliance/jco#readme",
   "scripts": {
     "build": "cargo xtask build workspace",
-    "build:typescript": "tsc -p tsconfig.json",
     "build:types:preview2-shim": "cargo xtask generate wasi-types",
     "lint": "eslint -c eslintrc.cjs lib/**/*.js packages/*/lib/**/*.js",
     "test": "mocha -u tdd test/test.js --timeout 120000"

test/api.js

@@ -100,7 +100,7 @@ export async function apiTest (fixtures) {
         tag: 'component',
         val: 4
       });
-      deepStrictEqual(meta[1].producers, [['processed-by', [['wit-component', '0.18.0'], ['dummy-gen', 'test']]], ['language', [['javascript', '']]]]);
+      deepStrictEqual(meta[1].producers, [['processed-by', [['wit-component', '0.19.0'], ['dummy-gen', 'test']]], ['language', [['javascript', '']]]]);
     });
 
     test('Multi-file WIT', async () => {
@@ -125,7 +125,7 @@ export async function apiTest (fixtures) {
         tag: 'component',
         val: 1
       });
-      deepStrictEqual(meta[1].producers, [['processed-by', [['wit-component', '0.18.0'], ['dummy-gen', 'test']]], ['language', [['javascript', '']]]]);
+      deepStrictEqual(meta[1].producers, [['processed-by', [['wit-component', '0.19.0'], ['dummy-gen', 'test']]], ['language', [['javascript', '']]]]);
     });
 
     test('Component new adapt', async () => {

test/cli.js

@@ -171,7 +171,7 @@ export async function cliTest (fixtures) {
         const meta = JSON.parse(stdout);
         deepStrictEqual(meta[0].metaType, { tag: 'component', val: 4 });
         deepStrictEqual(meta[1].producers, [
-          ['processed-by', [['wit-component', '0.18.0'], ['dummy-gen', 'test']]],
+          ['processed-by', [['wit-component', '0.19.0'], ['dummy-gen', 'test']]],
           ['language', [['javascript', '']]],
         ]);
       }

update-wasi.sh

@@ -1,9 +1,6 @@
 #!/bin/bash
 set -ex
 
-# update dependencies
-git submodule update --init --recursive
-git submodule foreach git pull origin main
 cd submodules/wasmtime
 
 # build the preview1 component adapter reactor
@@ -43,5 +40,5 @@ mv ../../test/fixtures/wit/flavorful ../../test/fixtures/wit/deps/
 
 # note the WASI version for reference
 cd ../..
-cat .git/modules/wasmtime/refs/heads/main | head -c 16 > wasi-version
+cat .git/modules/submodules/wasmtime/HEAD | head -c 16 > wasi-version
 echo "WASI Updated to $(cat wasi-version)"

wasi-version

@@ -1 +1 @@
-e105aa385e8bb1b2
+6f0da842311d6de7

xtask/src/main.rs

@@ -3,26 +3,17 @@ use structopt::StructOpt;
 mod build;
 mod generate;
 mod test;
-mod update;
 
 #[derive(StructOpt)]
 enum Opts {
     /// Build the project
     Build(Build),
     /// Run cargo tests
     Test,
-    /// Update the various dependencies in the project
-    Update(Update),
     /// Generate code
     Generate(Generate),
 }
 
-#[derive(StructOpt)]
-enum Update {
-    /// Update preview 2
-    Preview2,
-}
-
 #[derive(StructOpt)]
 enum Build {
     /// Build and transpile the `jco` tools
@@ -48,7 +39,6 @@ fn main() -> anyhow::Result<()> {
             Ok(())
         }
         Opts::Test => test::run(),
-        Opts::Update(Update::Preview2) => update::preview2::run(),
         Opts::Generate(Generate::Tests) => generate::tests::run(),
         Opts::Generate(Generate::WasiTypes) => generate::wasi_types::run(),
     }