ruby_wasm 2.6.2-x86_64-linux-musl → 2.7.1-x86_64-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 600f38b1685c5427dc537c287f3fb6d17944613758b5451ea46110318d681500
-  data.tar.gz: 880db754bb7abf5744ef2adbcfa7f4bb6af06eb8be610e7e7781a7f15a648b54
+  metadata.gz: 0276a0c3649ee468e43730331a014773851603bb2d9d65ad2cf9dddfb24057a8
+  data.tar.gz: 33c4803879470e0c90af19499481c4ba2360846799cc58840600c5327e0cfe38
 SHA512:
-  metadata.gz: 2614e52c087fc8e9927917e40bcfce57cd2d3117ebfb8657af7e993d08084e5614e6e0d61bdc601f3a644f9ef725e79a2f44944efb1daa1431700c24f859cd59
-  data.tar.gz: 74c712f53ed169c9173e7ffd5efd0207c6f933c82e3ceaf2b5f9a0f0d5ca0b20fa15e7584e213c319a79075de737075cefcffb7754584ad549728d216cff549f
+  metadata.gz: ef17a9dece48ae79a0f1c379234710e284b31ee89ec20e1dbbdfb3f9ae3691a53971beb13b2c25f7cca9f2b03e45f4a77f978c0f658338c5a11c671339702c88
+  data.tar.gz: a9f9236f32c6e16bf5044a6bd74942e04492eebd81151aaa64cb14ae0ba41fb4bb2e87026f597b86961f1d679109dff9dd150a54ca55e4060ffd1a69a4a455ac

data/CONTRIBUTING.md

@@ -9,8 +9,6 @@ This document describes development setup and pointers for diving into this proj
 $ 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
@@ -26,9 +24,9 @@ $ rake build:download_prebuilt
 $ rake build:head-wasm32-unknown-wasip1-full
 
 # Build npm package
-$ rake npm:ruby-head-wasm-wasi
+$ rake npm:ruby-head-wasm-wasip2:build
 # Test npm package
-$ rake npm:ruby-head-wasm-wasi:check
+$ rake npm:ruby-head-wasm-wasip2:check
 ```
 
 If you need to re-build Ruby, please clean `./rubies` directory, and run `rake npm:ruby-head-wasm-wasi` again.
@@ -111,9 +109,13 @@ $ rake 'bump_version[0.6.0]'
 $ git commit -m"Bump version to 0.6.0"
 $ git tag 0.6.0
 $ git push origin 0.6.0
-$ for pkg in pkg/ruby_wasm-*; do gem push $pkg; done
+# After GitHub Actions "Build gems" is done
+# https://github.com/ruby/ruby.wasm/actions/workflows/build-gems.yml
+$ gh run download <run-id>
+$ for pkg in cross-gem/pkg/ruby_wasm-*; do gem push $pkg; done
 $ gem build && gem push ruby_wasm-*.gem && rm ruby_wasm-*.gem
 $ (cd packages/gems/js/ && gem build && gem push js-*.gem && rm js-*.gem)
+$ rake bump_dev_version
 ```
 
 ## Release Channels
@@ -127,5 +129,45 @@ $ 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.2-2024-06-29-a
+$ npm install --save @ruby/wasm-wasi@2.7.1-2025-01-23-a
 ```
+
+
+## Adding Support for a New Ruby Version
+
+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
+   - Specify the tarball URL and required default extensions
+
+2. Update `Rakefile`:
+   - Add the new version to `BUILD_SOURCES`
+   - Add a new entry in `NPM_PACKAGES` for the new version
+
+3. Create a new npm package:
+   ```console
+   # Copy from head package
+   $ cp -r packages/npm-packages/ruby-head-wasm-wasi packages/npm-packages/ruby-NEW.VERSION-wasm-wasi
+
+   # Update version references
+   # - In package.json: Update name, version, and description
+   # - In README.md: Update version references
+   ```
+   Note: Most of the package contents can be reused from the head package as is, since the JavaScript API and build configuration remain the same across versions.
+
+4. Update `package-lock.json` by `npm install`
+
+4. Update documentation:
+   - Update version references in `README.md`
+   - Update examples in `docs/cheat_sheet.md`
+   - Update the package list in `packages/npm-packages/ruby-wasm-wasi/README.md`
+
+5. Test the build:
+   ```console
+   $ rake build:NEW.VERSION-wasm32-unknown-wasip1-full
+   $ rake npm:ruby-NEW.VERSION-wasm-wasi:build
+   $ rake npm:ruby-NEW.VERSION-wasm-wasi:check
+   ```
+
+6. Create a pull request with all the changes

data/Gemfile

@@ -7,11 +7,12 @@ gemspec
 group :development do
   gem "rake"
   gem "rake-compiler"
-  gem "rb_sys", "0.9.97"
+  gem "rb_sys", "0.9.108"
 end
 
 group :check do
-  gem "webrick"
+  # Use the latest version of webrick for URI change in Ruby 3.4
+  gem "webrick", "~> 1.8.2"
   gem "syntax_tree", "~> 3.5"
-  gem "steep"
+  gem "steep", "~> 1.9" if RUBY_VERSION >= "3.1.0"
 end

data/NOTICE

@@ -1264,8 +1264,7 @@ Licensed under the Apache License 2.0 https://www.openssl.org/source/license.htm
 https://github.com/kateinoigakukun/wasi-vfs
 
 ```
