Skip to content

Commit c1d91d7

Browse files
committed
shakapacker and jquery and css working, I think
1 parent e7237de commit c1d91d7

38 files changed

+2246
-5976
lines changed

.browserslistrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,20 @@ gem 'rake', '< 13.0'
4848
gem 'rack-attack'
4949
gem 'rack-mini-profiler'
5050
gem 'rails', '6.1.6.1'
51+
gem "react_on_rails", "= 13.0"
5152
gem 'record_tag_helper', '~> 1.0'
52-
gem 'react-rails', '~> 2.3.0'
5353
gem 'recap', '~> 1.0.0'
5454
gem 'redis-rails'
5555
gem 'remotipart', '~> 1.2'
5656
gem 'rmagick'
5757
gem 'sass-rails', '~> 5.0.1'
5858
gem 'searchkick'
59+
gem 'shakapacker', '6.5.0'
5960
gem 'sitemap_generator'
6061
gem 'therubyracer'
6162
gem 'twitter-bootstrap-rails'
6263
gem 'uglifier', '>= 1.3.0'
6364
# gem 'weather-icons-rails'
64-
gem 'webpacker'
6565
gem 'whenever'
6666
gem 'mimemagic', '~> 0.3.10'
6767

@@ -96,3 +96,4 @@ group :production do
9696
end
9797

9898
gem "aws-sdk-s3", "~> 1.103"
99+

Gemfile.lock

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,6 @@ GEM
8585
descendants_tracker (~> 0.0.4)
8686
ice_nine (~> 0.11.0)
8787
thread_safe (~> 0.3, >= 0.3.1)
88-
babel-source (5.8.35)
89-
babel-transpiler (0.7.0)
90-
babel-source (>= 4.0, < 6)
91-
execjs (~> 2.0)
9288
barometer (0.9.7)
9389
addressable
9490
choc_mool
@@ -375,17 +371,18 @@ GEM
375371
method_source
376372
rake (>= 12.2)
377373
thor (~> 1.0)
374+
rainbow (3.1.1)
378375
rake (12.3.3)
379376
rb-fsevent (0.11.1)
380377
rb-inotify (0.10.1)
381378
ffi (~> 1.0)
382379
rdoc (4.3.0)
383-
react-rails (2.3.1)
384-
babel-transpiler (>= 0.7.0)
380+
react_on_rails (13.0.0)
381+
addressable
385382
connection_pool
386-
execjs
387-
railties (>= 3.2)
388-
tilt
383+
execjs (~> 2.5)
384+
rails (>= 5.2)
385+
rainbow (~> 3.0)
389386
recap (1.0.12)
390387
capistrano (~> 2.9)
391388
open4
@@ -457,6 +454,11 @@ GEM
457454
activemodel (>= 5.2)
458455
hashie
459456
semantic_range (3.0.0)
457+
shakapacker (6.5.0)
458+
activesupport (>= 5.2)
459+
rack-proxy (>= 0.6.1)
460+
railties (>= 5.2)
461+
semantic_range (>= 2.3.0)
460462
shellany (0.0.1)
461463
sitemap_generator (6.2.1)
462464
builder (~> 3.0)
@@ -492,11 +494,6 @@ GEM
492494
descendants_tracker (~> 0.0, >= 0.0.3)
493495
warden (1.2.9)
494496
rack (>= 2.0.9)
495-
webpacker (5.4.3)
496-
activesupport (>= 5.2)
497-
rack-proxy (>= 0.6.1)
498-
railties (>= 5.2)
499-
semantic_range (>= 2.3.0)
500497
websocket-driver (0.7.5)
501498
websocket-extensions (>= 0.1.0)
502499
websocket-extensions (0.1.5)
@@ -569,7 +566,7 @@ DEPENDENCIES
569566
rails-assets-underscore!
570567
rails_12factor
571568
rake (< 13.0)
572-
react-rails (~> 2.3.0)
569+
react_on_rails (= 13.0)
573570
recap (~> 1.0.0)
574571
record_tag_helper (~> 1.0)
575572
redis-rails
@@ -579,12 +576,12 @@ DEPENDENCIES
579576
sass-rails (~> 5.0.1)
580577
sdoc (~> 0.4.0)
581578
searchkick
579+
shakapacker (= 6.5.0)
582580
sitemap_generator
583581
terminal-notifier-guard
584582
therubyracer
585583
twitter-bootstrap-rails
586584
uglifier (>= 1.3.0)
587-
webpacker
588585
whenever
589586

590587
RUBY VERSION
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { React } from "react";
2+
3+
const TestComponent = () => {
4+
return (<div>hi</div>)
5+
}
6+
7+
export default TestComponent;

0 commit comments

Comments
 (0)