Update starlingmonkey to 0.2.0 (#285)

Author: karthik2804

.github/workflows/main.yml

@@ -87,7 +87,6 @@ jobs:
         build-type:
           - 'release'
           - 'debug'
-          - 'weval'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -159,7 +158,6 @@ jobs:
         build-type:
           - 'release'
           - 'debug'
-          - 'weval'
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -10,7 +10,6 @@ examples/hello-world/guest/package-lock.json
 examples/hello-world/guest/hello.component.wasm
 /build-debug
 /build-release
-/build-release-weval
 .vscode
 /package-lock.json
 .idea

CMakeLists.txt

@@ -26,14 +26,10 @@ set(EMBEDDING_DEP "starling-raw.wasm")
 # Define output filenames based on build configuration
 set(OUTPUT_NAME_RELEASE "starlingmonkey_embedding.wasm")
 set(OUTPUT_NAME_DEBUG "starlingmonkey_embedding.debug.wasm")
-set(OUTPUT_NAME_WEVAL "starlingmonkey_embedding_weval.wasm")
 
 # Set the appropriate name based on current configuration
 if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     set(OUTPUT_FILENAME ${OUTPUT_NAME_DEBUG})
-elseif(WEVAL)
-    set(OUTPUT_FILENAME ${OUTPUT_NAME_WEVAL})
-    set(EMBEDDING_DEP "starling-ics.wevalcache")
 else()
     set(OUTPUT_FILENAME ${OUTPUT_NAME_RELEASE})
 endif()

Makefile

@@ -15,7 +15,6 @@ STARLINGMONKEY_DEPS = $(STARLINGMONKEY_SRC)/cmake/* embedding/* $(STARLINGMONKEY
 all: release
 debug: lib/starlingmonkey_embedding.debug.wasm lib/spidermonkey-embedding-splicer.js
 release: lib/starlingmonkey_embedding.wasm lib/spidermonkey-embedding-splicer.js
-release-weval: lib/starlingmonkey_ics.wevalcache lib/spidermonkey-embedding-splicer.js
 
 lib/spidermonkey-embedding-splicer.js: target/wasm32-wasip1/release/splicer_component.wasm crates/spidermonkey-embedding-splicer/wit/spidermonkey-embedding-splicer.wit | obj lib
 	@$(JCO) new target/wasm32-wasip1/release/splicer_component.wasm -o obj/spidermonkey-embedding-splicer.wasm --wasi-reactor
@@ -28,12 +27,6 @@ lib/starlingmonkey_embedding.wasm: $(STARLINGMONKEY_DEPS) | lib
 	cmake -B build-release -DCMAKE_BUILD_TYPE=Release
 	make -j16 -C build-release starlingmonkey_embedding
 
-lib/starlingmonkey_embedding_weval.wasm: $(STARLINGMONKEY_DEPS) | lib
-	cmake -B build-release-weval -DCMAKE_BUILD_TYPE=Release -DUSE_WASM_OPT=OFF -DWEVAL=ON
-	make -j16 -C build-release-weval starlingmonkey_embedding
-
-lib/starlingmonkey_ics.wevalcache: lib/starlingmonkey_embedding_weval.wasm
-	@cp build-release-weval/starling-raw.wasm/starling-ics.wevalcache $@
 
 lib/starlingmonkey_embedding.debug.wasm: $(STARLINGMONKEY_DEPS) | lib
 	cmake -B build-debug -DCMAKE_BUILD_TYPE=RelWithDebInfo

README.md

@@ -51,23 +51,25 @@ Establishing this initial prototype as a singular flexible engine foundation tha
 
 ### Weval AOT Compilation
 
+Note: unfortunately Weval AOT Compilation is disabled for the time being, due to incompatibilities with newer versions of the LLVM toolchain used to compile StarlingMonkey. See [this](https://bytecodealliance.zulipchat.com/#narrow/channel/459697-StarlingMonkey/topic/Updating.20Gecko.20version/near/527089464) and the following messages for details.
 
 ## Platform APIs
 
 The following APIs are available:
 
 * **Legacy Encoding**: `atob`, `btoa`, `decodeURI`, `encodeURI`, `decodeURIComponent`, `encodeURIComponent`
 * **Streams**: `ReadableStream`, `ReadableStreamBYOBReader`, `ReadableStreamBYOBRequest`, `ReadableStreamDefaultReader`, `ReadableStreamDefaultController`, `ReadableByteStreamController`, `WritableStream` `ByteLengthQueuingStrategy` `CountQueuingStrategy`, `TransformStream`
-* **URL**: `URL` `URLSearchParams`
+* **URL**: `URL`, `URLSearchParams`
 * **Console**: `console`
 * **Performance**: `Performance`
 * **Task**: `queueMicrotask`, `setInterval` `setTimeout` `clearInterval` `clearTimeout`
 * **Location**: `WorkerLocation`, `location`
 * **Encoding**: `TextEncoder`, `TextDecoder`, `CompressionStream`, `DecompressionStream`
 * **Structured Clone**: `structuredClone`
-* **Fetch**: `fetch` `Request` `Response` `Headers`
+* **Fetch**: `fetch`, `Request`, `Response`, `Headers`
 * **Forms, Files, and Blobs**: `FormData`, `MultipartFormData`, `File`, `Blob`
-* **Crypto**: `SubtleCrypto` `Crypto` `crypto` `CryptoKey`
+* **Crypto**: `SubtleCrypto`, `Crypto`, `crypto`, `CryptoKey`
+* **Abort**: `AbortController`, `AbortSignal`
 
 ## Usage
 
@@ -106,23 +108,7 @@ See [types.d.ts](types.d.ts) for the full interface options.
 
 The component itself can be executed in any component runtime, see the [example](EXAMPLE.md) for an end to end workflow in Wasmtime.
 
-### AOT Compilation
-
-To enable AOT compilation, set the `enableAot: true` option to run [Weval][weval] ahead-of-time compilation.
-
-AOT compilation can also be configured with the following options:
-
-| Option                 | Type                                | Example         | Description                                                              |
-|------------------------|-------------------------------------|-----------------|--------------------------------------------------------------------------|
-| `aotMinStackSizeBytes` | `nubmer | Number | bigint | BigInt` | `2_007_846_092` | The minimum stack size (via `RUST_MIN_STACK` to set when running `weval` |
-
-[weval]: https://github.com/bytecodealliance/weval
-
-### Custom `weval` binary for AOT
-
-To use a custom (pre-downloaded) [`weval`][weval] binary, set the `wevalBin` option to the path to your desired weval binary.
-
-### Custom `wizer` binary when AOT is disabled
+### Custom `wizer` binary
 
 To use a custom (pre-downloaded) [`wizer`](https://github.com/bytecodealliance/wizer) binary, set the `wizerBin` option to the path to your desired wizer binary.
 
@@ -229,18 +215,6 @@ export function componentize(opts: {
    * Path to custom ComponentizeJS engine build to use
    */
   engine?: string;
-  /**
-   * Path to custom weval cache to use
-   */
-  aotCache?: string;
-  /**
-   * Enable AoT using weval
-   */
-  enableAot?: boolean;
-  /**
-   * Use a pre-existing path to the `weval` binary, if present
-   */
-  wevalBin?: string;
   /**
    * Use a pre-existing path to the `wizer` binary, if present
    */
@@ -266,7 +240,7 @@ export function componentize(opts: {
    */
   enableFeatures?: [];
   /**
-   * Pass environment variables to the spawned Wizer or Weval Process
+   * Pass environment variables to the spawned Wizer Process
    * If set to true, all host environment variables are passed
    * To pass only a subset, provide an object with the desired variables
    */
@@ -345,14 +319,6 @@ npm install
 npm run build
 ```
 
-Before being able to use `componetize-js` (ex. via `npm link`, from `jco`), you'll need to run:
-
-```
-npm run build:weval
-```
-
-This will produce a few files, most importantly `lib/starlingmonkey_embedding_weval.wasm`.
-
 To clean up a local installation (i.e. remove the installation of StarlingMonkey):
 
 ```console

StarlingMonkey

@@ -3,14 +3,10 @@ import { resolve } from 'node:path';
 
 import { componentize } from '@bytecodealliance/componentize-js';
 
-// AoT compilation makes use of weval (https://github.com/bytecodealliance/weval)
-const enableAot = process.env.ENABLE_AOT == '1';
-
 const jsSource = await readFile('hello.js', 'utf8');
 
 const { component } = await componentize(jsSource, {
   witPath: resolve('hello.wit'),
-  enableAot
 });
 
 await writeFile('hello.component.wasm', component);

examples/hello-world/guest/componentize.js

@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@bytecodealliance/jco": "^1.9.1",
-    "@bytecodealliance/weval": "^0.3.4",
     "@bytecodealliance/wizer": "^10.0.0",
     "es-module-lexer": "^1.6.0",
     "oxc-parser": "^0.76.0"
@@ -31,13 +30,11 @@
   "scripts": {
     "clean": "npm run clean:starlingmonkey",
     "clean:starlingmonkey": "rm -rf build-release",
-    "build": "npm run build:release && npm run build:debug && npm run build:weval",
+    "build": "npm run build:release && npm run build:debug",
     "build:release": "make release",
-    "build:weval": "make release-weval",
     "build:debug": "make debug",
     "test": "vitest run -c test/vitest.ts",
     "test:release": "vitest run -c test/vitest.ts",
-    "test:weval": "cross-env WEVAL_TEST=1 vitest run -c test/vitest.ts",
     "test:debug": "cross-env DEBUG_TEST=1 vitest run -c test/vitest.ts",
     "prepack": "node scripts/prepack.mjs"
   },
@@ -46,12 +43,10 @@
     "lib/spidermonkey-*",
     "lib/starlingmonkey_embedding.wasm",
     "lib/starlingmonkey_embedding.debug.wasm",
-    "lib/starlingmonkey_embedding_weval.wasm",
-    "lib/starlingmonkey_ics.wevalcache",
     "src",
     "types.d.ts"
   ],
   "workspaces": [
     "."
   ]
-}
+}

package.json

@@ -11,7 +11,6 @@ export async function componentizeCmd(jsSource, opts) {
     witPath: resolve(opts.wit),
     worldName: opts.worldName,
     runtimeArgs: opts.runtimeArgs,
-    enableAot: opts.aot,
     disableFeatures: opts.disable,
     preview2Adapter: opts.preview2Adapter,
     debugBindings: opts.debugBindings,
@@ -29,7 +28,6 @@ program
   .requiredOption('-w, --wit <path>', 'WIT path to build with')
   .option('-n, --world-name <name>', 'WIT world to build')
   .option('--runtime-args <string>', 'arguments to pass to the runtime')
-  .option('--aot', 'enable AOT compilation')
   .addOption(
     new Option('-d, --disable <feature...>', 'disable WASI features').choices(
       DEFAULT_FEATURES,