chore: upgrade to Ruby 3.4, fix escaping source code

Author: palkan

.github/workflows/build.yml

@@ -17,7 +17,7 @@ jobs:
         toolchain: 1.74.0
     - uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.3
+        ruby-version: 3.4
         bundler-cache: true
     - name: Setup yarn
       run: npm install -g yarn
@@ -43,14 +43,14 @@ jobs:
     - name: Build ruby.wasm
       if: steps.cache-ruby-wasm-module.outputs.cache-hit != 'true'
       run: |
-        bundle exec rbwasm build -o src/ruby.wasm --ruby-version 3.3
+        bin/rbwasm build -o src/ruby.wasm --ruby-version 3.4
     - name: Build web app
       run: |
         yarn install
         yarn build
     - name: Push to Github Pages
       if: github.ref == 'refs/heads/master' || github.event_name == 'workflow_dispatch'
-      uses: actions/upload-pages-artifact@v1
+      uses: actions/upload-pages-artifact@v3
       with:
         path: './dist'
 
@@ -72,4 +72,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Deploy to GitHub Pages
-        uses: actions/deploy-pages@v1
+        uses: actions/deploy-pages@v4

Gemfile

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "js", "~> 2.5" unless ENV["JS"] == "false"
-gem "ruby_wasm", "~> 2.5"
+gem "js", "~> 2.7.1" unless ENV["JS"] == "false"
+gem "ruby_wasm", "~> 2.7.1"
 gem "ruby-next", "~> 1.1.0"

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     ast (2.4.2)
     diff-lcs (1.5.1)
-    js (2.5.0)
+    js (2.7.1)
     paco (0.2.3)
     parser (3.3.7.0)
       ast (~> 2.4.1)
@@ -19,7 +19,10 @@ GEM
     ruby-next-core (1.1.0)
     ruby-next-parser (3.4.0.2)
       parser (>= 3.0.3.1)
-    ruby_wasm (2.5.0)
+    ruby_wasm (2.7.1)
+    ruby_wasm (2.7.1-aarch64-linux)
+    ruby_wasm (2.7.1-arm64-darwin)
+    ruby_wasm (2.7.1-x86_64-linux)
     unparser (0.6.15)
       diff-lcs (~> 1.3)
       parser (>= 3.3.0)
@@ -31,9 +34,9 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  js (~> 2.5)
+  js (~> 2.7.1)
   ruby-next (~> 1.1.0)
-  ruby_wasm (~> 2.5)
+  ruby_wasm (~> 2.7.1)
 
 BUNDLED WITH
    2.5.3

README.md