-Copyright (c) 2022 Yuta Saito. All rights reserved.
-Licensed under the MIT License
+Licensed under the Apache License v2.0 with LLVM Exceptions
 ```
 
 ---

data/README.md

@@ -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.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.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.3-wasm32-unknown-wasip1-full.tar.gz
-$ tar xfz ruby-3.3-wasm32-unknown-wasip1-full.tar.gz
+$ 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
 
 # Extract ruby binary not to pack itself
-$ mv ruby-3.3-wasm32-unknown-wasip1-full/usr/local/bin/ruby ruby.wasm
+$ mv ruby-3.4-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.3-wasm32-unknown-wasip1-full/usr::/usr -o my-ruby-app.wasm
+$ rbwasm pack ruby.wasm --dir ./src::/src --dir ./ruby-3.4-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-3.4-wasm-wasi">@ruby/3.4-wasm-wasi</a></td>
+      <td>CRuby 3.4 built on WASI with JS interop support</td>
+      <td><a href="https://www.npmjs.com/package/@ruby/3.4-wasm-wasi" rel="nofollow"><img src="https://badge.fury.io/js/@ruby%2F3.4-wasm-wasi.svg" alt="npm version" style="max-width: 100%;"></a></td>
+    </tr>
     <tr>
       <td><a href="/packages/npm-packages/ruby-3.3-wasm-wasi">@ruby/3.3-wasm-wasi</a></td>
       <td>CRuby 3.3 built on WASI with JS interop support</td>

data/Rakefile

@@ -9,7 +9,7 @@ require "ruby_wasm/rake_task"
 require "ruby_wasm/packager"
 require "ruby_wasm/cli"
 
-BUILD_SOURCES = %w[3.3 3.2 head]
+BUILD_SOURCES = %w[3.4 3.3 3.2 head]
 BUILD_PROFILES = %w[full minimal]
 
 BUILDS =
@@ -28,20 +28,32 @@ NPM_PACKAGES = [
   {
     name: "ruby-head-wasm-wasi",
     ruby_version: "head",
-    gemfile: "packages/npm-packages/ruby-wasm-wasi/Gemfile",
+    gemfile: "packages/npm-packages/ruby-head-wasm-wasi/Gemfile",
     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,
   },
+  {
+    name: "ruby-3.4-wasm-wasi",
+    ruby_version: "3.4",
+    gemfile: "packages/npm-packages/ruby-3.3-wasm-wasi/Gemfile",
+    target: "wasm32-unknown-wasip1"
+  },
   {
     name: "ruby-3.3-wasm-wasi",
     ruby_version: "3.3",
-    gemfile: "packages/npm-packages/ruby-wasm-wasi/Gemfile",
+    gemfile: "packages/npm-packages/ruby-3.3-wasm-wasi/Gemfile",
     target: "wasm32-unknown-wasip1"
   },
   {
     name: "ruby-3.2-wasm-wasi",
     ruby_version: "3.2",
-    gemfile: "packages/npm-packages/ruby-wasm-wasi/Gemfile",
+    gemfile: "packages/npm-packages/ruby-3.2-wasm-wasi/Gemfile",
     target: "wasm32-unknown-wasip1"
   },
   { name: "ruby-wasm-wasi", target: "wasm32-unknown-wasip1" }

data/docs/api.md

@@ -1,2 +1,2 @@
 - [Ruby API](https://ruby.github.io/ruby.wasm/JS.html)
-- [JavaScript API](https://github.com/ruby/ruby.wasm/blob/main/packages/npm-packages/ruby-wasm-wasi/README.md#API)
+- [JavaScript API](https://ruby.github.io/ruby.wasm/npm/@ruby/wasm-wasi/)

data/docs/cheat_sheet.md

@@ -8,10 +8,10 @@
 
 ## Node.js
 
-To install the package, install `@ruby/3.3-wasm-wasi` and `@ruby/wasm-wasi` from npm:
+To install the package, install `@ruby/3.4-wasm-wasi` and `@ruby/wasm-wasi` from npm:
 
 ```console
