Merge branch 'hyperloop-legacy' into edge

catmando · catmando · commit aa73d9b00ff3 · 2018-10-09T14:16:15.000-04:00
diff --git a/ruby/hyper-component/Gemfile.lock b/ruby/hyper-component/Gemfile.lock
@@ -105,7 +105,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     builder (3.2.3)
-    capybara (3.8.2)
+    capybara (3.9.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -274,9 +274,9 @@ GEM
     ruby-progressbar (1.10.0)
     ruby_dep (1.5.0)
     rubyzip (1.2.2)
-    selenium-webdriver (3.14.0)
+    selenium-webdriver (3.14.1)
       childprocess (~> 0.5)
-      rubyzip (~> 1.2)
+      rubyzip (~> 1.2, >= 1.2.2)
     sourcemap (0.1.1)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
diff --git a/ruby/hyper-component/lib/hyper-component/jquery.rb b/ruby/hyper-component/lib/hyper-component/jquery.rb
@@ -0,0 +1,2 @@
+require 'opal-jquery' # remove this line if you don't need jquery'
+require 'react/ext/opal-jquery/element'
diff --git a/ruby/hyper-component/lib/reactive-ruby/version.rb b/ruby/hyper-component/lib/reactive-ruby/version.rb
@@ -1,5 +1,5 @@
 module Hyperloop
   class Component
-    VERSION = '0.99.2'
+    VERSION = '0.99.3'
   end
 end
diff --git a/ruby/hyper-console/lib/hyperloop/console/version.rb b/ruby/hyper-console/lib/hyperloop/console/version.rb
@@ -1,5 +1,5 @@
 module Hyperloop
   module Console
-    VERSION = '0.99.2'
+    VERSION = '0.99.3'
   end
 end
diff --git a/ruby/hyper-i18n/lib/hyper-i18n/version.rb b/ruby/hyper-i18n/lib/hyper-i18n/version.rb
@@ -1,3 +1,3 @@
 module HyperI18n
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-model/lib/hyper_model/version.rb b/ruby/hyper-model/lib/hyper_model/version.rb
@@ -1,3 +1,3 @@
 module HyperModel
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-operation/lib/hyper-operation/version.rb b/ruby/hyper-operation/lib/hyper-operation/version.rb
@@ -1,5 +1,5 @@
 module Hyperloop
   class Operation
-    VERSION = '0.99.2'
+    VERSION = '0.99.3'
   end
 end
diff --git a/ruby/hyper-react/lib/react/version.rb b/ruby/hyper-react/lib/react/version.rb
@@ -1,3 +1,3 @@
 module React
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-router/lib/hyper-router/version.rb b/ruby/hyper-router/lib/hyper-router/version.rb
@@ -1,3 +1,3 @@
 module HyperRouter
-  HYPERLOOP_VERSION = VERSION = '0.99.2'
+  HYPERLOOP_VERSION = VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-spec/lib/hyper-spec/version.rb b/ruby/hyper-spec/lib/hyper-spec/version.rb
@@ -1,3 +1,3 @@
 module HyperSpec
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-store/lib/hyper-store/version.rb b/ruby/hyper-store/lib/hyper-store/version.rb
@@ -1,3 +1,3 @@
 module HyperStore
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyper-trace/lib/hyper_trace/version.rb b/ruby/hyper-trace/lib/hyper_trace/version.rb
@@ -1,3 +1,3 @@
 module HyperTrace
-  VERSION = '0.99.2'
+  VERSION = '0.99.3'
 end
diff --git a/ruby/hyperloop-config/lib/hyperloop/config/version.rb b/ruby/hyperloop-config/lib/hyperloop/config/version.rb
@@ -1,5 +1,5 @@
 module Hyperloop
   module Config
-    VERSION = '0.99.2'
+    VERSION = '0.99.3'
   end
 end
diff --git a/ruby/hyperloop/lib/generators/hyperloop/install_generator.rb b/ruby/hyperloop/lib/generators/hyperloop/install_generator.rb
@@ -130,8 +130,7 @@ def create_initializer
   config.prerendering = :off # or :on
   config.import 'reactrb/auto-import' # will automatically bridge js components to hyperloop components
 #{"  config.import 'jquery', client_only: true  # remove this line if you don't need jquery" if skip_webpack?}
-  config.import 'opal-jquery', client_only: true # remove this line if you don't need jquery'
-  config.import 'react/ext/opal-jquery/element', client_only: true # remove tis line if you don't need jquery
+  config.import 'hyper-component/jquery', client_only: true # remove this line if you don't need jquery
 #{"  config.import 'opal_hot_reloader' if Rails.env.development?" unless options['skip-hot-reloader']}
 end
         RUBY
diff --git a/ruby/hyperloop/lib/hyperloop/version.rb b/ruby/hyperloop/lib/hyperloop/version.rb
@@ -1,3 +1,3 @@
 module Hyperloop
-  ROUTERVERSION = VERSION = '0.99.2'
+  ROUTERVERSION = VERSION = '0.99.3'
 end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+require 'opal-jquery' # remove this line if you don't need jquery'`
	`2`	`+require 'react/ext/opal-jquery/element'`