Skip to content

Commit 019e0c7

Browse files
committed
combined import of opal-jquery and react/ext/opal-jquery/element into a single import
1 parent ce2a468 commit 019e0c7

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

ruby/hyper-component/Gemfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: ../hyper-spec
33
specs:
4-
hyper-spec (0.99.1)
4+
hyper-spec (0.99.2)
55
capybara
66
chromedriver-helper (= 1.2.0)
77
libv8 (~> 6.3.0)
@@ -20,14 +20,14 @@ PATH
2020
PATH
2121
remote: ../hyper-store
2222
specs:
23-
hyper-store (0.99.1)
24-
hyperloop-config (= 0.99.1)
23+
hyper-store (0.99.2)
24+
hyperloop-config (= 0.99.2)
2525
opal (>= 0.11.0, < 0.12.0)
2626

2727
PATH
2828
remote: ../hyperloop-config
2929
specs:
30-
hyperloop-config (0.99.1)
30+
hyperloop-config (0.99.2)
3131
libv8 (~> 6.3.0)
3232
mini_racer (~> 0.1.15)
3333
opal (>= 0.11.0, < 0.12.0)
@@ -37,9 +37,9 @@ PATH
3737
PATH
3838
remote: .
3939
specs:
40-
hyper-component (0.99.1)
41-
hyper-store (= 0.99.1)
42-
hyperloop-config (= 0.99.1)
40+
hyper-component (0.99.2)
41+
hyper-store (= 0.99.2)
42+
hyperloop-config (= 0.99.2)
4343
libv8 (~> 6.3.0)
4444
mini_racer (~> 0.1.15)
4545
opal (>= 0.11.0, < 0.12.0)
@@ -105,7 +105,7 @@ GEM
105105
babel-source (>= 4.0, < 6)
106106
execjs (~> 2.0)
107107
builder (3.2.3)
108-
capybara (3.8.2)
108+
capybara (3.9.0)
109109
addressable
110110
mini_mime (>= 0.1.3)
111111
nokogiri (~> 1.8)
@@ -274,9 +274,9 @@ GEM
274274
ruby-progressbar (1.10.0)
275275
ruby_dep (1.5.0)
276276
rubyzip (1.2.2)
277-
selenium-webdriver (3.14.0)
277+
selenium-webdriver (3.14.1)
278278
childprocess (~> 0.5)
279-
rubyzip (~> 1.2)
279+
rubyzip (~> 1.2, >= 1.2.2)
280280
sourcemap (0.1.1)
281281
sprockets (3.7.2)
282282
concurrent-ruby (~> 1.0)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff 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'

ruby/hyperloop/lib/generators/hyperloop/install_generator.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ def create_initializer
130130
config.prerendering = :off # or :on
131131
config.import 'reactrb/auto-import' # will automatically bridge js components to hyperloop components
132132
#{" config.import 'jquery', client_only: true # remove this line if you don't need jquery" if skip_webpack?}
133-
config.import 'opal-jquery', client_only: true # remove this line if you don't need jquery'
134-
config.import 'react/ext/opal-jquery/element', client_only: true # remove tis line if you don't need jquery
133+
config.import 'hyper-component/jquery', client_only: true # remove this line if you don't need jquery
135134
#{" config.import 'opal_hot_reloader' if Rails.env.development?" unless options['skip-hot-reloader']}
136135
end
137136
RUBY

0 commit comments

Comments
 (0)