-npm install --save @ruby/3.3-wasm-wasi @ruby/wasm-wasi
+npm install --save @ruby/3.4-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.3-wasm-wasi/dist/ruby.wasm");
+const binary = await fs.readFile("./node_modules/@ruby/3.4-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.3-wasm-wasi@2.6.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.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.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.2/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.1/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.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.2/dist/browser.umd.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.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.2/dist/ruby+stdlib.wasm");
+      const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.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.2/dist/browser.script.iife.js"></script>
+  <script src="https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.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.2/dist/browser/+esm";
-    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.3-wasm-wasi@2.6.2/dist/ruby+stdlib.wasm");
+    import { DefaultRubyVM } from "https://cdn.jsdelivr.net/npm/@ruby/wasm-wasi@2.7.1/dist/browser/+esm";
+    const response = await fetch("https://cdn.jsdelivr.net/npm/@ruby/3.4-wasm-wasi@2.7.1/dist/ruby+stdlib.wasm");
     const module = await WebAssembly.compileStreaming(response);
     const { vm } = await DefaultRubyVM(module);
 

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

@@ -32,7 +32,7 @@ module RubyWasm
     end
 
     def make_args(crossruby)
-      make_args = []
+      make_args = [] #: Array[String]
       make_args << "CC=#{@toolchain.cc}"
       make_args << "CXX=#{@toolchain.cc}"
       make_args << "LD=#{@toolchain.ld}"
@@ -71,14 +71,14 @@ module RubyWasm
         return
       end
       objdir = product_build_dir crossruby
-      rbconfig_rb = Dir.glob(File.join(crossruby.dest_dir, "usr/local/lib/ruby/*/wasm32-wasi/rbconfig.rb")).first
+      rbconfig_rb = crossruby.rbconfig_rb
       raise "rbconfig.rb not found" unless rbconfig_rb
       extconf_args = [
         "-C", objdir,
         "#{@srcdir}/extconf.rb",
         "--target-rbconfig=#{rbconfig_rb}",
       ]
-      extconf_args << "--enable-component-model" if @features.support_component_model?
+      extconf_args << "--disable-component-model" unless @features.support_component_model?
       executor.system crossruby.baseruby_path, *extconf_args
     end
 
@@ -90,10 +90,19 @@ module RubyWasm
         "--disable=gems",
         # HACK: top_srcdir is required to find ruby headers
         "-e",
-        %Q($top_srcdir="#{source.src_dir}"),
+        %Q($top_srcdir=ENV["top_srcdir"]="#{source.src_dir}"),
         # HACK: extout is required to find config.h
         "-e",
-        %Q($extout="#{crossruby.build_dir}/.ext"),
+        %Q($extout=ENV["extout"]="#{crossruby.build_dir}/.ext"),
+      ]
+      unless @features.support_component_model?
+        extconf_args.concat([
+          # HACK: skip have_devel check since ruby is not installed yet
+          "-e",
+          "$have_devel = true",
+        ])
+      end
+      extconf_args.concat([
         # HACK: force static ext build by imitating extmk
         "-e",
         "$static = true; trace_var(:$static) {|v| $static = true }",
@@ -110,8 +119,8 @@ module RubyWasm
         %Q(require "json"; File.write("#{metadata_json(crossruby)}", JSON.dump({target: $target}))),
         "-I#{crossruby.build_dir}",
         "--",
-      ]
-      extconf_args << "--enable-component-model" if @features.support_component_model?
+      ])
+      extconf_args << "--disable-component-model" unless @features.support_component_model?
       # Clear RUBYOPT to avoid loading unrelated bundle setup
       executor.system crossruby.baseruby_path,
                       *extconf_args,
@@ -222,6 +231,10 @@ module RubyWasm
       end
       install_dir = File.join(build_dir, "install")
       if !File.exist?(install_dir) || remake || reconfigure
+        unless target.pic?
+          # HACK: force static linking for non-pic target
+          executor.rm_f File.join(build_dir, "ruby")
+        end
         executor.system "make",
                         "-j#{executor.process_count}",
                         "install",
@@ -301,6 +314,10 @@ module RubyWasm
       File.expand_path("../crossruby/extinit.c.erb", __FILE__)
     end
 
+    def rbconfig_rb
+      Dir.glob(File.join(dest_dir, "usr/local/lib/ruby/*/wasm32-wasi/rbconfig.rb")).first
+    end
+
     def baseruby_path
       File.join(@baseruby.install_dir, "bin/ruby")
     end

