Merge pull request #67 from keyasuda/v0114

v0.1.14
keyasuda · Jan 3, 2023 · e028b18 · e028b18
2 parents ffa23cc + 93afd02
commit e028b18
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## [0.1.14] - 2022-01-03
+
+- avoid TypeError with old app.js
+
 ## [0.1.13] - 2022-01-02
 
 - enable JS::Object#await

diff --git a/gem/Gemfile.lock b/gem/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bormashino (0.1.13)
+    bormashino (0.1.14)
       json_pure (~> 2.6, >= 2.6.1)
       os (~> 1.1, >= 1.1.4)
       ruby2_keywords (= 0.0.4)

diff --git 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.13'
+  VERSION = '0.1.14'
 end
diff --git a/npm/package-lock.json b/npm/package-lock.json
diff --git 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.13",
+  "version": "0.1.14",
   "main": "src/index.js",
   "scripts": {
     "test": "jest --notify src/",

diff --git a/npm/src/ruby.js b/npm/src/ruby.js
@@ -88,6 +88,9 @@ export const initVmFromRubyModule = async (
 }
 
 const requestToServer = async (method, path, payload, referer) => {
+  if (typeof window.bormashino == 'undefined') {
+    window.bormashino = {}
+  }
   window.bormashino.requestSrc = JSON.stringify({
     method,
     path,

diff --git a/test-app/Gemfile.lock b/test-app/Gemfile.lock
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: ../gem
   specs:
-    bormashino (0.1.13)
+    bormashino (0.1.14)
       json_pure (~> 2.6, >= 2.6.1)
       os (~> 1.1, >= 1.1.4)
       ruby2_keywords (= 0.0.4)

diff --git a/test-app/js/app.js b/test-app/js/app.js
@@ -20,12 +20,12 @@ const main = async () => {
         'dispatched: ' + Number(new Date())
     })
 
-  window.bormashino = RubyApplication
-  window.rubyVM = vm
-
   const currentPath = () => location.href.replace(location.origin, '')
   RubyApplication.request('get', currentPath())
   RubyApplication.mount()
+
+  window.bormashino = RubyApplication
+  window.rubyVM = vm
 }
 
 main()
diff --git a/test-app/package-lock.json b/test-app/package-lock.json
diff --git a/test-app/spec/test_app_spec.rb b/test-app/spec/test_app_spec.rb
@@ -5,7 +5,10 @@
     visit 'http://localhost:5000'
     loop do
       sleep 1
-      break if page.find(:css, 'h1')
+      begin
+        break if page.find(:css, 'h1')
+      rescue StandardError
+      end
     end
   end