Skip to content

Commit 5e8d326

Browse files
committed
Merge branch 'fix-hyper-state-require' into edge
2 parents 3154f3f + 47ef8b3 commit 5e8d326

File tree

5 files changed

+3
-7
lines changed

5 files changed

+3
-7
lines changed

docs/isomorphic-dsl/hyper-policy.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ Finally falsy values are ignored.
291291
You can also send `connect` directly to ActiveRecord models:
292292

293293
```ruby
294-
AdminUser.connect! # same as Hyperloop.connect(AdminUser)
295-
current_user.connect! # same as Hyperloop.connect(current_user)
294+
AdminUser.connect # same as Hyperloop.connect(AdminUser)
295+
current_user.connect # same as Hyperloop.connect(current_user)
296296
```
297297

298298
#### Connection Sequence Summary
@@ -591,4 +591,3 @@ end
591591
```
592592

593593
BTW what if you want to restrict what data is broadcast? In Hyperloop you just update the regulation. In pundit you may have to edit both the index controller method and Policy class.
594-

ruby/hyper-component/lib/hyper-component.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'hyperstack/internal/component'
22

3-
Hyperstack.import 'hyper-state'
43
Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: %w[ReactDOM React]
54
Hyperstack.js_import 'react/react-source-server', server_only: true, defines: 'React'
65
Hyperstack.import 'browser/delay', client_only: true
@@ -39,6 +38,7 @@
3938
require 'hyperstack/component/version'
4039
else
4140
require 'opal'
41+
require 'hyper-state'
4242
require 'opal-activesupport'
4343
require 'hyperstack/component/version'
4444
require 'hyperstack/internal/component/rails'

ruby/hyper-component/lib/hyperstack/component.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require 'hyperstack/ext/component/string'
22
require 'hyperstack/ext/component/hash'
33
require 'active_support/core_ext/class/attribute'
4-
require 'hyperstack/internal/auto_unmount'
54
require 'hyperstack/internal/component/rendering_context'
65
require 'hyperstack/internal/component'
76
require 'hyperstack/internal/component/instance_methods'

ruby/hyper-i18n/lib/hyper-i18n.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
require 'hyper-component'
55
require 'hyper-operation'
6-
require 'hyper-state'
76

87
require 'hyperstack/internal/i18n/helper_methods'
98
require 'hyperstack/internal/i18n/localize'

ruby/rails-hyperstack/lib/rails-hyperstack.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require 'hyperstack-config'
22
require 'rails/generators'
3-
require 'hyper-state'
43

54
# remove these once lap29 is released ...
65
Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: ['ReactDOM', 'React']

0 commit comments

Comments
 (0)