Skip to content

Commit

Permalink
Ap esbuild (#1071)
Browse files Browse the repository at this point in the history
* replace webpack with esbuild
  • Loading branch information
andypf authored Apr 27, 2022
1 parent b41400e commit a409037
Show file tree
Hide file tree
Showing 1,005 changed files with 20,782 additions and 80,115 deletions.
41 changes: 0 additions & 41 deletions .eslintrc

This file was deleted.

30 changes: 30 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"env": {
"browser": true,
"es2021": true,
"es6": true,
"jest": true,
"node": true
},
"extends": ["eslint:recommended", "plugin:react/recommended"],
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["react"],
"rules": {
"no-debugger": "off",
"no-console": "off",
"no-unused-vars": "warn",
"react/prop-types": "warn"
}, // disable and enable some warnings
"settings": {
"react": {
"version": "detect"
} // required by eslint-plugin-react
},
"root": true //this is the root ESLint config and local ESLint configs in the userfolder will not interfere
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ yarn-debug.log*
/yarn-error.log
yarn-debug.log*
.yarn-integrity

/app/assets/builds/*
!/app/assets/builds/.keep
13 changes: 7 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ source 'https://rubygems.org'
gem 'unf', '>= 0.2.0beta2'

gem 'rails', '6.1.2' # Don't use 5.1.3 because of redirect errors in tests (scriptr vs. script name in ActionPack)
gem 'webpacker' # Check package.json -> "@rails/webpacker"
gem 'jsbundling-rails'

gem 'bootstrap-sass'
gem 'uglifier'
gem 'coffee-rails'
gem 'jquery-rails'
gem 'jquery-ui-rails'
# gem 'jquery-rails'
# gem 'jquery-ui-rails'
gem 'haml-rails'
gem 'simple_form'
gem 'redcarpet'
Expand All @@ -32,8 +32,8 @@ gem 'kaminari', '~> 1.2.1'

gem 'responders'

# make it fancy with react
gem 'react-rails', '~> 2.2.1'
# # make it fancy with react
# gem 'react-rails', '~> 2.2.1'

# Database
gem 'pg', '1.3.4'
Expand Down Expand Up @@ -72,7 +72,8 @@ gem 'arc-client', git: 'https://github.com/sapcc/arc-client.git'
gem 'sdoc', '~> 1.1.0', group: :doc

# if you update puma check Dockerfile for Version dependencies!
gem 'puma', '= 4.3.9', require: false
# gem 'puma', '= 4.3.9', require: false
gem "puma", "4.3.12"
###################### PLUGINS #####################

# backlist plugins (global)
Expand Down
36 changes: 5 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,6 @@ GEM
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
bindex (0.8.1)
bootstrap-kaminari-views (0.0.5)
kaminari (>= 0.13)
Expand All @@ -283,7 +279,6 @@ GEM
config (2.2.3)
deep_merge (~> 1.2, >= 1.2.1)
dry-validation (~> 1.0, >= 1.0.0)
connection_pool (2.2.5)
crass (1.0.6)
database_cleaner (2.0.1)
database_cleaner-active_record (~> 2.0.0)
Expand Down Expand Up @@ -377,12 +372,8 @@ GEM
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jmespath (1.6.1)
jquery-rails (4.4.0)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
jsbundling-rails (1.0.2)
railties (>= 6.0.0)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
Expand Down Expand Up @@ -433,12 +424,10 @@ GEM
pry (>= 0.10.4)
psych (4.0.3)
stringio
puma (4.3.9)
puma (4.3.12)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.3)
rack-proxy (0.7.2)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (6.1.2)
Expand Down Expand Up @@ -478,12 +467,6 @@ GEM
ffi (~> 1.0)
rdoc (6.4.0)
psych (>= 4.0.0)
react-rails (2.2.1)
babel-transpiler (>= 0.7.0)
connection_pool
execjs
railties (>= 3.2)
tilt
redcarpet (3.5.1)
responders (3.0.1)
actionpack (>= 5.0)
Expand Down Expand Up @@ -530,7 +513,6 @@ GEM
tilt
sdoc (1.1.0)
rdoc (>= 5.0)
semantic_range (3.0.0)
sentry-raven (3.1.2)
faraday (>= 1.0)
sexp_processor (4.16.0)
Expand Down Expand Up @@ -569,11 +551,6 @@ GEM
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
webpacker (5.4.3)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -612,8 +589,7 @@ DEPENDENCIES
identity!
image!
inquiry!
jquery-rails
jquery-ui-rails
jsbundling-rails
kaminari (~> 1.2.1)
keppel!
key_manager!
Expand All @@ -633,11 +609,10 @@ DEPENDENCIES
prettier
prometheus-client
pry-rails
puma (= 4.3.9)
puma (= 4.3.12)
rails (= 6.1.2)
rails-controller-testing
rails_stdout_logging
react-rails (~> 2.2.1)
redcarpet
reports!
resource_management!
Expand All @@ -659,7 +634,6 @@ DEPENDENCIES
unf (>= 0.2.0beta2)
web-console (~> 3.0)
webconsole!
webpacker

BUNDLED WITH
2.3.9
1 change: 0 additions & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#db: postgres -D /usr/local/var/postgres
rails: bundle exec rails s Puma -b 0.0.0.0 -p $APP_PORT
webpack: bundle exec bin/webpack-dev-server
#log: tail -f log/development.log
2 changes: 2 additions & 0 deletions Procfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
web: bin/rails server -p 3000
js: yarn build --watch
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,10 @@ Second: Install nodejs modules

Third: Start the Elektra Dashboard Application
---------------------------------------
1. run: ```foreman start```. **Important:** Ensure the **PORT** parameter is set in **.env**! This will start the rails server and also the webpack-dev-server.
2. Browser access for Elektra: http://localhost:<PORT>/Default
3. DevStack: Login with user demo/devstack
1. run: ```bin/rails s -b 0.0.0.0 -p 3000```
2. run: ```yarn build --watch```
3. Browser access for Elektra: http://localhost:3000
4. DevStack: Login with user demo/devstack

Use Elektra Request Management
------------------------------
Expand Down
3 changes: 2 additions & 1 deletion app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//= link_tree ../images
//= link application.css
//= link application.js
//= link_tree ../builds
//= link policy_engine.js
62 changes: 0 additions & 62 deletions app/assets/javascripts/application.js.erb

This file was deleted.

14 changes: 0 additions & 14 deletions app/assets/javascripts/cable.js

This file was deleted.

1 change: 0 additions & 1 deletion app/assets/javascripts/components.js

This file was deleted.

32 changes: 0 additions & 32 deletions app/assets/javascripts/components/confirm_dialog.coffee

This file was deleted.

3 changes: 0 additions & 3 deletions app/assets/javascripts/components/dialogs.coffee

This file was deleted.

Loading

0 comments on commit a409037

Please sign in to comment.