data/lib/ruby_wasm/build/product/product.rb

@@ -11,7 +11,7 @@ module RubyWasm
       @toolchain = toolchain
     end
     def system_triplet_args
-      args = []
+      args = [] #: Array[String]
       case @target.triple
       when /^wasm32-unknown-wasi/
         args.concat(%W[--host wasm32-wasi])
@@ -24,7 +24,7 @@ module RubyWasm
     end
 
     def tools_args
-      args = []
+      args = [] #: Array[String]
       args << "CC=#{@toolchain.cc}"
       args << "CXX=#{@toolchain.cxx}"
       args << "LD=#{@toolchain.ld}"

data/lib/ruby_wasm/build/toolchain.rb

@@ -45,7 +45,7 @@ module RubyWasm
 
     %i[cc cxx ranlib ld ar].each do |name|
       define_method(name) do
-        @tools_cache ||= {}
+        @tools_cache ||= {} #: Hash[String, String]
         @tools_cache[name] ||= find_tool(name)
         @tools_cache[name]
       end

data/lib/ruby_wasm/cli.rb

@@ -242,6 +242,11 @@ module RubyWasm
           rev: "master",
           all_default_exts: RubyWasm::Packager::ALL_DEFAULT_EXTS,
         },
+        "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",
+        },
         "3.3" => {
           type: "tarball",
           url: "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.3.tar.gz",
@@ -310,7 +315,10 @@ module RubyWasm
 
     def derive_packager(options)
       __skip__ = definition = nil
-      __skip__ = if defined?(Bundler) && !options[:disable_gems]
+      features = RubyWasm::FeatureSet.derive_from_env
+      # The head ruby & dynamic linking uses "bundle" command to build gems instead of in-process integration.
+      use_in_process_gem_building = !(options[:ruby_version] == "head" && features.support_dynamic_linking?)
+      __skip__ = if defined?(Bundler) && !options[:disable_gems] && use_in_process_gem_building
         begin
           # Silence Bundler UI if --print-ruby-cache-key is specified not to bother the JSON output.
           level = options[:print_ruby_cache_key] ? :silent : Bundler.ui.level
@@ -321,10 +329,10 @@ module RubyWasm
           Bundler.ui.level = old_level
         end
       end
-      RubyWasm.logger.info "Using Gemfile: #{definition.gemfiles}" if definition
+      RubyWasm.logger.info "Using Gemfile: #{definition.gemfiles.map(&:to_s).join(", ")}" if definition
       RubyWasm::Packager.new(
         root, build_config(options), definition,
-        features: RubyWasm::FeatureSet.derive_from_env
+        features: features,
       )
     end
 
@@ -332,6 +340,9 @@ module RubyWasm
       ruby_core_build = packager.ruby_core_build
       require "digest"
       digest = Digest::SHA256.new
+      # The build system key is used to invalidate the cache when the build system is updated.
+      build_system_key = 1
+      digest.update(build_system_key.to_s)
       ruby_core_build.cache_key(digest)
       hexdigest = digest.hexdigest
       require "json"

data/lib/ruby_wasm/packager/core.rb

@@ -1,4 +1,5 @@
 require "forwardable"
+require "pathname"
 
 class RubyWasm::Packager::Core
   def initialize(packager)
@@ -19,7 +20,6 @@ class RubyWasm::Packager::Core
   def build_strategy
     @build_strategy ||=
       begin
-        has_exts = @packager.specs.any? { |spec| spec.extensions.any? }
         if @packager.features.support_dynamic_linking?
           DynamicLinking.new(@packager)
         else
@@ -59,14 +59,6 @@ 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 with_unbundled_env(&block)
       __skip__ = if defined?(Bundler)
         Bundler.with_unbundled_env(&block)
@@ -119,7 +111,7 @@ class RubyWasm::Packager::Core
     end
 
     def _link_gem_exts(executor, build, ruby_root, gem_home, module_bytes)
-      libraries = []
+      libraries = [] #: Array[String]
 
       # TODO: Should be computed from dyinfo of ruby binary
       wasi_libc_shared_libs = [
@@ -138,12 +130,16 @@ 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(wasi_exec_model)
-      adapters = [wasi_adapter]
-      dl_openable_libs = []
+      dl_openable_libs = [] #: Array[[string, Array[String]]]
       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"))]
 
+      has_js_so = dl_openable_libs.any? do |root, libs|
+        libs.any? { |lib| lib.end_with?("/js.so") }
+      end
+      wasi_adapter = RubyWasm::Packager::ComponentAdapter.wasi_snapshot_preview1(has_js_so ? "reactor" : "command")
+      adapters = [wasi_adapter]
+
       linker = RubyWasmExt::ComponentLink.new
       linker.use_built_in_libdl(true)
       linker.stub_missing_functions(false)
@@ -151,11 +147,13 @@ class RubyWasm::Packager::Core
 
       linker.library("ruby", module_bytes, false)
 
+      RubyWasm.logger.info "Linking Ruby with extensions"
+
       libraries.each do |lib|
         # Non-DL openable libraries should be referenced as base name
         lib_name = File.basename(lib)
         module_bytes = File.binread(lib)
-        RubyWasm.logger.info "Linking #{lib_name} (#{module_bytes.size} bytes)"
+        RubyWasm.logger.debug "Linking #{lib_name} (#{module_bytes.size} bytes)"
         linker.library(lib_name, module_bytes, false)
       end
 
@@ -164,7 +162,7 @@ class RubyWasm::Packager::Core
           # 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)"
+          RubyWasm.logger.debug "Linking #{lib_name} (#{module_bytes.size} bytes)"
           linker.library(lib_name, module_bytes, true)
         end
       end
@@ -174,7 +172,7 @@ 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)"
+        RubyWasm.logger.debug "Linking adapter #{adapter_name}=#{adapter} (#{module_bytes.size} bytes)"
         linker.adapter(adapter_name, module_bytes)
       end
       return linker.encode()
@@ -187,31 +185,43 @@ class RubyWasm::Packager::Core
         baseruby.build(executor)
       end
 
-      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)
-          prod = RubyWasm::CrossRubyExtProduct.new(
-            ext_srcdir,
-            build.toolchain,
-            features: @packager.features,
-            ext_relative_path: ext_relative_path
-          )
-          [prod, spec]
-        end
-      end
+      crossruby = build.crossruby
+      rbconfig_rb = crossruby.rbconfig_rb
 
