From 7660c132f632e6599946465e2867aa7efbe8eebf Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 12:19:10 +0000
Subject: [PATCH 01/11] Split out Component binaries into `@ruby/wasm-wasip2`
 package

The `@ruby/wasm-wasi` package included both the Core Module and the Component
binaries but it has two problems:
1. npm package size was too large and it was very close to the limit of
   the jsdelivr CDN.
2. The Component model build (in other words, dynamic linking build)
   well supports incremental build. But the Core Module build does not
   because it requires to re-link C-extensions every time statically.
   And it led to clean build every time. Splitting out the Component
   build makes the p2 package itself incremental buildable.
---
 Rakefile                                      |  6 ++
 .../ruby-head-wasm-wasi/README.md             |  2 +-
 .../ruby-head-wasm-wasi/package.json          |  2 +-
 .../ruby-head-wasm-wasip2/.gitignore          |  4 +
 .../ruby-head-wasm-wasip2/Gemfile             | 15 ++++
 .../ruby-head-wasm-wasip2/Gemfile.lock        | 25 ++++++
 .../ruby-head-wasm-wasip2/README.md           |  7 ++
 .../ruby-head-wasm-wasip2/package.json        | 56 +++++++++++++
 .../ruby-head-wasm-wasip2/rollup.config.mjs   | 21 +++++
 .../src/browser.script.js                     |  6 ++
 .../npm-packages/ruby-wasm-wasi/package.json  |  1 -
 .../ruby-wasm-wasi/src/browser.script.ts      | 29 +++++++
 .../npm-packages/ruby-wasm-wasi/src/vm.ts     | 19 +++--
 rakelib/packaging.rake                        | 80 ++++++++++---------
 14 files changed, 225 insertions(+), 48 deletions(-)
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/.gitignore
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/Gemfile
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/Gemfile.lock
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/README.md
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/package.json
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/rollup.config.mjs
 create mode 100644 packages/npm-packages/ruby-head-wasm-wasip2/src/browser.script.js

