Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-picks for 1.18-stable #5463

Merged
merged 3 commits into from Apr 26, 2018

Conversation

Projects
None yet
9 participants
@xprazak2
Copy link
Contributor

commented Apr 17, 2018

No description provided.

@theforeman-bot

This comment has been minimized.

Copy link
Member

commented Apr 17, 2018

Issues: #23147

}
});
return entry;
}

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Apr 17, 2018

Missing semicolon semi


Object.keys(pluginEntries).forEach((key) => {
if (key === pluginName) {
entry[key] = path.dirname(pluginEntries[key]);

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Apr 17, 2018

Expected indentation of 6 spaces but found 8 indent

@@ -47,6 +47,17 @@ var webpackedDirs = (stderr) => {
});
};

var pluginEntry = (pluginEntries, pluginName) => {

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Apr 17, 2018

'pluginEntry' is assigned a value but never used no-unused-vars

config_file = ::Rails.root.join(::Rails.configuration.webpack.config_file)
sh "#{webpack_bin} --config #{config_file} --bail --env.pluginName=#{@plugin.id}"
end

This comment has been minimized.

Copy link
@houndci-bot

houndci-bot Apr 17, 2018

Layout/EmptyLinesAroundClassBody: Extra empty line detected at class body end.

@coveralls

This comment has been minimized.

Copy link

commented Apr 17, 2018

Coverage Status

Coverage remained the same at 79.479% when pulling 275ffb6 on xprazak2:webpack-bundle into 98e788e on theforeman:1.18-stable.

@tbrisker tbrisker added this to the 1.18.0 milestone Apr 18, 2018

@xprazak2 xprazak2 force-pushed the xprazak2:webpack-bundle branch from 229a733 to dd3453c Apr 19, 2018

@xprazak2

This comment has been minimized.

Copy link
Contributor Author

commented Apr 19, 2018

Fixing the rubocop issues including the removal of unused pluginEntries function from plugin_webpack_directories.js

@mmoll

This comment has been minimized.

Copy link
Member

commented Apr 19, 2018

are these fixes also going to development?

@bastilian

This comment has been minimized.

Copy link
Member

commented Apr 19, 2018

Wouldn't it be nicer to have the parts in the initializer as a module, which would allow the implementation of loading webpack assets to be cleaner (and make it testable). It could also accommodate the functionality that is now in the module of the rake task file.

@mmoll

This comment has been minimized.

Copy link
Member

commented Apr 19, 2018

@bastilian please note that this PR is against 1.18 and is only a tidied up version of a commit that got into develop.

@bastilian

This comment has been minimized.

Copy link
Member

commented Apr 19, 2018

@mmoll ah! thanks, that I overlooked. :D

@xprazak2

This comment has been minimized.

Copy link
Contributor Author

commented Apr 19, 2018

Exactly, this is a cp of #5413

@xprazak2 xprazak2 changed the title Fixes #23147 - Allow plugins to compile production webpack assets Cherry-picks for 1.18-stable Apr 26, 2018

@xprazak2

This comment has been minimized.

Copy link
Contributor Author

commented Apr 26, 2018

I added a cherry-pick of #5485

@mmoll

This comment has been minimized.

Copy link
Member

commented Apr 26, 2018

@xprazak2 are the fixups for #23147 going to develop, too? I'd rather opt for having the same code.

@xprazak2

This comment has been minimized.

Copy link
Contributor Author

commented Apr 26, 2018

They are on the way...

@tbrisker
Copy link
Member

left a comment

Thanks @xprazak2 !

@tbrisker tbrisker merged commit 8a498eb into theforeman:1.18-stable Apr 26, 2018

7 checks passed

Hound No violations found. Woof!
continuous-integration/travis-ci/pr The Travis CI build passed
Details
coverage/coveralls Coverage remained the same at 79.479%
Details
foreman Build finished. 33152 tests run, 8 skipped, 0 failed.
Details
katello Build finished. 3627 tests run, 9 skipped, 0 failed.
Details
prprocessor Commit message style is correct
Details
upgrade Build finished. No test results found.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.