diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b822cc7f2ae..bf5edbff923 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -39,5 +39,5 @@ //= require ./miq_c3 //= require ./miq_explorer //= require ./miq_timeline -//= require bower_components/manageiq-ui-components/dist/js/ui-components +//= require @manageiq/ui-components/dist/js/ui-components //= require ui-select/dist/select diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index e8b131e8ffe..46a5c7f8880 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -20,7 +20,7 @@ *= require ./metrics *= require ./service_dialogs *= require @pf3/timeline/style - *= require bower_components/manageiq-ui-components/dist/css/ui-components + *= require @manageiq/ui-components/dist/css/ui-components *= require ui-select/dist/select *= require ./remote_console *= require graphiql/graphiql.css diff --git a/app/assets/stylesheets/print.scss b/app/assets/stylesheets/print.scss index f0a142ef407..fbe881d6fb6 100644 --- a/app/assets/stylesheets/print.scss +++ b/app/assets/stylesheets/print.scss @@ -1,4 +1,4 @@ -@import 'bower_components/manageiq-ui-components/dist/css/ui-components.css'; +@import '@manageiq/ui-components/dist/css/ui-components.css'; @import 'patternfly-sprockets'; @import 'patternfly/variables'; diff --git a/bower.json b/bower.json index 1d320a2994f..45f79eb062b 100644 --- a/bower.json +++ b/bower.json @@ -18,6 +18,5 @@ "tests" ], "dependencies": { - "manageiq-ui-components": "bower-dev" } } diff --git a/package.json b/package.json index 2b7182642db..8528b36142d 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "homepage": "https://github.com/ManageIQ/manageiq#readme", "dependencies": { "@manageiq/react-ui-components": "~0.10.8", + "@manageiq/ui-components": "~1.1.15", "@pf3/timeline": "~1.0.8", "angular": "~1.6.6", "angular-animate": "~1.6.6", diff --git a/tools/ci/setup_js_env.sh b/tools/ci/setup_js_env.sh index 323f2df0f20..5f4f989e77b 100644 --- a/tools/ci/setup_js_env.sh +++ b/tools/ci/setup_js_env.sh @@ -20,7 +20,7 @@ else # fail the whole test suite if bower install failed [ $STATUS = 0 ] || exit 1 - [ -d vendor/assets/bower/bower_components ] || exit 1 + #[ -d vendor/assets/bower/bower_components ] || exit 1 fi # make sure yarn is installed, in the right version