diff --git a/Rakefile b/Rakefile
index 05ff059282..4a0784e8bb 100644
--- a/Rakefile
+++ b/Rakefile
@@ -30,6 +30,12 @@ NPM_PACKAGES = [
     ruby_version: "head",
     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,
   },
   {
diff --git a/packages/npm-packages/ruby-head-wasm-wasi/README.md b/packages/npm-packages/ruby-head-wasm-wasi/README.md
index d25df14174..61d7c23167 100644
--- a/packages/npm-packages/ruby-head-wasm-wasi/README.md
+++ b/packages/npm-packages/ruby-head-wasm-wasi/README.md
@@ -2,6 +2,6 @@
 
 [![npm version](https://badge.fury.io/js/@ruby%2Fhead-wasm-wasi.svg)](https://www.npmjs.com/package/@ruby/head-wasm-wasi)
 
-This package provides WebAssembly binaries of CRuby built from the latest `HEAD` source code targeting WASI-compatible environments.
+This package provides WebAssembly binaries of CRuby built from the latest `HEAD` source code targeting environments compatible with WASI Preview1.
 
 See [`@ruby/wasm-wasi`](https://github.com/ruby/ruby.wasm/blob/main/packages/npm-packages/ruby-wasm-wasi/README.md) for how to use this package.
diff --git a/packages/npm-packages/ruby-head-wasm-wasi/package.json b/packages/npm-packages/ruby-head-wasm-wasi/package.json
index 6df914973c..b0f5ff508a 100644
--- a/packages/npm-packages/ruby-head-wasm-wasi/package.json
+++ b/packages/npm-packages/ruby-head-wasm-wasi/package.json
@@ -29,7 +29,7 @@
     "README.md"
   ],
   "scripts": {
-    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi run test:run:all",
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi npm -C ../ruby-wasm-wasi run test:run",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
     "build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-head-wasm-wasi",
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/.gitignore b/packages/npm-packages/ruby-head-wasm-wasip2/.gitignore
new file mode 100644
index 0000000000..cbb80a5cd4
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/.gitignore
@@ -0,0 +1,4 @@
+*.tgz
+/tmp
+/bundle
+/vendor
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile b/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile
new file mode 100644
index 0000000000..35a14732c1
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+# We build ./vendor/cache/js-{version}.gem just before evaluating this Gemfile
+# so that Bundler builds extensions even from the local gem. (gem extensions
+# from "path:" gems are not built by Bundler.)
+# Thus even we specify version of "js" gem here, it should always installed
+# from the ./vendor/cache/js-{version}.gem, not from rubygems.org. To achieve this,
+# we always use non-exist version during development.
+require_relative "../../gems/js/lib/js/version.rb"
+gem "js", JS::VERSION
+gem "ruby_wasm", path: "../../../", group: [:build]
+gem "power_assert"
+gem "test-unit"
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile.lock b/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile.lock
new file mode 100644
index 0000000000..f5bf0d9958
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/Gemfile.lock
@@ -0,0 +1,25 @@
+PATH
+  remote: ../../..
+  specs:
+    ruby_wasm (2.6.2.dev)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    js (2.6.2.dev)
+    power_assert (2.0.3)
+    test-unit (3.6.2)
+      power_assert
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  js (= 2.6.2.dev)
+  power_assert
+  ruby_wasm!
+  test-unit
+
+BUNDLED WITH
+   2.6.0.dev
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/README.md b/packages/npm-packages/ruby-head-wasm-wasip2/README.md
new file mode 100644
index 0000000000..e5b87edac6
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/README.md
@@ -0,0 +1,7 @@
+# @ruby/head-wasm-wasip2
+
+[![npm version](https://badge.fury.io/js/@ruby%2Fhead-wasm-wasip2.svg)](https://www.npmjs.com/package/@ruby/head-wasm-wasip2)
+
+This package provides WebAssembly binaries of CRuby built from the latest `HEAD` source code targeting environments compatible with WASI Preview2.
+
+See [`@ruby/wasm-wasi`](https://github.com/ruby/ruby.wasm/blob/main/packages/npm-packages/ruby-wasm-wasi/README.md) for how to use this package.
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/package.json b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
new file mode 100644
index 0000000000..92b3c9e1af
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
@@ -0,0 +1,56 @@
+{
+  "name": "@ruby/head-wasm-wasip2",
+  "version": "2.6.2",
+  "description": "Ruby head built on WASI Preview 2",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.js",
+  "exports": {
+    ".": {
+      "browser": "./dist/esm/index.js",
+      "umd": "./dist/umd/index.js",
+      "import": "./dist/esm/index.js",
+      "require": "./dist/cjs/index.js"
+    },
+    "./dist/*": {
+      "browser": "./dist/esm/*.js",
+      "umd": "./dist/umd/*.js",
+      "import": "./dist/esm/*.js",
+      "require": "./dist/cjs/*.js"
+    },
+    "./*.wasm": {
+      "browser": "./*.wasm",
+      "umd": "./*.wasm",
+      "import": "./*.wasm",
+      "require": "./*.wasm"
+    }
+  },
+  "files": [
+    "dist",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi ENABLE_COMPONENT_TESTS=1 npm -C ../ruby-wasm-wasi run test:run",
+    "build:deps": "cd ../ruby-wasm-wasi && npm run build",
+    "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
+    "build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-head-wasm-wasi",
+    "build:static": "npm run build:static:files && npm run build:static:compat",
+    "build:rollup": "rollup -c rollup.config.mjs",
+    "build": "npm run build:deps && npm run build:static && npm run build:rollup && ../ruby-wasm-wasi/tools/post-build.sh ./dist"
+  },
+  "repository": "https://github.com/ruby/ruby.wasm",
+  "homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-head-wasm-wasi",
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "wasm",
+    "webassembly",
+    "wasi",
+    "ruby"
+  ],
+  "license": "MIT",
+  "dependencies": {
+    "@ruby/wasm-wasi": "^2.0.0",
+    "@bytecodealliance/preview2-shim": "^0.16.5"
+  }
+}
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/rollup.config.mjs b/packages/npm-packages/ruby-head-wasm-wasip2/rollup.config.mjs
new file mode 100644
index 0000000000..302c2c6720
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/rollup.config.mjs
@@ -0,0 +1,21 @@
+import json from "@rollup/plugin-json";
+import { nodeResolve } from "@rollup/plugin-node-resolve";
+import fs from "fs";
+import path from "path";
+
+/** @type {import('rollup').RollupOptions[]} */
+export default [
+  {
+    input: "src/browser.script.js",
+    output: [
+      {
+        file: "dist/browser.script.iife.js",
+        format: "iife",
+        banner: "/* " + fs.readFileSync(path.resolve("../../../NOTICE"), "utf8") + "*/",
+      }
+    ],
+    plugins: [
+      json(), nodeResolve()
+    ],
+  },
+];
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/src/browser.script.js b/packages/npm-packages/ruby-head-wasm-wasip2/src/browser.script.js
new file mode 100644
index 0000000000..aff548be89
--- /dev/null
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/src/browser.script.js
@@ -0,0 +1,6 @@
+import { instantiate } from "../dist/component/ruby.component"
+import { componentMain } from "@ruby/wasm-wasi/dist/browser.script"
+import * as wasip2 from "@bytecodealliance/preview2-shim"
+import * as pkg from "../package.json"
+
+componentMain(pkg, { instantiate, wasip2 })
diff --git a/packages/npm-packages/ruby-wasm-wasi/package.json b/packages/npm-packages/ruby-wasm-wasi/package.json
index fdd86b4413..a6c09454b0 100644
--- a/packages/npm-packages/ruby-wasm-wasi/package.json
+++ b/packages/npm-packages/ruby-wasm-wasi/package.json
@@ -39,7 +39,6 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test:run:all": "npm run test:run && ENABLE_COMPONENT_TESTS=1 npm run test:run",
     "test:run": "npm run test:unit && npm run test:vitest -- --run && npm run test:e2e",
     "test:vitest": "vitest ./test/",
     "test:unit": "./tools/run-test-unit.mjs",
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts b/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts
index 65c1b8af90..2c5b2bd32a 100644
--- a/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts
+++ b/packages/npm-packages/ruby-wasm-wasi/src/browser.script.ts
@@ -1,5 +1,9 @@
 import { DefaultRubyVM } from "./browser.js";
+import { RubyInitComponentOptions, RubyComponentInstantiator, RubyVM } from "./vm.js";
 
+/**
+ * The main entry point of `<script type="text/ruby">`-based scripting with WebAssembly Core Module.
+ */
 export const main = async (
   pkg: { name: string; version: string },
   options?: Parameters<typeof DefaultRubyVM>[1],
@@ -9,7 +13,32 @@ export const main = async (
   );
   const module = await compileWebAssemblyModule(response);
   const { vm } = await DefaultRubyVM(module, options);
+  await mainWithRubyVM(vm);
+};
+
+/**
+ * The main entry point of `<script type="text/ruby">`-based scripting with WebAssembly Component.
+ */
+export const componentMain = async (
+    pkg: { name: string; version: string },
+    options: {
+        instantiate: RubyComponentInstantiator;
+        wasip2: any;
+    }
+) => {
+    const componentUrl = `https://cdn.jsdelivr.net/npm/${pkg.name}@${pkg.version}/dist/component`;
+    const fetchComponentFile = (relativePath: string) => fetch(`${componentUrl}/${relativePath}`);
+    const { vm } = await RubyVM.instantiateComponent({
+        ...options,
+        getCoreModule: (relativePath: string) => {
+            const response = fetchComponentFile(relativePath);
+            return compileWebAssemblyModule(response);
+        },
+    });
+    await mainWithRubyVM(vm);
+};
 
+const mainWithRubyVM = async (vm: RubyVM) => {
   vm.printVersion();
 
   globalThis.rubyVM = vm;
diff --git a/packages/npm-packages/ruby-wasm-wasi/src/vm.ts b/packages/npm-packages/ruby-wasm-wasi/src/vm.ts
index efd3d39499..01f9530e4c 100644
--- a/packages/npm-packages/ruby-wasm-wasi/src/vm.ts
+++ b/packages/npm-packages/ruby-wasm-wasi/src/vm.ts
@@ -9,6 +9,17 @@ import {
 } from "./bindgen/legacy/rb-js-abi-host.js";
 import { Binding, ComponentBinding, LegacyBinding, RbAbiValue } from "./binding.js";
 
+/**
+ * A function type that instantiates a Ruby component
+ */
+export type RubyComponentInstantiator = (
+  (
+    getCoreModule: (path: string) => WebAssembly.Module,
+    importObject: any,
+    instantiateCore?: (module: WebAssembly.Module, imports: Record<string, any>) => WebAssembly.Instance | Promise<WebAssembly.Instance>,
+  ) => Promise<({ rubyRuntime: typeof RubyJsRubyRuntime })>
+)
+
 export type RubyInitComponentOptions = {
   /**
    * A lower-level instantiation function that instantiates the Ruby component with the given component
@@ -26,13 +37,7 @@ export type RubyInitComponentOptions = {
   /**
    * An `instantiate` function generated by `@bytecodealliance/jco` that instantiates the Ruby component.
    */
-  instantiate: (
-    (
-      getCoreModule: (path: string) => WebAssembly.Module,
-      importObject: any,
-      instantiateCore?: (module: WebAssembly.Module, imports: Record<string, any>) => WebAssembly.Instance | Promise<WebAssembly.Instance>,
-    ) => Promise<({ rubyRuntime: typeof RubyJsRubyRuntime })>
-  ),
+  instantiate: RubyComponentInstantiator,
 
   /**
    * A function that returns a WebAssembly Core module within the Ruby component transpiled by `@bytecodealliance/jco`.
diff --git a/rakelib/packaging.rake b/rakelib/packaging.rake
index dfdccd7206..a7188929b0 100644
--- a/rakelib/packaging.rake
+++ b/rakelib/packaging.rake
@@ -69,7 +69,7 @@ namespace :npm do
           # Share ./build and ./rubies in the same workspace
           "RUBY_WASM_ROOT" => base_dir
         }
-        cwd = nil
+        cwd = base_dir
         if gemfile_path = pkg[:gemfile]
           cwd = File.dirname(gemfile_path)
         else
@@ -80,49 +80,53 @@ namespace :npm do
         dist_dir = File.join(pkg_dir, "dist")
         mkdir_p dist_dir
         if pkg[:target].start_with?("wasm32-unknown-wasi")
-          Dir.chdir(cwd || base_dir) do
-            # Uninstall js gem to re-install just-built js gem
-            sh "gem", "uninstall", "js", "-v", js_gem_version, "--force"
-            # Install gems including js gem
-            sh "bundle", "install"
-
-            sh env,
-               "bundle", "exec",
-               *build_command,
-               "--no-stdlib", "--remake",
-               "-o",
-               File.join(dist_dir, "ruby.wasm")
-            sh env,
-               "bundle", "exec",
-               *build_command,
-               "-o",
-               File.join(dist_dir, "ruby.debug+stdlib.wasm")
-            if pkg[:enable_component_model]
-              component_path = File.join(pkg_dir, "tmp", "ruby.component.wasm")
-              FileUtils.mkdir_p(File.dirname(component_path))
+          if pkg[:enable_component_model]
+            component_path = File.join(pkg_dir, "tmp", "ruby.component.wasm")
+            FileUtils.mkdir_p(File.dirname(component_path))
 
-              # Remove js gem from the ./bundle directory to force Bundler to re-install it
-              rm_rf FileList[File.join(pkg_dir, "bundle", "**", "js-#{js_gem_version}")]
+            # Remove js gem from the ./bundle directory to force Bundler to re-install it
+            rm_rf FileList[File.join(pkg_dir, "bundle", "**", "js-#{js_gem_version}")]
 
+            Dir.chdir(cwd) do
               sh env.merge("RUBY_WASM_EXPERIMENTAL_DYNAMIC_LINKING" => "1"),
                  *build_command, "-o", component_path
-              sh "npx", "jco", "transpile",
-                "--no-wasi-shim", "--instantiation", "--valid-lifting-optimization",
-                component_path, "-o", File.join(dist_dir, "component")
-              # ./component/package.json is required to be an ES module
-              File.write(File.join(dist_dir, "component", "package.json"), '{ "type": "module" }')
             end
+            sh "npx", "jco", "transpile",
+              "--no-wasi-shim", "--instantiation", "--valid-lifting-optimization",
+              component_path, "-o", File.join(dist_dir, "component")
+            # ./component/package.json is required to be an ES module
+            File.write(File.join(dist_dir, "component", "package.json"), '{ "type": "module" }')
+          else
+            Dir.chdir(cwd) do
+              # uninstall js gem to re-install just-built js gem
+              sh "gem", "uninstall", "js", "-v", js_gem_version, "--force"
+              # install gems including js gem
+              sh "bundle", "install"
+
+              sh env,
+                 "bundle", "exec",
+                 *build_command,
+                 "--no-stdlib", "--remake",
+                 "-o",
+                 File.join(dist_dir, "ruby.wasm")
+              sh env,
+                 "bundle", "exec",
+                 *build_command,
+                 "-o",
+                 File.join(dist_dir, "ruby.debug+stdlib.wasm")
+            end
+
+            sh wasi_sdk.wasm_opt,
+               "--strip-debug",
+               File.join(dist_dir, "ruby.wasm"),
+               "-o",
+               File.join(dist_dir, "ruby.wasm")
+            sh wasi_sdk.wasm_opt,
+               "--strip-debug",
+               File.join(dist_dir, "ruby.debug+stdlib.wasm"),
+               "-o",
+               File.join(dist_dir, "ruby+stdlib.wasm")
           end
-          sh wasi_sdk.wasm_opt,
-             "--strip-debug",
-             File.join(dist_dir, "ruby.wasm"),
-             "-o",
-             File.join(dist_dir, "ruby.wasm")
-          sh wasi_sdk.wasm_opt,
-             "--strip-debug",
-             File.join(dist_dir, "ruby.debug+stdlib.wasm"),
-             "-o",
-             File.join(dist_dir, "ruby+stdlib.wasm")
         elsif pkg[:target] == "wasm32-unknown-emscripten"
           Dir.chdir(cwd || base_dir) do
             sh env, *build_command, "-o", "/dev/null"

From e99f7ee9c98dc1d3c28e40b6215ee815641e9789 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 12:33:35 +0000
Subject: [PATCH 02/11] Ignroe test-results directory generated by playwright

---
 packages/npm-packages/ruby-wasm-wasi/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/npm-packages/ruby-wasm-wasi/.gitignore b/packages/npm-packages/ruby-wasm-wasi/.gitignore
index f647196f26..62246d4097 100644
--- a/packages/npm-packages/ruby-wasm-wasi/.gitignore
+++ b/packages/npm-packages/ruby-wasm-wasi/.gitignore
@@ -1,4 +1,5 @@
 !.gitkeep
 /coverage
 /playwright-report
+/test-results
 *.tgz

From 5285a75198c31a39381252e80d900bc97a3eb205 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 12:43:50 +0000
Subject: [PATCH 03/11] Update package-lock.json for wasip2 package

---
 package-lock.json | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0c747e19d4..70f3856069 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -75,8 +75,7 @@
         "node_modules/@bytecodealliance/preview2-shim": {
             "version": "0.16.5",
             "resolved": "https://registry.npmjs.org/@bytecodealliance/preview2-shim/-/preview2-shim-0.16.5.tgz",
-            "integrity": "sha512-1YThPyZ/gWZBgmJ3nEsnBXLxgSV3VOW3vLfyxe/RTKk9fWkTKaUouuZHWBvP0aFN7Hnat733rUeSYAUjEUNONQ==",
-            "dev": true
+            "integrity": "sha512-1YThPyZ/gWZBgmJ3nEsnBXLxgSV3VOW3vLfyxe/RTKk9fWkTKaUouuZHWBvP0aFN7Hnat733rUeSYAUjEUNONQ=="
         },
         "node_modules/@esbuild/linux-x64": {
             "version": "0.21.5",
@@ -455,6 +454,10 @@
             "resolved": "packages/npm-packages/ruby-head-wasm-wasi",
             "link": true
         },
+        "node_modules/@ruby/head-wasm-wasip2": {
+            "resolved": "packages/npm-packages/ruby-head-wasm-wasip2",
+            "link": true
+        },
         "node_modules/@ruby/wasm-emscripten": {
             "resolved": "packages/npm-packages/ruby-wasm-emscripten",
             "link": true
@@ -2208,6 +2211,14 @@
                 "@ruby/wasm-wasi": "^2.0.0"
             }
         },
+        "packages/npm-packages/ruby-head-wasm-wasip2": {
+            "version": "2.6.2",
+            "license": "MIT",
+            "dependencies": {
+                "@bytecodealliance/preview2-shim": "^0.16.5",
+                "@ruby/wasm-wasi": "^2.0.0"
+            }
+        },
         "packages/npm-packages/ruby-wasm-emscripten": {
             "name": "@ruby/wasm-emscripten",
             "version": "0.1.0",

From 338fcee8149404b7250416ea39f33b8ebbeb9b6c Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 12:55:55 +0000
Subject: [PATCH 04/11] Skip publishing packages with `"private": true` and
 mark p2 package as private

I'm not confident that the name of the package, `@ruby/head-wasm-wasip2`,
is the best name for the package. So I'm marking it as private for now.
---
 .gitignore                                        |  1 +
 .../ruby-head-wasm-wasip2/package.json            |  1 +
 rakelib/ci.rake                                   | 15 ++++++++++-----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9ad8354b2b..dc85eaa010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ compile_commands.json
 html
 
 build_manifest.json
+ci_matrix.json
 
 vendor/bundle
 /pkg
diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/package.json b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
index 92b3c9e1af..fb3140f686 100644
--- a/packages/npm-packages/ruby-head-wasm-wasip2/package.json
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
@@ -4,6 +4,7 @@
   "description": "Ruby head built on WASI Preview 2",
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
+  "private": true,
   "exports": {
     ".": {
       "browser": "./dist/esm/index.js",
diff --git a/rakelib/ci.rake b/rakelib/ci.rake
index 1b90b3a549..3f4889be65 100644
--- a/rakelib/ci.rake
+++ b/rakelib/ci.rake
@@ -62,19 +62,21 @@ def rake_task_matrix
     end
   npm_entries =
     NPM_PACKAGES.map do |pkg|
+      package_json =
+        JSON.parse(
+          File.read("packages/npm-packages/#{pkg[:name]}/package.json")
+        )
       entry = {
         task: "npm:#{pkg[:name]}",
         prerelease: "npm:configure_prerelease",
         artifact: "packages/npm-packages/#{pkg[:name]}/#{pkg[:name]}-*.tgz",
         artifact_name: "npm-#{pkg[:name]}",
+        # Skip publishing packages with `"private": true`
+        should_publish: !package_json["private"],
         builder: pkg[:target],
         rubies_cache_key: npm_pkg_rubies_cache_key(pkg)
       }
       # Run tests only if the package has 'test' script
-      package_json =
-        JSON.parse(
-          File.read("packages/npm-packages/#{pkg[:name]}/package.json")
-        )
       if package_json["scripts"] && package_json["scripts"]["test"]
         entry[:test] = "npm:#{pkg[:name]}:check"
       end
@@ -96,7 +98,9 @@ end
 namespace :ci do
   task :rake_task_matrix do
     content = JSON.generate(rake_task_matrix.flat_map { |_, entries| entries })
-    File.write("ci_matrix.json", content)
+    output = "ci_matrix.json"
+    File.write("#{output}", content)
+    puts "Created \"#{output}\""
   end
 
   task :pin_build_manifest do
@@ -140,6 +144,7 @@ namespace :ci do
         .map { |entry| "release/#{entry[:artifact_name]}/*" }
     File.open("release/note.md", "w") { |f| f.print release_note }
     matrix[:npm].each do |task|
+      next unless task[:should_publish]
       artifact = task[:artifact_name]
       tarball = Dir.glob("release/#{artifact}/*")
       next if tarball.empty?

From cccd90035b7d7185172860b32bca581a5a219635 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 13:01:16 +0000
Subject: [PATCH 05/11] Add p2 builder image

---
 builders/wasm32-unknown-wasip1                                   | 1 +
 .../{wasm32-unknown-wasip1 => wasm32-unknown-wasip2}/Dockerfile  | 0
 .../entrypoint.sh                                                | 0
 3 files changed, 1 insertion(+)
 create mode 120000 builders/wasm32-unknown-wasip1
 rename builders/{wasm32-unknown-wasip1 => wasm32-unknown-wasip2}/Dockerfile (100%)
 rename builders/{wasm32-unknown-wasip1 => wasm32-unknown-wasip2}/entrypoint.sh (100%)

diff --git a/builders/wasm32-unknown-wasip1 b/builders/wasm32-unknown-wasip1
new file mode 120000
index 0000000000..27021ac96c
--- /dev/null
+++ b/builders/wasm32-unknown-wasip1
@@ -0,0 +1 @@
+wasm32-unknown-wasip2
\ No newline at end of file
diff --git a/builders/wasm32-unknown-wasip1/Dockerfile b/builders/wasm32-unknown-wasip2/Dockerfile
similarity index 100%
rename from builders/wasm32-unknown-wasip1/Dockerfile
rename to builders/wasm32-unknown-wasip2/Dockerfile
diff --git a/builders/wasm32-unknown-wasip1/entrypoint.sh b/builders/wasm32-unknown-wasip2/entrypoint.sh
similarity index 100%
rename from builders/wasm32-unknown-wasip1/entrypoint.sh
rename to builders/wasm32-unknown-wasip2/entrypoint.sh

From fbac87db11975ca6537753eecee0ab3588872c82 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 13:29:54 +0000
Subject: [PATCH 06/11] Fix test script and remove unnecessary build steps

---
 packages/npm-packages/ruby-head-wasm-wasip2/package.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/package.json b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
index fb3140f686..ba37a32636 100644
--- a/packages/npm-packages/ruby-head-wasm-wasip2/package.json
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
@@ -30,13 +30,12 @@
     "README.md"
   ],
   "scripts": {
-    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasi ENABLE_COMPONENT_TESTS=1 npm -C ../ruby-wasm-wasi run test:run",
+    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasip2 ENABLE_COMPONENT_TESTS=1 npm -C ../ruby-wasm-wasi run test:run",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
-    "build:static:compat": "../ruby-wasm-wasi/tools/pack-compat-shim.mjs --dist=./dist --pkg=ruby-head-wasm-wasi",
-    "build:static": "npm run build:static:files && npm run build:static:compat",
+    "build:static": "npm run build:static:files",
     "build:rollup": "rollup -c rollup.config.mjs",
-    "build": "npm run build:deps && npm run build:static && npm run build:rollup && ../ruby-wasm-wasi/tools/post-build.sh ./dist"
+    "build": "npm run build:deps && npm run build:static && npm run build:rollup"
   },
   "repository": "https://github.com/ruby/ruby.wasm",
   "homepage": "https://github.com/ruby/ruby.wasm/tree/main/packages/npm-packages/ruby-head-wasm-wasi",

From d223a21793e3cc3480920c13653d60e147d56539 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 14:21:26 +0000
Subject: [PATCH 07/11] Skip packaging tests and do not try to load core
 modules when CM enabled

---
 .../npm-packages/ruby-wasm-wasi/test/init.js     | 16 +++++++++++++---
 .../ruby-wasm-wasi/test/package.test.js          |  5 ++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/npm-packages/ruby-wasm-wasi/test/init.js b/packages/npm-packages/ruby-wasm-wasi/test/init.js
index c55c4b95e9..b4c0c3647f 100644
--- a/packages/npm-packages/ruby-wasm-wasi/test/init.js
+++ b/packages/npm-packages/ruby-wasm-wasi/test/init.js
@@ -4,7 +4,17 @@ import { WASI } from "wasi";
 import { RubyVM } from "../src/index";
 import * as preview2Shim from "@bytecodealliance/preview2-shim"
 
-const rubyModule = (async () => {
+const memoize = (fn) => {
+  let result;
+  return async () => {
+    if (!result) {
+      result = await fn();
+    }
+    return result;
+  };
+};
+
+const getRubyModule = memoize(async () => {
   let binaryPath;
   if (process.env.RUBY_ROOT) {
     binaryPath = path.join(process.env.RUBY_ROOT, "./usr/local/bin/ruby");
@@ -18,7 +28,7 @@ const rubyModule = (async () => {
   }
   const binary = await fs.readFile(binaryPath);
   return await WebAssembly.compile(binary.buffer);
-})();
+});
 
 const initModuleRubyVM = async ({ suppressStderr } = { suppressStderr: false }) => {
   let preopens = {};
@@ -38,7 +48,7 @@ const initModuleRubyVM = async ({ suppressStderr } = { suppressStderr: false })
     preopens,
   });
 
-  const module = await rubyModule;
+  const module = await getRubyModule();
   const { vm } = await RubyVM.instantiateModule({ module, wasip1: wasi })
   return vm;
 };
diff --git a/packages/npm-packages/ruby-wasm-wasi/test/package.test.js b/packages/npm-packages/ruby-wasm-wasi/test/package.test.js
index b5c9e42fbc..d3924092d2 100644
--- a/packages/npm-packages/ruby-wasm-wasi/test/package.test.js
+++ b/packages/npm-packages/ruby-wasm-wasi/test/package.test.js
@@ -32,7 +32,10 @@ const initRubyVM = async (rubyModule, args) => {
 };
 
 describe("Packaging validation", () => {
-  if (!process.env.RUBY_NPM_PACKAGE_ROOT) {
+  if (
+    !process.env.RUBY_NPM_PACKAGE_ROOT ||
+    (process.env.ENABLE_COMPONENT_TESTS && process.env.ENABLE_COMPONENT_TESTS !== 'false')
+  ) {
     test.skip("skip", () => {});
     return;
   }

From cc1255e3e9db591e8a94f7658f4cc6362748aa04 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 14:22:35 +0000
Subject: [PATCH 08/11] Recommend to use p2 package for local development

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b33b65eecd..d4a4ab5727 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,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.

From 54ff9a71926f4c6e2b409897cd2788af28368c06 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 15:27:54 +0000
Subject: [PATCH 09/11] Mock p2 package in e2e test by looking at package.json

---
 .../npm-packages/ruby-wasm-wasi/test-e2e/support.ts  | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts b/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
index 72c13075e0..757379c488 100644
--- a/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
+++ b/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
@@ -1,4 +1,5 @@
 import { BrowserContext, Page, expect } from "@playwright/test";
+import { readFileSync } from "fs";
 import path from "path";
 
 export const waitForRubyVM = async (page: Page) => {
@@ -18,14 +19,19 @@ export const setupDebugLog = (context: BrowserContext) => {
 };
 
 export const setupProxy = (context: BrowserContext) => {
-  const cdnPattern =
-    /cdn.jsdelivr.net\/npm\/@ruby\/.+-wasm-wasi@.+\/dist\/(.+)/;
+  const injectingPkgPath = process.env.RUBY_NPM_PACKAGE_ROOT;
+  const injectingPkg = JSON.parse(
+      readFileSync(path.join(injectingPkgPath, "package.json"), "utf-8"),
+  );
+  const cdnPattern = new RegExp(
+    `cdn.jsdelivr.net/npm/${injectingPkg.name}@.+/dist/(.+)`
+  );
   context.route(cdnPattern, (route) => {
     const request = route.request();
     console.log(">> [MOCK]", request.method(), request.url());
     const relativePath = request.url().match(cdnPattern)[1];
     const mockedPath = path.join(
-      process.env.RUBY_NPM_PACKAGE_ROOT,
+      injectingPkgPath,
       "dist",
       relativePath,
     );

From f68f0374d2b60e9412899f2daf8e9e04ef2607d8 Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 15:35:48 +0000
Subject: [PATCH 10/11] Skip e2e tests for p2 package for now

---
 packages/npm-packages/ruby-head-wasm-wasip2/package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/npm-packages/ruby-head-wasm-wasip2/package.json b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
index ba37a32636..2f759975af 100644
--- a/packages/npm-packages/ruby-head-wasm-wasip2/package.json
+++ b/packages/npm-packages/ruby-head-wasm-wasip2/package.json
@@ -30,7 +30,9 @@
     "README.md"
   ],
   "scripts": {
-    "test": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasip2 ENABLE_COMPONENT_TESTS=1 npm -C ../ruby-wasm-wasi run test:run",
+    "__comment": "FIXME: Enable test:e2e after https://github.com/bytecodealliance/jco/pull/499 is merged",
+    "test": "npm run run-script -- test:unit && npm run run-script -- test:vitest -- --run",
+    "run-script": "RUBY_NPM_PACKAGE_ROOT=../ruby-head-wasm-wasip2 ENABLE_COMPONENT_TESTS=1 npm -C ../ruby-wasm-wasi run",
     "build:deps": "cd ../ruby-wasm-wasi && npm run build",
     "build:static:files": "../ruby-wasm-wasi/tools/pack-static-files.sh ./dist",
     "build:static": "npm run build:static:files",

From 5b5199761a1853c2c9fe88f3a5bea4980daedbab Mon Sep 17 00:00:00 2001
From: Yuta Saito <kateinoigakukun@gmail.com>
Date: Sun, 8 Sep 2024 16:02:59 +0000
Subject: [PATCH 11/11] Revert "Mock p2 package in e2e test by looking at
 package.json"

This reverts commit 54ff9a71926f4c6e2b409897cd2788af28368c06.
---
 .../npm-packages/ruby-wasm-wasi/test-e2e/support.ts  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts b/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
index 757379c488..72c13075e0 100644
--- a/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
+++ b/packages/npm-packages/ruby-wasm-wasi/test-e2e/support.ts
@@ -1,5 +1,4 @@
 import { BrowserContext, Page, expect } from "@playwright/test";
-import { readFileSync } from "fs";
 import path from "path";
 
 export const waitForRubyVM = async (page: Page) => {
@@ -19,19 +18,14 @@ export const setupDebugLog = (context: BrowserContext) => {
 };
 
 export const setupProxy = (context: BrowserContext) => {
-  const injectingPkgPath = process.env.RUBY_NPM_PACKAGE_ROOT;
-  const injectingPkg = JSON.parse(
-      readFileSync(path.join(injectingPkgPath, "package.json"), "utf-8"),
-  );
-  const cdnPattern = new RegExp(
-    `cdn.jsdelivr.net/npm/${injectingPkg.name}@.+/dist/(.+)`
-  );
+  const cdnPattern =
+    /cdn.jsdelivr.net\/npm\/@ruby\/.+-wasm-wasi@.+\/dist\/(.+)/;
   context.route(cdnPattern, (route) => {
     const request = route.request();
     console.log(">> [MOCK]", request.method(), request.url());
     const relativePath = request.url().match(cdnPattern)[1];
     const mockedPath = path.join(
-      injectingPkgPath,
+      process.env.RUBY_NPM_PACKAGE_ROOT,
       "dist",
       relativePath,
     );