RubyGems - ruby_wasm - Versions diffs - 2.7.2-x86_64-linux-musl → 2.8.1-x86_64-linux-musl - Mend

ruby_wasm 2.7.2-x86_64-linux-musl → 2.8.1-x86_64-linux-musl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

checksums.yaml +4 -4
data/CONTRIBUTING.md +2 -2
data/README.md +10 -5
data/Rakefile +9 -13
data/docs/cheat_sheet.md +11 -11
data/lib/ruby_wasm/{3.2 → 3.3}/ruby_wasm.so +0 -0
data/lib/ruby_wasm/3.4/ruby_wasm.so +0 -0
data/lib/ruby_wasm/build/executor.rb +10 -0
data/lib/ruby_wasm/build/product/crossruby.rb +12 -1
data/lib/ruby_wasm/build/toolchain.rb +144 -50
data/lib/ruby_wasm/build.rb +1 -1
data/lib/ruby_wasm/cli.rb +88 -44
data/lib/ruby_wasm/packager/core.rb +1 -1
data/lib/ruby_wasm/packager.rb +1 -1
data/lib/ruby_wasm/version.rb +1 -1
data/package-lock.json +19 -7
data/rakelib/ci.rake +4 -2
data/rakelib/packaging.rake +11 -9
data/sig/ruby_wasm/build.rbs +33 -13
data/sig/ruby_wasm/cli.rbs +2 -2
data/sig/ruby_wasm/packager.rbs +2 -11
metadata +4 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0803e37c23fc0a6f19722f7883213f144023ab97556872e7c5fc3b42b5ce701
-  data.tar.gz: bb944ebba22d32f94ad0fb55c6a111e8c4f4d36e9968d611b58620062e6b2e64
+  metadata.gz: 7fb64bda6f43e8425d5f89dc189c0146c3b1ac2e6868a4ed96f798dd7471043d
+  data.tar.gz: bbaabba0d1386dcf5504e31ebae37735f3598537daeaeb136cc7d9154a1805fe
 SHA512:
-  metadata.gz: 60501bff560dfe67bbde3ea8541a027c47e5333115ae7afa83ee9bf35ba1ba8554c6199a06f9429890ed57134d45e7da230f1ecf733c29a609f15a9a4794fd2a
-  data.tar.gz: a43ebd3fd8fbc3265567c28658d5de73ac262d981fe6aa66fb20366e706e734d0f726feac6a5b8990a2e0622ffe9ccd9afee39e1d4bf30204c1b87c730843c50
+  metadata.gz: c414d50a4b52a05339100c82a06248924ddaa464f7d09ae37c50819187f73ba74c2e00e86b809aa1a7c211744428327f4460bfdcfe06ec6fd17754eeda1683e4
+  data.tar.gz: 2a8ec5f318a1cf4c19fc6d37d28196e25b38d7c2aa342d9667e17f88ae5c5ddbc6e5b90338248ab78576f77eb02d82d04c742e98dac7f1a08f12f197abfc4048

data/CONTRIBUTING.md CHANGED Viewed

@@ -129,7 +129,7 @@ $ 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.7.2-2025-10-03-a
+$ npm install --save @ruby/wasm-wasi@2.8.0-2025-12-29-a
 ```
@@ -138,7 +138,7 @@ $ npm install --save @ruby/wasm-wasi@2.7.2-2025-10-03-a
 When a new version of Ruby is released, the following steps need to be taken to add support for it in ruby.wasm:
 1. Update `lib/ruby_wasm/cli.rb`:
-   - Add a new entry in the `build_source_aliases` method for the new version
+   - Add a new entry in the `build_config_aliases` method for the new version
    - Specify the tarball URL and required default extensions
 2. Update `Rakefile`:

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.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/browser.script.iife.js"></script>
   <script type="text/ruby">
     require "js"
@@ -40,18 +40,18 @@ Dependencies: [wasmtime](https://github.com/bytecodealliance/wasmtime)
 ```console
 $ gem install ruby_wasm
 # Download a prebuilt Ruby release
-$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-3.4-wasm32-unknown-wasip1-full.tar.gz
-$ tar xfz ruby-3.4-wasm32-unknown-wasip1-full.tar.gz
+$ curl -LO https://github.com/ruby/ruby.wasm/releases/latest/download/ruby-4.0-wasm32-unknown-wasip1-full.tar.gz
+$ tar xfz ruby-4.0-wasm32-unknown-wasip1-full.tar.gz
 # Extract ruby binary not to pack itself
-$ mv ruby-3.4-wasm32-unknown-wasip1-full/usr/local/bin/ruby ruby.wasm
+$ mv ruby-4.0-wasm32-unknown-wasip1-full/usr/local/bin/ruby ruby.wasm
 # Put your app code
 $ mkdir src
 $ echo "puts 'Hello'" > src/my_app.rb
 # Pack the whole directory under /usr and your app dir
-$ rbwasm pack ruby.wasm --dir ./src::/src --dir ./ruby-3.4-wasm32-unknown-wasip1-full/usr::/usr -o my-ruby-app.wasm
+$ rbwasm pack ruby.wasm --dir ./src::/src --dir ./ruby-4.0-wasm32-unknown-wasip1-full/usr::/usr -o my-ruby-app.wasm
 # Run the packed scripts
 $ wasmtime my-ruby-app.wasm /src/my_app.rb
