Apply wasi-vfs for Componentized version too

We will eventually use wasi-virt but for now, we use wasi-vfs for
Componentized version too because we know that it works.

Author: kateinoigakukun

lib/ruby_wasm/packager.rb

@@ -29,20 +29,22 @@ def package(executor, dest_dir, options)
 
     fs = RubyWasm::Packager::FileSystem.new(dest_dir, self)
     fs.package_ruby_root(tarball, executor)
-    wasm_bytes = ruby_core.build_and_link_exts(executor)
+
+    wasm_bytes = File.binread(File.join(fs.ruby_root, "bin", "ruby"))
 
     fs.package_gems
     fs.remove_non_runtime_files(executor)
     fs.remove_stdlib(executor) unless options[:stdlib]
 
-    if full_build_options[:target] == "wasm32-unknown-wasip1" && !features.support_component_model?
+    if full_build_options[:target] == "wasm32-unknown-wasip1"
       # wasi-vfs supports only WASI target
       wasi_vfs = RubyWasmExt::WasiVfs.new
       wasi_vfs.map_dir("/bundle", fs.bundle_dir)
       wasi_vfs.map_dir("/usr", File.dirname(fs.ruby_root))
 
       wasm_bytes = wasi_vfs.pack(wasm_bytes)
     end
+    wasm_bytes = ruby_core.build_and_link_exts(executor, wasm_bytes)
 
     wasm_bytes = RubyWasmExt.preinitialize(wasm_bytes) if options[:optimize]
     wasm_bytes

lib/ruby_wasm/packager/core.rb

@@ -37,7 +37,7 @@ def build(executor, options)
       raise NotImplementedError
     end
 
-    def build_and_link_exts(executor)
+    def build_and_link_exts(executor, module_bytes)
       raise NotImplementedError
     end
 
@@ -93,7 +93,7 @@ def build(executor, options)
       build.crossruby.artifact
     end
 
-    def build_and_link_exts(executor)
+    def build_and_link_exts(executor, module_bytes)
       build = derive_build
       self.build_exts(executor, build)
       self.link_exts(executor, build)
@@ -276,7 +276,6 @@ def derive_build
       return @build if @build
       __skip__ = build ||= RubyWasm::Build.new(
         name, **@packager.full_build_options, target: target,
-        wasi_vfs: @packager.features.support_component_model? ? nil : :default
       )
       build.crossruby.user_exts = user_exts(build)
       # Emscripten uses --global-base=1024 by default, but it conflicts with
@@ -302,10 +301,7 @@ def derive_build
       build
     end
 
-    def build_and_link_exts(executor)
-      build = derive_build
-      ruby_root = build.crossruby.dest_dir
-      module_bytes = File.binread(File.join(ruby_root, "usr", "local", "bin", "ruby"))
+    def build_and_link_exts(executor, module_bytes)
       return module_bytes unless @packager.features.support_component_model?
 
       linker = RubyWasmExt::ComponentEncode.new

sig/ruby_wasm/packager.rbs

@@ -56,7 +56,7 @@ 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
+    def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
 
     extend Forwardable
 
@@ -72,7 +72,7 @@ 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
+      def build_and_link_exts: (RubyWasm::BuildExecutor, bytes module_bytes) -> bytes
     end
 
     class DynamicLinking < RubyWasm::Packager::Core::BuildStrategy