Skip to content

Commit 270fb62

Browse files
catmandocatmando
committed
fixed a few more issues, but postgresql still not running in CI
1 parent 7f61a22 commit 270fb62

File tree

8 files changed

+17
-7
lines changed

8 files changed

+17
-7
lines changed

‎ruby/hyper-component/hyper-component.gemspec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
3030
spec.add_development_dependency 'mime-types'
3131
spec.add_development_dependency 'mini_racer', '< 0.4.0' # something is busted with 0.4.0 and its libv8-node dependency
3232
spec.add_development_dependency 'nokogiri'
33+
spec.add_development_dependency 'opal-browser', '~> 0.3.0'
3334
spec.add_development_dependency 'opal-jquery'
3435
spec.add_development_dependency 'opal-rails', '>= 0.9.4', '< 2.0'
3536
spec.add_development_dependency 'pry-rescue'

‎ruby/hyper-component/spec/client_features/component_spec.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,9 @@ class Foo
594594
foo.class_eval do
595595
render { "hello" }
596596
end
597-
597+
598598
Hyperstack::Component::ReactTestUtils.render_component_into_document(foo)
599599
end
600-
binding.pry
601600
expect(page.driver.browser.logs.get(:browser)
602601
.reject { |entry| entry.to_s.include?('Deprecated feature') }
603602
.reject { |entry| entry.to_s.include?('Object freezing is not supported by Opal')}

‎ruby/hyper-component/spec/spec_helper.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
require 'opal'
44
#require 'opal-rspec'
55
require 'opal-jquery'
6+
require 'opal-browser'
7+
68

79
begin
810
require File.expand_path('../test_app/config/environment', __FILE__)
@@ -12,7 +14,6 @@
1214
require 'rspec/rails'
1315
require 'hyper-spec'
1416
require 'pry'
15-
require 'opal-browser'
1617
require 'timecop'
1718

1819

‎ruby/hyper-component/spec/test_app/app/hyperstack/components/components.rb‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
require 'js'
1111
# require 'hyper-store'
1212
require 'hyperstack/internal/component/haml'
13+
require 'promise'
14+
require 'browser/delay'
15+
require 'browser/interval'
1316

1417
# these mechanisms are deprecated in favor of using the features of hyper-spec. However
1518
# in order to expedite getting Hyperstack 1.0 released we are just leaving these methods

‎ruby/hyper-component/spec/test_app/config/initializers/hyperstack.rb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,7 @@
99
Hyperstack.import 'react-server', js_import: true, at_head: true, client_only: true
1010
Hyperstack.import 'hyperstack/component/jquery', client_only: true
1111
Hyperstack.import 'hyperstack/component/server'
12+
Hyperstack.import 'promise', client_only: true
13+
Hyperstack.import 'browser', client_only: true
14+
Hyperstack.import 'browser/delay', client_only: true
15+

‎ruby/hyper-spec/hyper-spec.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
3737
spec.add_development_dependency 'bundler'
3838
spec.add_development_dependency 'hyper-component', HyperSpec::VERSION
3939
spec.add_development_dependency 'mini_racer', '< 0.4.0' # something is busted with 0.4.0 and its libv8-node dependency
40-
spec.add_development_dependency 'opal-browser', '~> 0.2.0'
40+
spec.add_development_dependency 'opal-browser', '~> 0.3.0'
4141
spec.add_development_dependency 'opal-rails', '>= 0.9.4'
4242
spec.add_development_dependency 'pry-rescue'
4343
spec.add_development_dependency 'pry-stack_explorer'

‎ruby/hyperstack-config/hyperstack-config.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
2424
spec.add_dependency 'listen', '~> 3.0' # for hot loader
2525
# spec.add_dependency 'mini_racer', '~> 0.2.6'
2626
spec.add_dependency 'opal', ENV['OPAL_VERSION'] || '>= 0.11.0', '< 2.0'
27-
spec.add_dependency 'opal-browser', '~> 0.2.0'
27+
#spec.add_dependency 'opal-browser', '~> 0.3.0'
2828
spec.add_dependency 'uglifier'
2929
spec.add_dependency 'websocket' # for hot loader
3030

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ def self.naming_convention
1515
require 'hyperstack/active_support_string_inquirer.rb'
1616
require 'hyperstack_env'
1717
require 'hyperstack/hotloader/stub'
18+
# require 'promise' REMOVED DURING UPGRADE TO Opal 1.7 WHY WAS THIS HERE?
1819
else
1920
require 'opal'
20-
require 'opal-browser'
21+
# require 'opal-browser' REMOVED DURING UPGRADE TO Opal 1.7 WHY WAS THIS HERE?
2122
# We need opal-rails to be loaded for Gem code to be properly included by sprockets.
2223
begin
2324
require 'opal-rails' if defined? Rails
@@ -41,7 +42,8 @@ def self.naming_convention
4142
Hyperstack.define_setting :hotloader_ping, nil
4243
Hyperstack.define_setting :hotloader_ignore_callback_mapping, false
4344
Hyperstack.import 'opal', gem: true
44-
Hyperstack.import 'browser', client_only: true
45+
# Hyperstack.import 'promise', client_only: true REMOVED DURING UPGRADE TO Opal 1.7 WHY WAS THIS HERE?
46+
# Hyperstack.import 'browser', client_only: true REMOVED DURING UPGRADE TO Opal 1.7 WHY WAS THIS HERE?
4547
Hyperstack.import 'hyperstack-config', gem: true
4648
Hyperstack.import 'hyperstack/autoloader'
4749
Hyperstack.import 'hyperstack/autoloader_starter'

0 commit comments

Comments
 (0)