RubyGems - ruby_wasm - Versions diffs - 2.6.0-x86_64-darwin → 2.6.1-x86_64-darwin - Mend

ruby_wasm 2.6.0-x86_64-darwin → 2.6.1-x86_64-darwin

Files changed (24) hide show

checksums.yaml +4 -4
data/CONTRIBUTING.md +4 -2
data/README.md +1 -1
data/docs/cheat_sheet.md +8 -8
data/ext/ruby_wasm/README.md +3 -0
data/lib/ruby_wasm/3.1/ruby_wasm.bundle +0 -0
data/lib/ruby_wasm/3.2/ruby_wasm.bundle +0 -0
data/lib/ruby_wasm/3.3/ruby_wasm.bundle +0 -0
data/lib/ruby_wasm/build/product/crossruby.rb +5 -5
data/lib/ruby_wasm/build/toolchain/wit_bindgen.rb +1 -1
data/lib/ruby_wasm/cli.rb +13 -1
data/lib/ruby_wasm/packager/core.rb +58 -24
data/lib/ruby_wasm/packager/file_system.rb +17 -0
data/lib/ruby_wasm/packager.rb +11 -3
data/lib/ruby_wasm/version.rb +1 -1
data/package-lock.json +7 -6
data/package.json +2 -1
data/sig/ruby_wasm/build.rbs +1 -1
data/sig/ruby_wasm/cli.rbs +2 -0
data/sig/ruby_wasm/packager.rbs +9 -4
metadata +4 -5
data/ext/.gitignore +0 -2
data/ext/README.md +0 -11
/data/{ext → lib/ruby_wasm/build/product/crossruby}/extinit.c.erb +0 -0

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f2fea2a56d7fa6c0fef885fbbf8f4ccb4741a30eb9a42dad64861a3cf466563
-  data.tar.gz: 17b4e266fd7bf112db801bffbcef96680d8f3053f650623bb384a4b775e7ae31
+  metadata.gz: 03b91bccc370d225e9bb781d00ae39f434e44f225cd2513cac8c9131c01654e0
+  data.tar.gz: 2c9b9c9071994734a49b268aaa43b08b4ef16be7bd8f99640685f7fd817e10e2
 SHA512:
-  metadata.gz: fcf59dc0f91ccfe2a134ba340e44612fda6f659565b35e57daeaf97b519e551e2b4d49cbac96f2f95e3afb4882ec093cee430e27097a8a1a94cffb966a068c08
-  data.tar.gz: 3c204c791a2532691150e678b74818c4215fc755383fbca3d32292ae2f7e132a574a412d94c02fde487ca0ddce0c28f7e37fc4830761662b566e92ce9669cbe3
+  metadata.gz: 044e4506b6818553a9dc618c0831ae38fc717c10f5bf9c70e0899c178016d11e60f455a801a5442177bd5738555780d9a52e843db0336908387e675f78d69935
+  data.tar.gz: 8c7dcebeeaa6d37721e0e8aba2539c5ba5d9827334bf792262442d6b434549d2f6e3be52d34ff21799d8393b4d8b5810616b55a85c5275d7e0dd59430f06a4f9

data/CONTRIBUTING.md CHANGED Viewed

@@ -6,9 +6,11 @@ This document describes development setup and pointers for diving into this proj
 ## Install dependencies
 ```console
-$ git clone https://github.com/ruby/ruby.wasm
+$ git clone https://github.com/ruby/ruby.wasm --recursive
 $ cd ruby.wasm
 $ ./bin/setup
+# Just for building vendor/jco (will be removed soon)
+$ rustup target add wasm32-wasi
 # Compile extension library
 $ bundle exec rake compile
 $ rake --tasks
@@ -125,5 +127,5 @@ $ npm install --save @ruby/wasm-wasi@latest
 # or if you want the nightly snapshot
 $ npm install --save @ruby/wasm-wasi@next
 # or you can specify the exact snapshot version
-$ npm install --save @ruby/wasm-wasi@2.6.0-2024-05-05-a
+$ npm install --save @ruby/wasm-wasi@2.6.1-2024-05-22-a
 ```

data/README.md CHANGED Viewed

@@ -23,7 +23,7 @@ Create and save `index.html` page with the following contents:
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/browser.script.iife.js"></script>
   <script type="text/ruby">
     require "js"

data/docs/cheat_sheet.md CHANGED Viewed