@@ -23,7 +23,7 @@ Play with Ruby Next right in the browser (powered by [ruby.wasm](https://github.
 Use the following command:
 
 ```sh
-bundle exec rbwasm build -o src/ruby.wasm --ruby-version 3.3
+bin/rbwasm build -o src/ruby.wasm --ruby-version 3.4
 ```
 
 This would build a JS-compatible WASM module. To build JS-free WASM module, use the `JS=false` env var.

bin/rbwasm

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+
+require "ruby_wasm"
+require "ruby_wasm/cli"
+
+# Patch ruby.wasm CLI to use the latest patch versions of Ruby
+RubyWasm::CLI.singleton_class.prepend(Module.new do
+  def build_source_aliases(root)
+    super.tap do |sources|
+      sources["3.3"][:url] = "https://cache.ruby-lang.org/pub/ruby/3.3/ruby-3.3.8.tar.gz"
+      sources["3.4"][:url] = "https://cache.ruby-lang.org/pub/ruby/3.4/ruby-3.4.3.tar.gz"
+    end
+  end
+end)
+
+RubyWasm::CLI.new(stdout: $stdout, stderr: $stderr).run(ARGV)

package.json

@@ -10,8 +10,7 @@
     "dev": "npm-run-all --parallel watch:*"
   },
   "dependencies": {
-    "@bjorn3/browser_wasi_shim": "^0.2.19",
-    "@ruby/wasm-wasi": "^2.4.1",
+    "@ruby/wasm-wasi": "^2.7.1",
     "@shoelace-style/shoelace": "^2.13.0",
     "monaco-editor": "^0.45.0"
   },

src/app.js

@@ -246,7 +246,13 @@ export default class App {
       this.vm.eval(this.configEditor.getValue());
 
       const result = this.vm
-        .eval("RubyNext.transform(%q(" + code + "), **" + rubyOptions + ")")
+        .eval(`
+code = <<~'RUBY'
+${code}
+RUBY
+
+RubyNext.transform(code, **${rubyOptions})
+        `)
         .toString();
 
       return result;

src/index.js

@@ -31,6 +31,7 @@ await Promise.all([
   import("./vm.js")
     .then(async ({ default: initVM }) => {
       const vm = await initVM();
+      window.$vm = vm;
       loaderDone("ruby");
       return vm;
     })

src/vm.js

@@ -1,5 +1,10 @@
 import { RubyVM } from "@ruby/wasm-wasi";
-import { File, WASI, OpenFile, ConsoleStdout } from "@bjorn3/browser_wasi_shim";
+import {
+  File,
+  WASI,
+  OpenFile,
+  ConsoleStdout,
+} from "@bjorn3/browser_wasi_shim";
 
 import ruby from "./ruby.wasm";
 
@@ -26,15 +31,10 @@ export default async function initVM() {
     ConsoleStdout.lineBuffered(setStdout),
     ConsoleStdout.lineBuffered(setStderr),
   ];
-  const wasi = new WASI([], [], fds, { debug: false });
-  const vm = new RubyVM();
-  const imports = {
-    wasi_snapshot_preview1: wasi.wasiImport,
-  };
-  vm.addToImports(imports);
-
-  const instance = await WebAssembly.instantiate(module, imports);
-  await vm.setInstance(instance);
+  const wasi = new WASI([], ["RUBYOPT=-EUTF-8 -W0", "NO_COLOR=1"], fds, { debug: false });
+  const { vm, instance } = await RubyVM.instantiateModule({
+    module, wasip1: wasi
+  });
 
   wasi.initialize(instance);
   vm.initialize();

yarn.lock

@@ -7,10 +7,10 @@
   resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
   integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
 
-"@bjorn3/browser_wasi_shim@^0.2.19":
-  version "0.2.19"
-  resolved "https://registry.yarnpkg.com/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.2.19.tgz#24b6dc7417677b641da6f0a24729b6d7766e0c5b"
-  integrity sha512-Zu5KVxRp7MBwwdOtXSmu14NUwPASNE6zK/BSwWKf0Fsc4g5NOqPYto5C0Nc6EixDb0AEXCoLFDMKP9RN7n2yPQ==
+"@bjorn3/browser_wasi_shim@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@bjorn3/browser_wasi_shim/-/browser_wasi_shim-0.3.0.tgz#8aa310eed2298bab435bd1f73ab100fbc3f018da"
+  integrity sha512-FlRBYttPRLcWORzBe6g8nmYTafBkOEFeOqMYM4tAHJzFsQy4+xJA94z85a9BCs8S+Uzfh9LrkpII7DXr2iUVFg==
 
 "@ctrl/tinycolor@^4.0.2":
   version "4.0.3"
@@ -234,12 +234,13 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@ruby/wasm-wasi@^2.4.1":
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/@ruby/wasm-wasi/-/wasm-wasi-2.4.1.tgz#86a0fe1dd342ecb0c37e99eaadde3920d27bd31e"
-  integrity sha512-MNosDpMKw9N0HaTSXpyZEzPMGTRzpA9maxnUYH1dBB9p/zbLNp4Q+fxGUCxAdFHCnb0Bf7K7RqzhHrjf6crBUg==
+"@ruby/wasm-wasi@^2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@ruby/wasm-wasi/-/wasm-wasi-2.7.1.tgz#72816add3dd665e6c6bcb39b69567f76b4c28ccb"
+  integrity sha512-2f4NqiJuFoeYiXNr60PH3TbH5c+z/xP2Hq36Av2yahp05AaLDyJxWZwr9EGmfoFsmVTmeDdEW2KjPTfpue6xeg==
   dependencies:
-    tslib "^2.6.1"
+    "@bjorn3/browser_wasi_shim" "^0.3.0"
+    tslib "^2.8.1"
 
 "@shoelace-style/animations@^1.1.0":
   version "1.1.0"
@@ -1444,8 +1445,16 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz#a14f64e0954f6e25cc6587bd4f392522db0d998f"
   integrity sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==
 
-"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0:
-  name string-width-cjs
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+string-width@^4.1.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -1499,8 +1508,14 @@ string.prototype.trimstart@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  name strip-ansi-cjs
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -1598,10 +1613,10 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
-tslib@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+tslib@^2.8.1:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
 typed-array-buffer@^1.0.0:
   version "1.0.0"