Skip to content

Commit 6da12f6

Browse files
committed
rearrange packs
1 parent 8610633 commit 6da12f6

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

ruby/hyperstack-config/lib/hyperstack/imports.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ def import_tree(value, cancelled: nil, client_only: nil, server_only: nil)
4141

4242
def cancel_import(value)
4343
return unless value
44+
puts "cancel_import: #{value}"
4445
current_spec = import_list.detect { |old_value, *_rest| value == old_value }
46+
pp current_spec
4547
if current_spec
4648
current_spec[1] = true
4749
else

ruby/hyperstack-config/lib/hyperstack/js_imports.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@ class << self
33
def js_import(value, client_only: nil, server_only: nil, defines:)
44
defines = [*defines]
55
if RUBY_ENGINE != 'opal'
6+
puts "server js_import #{value}"
67
import(value, client_only: client_only, server_only: server_only, js_import: true)
78
else
89
on_server = `typeof Opal.global.document === 'undefined'`
910
return if (server_only && !on_server) || (client_only && on_server)
11+
puts "client js_import #{value}"
1012
defines.each do |name|
13+
#puts "#{name}: #{`Opal.global[#{name}]`}"
1114
next unless `Opal.global[#{name}] === undefined`
1215
raise "The package #{name} was not found. Add it to the webpack "\
1316
"#{client_only ? 'client_only.js' : 'client_and_server.js'} manifest."

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
require 'rails/generators'
33

44
# remove these once lap29 is released ...
5-
Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: ['ReactDOM', 'React']
6-
Hyperstack.js_import 'react/react-source-server', server_only: true, defines: 'React'
7-
#Hyperstack.js_import 'hyper-router/react-router-source', defines: ['ReactRouter', 'ReactRouterDOM', 'History']
8-
Hyperstack.js_import 'react_ujs', defines: 'ReactRailsUJS'
5+
# Hyperstack.js_import 'react/react-source-browser', client_only: true, defines: ['ReactDOM', 'React']
6+
# Hyperstack.js_import 'react/react-source-server', server_only: true, defines: 'React'
7+
# #Hyperstack.js_import 'hyper-router/react-router-source', defines: ['ReactRouter', 'ReactRouterDOM', 'History']
8+
# Hyperstack.js_import 'react_ujs', defines: 'ReactRailsUJS'
99
# remove above once lap29 is released ...
1010

1111
Hyperstack.import 'hyper-router'

0 commit comments

Comments
 (0)