diff --git a/Gemfile b/Gemfile index fff3d32..a56740e 100644 --- a/Gemfile +++ b/Gemfile @@ -12,8 +12,10 @@ gem "susy" , "2.2.12" gem 'high_voltage' -gem 'opal-rails' -gem 'opal-browser' +gem 'opal', '~> 0.11.0' +gem 'opal-rails' , "0.9.4" +gem 'opal-jquery', github: 'opal/opal-jquery' +gem 'opal-browser' , "0.2.0" gem "rubyx-debugger" , "0.3" , path: "../rubyx-debugger" , require: false gem "rubyx" , "0.6" , :path => "../rubyx" , require: false gem "rx-file" , :git => "https://github.com/ruby-x/rx-file" diff --git a/Gemfile.lock b/Gemfile.lock index c603fb1..aef5173 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: git://github.com/opal/opal-jquery.git + revision: f47a9b42da366cea270f743b05acf529f3077d35 + specs: + opal-jquery (0.4.2) + opal (>= 0.10.0, < 0.12.0) + GIT remote: https://github.com/ruby-x/rx-file revision: c1de10352d8af105fe532008ceafcdd30b5fbdab @@ -67,15 +74,15 @@ GEM bindex (0.5.0) builder (3.2.3) byebug (10.0.2) - capybara (2.18.0) + capybara (3.0.2) addressable mini_mime (>= 0.1.3) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (>= 2.0, < 4.0) - capybara-screenshot (1.0.18) - capybara (>= 1.0, < 3) + nokogiri (~> 1.8) + rack (>= 1.6.0) + rack-test (>= 0.6.3) + xpath (~> 3.0) + capybara-screenshot (1.0.19) + capybara (>= 1.0, < 4) launchy concurrent-ruby (1.0.5) crass (1.0.4) @@ -129,18 +136,16 @@ GEM nio4r (2.3.0) nokogiri (1.8.2) mini_portile2 (~> 2.3.0) - opal (0.10.5) + opal (0.11.0) + ast (>= 2.3.0) hike (~> 1.2) + parser (= 2.3.3.1) sourcemap (~> 0.1.0) - sprockets (~> 3.1) - tilt (>= 1.4) opal-activesupport (0.3.1) opal (>= 0.5.0, < 1.0.0) opal-browser (0.2.0) opal paggio - opal-jquery (0.4.2) - opal (>= 0.7.0, < 0.11.0) opal-rails (0.9.4) jquery-rails opal (>= 0.10.0, < 0.12) @@ -149,15 +154,15 @@ GEM opal-sprockets (~> 0.4.1) rails (>= 4.1, < 6.0) sprockets-rails (>= 2.3.3, < 4.0) - opal-sprockets (0.4.1.0.10.4.3.1.0) - opal (~> 0.10.4) + opal-sprockets (0.4.1.0.11.0.3.1) + opal (~> 0.11.0) sprockets (~> 3.1) tilt (>= 1.4) paggio (0.2.6) parser (2.3.3.1) ast (~> 2.2) public_suffix (3.0.2) - puma (3.11.3) + puma (3.11.4) rack (2.0.4) rack-test (1.0.0) rack (>= 1.0, < 3) @@ -239,9 +244,9 @@ GEM tilt (2.0.8) tzinfo (1.2.5) thread_safe (~> 0.1) - uglifier (4.1.8) + uglifier (4.1.9) execjs (>= 0.3.0, < 3) - web-console (3.5.1) + web-console (3.6.0) actionview (>= 5.0) activemodel (>= 5.0) bindex (>= 0.4.0) @@ -262,8 +267,10 @@ DEPENDENCIES haml-rails high_voltage listen (>= 3.0.5, < 3.2) - opal-browser - opal-rails + opal (~> 0.11.0) + opal-browser (= 0.2.0) + opal-jquery! + opal-rails (= 0.9.4) puma (~> 3.11) rails rspec-rails diff --git a/app/assets/javascripts/debug.js.rb b/app/assets/javascripts/debug.js.rb index 8e5bd70..d6d4daf 100644 --- a/app/assets/javascripts/debug.js.rb +++ b/app/assets/javascripts/debug.js.rb @@ -1,3 +1,2 @@ require "opal" - require "debugger" diff --git a/config/initializers/debugger.rb b/config/initializers/debugger.rb index 93ff9bb..242358e 100644 --- a/config/initializers/debugger.rb +++ b/config/initializers/debugger.rb @@ -1,2 +1 @@ Opal.use_gem("rubyx") -Opal.use_gem("ast")