Merge pull request #4735 from himdel/npm-bower

Remove bower

.eslintignore

@@ -3,7 +3,6 @@ app/assets/javascripts/locale/**/*.js
 
 # not ours or already processed or not javascript
 node_modules/
-vendor/assets/bower_components/
 public/
 tmp/
 db/

.eslintrc.json

@@ -22,17 +22,17 @@
     "vanillaJsAPI": false, // local: http_api/api.js - deprecated
     "API": false, // local: http_api/api.js
     "ManageIQ": false, // local: mig_global.js
-    "Promise": false, // bower: es6-shim
-    "_": false, // bower: lodash
+    "Promise": false, // modern browser / npm: es6-shim
+    "_": false, // npm: lodash
     "__": false, // local: i18n.js
-    "angular": false, // bower: angular
-    "c3": false, // bower: c3
-    "d3": false, // bower: d3
+    "angular": false, // npm: angular
+    "c3": false, // npm: c3
+    "d3": false, // npm: d3
     "http": false, // local: http_api/http.js
     "i18n": false, // gem: gettext_i18n_rails_js
-    "moment": false, // bower: moment
-    "numeral": false, // bower: numeral
-    "sprintf": false // bower: sprintf
+    "moment": false, // npm: moment
+    "numeral": false, // npm: numeral
+    "sprintf": false // npm: sprintf-js
   },
 
   "rules": {

.gitignore

@@ -16,8 +16,6 @@ tmp/
 .idea/
 .vscode/
 .ruby-version
-vendor/assets/bower_components/
-vendor/assets/bower/bower_components/
 node_modules/
 config/webpack/paths.json
 *.sw[po]

.travis.yml

@@ -6,8 +6,6 @@ sudo: false
 cache:
   bundler: true
   yarn: true
-  directories:
-  - vendor/assets/bower/bower_components
 addons:
   postgresql: '9.4'
 env:
@@ -28,8 +26,6 @@ bundler_args: "--no-deployment"
 before_install: source tools/ci/before_install.sh
 before_script: bundle exec rake $TEST_SUITE:setup
 script: bundle exec rake $TEST_SUITE
-before_cache:
-- cp bower.json vendor/assets/bower/bower_components
 after_script: source tools/ci/after_install.sh
 notifications:
   webhooks:

config/initializers/assets.rb

@@ -1,4 +1,3 @@
-Rails.application.config.assets.paths << ManageIQ::UI::Classic::Engine.root.join('vendor', 'assets', 'bower') # all bower deps need to be prefixed by bower_components/, but vendor/assets/* can't be removed from paths :(
 Rails.application.config.assets.paths << ManageIQ::UI::Classic::Engine.root.join('node_modules')
 
 Rails.application.config.assets.precompile << proc do |filename, path|

lib/tasks/manageiq/ui_tasks.rake

@@ -1,10 +1,4 @@
 namespace :update do
-  task :bower do
-    Dir.chdir ManageIQ::UI::Classic::Engine.root do
-      system("bower update --allow-root -F --config.analytics=false") || abort("\n== bower install failed ==")
-    end
-  end
-
   task :yarn do
     asset_engines.each do |engine|
       Dir.chdir engine.path do
@@ -15,8 +9,10 @@ namespace :update do
   end
 
   task :clean do
-    # clean up old bower install to prevent it from winning over npm
+    # clean up old bower packages
+    # FIXME: remove 2018-11 or so, hammer/no
     FileUtils.rm_rf(ManageIQ::UI::Classic::Engine.root.join('vendor', 'assets', 'bower_components'))
+    FileUtils.rm_rf(ManageIQ::UI::Classic::Engine.root.join('vendor', 'assets', 'bower'))
 
     # clean up old webpack packs to prevent stale packs now that we're hashing the filenames
     FileUtils.rm_rf(Rails.root.join('public', 'packs'))
@@ -33,7 +29,7 @@ namespace :update do
     puts
   end
 
-  task :actual_ui => ['update:clean', 'update:bower', 'update:yarn', 'webpack:compile', 'update:print_engines']
+  task :actual_ui => ['update:clean', 'update:yarn', 'webpack:compile', 'update:print_engines']
 
   task :ui do
     # when running update:ui from ui-classic, asset_engines won't see the other engines

tools/ci/setup_js_env.sh

@@ -1,28 +1,3 @@
-which bower || npm install -g bower
-
-# Clean up old bower_components location
-if [ -d vendor/assets/bower_components ]; then
-  rm -rf vendor/assets/bower_components
-fi
-
-# Check if the bower cache is valid, otherwise delete it
-if ! cmp --silent bower.json vendor/assets/bower/bower_components/bower.json; then
-  rm -rf vendor/assets/bower/bower_components
-fi
-
-if [ -d vendor/assets/bower/bower_components ]; then
-  # Using bower_components from cache
-  echo "bower assets installed... moving on."
-else
-  bower install --allow-root -F --config.analytics=false
-  STATUS=$?
-  echo bower exit code: $STATUS
-
-  # fail the whole test suite if bower install failed
-  [ $STATUS = 0 ] || exit 1
-  #[ -d vendor/assets/bower/bower_components ] || exit 1
-fi
-
 # make sure yarn is installed, in the right version
 bundle exec rake webpacker:check_yarn || npm install -g yarn