From d0e5b1ffdd9793c39c918ff432d424e993b67aca Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Mon, 25 Jun 2018 16:52:21 +0000 Subject: [PATCH] webpack:paths - always load inflectors this was working when run as part of webpack:compile but running webpack:paths by itself would fail to generate manageiq-v2v, using manageiq-v2_v instead --- lib/tasks/manageiq/ui_tasks.rake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tasks/manageiq/ui_tasks.rake b/lib/tasks/manageiq/ui_tasks.rake index 31ea68a7288..c27532f051d 100644 --- a/lib/tasks/manageiq/ui_tasks.rake +++ b/lib/tasks/manageiq/ui_tasks.rake @@ -65,6 +65,8 @@ namespace :ui do end end end + + task :load_inflectors => ["ui:load_app_inflectors", "ui:load_asset_engine_inflectors"] end namespace :webpack do @@ -82,8 +84,6 @@ namespace :webpack do # 'webpacker:compile') to function. EvmRakeHelper.with_dummy_database_url_configuration do Dir.chdir ManageIQ::UI::Classic::Engine.root do - Rake::Task["ui:load_app_inflectors"].invoke - Rake::Task["ui:load_asset_engine_inflectors"].invoke Rake::Task["webpack:paths"].invoke Rake::Task["webpacker:#{webpacker_task}"].invoke end @@ -91,7 +91,7 @@ namespace :webpack do end end - task :paths do + task :paths => 'ui:load_inflectors' do paths_config = ManageIQ::UI::Classic::Engine.root.join('config/webpack/paths.json') File.open(paths_config, 'w') do |file|