@@ -38,7 +38,7 @@ The easiest way to run Ruby on browser is to use `browser.script.iife.js` script
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/browser.script.iife.js"></script>
   <script type="text/ruby">
     require "js"
     JS.global[:document].write "Hello, world!"
@@ -51,8 +51,8 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
 ```html
 <html>
   <script type="module">
-    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.0/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.1/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);
@@ -69,11 +69,11 @@ If you want to control Ruby VM from JavaScript, you can use `@ruby/wasm-wasi` pa
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.0/dist/browser.umd.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.1/dist/browser.umd.js"></script>
   <script>
     const main = async () => {
       const { DefaultRubyVM } = window["ruby-wasm-wasi"];
-      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/ruby+stdlib.wasm");
+      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/ruby+stdlib.wasm");
       const module = await WebAssembly.compileStreaming(response);
       const { vm } = await DefaultRubyVM(module);
@@ -128,7 +128,7 @@ end
 ```html
 <html>
-  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/browser.script.iife.js"></script>
   <script type="text/ruby" data-eval="async">
     require "js"
@@ -143,8 +143,8 @@ Or using `@ruby/wasm-wasi` package API `RubyVM#evalAsync`:
 ```html
 <html>
   <script type="module">
-    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.0/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.0/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.6.1/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.1/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);

data/ext/ruby_wasm/README.md ADDED Viewed

@@ -0,0 +1,3 @@
+## Extension library for `ruby_wasm` gem
+This library exposes WebAssembly tools and utilities from Rust ecosystem as Ruby API.

data/lib/ruby_wasm/3.1/ruby_wasm.bundle CHANGED Viewed

Binary file

data/lib/ruby_wasm/3.2/ruby_wasm.bundle CHANGED Viewed

Binary file

data/lib/ruby_wasm/3.3/ruby_wasm.bundle CHANGED Viewed

Binary file

data/lib/ruby_wasm/build/product/crossruby.rb CHANGED Viewed

@@ -42,7 +42,7 @@ module RubyWasm
       make_args
     end
-    def build(executor, crossruby)
+    def build(executor, crossruby, extra_mkargs = [])
       objdir = product_build_dir crossruby
       executor.mkdir_p objdir
       do_extconf executor, crossruby
@@ -54,7 +54,8 @@ module RubyWasm
                       "-C",
                       "#{objdir}",
                       *make_args(crossruby),
-                      build_target
+                      build_target,
+                      *extra_mkargs
       # A ext can provide link args by link.filelist. It contains only built archive file by default.
       unless File.exist?(linklist(crossruby))
         executor.write(
@@ -187,7 +188,7 @@ module RubyWasm
     def build_exts(executor)
       @user_exts.each do |prod|
         executor.begin_section prod.class, prod.name, "Building"
-        prod.build(executor, self)
+        prod.build(executor, self, [])
         executor.end_section prod.class, prod.name
       end
     end
@@ -298,8 +299,7 @@ module RubyWasm
     end
     def extinit_c_erb
-      lib_root = File.expand_path("../../../../..", __FILE__)
-      File.join(lib_root, "ext", "extinit.c.erb")
+      File.expand_path("../crossruby/extinit.c.erb", __FILE__)
     end
     def baseruby_path

data/lib/ruby_wasm/build/toolchain/wit_bindgen.rb CHANGED Viewed

@@ -4,7 +4,7 @@ module RubyWasm
     def initialize(
       build_dir:,
-      revision: "v0.24.0"
+      revision: "67e17745a417d07852cc283d1399d210d4d659cc"
     )
       @build_dir = build_dir
       @tool_dir = File.join(@build_dir, "toolchain", "wit-bindgen-#{revision}")

data/lib/ruby_wasm/cli.rb CHANGED Viewed

@@ -53,6 +53,8 @@ module RubyWasm
         target_triplet: "wasm32-unknown-wasip1",
         profile: "full",
         stdlib: true,
+        without_stdlib_components: [],
+        dest_dir: nil,
         disable_gems: false,
         gemfile: nil,
         patches: [],
@@ -104,10 +106,18 @@ module RubyWasm
             options[:stdlib] = stdlib
           end
+          opts.on("--without-stdlib COMPONENT", "Exclude stdlib component") do |component|
+            options[:without_stdlib_components] << component
+          end
           opts.on("--disable-gems", "Disable gems") do
             options[:disable_gems] = true
           end
+          opts.on("--dest-dir PATH", "(Experimental) Destination directory") do |path|
+            options[:dest_dir] = path
+          end
           opts.on("-p", "--patch PATCH", "Apply a patch") do |patch|
             options[:patches] << patch
           end
@@ -149,7 +159,9 @@ module RubyWasm
       require "tmpdir"
-      if options[:save_temps]
+      if dest_dir = options[:dest_dir]
+        self.do_build(executor, dest_dir, packager, options)
+      elsif options[:save_temps]
         tmpdir = Dir.mktmpdir
         self.do_build(executor, tmpdir, packager, options)
         @stderr.puts "Temporary files are saved to #{tmpdir}"

data/lib/ruby_wasm/packager/core.rb CHANGED Viewed

@@ -12,7 +12,7 @@ class RubyWasm::Packager::Core
   extend Forwardable
-  def_delegators :build_strategy, :cache_key, :artifact, :build_and_link_exts
+  def_delegators :build_strategy, :cache_key, :artifact, :build_gem_exts, :link_gem_exts
   private
@@ -37,7 +37,11 @@ class RubyWasm::Packager::Core
       raise NotImplementedError
     end
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
+      raise NotImplementedError
+    end
+    def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
       raise NotImplementedError
     end
@@ -55,6 +59,14 @@ class RubyWasm::Packager::Core
       end
     end
+    def wasi_exec_model
+      # TODO: Detect WASI exec-model from binary exports (_start or _initialize)
+      use_js_gem = @packager.specs.any? do |spec|
+        spec.name == "js"
+      end
+      use_js_gem ? "reactor" : "command"
+    end
     def cache_key(digest)
       raise NotImplementedError
     end
@@ -93,20 +105,24 @@ class RubyWasm::Packager::Core
       build.crossruby.artifact
     end
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
       build = derive_build
-      self.build_exts(executor, build)
-      self.link_exts(executor, build)
+      self._build_gem_exts(executor, build, gem_home)
     end
-    def link_exts(executor, build)
-      ruby_root = build.crossruby.dest_dir
+    def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
+      build = derive_build
+      self._link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
+    end
-      libraries = [File.join(ruby_root, "usr", "local", "bin", "ruby")]
+    def _link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
+      libraries = []
       # TODO: Should be computed from dyinfo of ruby binary
       wasi_libc_shared_libs = [
         "libc.so",
+        "libc++.so",
+        "libc++abi.so",
         "libwasi-emulated-getpid.so",
         "libwasi-emulated-mman.so",
         "libwasi-emulated-process-clocks.so",
@@ -119,13 +135,18 @@ class RubyWasm::Packager::Core
         wasi_sdk_path = toolchain.wasi_sdk_path
         libraries << File.join(wasi_sdk_path, "share/wasi-sysroot/lib/wasm32-wasi", lib)
       end
-      wasi_adapter = RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1("command")
+      wasi_adapter = RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1(wasi_exec_model)
       adapters = [wasi_adapter]
-      dl_openable_libs = Dir.glob(File.join(ruby_root, "usr", "local", "lib", "ruby", "**", "*.so"))
+      dl_openable_libs = []
+      dl_openable_libs << [File.dirname(ruby_root), Dir.glob(File.join(ruby_root, "lib", "ruby", "**", "*.so"))]
+      dl_openable_libs << [gem_home, Dir.glob(File.join(gem_home, "**", "*.so"))]
       linker = RubyWasmExt::ComponentLink.new
       linker.use_built_in_libdl(true)
       linker.stub_missing_functions(false)
-      linker.validate(true)
+      linker.validate(ENV["RUBYWASM_SKIP_LINKER_VALIDATION"] != "1")
+      linker.library("ruby", module_bytes, false)
       libraries.each do |lib|
         # Non-DL openable libraries should be referenced as base name
@@ -135,12 +156,14 @@ class RubyWasm::Packager::Core
         linker.library(lib_name, module_bytes, false)
       end
-      dl_openable_libs.each do |lib|
-        # DL openable lib_name should be a relative path from ruby_root
-        lib_name = "/" + Pathname.new(lib).relative_path_from(Pathname.new(ruby_root)).to_s
-        module_bytes = File.binread(lib)
-        RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
-        linker.library(lib_name, module_bytes, true)
+      dl_openable_libs.each do |root, libs|
+        libs.each do |lib|
+          # DL openable lib_name should be a relative path from ruby_root
+          lib_name = "/" + Pathname.new(lib).relative_path_from(Pathname.new(File.dirname(root))).to_s
+          module_bytes = File.binread(lib)
+          RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
+          linker.library(lib_name, module_bytes, true)
+        end
       end
       adapters.each do |adapter|
@@ -148,29 +171,36 @@ class RubyWasm::Packager::Core
         # e.g. wasi_snapshot_preview1.command.wasm -> wasi_snapshot_preview1
         adapter_name = adapter_name.split(".")[0]
         module_bytes = File.binread(adapter)
+        RubyWasm.logger.info "Linking adapter #{adapter_name}=#{adapter} (#{module_bytes.size} bytes)"
         linker.adapter(adapter_name, module_bytes)
       end
       return linker.encode()
     end
-    def build_exts(executor, build)
+    def _build_gem_exts(executor, build, gem_home)
       exts = specs_with_extensions.flat_map do |spec, exts|
         exts.map do |ext|
           ext_feature = File.dirname(ext) # e.g. "ext/cgi/escape"
           ext_srcdir = File.join(spec.full_gem_path, ext_feature)
           ext_relative_path = File.join(spec.full_name, ext_feature)
-          RubyWasm::CrossRubyExtProduct.new(
+          prod = RubyWasm::CrossRubyExtProduct.new(
             ext_srcdir,
             build.toolchain,
             features: @packager.features,
             ext_relative_path: ext_relative_path
           )
+          [prod, spec]
         end
       end
-      exts.each do |prod|
+      exts.each do |prod, spec|
+        libdir = File.join(gem_home, "gems", spec.full_name, spec.raw_require_paths.first)
+        extra_mkargs = [
+          "sitearchdir=#{libdir}",
+          "sitelibdir=#{libdir}",
+        ]
         executor.begin_section prod.class, prod.name, "Building"
-        prod.build(executor, build.crossruby)
+        prod.build(executor, build.crossruby, extra_mkargs)
         executor.end_section prod.class, prod.name
       end
     end
@@ -301,15 +331,19 @@ class RubyWasm::Packager::Core
       build
     end
-    def build_and_link_exts(executor, module_bytes)
+    def build_gem_exts(executor, gem_home)
+      # No-op because we already built extensions as part of the Ruby build
+    end
+    def link_gem_exts(executor, ruby_root, gem_home, module_bytes)
       return module_bytes unless @packager.features.support_component_model?
       linker = RubyWasmExt::ComponentEncode.new
-      linker.validate(true)
+      linker.validate(ENV["RUBYWASM_SKIP_LINKER_VALIDATION"] != "1")
       linker.module(module_bytes)
       linker.adapter(
         "wasi_snapshot_preview1",
-        File.binread(RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1("reactor"))
+        File.binread(RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1(wasi_exec_model))
       )
       linker.encode()

data/lib/ruby_wasm/packager/file_system.rb CHANGED Viewed

@@ -38,6 +38,23 @@ class RubyWasm::Packager::FileSystem
     File.write(rbconfig, rbconfig_contents)
   end
+  def remove_stdlib_component(executor, component)
+    RubyWasm.logger.info "Removing stdlib component: #{component}"
+    case component
+    when "enc"
+      # Remove all encodings except for encdb.so and transdb.so
+      enc_dir = File.join(@ruby_root, "lib", "ruby", ruby_version, "wasm32-wasi", "enc")
+      puts File.join(enc_dir, "**/*.so")
+      Dir.glob(File.join(enc_dir, "**/*.so")).each do |entry|
+        next if entry.end_with?("encdb.so", "transdb.so")
+        RubyWasm.logger.debug "Removing stdlib encoding: #{entry}"
+        executor.rm_rf entry
+      end
+    else
+      raise "Unknown stdlib component: #{component}"
+    end
+  end
   def package_gems
     @packager.specs.each do |spec|
       RubyWasm.logger.info "Packaging gem: #{spec.full_name}"

data/lib/ruby_wasm/packager.rb CHANGED Viewed

@@ -32,11 +32,19 @@ class RubyWasm::Packager
     wasm_bytes = File.binread(File.join(fs.ruby_root, "bin", "ruby"))
+    ruby_core.build_gem_exts(executor, fs.bundle_dir)
     fs.package_gems
     fs.remove_non_runtime_files(executor)
-    fs.remove_stdlib(executor) unless options[:stdlib]
+    if options[:stdlib]
+      options[:without_stdlib_components].each do |component|
+        fs.remove_stdlib_component(executor, component)
+      end
+    else
+      fs.remove_stdlib(executor)
+    end
-    if full_build_options[:target] == "wasm32-unknown-wasip1"
+    if full_build_options[:target] == "wasm32-unknown-wasip1" && !features.support_dynamic_linking?
       # wasi-vfs supports only WASI target
       wasi_vfs = RubyWasmExt::WasiVfs.new
       wasi_vfs.map_dir("/bundle", fs.bundle_dir)
@@ -44,7 +52,7 @@ class RubyWasm::Packager
       wasm_bytes = wasi_vfs.pack(wasm_bytes)
     end
-    wasm_bytes = ruby_core.build_and_link_exts(executor, wasm_bytes)
+    wasm_bytes = ruby_core.link_gem_exts(executor, fs.ruby_root, fs.bundle_dir, wasm_bytes)
     wasm_bytes = RubyWasmExt.preinitialize(wasm_bytes) if options[:optimize]
     wasm_bytes

data/lib/ruby_wasm/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module RubyWasm
-  VERSION = "2.6.0"
+  VERSION = "2.6.1"
 end

data/package-lock.json CHANGED Viewed

@@ -9,6 +9,7 @@
                 "packages/npm-packages/*"
             ],
             "devDependencies": {
+                "@bytecodealliance/jco": "./vendor/jco",
                 "@playwright/test": "^1.43.1",
                 "@rollup/plugin-json": "^6.1.0",
                 "rollup": "^4.17.2"
@@ -4783,7 +4784,7 @@
         },
         "packages/npm-packages/ruby-3.2-wasm-wasi": {
             "name": "@ruby/3.2-wasm-wasi",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -4791,7 +4792,7 @@
         },
         "packages/npm-packages/ruby-3.3-wasm-wasi": {
             "name": "@ruby/3.3-wasm-wasi",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -4799,12 +4800,12 @@
         },
         "packages/npm-packages/ruby-head-wasm-emscripten": {
             "name": "@ruby/head-wasm-emscripten",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "license": "MIT"
         },
         "packages/npm-packages/ruby-head-wasm-wasi": {
             "name": "@ruby/head-wasm-wasi",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -4820,7 +4821,7 @@
         },
         "packages/npm-packages/ruby-wasm-wasi": {
             "name": "@ruby/wasm-wasi",
-            "version": "2.6.0",
+            "version": "2.6.1",
             "license": "MIT",
             "dependencies": {
                 "tslib": "^2.6.1"
@@ -4838,7 +4839,7 @@
         },
         "vendor/jco": {
             "name": "@bytecodealliance/jco",
-            "version": "1.2.1",
+            "version": "1.2.4",
             "dev": true,
             "license": "(Apache-2.0 WITH LLVM-exception)",
             "workspaces": [

data/package.json CHANGED Viewed

@@ -7,6 +7,7 @@
     "devDependencies": {
         "@playwright/test": "^1.43.1",
         "@rollup/plugin-json": "^6.1.0",
-        "rollup": "^4.17.2"
+        "rollup": "^4.17.2",
+        "@bytecodealliance/jco": "./vendor/jco"
     }
 }

data/sig/ruby_wasm/build.rbs CHANGED Viewed

@@ -168,7 +168,7 @@ module RubyWasm
     def feature_name: (CrossRubyProduct crossruby) -> String
     def make_args: (CrossRubyProduct crossruby) -> Array[String]
-    def build: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
+    def build: (BuildExecutor executor, CrossRubyProduct crossruby, Array[String] extra_mkargs) -> void
     def do_extconf: (BuildExecutor executor, CrossRubyProduct crossruby) -> void
     def do_install_rb: (BuildExecutor executor, CrossRubyProduct crossruby) -> void

data/sig/ruby_wasm/cli.rbs CHANGED Viewed

@@ -14,10 +14,12 @@ module RubyWasm
       target_triplet: String,
       profile: String,
       stdlib: bool,
+      without_stdlib_components: Array[String],
       disable_gems: bool,
       gemfile: String?,
       patches: Array[String],
       format: String,
+      dest_dir: String,
     }
     DEFAULT_RUBIES_DIR: string

data/sig/ruby_wasm/packager.rbs CHANGED Viewed

@@ -23,6 +23,7 @@ class RubyWasm::Packager
     src: RubyWasm::Packager::build_source,
     default_exts: String,
     suffix: String,
+    gem_home: String?,
   }
   type bytes = String
@@ -56,7 +57,8 @@ class RubyWasm::Packager
     @packager: RubyWasm::Packager
     def initialize: (RubyWasm::Packager) -> void
     def build: (RubyWasm::BuildExecutor, untyped options) -> String
-    def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+    def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+    def link_gem_exts: (RubyWasm::BuildExecutor, string ruby_root, string gem_home, bytes module_bytes) -> bytes
     extend Forwardable
@@ -72,16 +74,18 @@ class RubyWasm::Packager
       def initialize: (RubyWasm::Packager) -> void
       def build: (RubyWasm::BuildExecutor, untyped options) -> String
       def specs_with_extensions: () -> Array[[untyped, Array[string]]]
-      def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
+      def build_gem_exts: (RubyWasm::BuildExecutor, string gem_home) -> void
+      def link_gem_exts: (RubyWasm::BuildExecutor, string ruby_root, string gem_home, bytes module_bytes) -> bytes
+      def wasi_exec_model: () -> String
     end
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy
       @build: RubyWasm::Build
       def derive_build: () -> RubyWasm::Build
-      def build_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> void
       def name: () -> string
-      private def link_exts: (RubyWasm::BuildExecutor, RubyWasm::Build) -> bytes
+      private def _build_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string gem_home) -> void
+      private def _link_gem_exts: (RubyWasm::BuildExecutor, RubyWasm::Build, string ruby_root, string gem_home, bytes module_bytes) -> bytes
     end
     class StaticLinking < RubyWasm::Packager::Core::BuildStrategy
@@ -102,6 +106,7 @@ class RubyWasm::Packager
     def initialize: (string dest_dir, RubyWasm::Packager) -> void
     def package_ruby_root: (String tarball, RubyWasm::BuildExecutor) -> void
     def remove_stdlib: (RubyWasm::BuildExecutor) -> void
+    def remove_stdlib_component: (RubyWasm::BuildExecutor, string) -> void
     def package_gems: () -> void
     def setup_rb_content: () -> String

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wasm
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: x86_64-darwin
 authors:
 - Yuta Saito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-05 00:00:00.000000000 Z
+date: 2024-05-22 00:00:00.000000000 Z
 dependencies: []
 description: Ruby to WebAssembly toolkit. This gem takes Ruby code and Gemfile, and
   packages them with Ruby runtime into a WebAssembly binary.
@@ -32,9 +32,7 @@ files:
 - docs/cheat_sheet.md
 - docs/faq.md
 - exe/rbwasm
-- ext/.gitignore
-- ext/README.md
-- ext/extinit.c.erb
+- ext/ruby_wasm/README.md
 - lib/ruby_wasm.rb
 - lib/ruby_wasm/3.1/ruby_wasm.bundle
 - lib/ruby_wasm/3.2/ruby_wasm.bundle
@@ -46,6 +44,7 @@ files:
 - lib/ruby_wasm/build/product.rb
 - lib/ruby_wasm/build/product/baseruby.rb
 - lib/ruby_wasm/build/product/crossruby.rb
+- lib/ruby_wasm/build/product/crossruby/extinit.c.erb
 - lib/ruby_wasm/build/product/libyaml.rb
 - lib/ruby_wasm/build/product/openssl.rb
 - lib/ruby_wasm/build/product/product.rb

data/ext/.gitignore DELETED Viewed

	@@ -1,2 +0,0 @@
1	- *.o
2	- link.filelist

data/ext/README.md DELETED Viewed

@@ -1,11 +0,0 @@
-# Ruby extensions
-`ruby.wasm` uses two C extensions to turn Ruby in to a guest module.
-The `js` extension enables Ruby to use JavaScript APIs.
-The `witapi` extension exports Ruby's interpreter interface to allow the host to use the Ruby interpreter.
-In other words, `js` allows Ruby to talk to Javascript and `witapi` allows a host to talk to Ruby.
-Under each subdirectory, there is a `bindgen/*.wit` file outlining the interfaces for each form of communication.
-Specifically, `bindgen/rb-js-abi-host.wit` describes embedder's requirements and `bindgen/rb-js-abi-guest.wit` describes exported API from Ruby interpreter.
-The `.c` and `.h` files are autogenerated from [wit-bindgen](https://github.com/bytecodealliance/wit-bindgen#host-runtimes-for-components).
-You can read more about it in the [contributing guide](/CONTRIBUTING.md#re-bindgen-from-wit-files).
-Note that we currently do not use the latest version of wit-bindgen because of how fast it is changing, with features being changed or even [removed](https://github.com/bytecodealliance/wit-bindgen/pull/346) at times.

/data/{ext → lib/ruby_wasm/build/product/crossruby}/extinit.c.erb RENAMED Viewed

File without changes