-      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, extra_mkargs)
-        executor.end_section prod.class, prod.name
-      end
+      options = @packager.full_build_options
+      target_triplet = options[:target]
+
+      local_path = File.join("bundle", target_triplet)
+      env = {
+        "BUNDLE_APP_CONFIG" => File.join(".bundle", target_triplet),
+        "BUNDLE_PATH" => local_path,
+        "BUNDLE_WITHOUT" => "build",
+        # Do not auto-switch bundler version by Gemfile.lock
+        "BUNDLE_VERSION" => "system",
+        # FIXME: BUNDLE_PATH is set as a installation destination here, but
+        # it is also used as a source of gems to be loaded by RubyGems itself.
+        # RubyGems loads "psych" gem and if Gemfile includes "psych" gem,
+        # RubyGems tries to load "psych" gem from BUNDLE_PATH at the second
+        # time of "bundle install" command. But the extension of "psych" gem
+        # under BUNDLE_PATH is built for Wasm target, not for host platform,
+        # so it fails to load the extension.
+        #
+        # Thus we preload psych from the default LOAD_PATH here to avoid
+        # loading Wasm version of psych.so via `Kernel#require` patched by
+        # RubyGems.
+        "RUBYOPT" => "-rpsych",
+      }
+
+      args = [
+        File.join(baseruby.install_dir, "bin", "bundle"),
+        "install",
+        "--standalone",
+        "--target-rbconfig",
+        rbconfig_rb,
+      ]
+
+      executor.system(*args, env: env)
+      executor.cp_r(local_path, gem_home)
     end
 
     def cache_key(digest)
@@ -337,6 +347,14 @@ class RubyWasm::Packager::Core
       # No-op because we already built extensions as part of the Ruby build
     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 link_gem_exts(executor, ruby_root, gem_home, module_bytes)
       return module_bytes unless @packager.features.support_component_model?
 

data/lib/ruby_wasm/packager/file_system.rb

@@ -44,7 +44,6 @@ class RubyWasm::Packager::FileSystem
     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}"

data/lib/ruby_wasm/packager.rb

@@ -34,7 +34,7 @@ class RubyWasm::Packager
 
     ruby_core.build_gem_exts(executor, fs.bundle_dir)
 
-    fs.package_gems
+    fs.package_gems unless features.support_component_model?
     fs.remove_non_runtime_files(executor)
     if options[:stdlib]
       options[:without_stdlib_components].each do |component|

data/lib/ruby_wasm/version.rb

@@ -1,3 +1,3 @@
 module RubyWasm
-  VERSION = "2.6.2"
+  VERSION = "2.7.1"
 end