Skip to content

Commit

Permalink
HOMS-364 Get rid of Webpacker & build all assets with Webpack 5
Browse files Browse the repository at this point in the history
  • Loading branch information
timale committed Aug 27, 2021
1 parent 085f8e2 commit a61b01b
Show file tree
Hide file tree
Showing 46 changed files with 1,358 additions and 4,988 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ v2.7.0 [unreleased]
### Refactoring
- [#592](https://github.com/latera/homs/pull/592) Replace memcached with redis.
- [#586](https://github.com/latera/homs/pull/586) Stub api container in tests with local api mock file and refactor tests.
- [#594](https://github.com/latera/homs/pull/594) Get rid of Webpacker & build all assets with Webpack 5.

v2.6.12 [2021-08-20]
-------------------
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ USER homs

RUN yarn install && \
yarn lint && \
bundle exec rails assets:precompile && \
yarn build && \
rm -rf /opt/homs/node_modules/

WORKDIR /opt/homs
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.oracle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ EXPOSE 3000
USER homs

RUN yarn install && \
bundle exec rails assets:precompile && \
yarn build && \
rm -rf /opt/homs/node_modules/

ENV RAILS_ENV=production
Expand Down
8 changes: 1 addition & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ source 'https://rubygems.org'
ruby '2.7.3'

gem 'apitome'
gem 'asset_symlink', git: 'https://github.com/fcheung/asset_symlink', ref: 'c300363' # ~> 0.3.1
gem 'aws-sdk-s3'
gem 'bootstrap3-datetimepicker-rails', '~> 4.7.14'
gem 'bootstrap-sass'
gem 'bootswatch-rails'
gem 'coderay', '~> 1.1'
gem 'coffee-rails', '~> 4.2'
gem 'dalli'
Expand All @@ -21,19 +17,17 @@ gem 'hbw', path: File.join(File.dirname(__FILE__), 'hbw')
gem 'i18n-js', git: 'https://github.com/fnando/i18n-js', ref: '7ed2d2'
gem 'jbuilder', '~> 2.10'
gem 'kaminari'
gem 'minipack'
gem 'modulejs-rails'
gem 'momentjs-rails', '>= 2.9.0'
gem 'pg', '0.20'
gem 'pry-rails'
gem 'rack', '~> 2.2.3'
gem 'rails', '~> 5.2.4'
gem 'redis'
gem 'sass-rails', '~> 5.0.7'
gem 'settingslogic'
gem 'simple_form'
gem 'uglifier', '>= 1.3.0'
gem 'web-console', '~> 2.0', group: :development
gem 'webpacker'

group :oracle do
gem 'ruby-oci8', '2.2.3'
Expand Down
55 changes: 4 additions & 51 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
GIT
remote: https://github.com/fcheung/asset_symlink
revision: c300363f5a12d45a7650e24618b61d5e4e8dbcd7
ref: c300363
specs:
asset_symlink (0.3.1)
rails (>= 4, < 6.0)

GIT
remote: https://github.com/fnando/i18n-js
revision: 7ed2d2900c844d70992b2f7222178867eaaca92a
Expand Down Expand Up @@ -75,8 +67,6 @@ GEM
railties
arel (9.0.0)
ast (2.4.2)
autoprefixer-rails (10.2.5.1)
execjs (> 0)
aws-eventstream (1.1.1)
aws-partitions (1.465.0)
aws-sdk-core (3.114.1)
Expand All @@ -100,13 +90,6 @@ GEM
rack (>= 0.9.0)
binding_of_caller (1.0.0)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
bootstrap3-datetimepicker-rails (4.7.14)
momentjs-rails (>= 2.8.1)
bootswatch-rails (3.3.5)
railties (>= 3.1)
builder (3.2.4)
byebug (11.1.3)
capybara (3.35.3)
Expand Down Expand Up @@ -206,7 +189,6 @@ GEM
faraday-net_http_persistent (1.1.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
haml (5.2.1)
Expand Down Expand Up @@ -255,6 +237,9 @@ GEM
method_source (1.0.0)
mini_mime (1.1.0)
mini_portile2 (2.5.3)
minipack (0.3.6)
actionview
railties (>= 4.2)
minitest (5.14.4)
modulejs-rails (2.2.0.0)
railties (>= 4.0)
Expand Down Expand Up @@ -284,8 +269,6 @@ GEM
nio4r (~> 2.0)
racc (1.5.2)
rack (2.2.3)
rack-proxy (0.7.0)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.6)
Expand Down Expand Up @@ -316,9 +299,6 @@ GEM
rainbow (3.0.0)
raindrops (0.19.2)
rake (13.0.3)
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.2.5)
regexp_parser (2.1.1)
responders (3.0.1)
Expand Down Expand Up @@ -369,23 +349,9 @@ GEM
ruby_parser (3.16.0)
sexp_processor (~> 4.15, >= 4.15.1)
rubyzip (2.3.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.0.8)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
semantic_range (3.0.0)
settingslogic (2.0.9)
sexp_processor (4.15.3)
simple_form (5.1.0)
Expand Down Expand Up @@ -417,8 +383,6 @@ GEM
translit (0.1.5)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.0.0)
unicorn (6.0.0)
kgio (~> 2.6)
Expand All @@ -430,11 +394,6 @@ GEM
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
webpacker (5.4.0)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -446,13 +405,9 @@ PLATFORMS

DEPENDENCIES
apitome
asset_symlink!
aws-sdk-s3
better_errors
binding_of_caller
bootstrap-sass
bootstrap3-datetimepicker-rails (~> 4.7.14)
bootswatch-rails
capybara
capybara-screenshot
coderay (~> 1.1)
Expand All @@ -473,6 +428,7 @@ DEPENDENCIES
jbuilder (~> 2.10)
kaminari
launchy
minipack
modulejs-rails
momentjs-rails (>= 2.9.0)
pg (= 0.20)
Expand All @@ -490,7 +446,6 @@ DEPENDENCIES
rubocop
ruby-oci8 (= 2.2.3)
ruby_parser
sass-rails (~> 5.0.7)
selenium-webdriver
settingslogic
simple_form
Expand All @@ -499,10 +454,8 @@ DEPENDENCIES
spring-commands-rspec
temping
translit
uglifier (>= 1.3.0)
unicorn
web-console (~> 2.0)
webpacker

RUBY VERSION
ruby 2.7.3p183
Expand Down
Binary file added app/assets/fonts/glyphicons-halflings-regular.eot
Binary file not shown.
Loading

0 comments on commit a61b01b

Please sign in to comment.