diff --git a/.ruby-version b/.ruby-version index d0f096c..944880f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.2.0-preview2 +3.2.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 52ab621..a9d700c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## [0.1.12] - 2022-12-30 + +- allow ruby 3.2.0 + ## [0.1.11] - 2022-12-03 - use ruby.wasm 0.5.0 diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock index 977a139..3c01a45 100644 --- a/gem/Gemfile.lock +++ b/gem/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - bormashino (0.1.11) + bormashino (0.1.12) json_pure (~> 2.6, >= 2.6.1) os (~> 1.1, >= 1.1.4) ruby2_keywords (= 0.0.4) diff --git a/gem/bormashino.gemspec b/gem/bormashino.gemspec index ff286b5..97ad0b8 100644 --- a/gem/bormashino.gemspec +++ b/gem/bormashino.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |spec| DESCRIPTION spec.homepage = 'https://github.com/keyasuda/bormashino' spec.license = 'MIT' - spec.required_ruby_version = '>= 3.2.0-preview1' + spec.required_ruby_version = '~> 3.2.0-preview1' spec.metadata['homepage_uri'] = spec.homepage spec.metadata['source_code_uri'] = spec.homepage diff --git a/gem/lib/bormashino/version.rb b/gem/lib/bormashino/version.rb index 73c305e..41ff66f 100644 --- a/gem/lib/bormashino/version.rb +++ b/gem/lib/bormashino/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Bormashino - VERSION = '0.1.11' + VERSION = '0.1.12' end diff --git a/npm/package-lock.json b/npm/package-lock.json index a71ac02..2bf434c 100644 --- a/npm/package-lock.json +++ b/npm/package-lock.json @@ -1,12 +1,12 @@ { "name": "bormashino", - "version": "0.1.11", + "version": "0.1.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bormashino", - "version": "0.1.11", + "version": "0.1.12", "license": "MIT", "dependencies": { "@wasmer/wasi": "0.12.0", diff --git a/npm/package.json b/npm/package.json index b7f2fe0..97572a5 100644 --- a/npm/package.json +++ b/npm/package.json @@ -2,7 +2,7 @@ "name": "bormashino", "description": "The package to build SPAs with Ruby", "homepage": "https://github.com/keyasuda/bormashino", - "version": "0.1.11", + "version": "0.1.12", "main": "src/index.js", "scripts": { "test": "jest --notify src/", diff --git a/npm/src/ruby.js b/npm/src/ruby.js index b5b9c11..e1fc300 100644 --- a/npm/src/ruby.js +++ b/npm/src/ruby.js @@ -81,7 +81,8 @@ export const initVmFromRubyModule = async ( vm.initialize(initializeOption) vm.eval(` - Gem.paths = {'GEM_PATH' => '/src/bundle/ruby/3.2.0+1'} + gem_path = Dir.glob('/src/bundle/ruby/*').join(':') + Gem.paths = {'GEM_PATH' => gem_path} # workaround require 'rack' Rack::Response diff --git a/test-app/Gemfile.lock b/test-app/Gemfile.lock index f9ee6cc..c8335bf 100644 --- a/test-app/Gemfile.lock +++ b/test-app/Gemfile.lock @@ -11,7 +11,7 @@ GIT PATH remote: ../gem specs: - bormashino (0.1.11) + bormashino (0.1.12) json_pure (~> 2.6, >= 2.6.1) os (~> 1.1, >= 1.1.4) ruby2_keywords (= 0.0.4) diff --git a/test-app/package-lock.json b/test-app/package-lock.json index fdbcfc5..e1feed8 100644 --- a/test-app/package-lock.json +++ b/test-app/package-lock.json @@ -15,7 +15,7 @@ }, "../npm": { "name": "bormashino", - "version": "0.1.11", + "version": "0.1.12", "license": "MIT", "dependencies": { "@wasmer/wasi": "0.12.0", @@ -24,8 +24,8 @@ "ruby-head-wasm-wasi": "0.5.0" }, "devDependencies": { - "@babel/core": "^7.19.6", - "@babel/preset-env": "^7.19.4", + "@babel/core": "^7.20.5", + "@babel/preset-env": "^7.20.2", "jest": "^28.1.3", "jest-environment-jsdom": "^28.1.3", "node-notifier": "^10.0.1" @@ -3731,8 +3731,8 @@ "bormashino": { "version": "file:../npm", "requires": { - "@babel/core": "^7.19.6", - "@babel/preset-env": "^7.19.4", + "@babel/core": "^7.20.5", + "@babel/preset-env": "^7.20.2", "@wasmer/wasi": "0.12.0", "@wasmer/wasmfs": "^0.12.0", "html5-history-router": "^1.1.0",