@@ -71,6 +71,11 @@ See the `README.md` of each package for more detail and its usage.
     </tr>
   </thead>
   <tbody>
+    <tr>
+      <td><a href="/packages/npm-packages/ruby-4.0-wasm-wasi">@ruby/4.0-wasm-wasi</a></td>
+      <td>CRuby 4.0 built on WASI with JS interop support</td>
+      <td><a href="https://www.npmjs.com/package/@ruby/4.0-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/@ruby%2F4.0-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
+    </tr>
     <tr>
       <td><a href="/packages/npm-packages/ruby-3.4-wasm-wasi">@ruby/3.4-wasm-wasi</a></td>
       <td>CRuby 3.4 built on WASI with JS interop support</td>

data/Rakefile CHANGED Viewed

@@ -9,7 +9,7 @@ require "ruby_wasm/rake_task"
 require "ruby_wasm/packager"
 require "ruby_wasm/cli"
-BUILD_SOURCES = %w[3.4 3.3 3.2 head]
+BUILD_SOURCES = %w[4.0 3.4 3.3 3.2 head]
 BUILD_PROFILES = %w[full minimal]
 BUILDS =
@@ -29,14 +29,20 @@ NPM_PACKAGES = [
     name: "ruby-head-wasm-wasi",
     ruby_version: "head",
     gemfile: "packages/npm-packages/ruby-head-wasm-wasi/Gemfile",
-    target: "wasm32-unknown-wasip1",
+    target: "wasm32-unknown-wasip1"
   },
   {
     name: "ruby-head-wasm-wasip2",
     ruby_version: "head",
     gemfile: "packages/npm-packages/ruby-head-wasm-wasip2/Gemfile",
     target: "wasm32-unknown-wasip2",
-    enable_component_model: true,
+    enable_component_model: true
+  },
+  {
+    name: "ruby-4.0-wasm-wasi",
+    ruby_version: "4.0",
+    gemfile: "packages/npm-packages/ruby-4.0-wasm-wasi/Gemfile",
+    target: "wasm32-unknown-wasip1"
   },
   {
     name: "ruby-3.4-wasm-wasi",
@@ -66,16 +72,6 @@ STANDALONE_PACKAGES = [
 LIB_ROOT = File.dirname(__FILE__)
-TOOLCHAINS = {}
-BUILDS
-  .map { |_, target, _| target }
-  .uniq
-  .each do |target|
-    build_dir = File.join(LIB_ROOT, "build")
-    toolchain = RubyWasm::Toolchain.get(target, build_dir)
-    TOOLCHAINS[toolchain.name] = toolchain
-  end
 class BuildTask < Struct.new(:name, :target, :build_command)
   def ruby_cache_key
     return @key if @key

data/docs/cheat_sheet.md CHANGED Viewed

@@ -8,10 +8,10 @@
 ## Node.js
-To install the package, install `@ruby/3.4-wasm-wasi` and `@ruby/wasm-wasi` from npm:
+To install the package, install `@ruby/4.0-wasm-wasi` and `@ruby/wasm-wasi` from npm:
 ```console
-npm install --save @ruby/3.4-wasm-wasi @ruby/wasm-wasi
+npm install --save @ruby/4.0-wasm-wasi @ruby/wasm-wasi
 ```
 Then instantiate a Ruby VM by the following code:
@@ -20,7 +20,7 @@ Then instantiate a Ruby VM by the following code:
 import fs from "fs/promises";
 import { DefaultRubyVM } from "@ruby/wasm-wasi/dist/node";
-const binary = await fs.readFile("./node_modules/@ruby/3.4-wasm-wasi/dist/ruby.wasm");
+const binary = await fs.readFile("./node_modules/@ruby/4.0-wasm-wasi/dist/ruby.wasm");
 const module = await WebAssembly.compile(binary);
 const { vm } = await DefaultRubyVM(module);
 vm.eval(`puts "hello world"`);
@@ -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.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.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.7.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.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.7.2/dist/browser.umd.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/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.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.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.4-wasm-wasi@2.7.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.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.7.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.2/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.8.0/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/4.0-wasm-wasi@2.8.1/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);

data/lib/ruby_wasm/{3.2 → 3.3}/ruby_wasm.so RENAMED Viewed

Binary file

data/lib/ruby_wasm/3.4/ruby_wasm.so CHANGED Viewed

Binary file

data/lib/ruby_wasm/build/executor.rb CHANGED Viewed

@@ -147,6 +147,16 @@ module RubyWasm
     end
   end
+  class SilentExecutor
+    def system(*args, chdir: nil, env: nil)
+      # @type var kwargs: Hash[Symbol, untyped]
+      kwargs = {}
+      kwargs[:chdir] = chdir if chdir
+      kwargs[:exception] = true
+      __skip__ = env ? Kernel.system(env, *args, **kwargs) : Kernel.system(*args, **kwargs)
+    end
+  end
   # Human readable status printer for the build.
   class StatusPrinter
     def initialize

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

@@ -204,7 +204,7 @@ module RubyWasm
     def build(executor, remake: false, reconfigure: false)
       executor.mkdir_p dest_dir
       executor.mkdir_p build_dir
-      @toolchain.install
+      @toolchain.install(executor)
       [@source, @baseruby, @libyaml, @zlib, @openssl, @wasi_vfs].each do |prod|
         next unless prod
         executor.begin_section prod.class, prod.name, "Building"
@@ -345,6 +345,17 @@ module RubyWasm
         wasi_sdk_path = @toolchain
         args << %Q(WASMOPT=#{wasi_sdk_path.wasm_opt})
         args << %Q(WASI_SDK_PATH=#{wasi_sdk_path.wasi_sdk_path})
+        # NOTE: wasi-libc 22 and later defines stubs for fchmod and chmod
+        # but they just return ENOTSUP, and ruby's configure doesn't check
+        # the runtime behavior. So we need to tell configure that
+        # these functions are not available.
+        # https://github.com/WebAssembly/wasi-libc/pull/463
+        args << %Q(ac_cv_func_fchmod=no)
+        args << %Q(ac_cv_func_chmod=no)
+        # TODO: wasi-libc 22 and later started using musl's realpath impl but
+        # it broke Kernel#require on @bjorn3/browser_wasi_shim setup for some
+        # reason. So we disable it for now.
+        args << %Q(ac_cv_func_realpath=no)
       when "wasm32-unknown-emscripten"
         ldflags.concat(%w[-s MODULARIZE=1])
         env_emcc_ldflags = ENV["RUBY_WASM_EMCC_LDFLAGS"] || ""

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

@@ -16,10 +16,15 @@ module RubyWasm
       raise "missing environment variable: #{name}" if ENV[name].nil?
     end
-    def self.get(target, build_dir = nil)
+    def self.get(target, options, build_dir = nil)
       case target
       when /^wasm32-unknown-wasi/
-        return RubyWasm::WASISDK.new(build_dir: build_dir)
+        return(
+          RubyWasm::WASISDK.new(
+            build_dir: build_dir,
+            version: options[:wasi_sdk_version]
+          )
+        )
       when "wasm32-unknown-emscripten"
         return RubyWasm::Emscripten.new
       else
@@ -56,32 +61,24 @@ module RubyWasm
     def initialize(
       wasi_sdk_path = ENV["WASI_SDK_PATH"],
       build_dir: nil,
-      version_major: 21,
-      version_minor: 0,
+      version: "23.0",
       binaryen_version: 108
     )
-      @wasm_opt_path = Toolchain.find_path("wasm-opt")
       @need_fetch_wasi_sdk = wasi_sdk_path.nil?
-      @need_fetch_binaryen = @wasm_opt_path.nil?
       if @need_fetch_wasi_sdk
         if build_dir.nil?
           raise "build_dir is required when WASI_SDK_PATH is not set"
         end
-        wasi_sdk_path = File.join(build_dir, "toolchain", "wasi-sdk")
-        @version_major = version_major
-        @version_minor = version_minor
-      end
-      if @need_fetch_binaryen
-        if build_dir.nil?
-          raise "build_dir is required when wasm-opt not installed in PATH"
+        wasi_sdk_path = File.join(build_dir, "toolchain", "wasi-sdk-#{version}")
+        if version.nil?
+          raise "version is required when WASI_SDK_PATH is not set"
         end
-        @binaryen_path = File.join(build_dir, "toolchain", "binaryen")
-        @binaryen_version = binaryen_version
-        @wasm_opt_path = File.join(@binaryen_path, "bin", "wasm-opt")
+        @version = version
       end
+      @binaryen =
+        Binaryen.new(build_dir: build_dir, binaryen_version: binaryen_version)
       @tools = {
         cc: "#{wasi_sdk_path}/bin/clang",
         cxx: "#{wasi_sdk_path}/bin/clang++",
@@ -101,27 +98,127 @@ module RubyWasm
     end
     def wasm_opt
-      @wasm_opt_path
+      @binaryen.wasm_opt
     end
     def wasi_sdk_path
       @wasi_sdk_path
     end
-    def download_url(version_major, version_minor)
-      version = "#{version_major}.#{version_minor}"
+    def download_url
+      major, _ = @version.split(".").map(&:to_i)
+      # @type var assets: Array[[Regexp, Array[String]]]
       assets = [
-        [/x86_64-linux/, "wasi-sdk-#{version}-linux.tar.gz"],
-        [/(arm64e?|x86_64)-darwin/, "wasi-sdk-#{version}-macos.tar.gz"]
+        [
+          /x86_64-linux/,
+          [
+            "wasi-sdk-#{@version}-x86_64-linux.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-linux.tar.gz"
+          ]
+        ],
+        [
+          /arm64e?-darwin/,
+          [
+            "wasi-sdk-#{@version}-arm64-macos.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-macos.tar.gz"
+          ]
+        ],
+        [
+          /x86_64-darwin/,
+          [
+            "wasi-sdk-#{@version}-x86_64-macos.tar.gz",
+            # For wasi-sdk version < 23.0
+            "wasi-sdk-#{@version}-macos.tar.gz"
+          ]
+        ]
       ]
-      asset = assets.find { |os, _| os =~ RUBY_PLATFORM }&.at(1)
+      asset = assets.find { |os, candidates| os =~ RUBY_PLATFORM }
       if asset.nil?
         raise "unsupported platform for fetching WASI SDK: #{RUBY_PLATFORM}"
       end
-      "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-#{version_major}/#{asset}"
+      _, candidates = asset
+      candidates_urls =
+        candidates.map do |candidate|
+          "https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-#{major}/#{candidate}"
+        end
+      require "net/http"
+      # Find an asset that exists by checking HEAD response to see if the asset exists
+      candidates_urls.each do |url_str|
+        # @type var url: URI::HTTPS
+        url = URI.parse(url_str)
+        ok =
+          __skip__ = Net::HTTP.start(
+            url.host,
+            url.port,
+            use_ssl: url.scheme == "https"
+          ) do |http|
+            response = http.head(url.request_uri)
+            next response.code == "302"
+          end
+        return url_str if ok
+      end
+      raise "WASI SDK asset not found: #{candidates_urls.join(", ")}"
+    end
+    def install_wasi_sdk(executor)
+      return unless @need_fetch_wasi_sdk
+      wasi_sdk_tarball =
+        File.join(File.dirname(@wasi_sdk_path), "wasi-sdk-#{@version}.tar.gz")
+      unless File.exist? wasi_sdk_tarball
+        FileUtils.mkdir_p File.dirname(wasi_sdk_tarball)
+        executor.system "curl",
+                        "-fsSL",
+                        "-o",
+                        wasi_sdk_tarball,
+                        self.download_url
+      end
+      unless File.exist? @wasi_sdk_path
+        FileUtils.mkdir_p @wasi_sdk_path
+        executor.system "tar",
+                        "-C",
+                        @wasi_sdk_path,
+                        "--strip-component",
+                        "1",
+                        "-xzf",
+                        wasi_sdk_tarball
+      end
+    end
+    def install(executor)
+      install_wasi_sdk(executor)
+      @binaryen.install(executor)
+    end
+  end
+  class Binaryen
+    def initialize(build_dir: nil, binaryen_version: 108)
+      @wasm_opt_path = Toolchain.find_path("wasm-opt")
+      @need_fetch_binaryen = @wasm_opt_path.nil?
+      if @need_fetch_binaryen
+        if build_dir.nil?
+          raise "build_dir is required when wasm-opt not installed in PATH"
+        end
+        @binaryen_path = File.join(build_dir, "toolchain", "binaryen")
+        @binaryen_version = binaryen_version
+        @wasm_opt_path = File.join(@binaryen_path, "bin", "wasm-opt")
+      end
+    end
+    def wasm_opt
+      @wasm_opt_path
     end
-    def binaryen_download_url(version)
+    def binaryen_path
+      @binaryen_path
+    end
+    def binaryen_version
+      @binaryen_version
+    end
+    def download_url(version)
       assets = [
         [
           /x86_64-linux/,
@@ -143,47 +240,44 @@ module RubyWasm
       "https://github.com/WebAssembly/binaryen/releases/download/version_#{@binaryen_version}/#{asset}"
     end
-    def install_wasi_sdk
-      return unless @need_fetch_wasi_sdk
-      wasi_sdk_tarball =
-        File.join(File.dirname(@wasi_sdk_path), "wasi-sdk.tar.gz")
-      unless File.exist? wasi_sdk_tarball
-        FileUtils.mkdir_p File.dirname(wasi_sdk_tarball)
-        system "curl -L -o #{wasi_sdk_tarball} #{self.download_url(@version_major, @version_minor)}"
-      end
-      unless File.exist? @wasi_sdk_path
-        FileUtils.mkdir_p @wasi_sdk_path
-        system "tar -C #{@wasi_sdk_path} --strip-component 1 -xzf #{wasi_sdk_tarball}"
-      end
-    end
-    def install_binaryen
+    def install(executor)
       return unless @need_fetch_binaryen
       binaryen_tarball = File.expand_path("../binaryen.tar.gz", @binaryen_path)
       unless File.exist? binaryen_tarball
         FileUtils.mkdir_p File.dirname(binaryen_tarball)
-        system "curl -L -o #{binaryen_tarball} #{self.binaryen_download_url(@binaryen_version)}"
+        executor.system "curl",
+                        "-L",
+                        "-o",
+                        binaryen_tarball,
+                        self.download_url(@binaryen_version)
       end
       unless File.exist? @binaryen_path
         FileUtils.mkdir_p @binaryen_path
-        system "tar -C #{@binaryen_path} --strip-component 1 -xzf #{binaryen_tarball}"
+        executor.system "tar",
+                        "-C",
+                        @binaryen_path,
+                        "--strip-component",
+                        "1",
+                        "-xzf",
+                        binaryen_tarball
       end
     end
-    def install
-      install_wasi_sdk
-      install_binaryen
-    end
   end
   class Emscripten < Toolchain
     def initialize
-      @tools = { cc: "emcc", cxx: "em++", ld: "emcc", ar: "emar", ranlib: "emranlib" }
+      @tools = {
+        cc: "emcc",
+        cxx: "em++",
+        ld: "emcc",
+        ar: "emar",
+        ranlib: "emranlib"
+      }
       @name = "emscripten"
     end
-    def install
+    def install(executor)
     end
     def find_tool(name)

data/lib/ruby_wasm/build.rb CHANGED Viewed

@@ -43,7 +43,7 @@ class RubyWasm::Build
     @target = target
     @build_dir = build_dir
     @rubies_dir = rubies_dir
-    @toolchain = (toolchain || RubyWasm::Toolchain.get(target, @build_dir))
+    @toolchain = toolchain || raise("toolchain is required")
     @libyaml = RubyWasm::LibYAMLProduct.new(@build_dir, @target, @toolchain)
     @zlib = RubyWasm::ZlibProduct.new(@build_dir, @target, @toolchain)

data/lib/ruby_wasm/cli.rb CHANGED Viewed

@@ -181,12 +181,12 @@ module RubyWasm
     private
     def build_config(options)
-      build_source, all_default_exts = compute_build_source(options)
       # @type var config: Packager::build_config
-      config = { target: options[:target_triplet], src: build_source }
+      config = compute_build_alias(options)
+      config[:target] = options[:target_triplet]
       case options[:profile]
       when "full"
-        config[:default_exts] = all_default_exts || ""
+        config[:default_exts] = config[:all_default_exts] || ""
         env_additional_exts = ENV["RUBY_WASM_ADDITIONAL_EXTS"] || ""
         unless env_additional_exts.empty?
           config[:default_exts] += "," + env_additional_exts
@@ -201,24 +201,32 @@ module RubyWasm
       config
     end
-    def compute_build_source(options)
+    def compute_build_alias(options)
       src_name = options[:ruby_version]
-      aliases = self.class.build_source_aliases(root)
-      source = aliases[src_name]
-      if source.nil?
+      aliases = self.class.build_config_aliases(root)
+      config = aliases[src_name]
+      if config.nil?
         if File.directory?(src_name)
           # Treat as a local source if the given name is a source directory.
           RubyWasm.logger.debug "Using local source: #{src_name}"
           if options[:patches].any?
             RubyWasm.logger.warn "Patches specified through --patch are ignored for local sources"
           end
-          # @type var local_source: RubyWasm::Packager::build_source_local
-          local_source = { type: "local", path: src_name }
-          # @type var local_source: RubyWasm::Packager::build_source
-          local_source = local_source.merge(name: "local", patches: [])
           # FIXME: We should have a way to specify extensions to be included by users.
           # For now, assume all default extensions available in the head revision are available.
-          return [local_source, RubyWasm::Packager::ALL_DEFAULT_EXTS]
+          # @type var patches: Array[String]
+          patches = []
+          return(
+            {
+              name: "local",
+              src: {
+                type: "local",
+                path: src_name,
+                patches: patches
+              },
+              all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS
+            }
+          )
         end
         # Otherwise, it's an unknown source.
         raise(
@@ -226,64 +234,100 @@ module RubyWasm
         )
       end
       # Apply user-specified patches in addition to bundled patches.
-      source[:patches].concat(options[:patches])
-      # @type var all_default_exts: String
-      __skip__ = all_default_exts = source[:all_default_exts]
-      [source, all_default_exts]
+      config[:src][:patches].concat(options[:patches])
+      config
     end
     # Retrieves the alias definitions for the Ruby sources.
-    def self.build_source_aliases(root)
-      # @type var sources: Hash[string, RubyWasm::Packager::build_source]
-      sources = {
-        "head" => {
-          type: "github",
-          repo: "ruby/ruby",
-          rev: "master",
+    def self.build_config_aliases(root)
+      # @type var aliases: Array[RubyWasm::Packager::build_source]
+      aliases = [
+        {
+          name: "head",
+          src: {
+            type: "github",
+            repo: "ruby/ruby",
+            rev: "master"
+          },
           all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS,
+          wasi_sdk_version: "24.0"
+        },
+        {
+          name: "4.0",
+          src: {
+            type: "tarball",
+            url: "https://cache.ruby-lang.org/pub/ruby/4.0/ruby-4.0.0.tar.gz"
+          },
+          all_default_exts:
+            "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "24.0"
         },
-        "3.4" => {
-          type: "tarball",
-          url: "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz",
-          all_default_exts: "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+        {
+          name: "3.4",
+          src: {
+            type: "tarball",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.1.tar.gz"
+          },
+          all_default_exts:
+            "cgi/escape,continuation,coverage,date,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,json,json/generator,json/parser,objspace,pathname,psych,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "22.0"
         },
-        "3.3" => {
-          type: "tarball",
-          url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz",
-          all_default_exts: "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+        {
+          name: "3.3",
+          src: {
+            type: "tarball",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz"
+          },
+          all_default_exts:
+            "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "22.0"
         },
-        "3.2" => {
-          type: "tarball",
-          url: "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz",
-          all_default_exts: "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+        {
+          name: "3.2",
+          src: {
+            type: "tarball",
+            url: "https://cache.ruby-lang.org/pub/ruby/3.2/ruby-3.2.4.tar.gz"
+          },
+          all_default_exts:
+            "bigdecimal,cgi/escape,continuation,coverage,date,dbm,digest/bubblebabble,digest,digest/md5,digest/rmd160,digest/sha1,digest/sha2,etc,fcntl,fiber,gdbm,json,json/generator,json/parser,nkf,objspace,pathname,psych,racc/cparse,rbconfig/sizeof,ripper,stringio,strscan,monitor,zlib,openssl",
+          wasi_sdk_version: "22.0"
         }
-      }
+      ]
+      # Set the name in the source config.
+      aliases.each { |config| config[:src][:name] = config[:name] }
       # Apply bundled and user-specified `<root>/patches` directories.
-      sources.each do |name, source|
-        source[:name] = name
+      aliases.each do |config|
         patches_dirs = [bundled_patches_path, File.join(root, "patches")]
-        source[:patches] = patches_dirs.flat_map do |patches_dir|
-          Dir[File.join(patches_dir, name, "*.patch")]
-            .map { |p| File.expand_path(p) }
-        end.uniq
+        config[:src][:patches] = patches_dirs
+          .flat_map do |patches_dir|
+            Dir[File.join(patches_dir, config[:name], "*.patch")].map do |p|
+              File.expand_path(p)
+            end
+          end
+          .uniq
       end
+      aliases_by_name = aliases.to_h { |config| [config[:name], config] }
+      # Pin the revisions based on build_manifest.json if available.
       build_manifest = File.join(root, "build_manifest.json")
       if File.exist?(build_manifest)
         begin
           manifest = JSON.parse(File.read(build_manifest))
           manifest["ruby_revisions"].each do |name, rev|
-            source = sources[name]
+            source = aliases_by_name[name][:src]
             next unless source[:type] == "github"
             # @type var source: RubyWasm::Packager::build_source_github
             source[:rev] = rev
           end
         rescue StandardError => e
           RubyWasm.logger.warn "Failed to load build_manifest.json: #{e}"
+          raise e
         end
       end
-      sources
+      aliases_by_name
     end
     # Retrieves the root directory of the Ruby project.

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

@@ -179,7 +179,7 @@ class RubyWasm::Packager::Core
     end
     def _build_gem_exts(executor, build, gem_home)
-      build.toolchain.install
+      build.toolchain.install(executor)
       baseruby = build.baseruby
       unless Dir.exist?(baseruby.install_dir)
         baseruby.build(executor)

data/lib/ruby_wasm/packager.rb CHANGED Viewed

@@ -111,7 +111,7 @@ class RubyWasm::Packager
     options = build_options
     build_dir = File.join(@root, "build")
     rubies_dir = File.join(@root, "rubies")
-    toolchain = RubyWasm::Toolchain.get(options[:target], build_dir)
+    toolchain = RubyWasm::Toolchain.get(options[:target], options, build_dir)
     options.merge(
       toolchain: toolchain,
       build_dir: build_dir,

data/lib/ruby_wasm/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module RubyWasm
-  VERSION = "2.7.2"
+  VERSION = "2.8.1"
 end

data/package-lock.json CHANGED Viewed

@@ -1479,6 +1479,10 @@
             "resolved": "packages/npm-packages/ruby-3.4-wasm-wasi",
             "link": true
         },
+        "node_modules/@ruby/4.0-wasm-wasi": {
+            "resolved": "packages/npm-packages/ruby-4.0-wasm-wasi",
+            "link": true
+        },
         "node_modules/@ruby/head-wasm-emscripten": {
             "resolved": "packages/npm-packages/ruby-head-wasm-emscripten",
             "link": true
@@ -3576,7 +3580,7 @@
         },
         "packages/npm-packages/ruby-3.2-wasm-wasi": {
             "name": "@ruby/3.2-wasm-wasi",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -3584,7 +3588,7 @@
         },
         "packages/npm-packages/ruby-3.3-wasm-wasi": {
             "name": "@ruby/3.3-wasm-wasi",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -3592,7 +3596,15 @@
         },
         "packages/npm-packages/ruby-3.4-wasm-wasi": {
             "name": "@ruby/3.4-wasm-wasi",
-            "version": "2.7.2",
+            "version": "2.8.1",
+            "license": "MIT",
+            "dependencies": {
+                "@ruby/wasm-wasi": "^2.0.0"
+            }
+        },
+        "packages/npm-packages/ruby-4.0-wasm-wasi": {
+            "name": "@ruby/4.0-wasm-wasi",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -3600,12 +3612,12 @@
         },
         "packages/npm-packages/ruby-head-wasm-emscripten": {
             "name": "@ruby/head-wasm-emscripten",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT"
         },
         "packages/npm-packages/ruby-head-wasm-wasi": {
             "name": "@ruby/head-wasm-wasi",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@ruby/wasm-wasi": "^2.0.0"
@@ -3613,7 +3625,7 @@
         },
         "packages/npm-packages/ruby-head-wasm-wasip2": {
             "name": "@ruby/head-wasm-wasip2",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@bytecodealliance/preview2-shim": "^0.17.2",
@@ -3630,7 +3642,7 @@
         },
         "packages/npm-packages/ruby-wasm-wasi": {
             "name": "@ruby/wasm-wasi",
-            "version": "2.7.2",
+            "version": "2.8.1",
             "license": "MIT",
             "dependencies": {
                 "@bjorn3/browser_wasi_shim": "^0.3.0",

data/rakelib/ci.rake CHANGED Viewed

@@ -1,7 +1,8 @@
 def latest_build_sources
   BUILD_SOURCES
     .filter_map do |name|
-      src = RubyWasm::CLI.build_source_aliases(LIB_ROOT)[name]
+      config = RubyWasm::CLI.build_config_aliases(LIB_ROOT)[name]
+      src = config[:src]
       case src[:type]
       when "github"
         url = "repos/#{src[:repo]}/commits/#{src[:rev]}"
@@ -23,7 +24,8 @@ def release_note
 EOS
   BUILD_SOURCES.each do |name|
-    source = RubyWasm::CLI.build_source_aliases(LIB_ROOT)[name]
+    config = RubyWasm::CLI.build_config_aliases(LIB_ROOT)[name]
+    source = config[:src]
     case source[:type]
     when "github"
       output +=

data/rakelib/packaging.rake CHANGED Viewed

@@ -1,10 +1,10 @@
 wasi_vfs = RubyWasm::WasiVfsProduct.new(File.join(Dir.pwd, "build"))
-wasi_sdk = TOOLCHAINS["wasi-sdk"]
+binaryen = RubyWasm::Binaryen.new(build_dir: File.join(Dir.pwd, "build"))
 def exe_rbwasm = File.expand_path(File.join(__dir__, "..", "exe", "rbwasm"))
 tools = {
   "WASI_VFS_CLI" => exe_rbwasm,
-  "WASMOPT" => wasi_sdk.wasm_opt
+  "WASMOPT" => binaryen.wasm_opt
 }
 def npm_pkg_build_command(pkg)
@@ -51,7 +51,7 @@ def vendor_gem_cache(pkg)
   JS::VERSION
 end
-def build_ruby(pkg, base_dir, pkg_dir, wasi_sdk, clean: false)
+def build_ruby(pkg, base_dir, pkg_dir, binaryen, clean: false)
   build_command = npm_pkg_build_command(pkg)
   # Skip if the package does not require building ruby
   return unless build_command
@@ -111,12 +111,12 @@ def build_ruby(pkg, base_dir, pkg_dir, wasi_sdk, clean: false)
            File.join(dist_dir, "ruby.debug+stdlib.wasm")
       end
-      sh wasi_sdk.wasm_opt,
+      sh binaryen.wasm_opt,
          "--strip-debug",
          File.join(dist_dir, "ruby.wasm"),
          "-o",
          File.join(dist_dir, "ruby.wasm")
-      sh wasi_sdk.wasm_opt,
+      sh binaryen.wasm_opt,
          "--strip-debug",
          File.join(dist_dir, "ruby.debug+stdlib.wasm"),
          "-o",
@@ -137,7 +137,7 @@ namespace :npm do
     namespace pkg[:name] do
       desc "Build ruby for npm package #{pkg[:name]}"
       task "ruby" do
-        build_ruby(pkg, base_dir, pkg_dir, wasi_sdk)
+        build_ruby(pkg, base_dir, pkg_dir, binaryen)
       end
       desc "Build npm package #{pkg[:name]}"
@@ -147,7 +147,7 @@ namespace :npm do
       desc "Clean and build npm package #{pkg[:name]}"
       task "clean-build" do
-        build_ruby(pkg, base_dir, pkg_dir, wasi_sdk, clean: true)
+        build_ruby(pkg, base_dir, pkg_dir, binaryen, clean: true)
       end
       desc "Check npm package #{pkg[:name]}"
@@ -158,7 +158,8 @@ namespace :npm do
     desc "Make tarball for npm package #{pkg[:name]}"
     task pkg[:name] do
-      wasi_sdk.install_binaryen
+      executor = RubyWasm::BuildExecutor.new
+      binaryen.install(executor)
       Rake::Task["npm:#{pkg[:name]}:build"].invoke
       sh "npm pack", chdir: pkg_dir
     end
@@ -201,7 +202,8 @@ namespace :standalone do
     desc "Build standalone package #{pkg[:name]}"
     task "#{pkg[:name]}" => ["build:#{pkg[:build]}"] do
-      wasi_sdk.install_binaryen
+      executor = RubyWasm::SilentExecutor.new
+      binaryen.install(executor)
       base_dir = Dir.pwd
       sh tools,
          "./build-package.sh #{base_dir}/rubies/ruby-#{pkg[:build]}",

data/sig/ruby_wasm/build.rbs CHANGED Viewed

@@ -240,7 +240,7 @@ module RubyWasm
     def initialize: -> void
     def find_tool: (Symbol name) -> String
     def check_envvar: (untyped name) -> void
-    def self.get: (Target target, ?String? build_dir) -> (Toolchain)
+    def self.get: (Target target, Hash[untyped, untyped] config, ?String? build_dir) -> (Toolchain)
     def self.find_path: (String command) -> String?
     def self.check_executable: (String command) -> String
     def cc: -> String
@@ -249,28 +249,38 @@ module RubyWasm
     def ld: -> String
     def ar: -> String
-    def install: -> void
+    def install: (_CommandExecutor executor) -> void
   end
   class WASISDK < Toolchain
     @wasm_opt_path: String
     @need_fetch_wasi_sdk: bool
-    @need_fetch_binaryen: bool
     @tools: Hash[Symbol, String]
     @wasi_sdk_path: String
-    @binaryen_version: Integer
-    @version_major: Integer
-    @version_minor: Integer
-    @binaryen_path: String
+    @version: String
+    @binaryen: Binaryen
-    def initialize: (?String? wasi_sdk_path, ?build_dir: String?, ?version_major: Integer, ?version_minor: Integer, ?binaryen_version: Integer) -> void
+    def initialize: (?String? wasi_sdk_path, ?build_dir: String?, ?version: String, ?binaryen_version: Integer) -> void
     def find_tool: (Symbol name) -> String
     def wasm_opt: -> String
     def wasi_sdk_path: -> String
-    def download_url: (Integer? version_major, Integer? version_minor) -> String
-    def binaryen_download_url: (Integer? version) -> String
-    def install_wasi_sdk: ->  void
-    def install_binaryen: ->  void
+    def download_url: () -> String
+    def install_wasi_sdk: (_CommandExecutor executor) -> void
+    def install: (_CommandExecutor executor) -> void
+  end
+  class Binaryen
+    @need_fetch_binaryen: bool
+    @binaryen_path: String
+    @binaryen_version: Integer
+    @wasm_opt_path: String
+    def initialize: (?build_dir: String?, ?binaryen_version: Integer) -> void
+    def wasm_opt: -> String
+    def binaryen_path: -> String
+    def binaryen_version: -> Integer
+    def download_url: (Integer version) -> String
+    def install: (_CommandExecutor executor) -> void
   end
   class Emscripten < Toolchain
@@ -280,7 +290,12 @@ module RubyWasm
     def find_tool: (Symbol name) -> String
   end
+  interface _CommandExecutor
+    def system: (*_ToS args, ?chdir: String?, ?env: Hash[String, String]?) -> void
+  end
   class BuildExecutor
+    include _CommandExecutor
     @verbose: bool
     @github_actions_markup: bool
     @process_count: Integer
@@ -289,7 +304,6 @@ module RubyWasm
     attr_reader process_count: Integer
     def initialize: (?verbose: bool) -> void
-    def system: (*_ToS args, ?chdir: String?, ?env: Hash[String, String]?) -> void
     def rm_rf: (FileUtils::pathlist list) -> void
     def rm_f: (FileUtils::pathlist list) -> void
     def cp_r: (FileUtils::pathlist src, path dest) -> void
@@ -304,6 +318,10 @@ module RubyWasm
     private def _print_command: (Array[_ToS] command, Hash[String, String]? env) -> void
   end
+  class SilentExecutor
+    include _CommandExecutor
+  end
   class StatusPrinter
     @mutex: Mutex
     @counter: Integer
@@ -319,6 +337,8 @@ module RubyWasm
     def format_size: (Integer size) -> String
     def download: (String url, String dest, String message) -> void
+    def head: (String url) -> bool
+    private def _head: (URI::HTTPS uri, Integer limit) -> bool
   end
   class BuildTask

data/sig/ruby_wasm/cli.rbs CHANGED Viewed

@@ -38,8 +38,8 @@ module RubyWasm
     private
     def build_config: (cli_options options) -> Packager::build_config
-    def compute_build_source: (cli_options options) -> [Packager::build_source, String?]
-    def self.build_source_aliases: (string root) -> Hash[string, Packager::build_source]
+    def compute_build_alias: (cli_options options) -> Packager::build_config
+    def self.build_config_aliases: (string root) -> Hash[string, Packager::build_config]
     def self.bundled_patches_path: () -> string
     def root: () -> string

data/sig/ruby_wasm/packager.rbs CHANGED Viewed

@@ -13,18 +13,9 @@ class RubyWasm::Packager
     type: "local",
     path: String,
   }
-  type build_source = (build_source_github | build_source_tarball | build_source_local) & {
-    name: string,
-    patches: Array[String],
-  }
+  type build_source = untyped
-  type build_config = {
-    target: String,
-    src: RubyWasm::Packager::build_source,
-    default_exts: String,
-    suffix: String,
-    gem_home: String?,
-  }
+  type build_config = untyped
   type bytes = String

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_wasm
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.1
 platform: x86_64-linux-musl
 authors:
 - Yuta Saito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-03 00:00:00.000000000 Z
+date: 2025-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -48,7 +48,7 @@ files:
 - exe/rbwasm
 - ext/ruby_wasm/README.md
 - lib/ruby_wasm.rb
-- lib/ruby_wasm/3.2/ruby_wasm.so
+- lib/ruby_wasm/3.3/ruby_wasm.so
 - lib/ruby_wasm/3.4/ruby_wasm.so
 - lib/ruby_wasm/build.rb
 - lib/ruby_wasm/build/build_params.rb
@@ -109,7 +109,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
   - - "<"
     - !ruby/object:Gem::Version
       version: 3.5.dev