Skip to content

Use config.local.js if present for grunt serve:dist #1796

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

Merged

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Jul 5, 2017

Fixes #1795

@spadgett spadgett requested a review from jwforres July 5, 2017 17:10

// If config.local.js exists, use that instead of config.js.
if (grunt.file.exists('app/config.local.js')) {
rewriteRules.unshift('^/config.js$ /config.local.js [L]');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this how we are doing it for the dev server? the only problem i see with this is that if you delete your config.local.js file you have to restart your grunt server

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, we copy the config.local.js to .tmp for grunt serve, but I don't think that works here.

https://github.com/openshift/origin-web-console/blob/master/Gruntfile.js#L552-L563

I suspect copying has the same problem when you delete the file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, not a big deal since we rarely create/delete them

@jwforres
Copy link
Member

jwforres commented Jul 5, 2017

[merge] going ahead and merging since this doesn't affect shipped code

@openshift-bot
Copy link

Evaluated for origin web console merge up to d135a99

@openshift-bot
Copy link

openshift-bot commented Jul 5, 2017

Origin Web Console Merge Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_requests_origin_web_console/1620/) (Base Commit: 5fdc228) (PR Branch Commit: d135a99)

@openshift-bot openshift-bot merged commit 8363ad1 into openshift:master Jul 5, 2017
@spadgett spadgett deleted the grunt-serve-dist-local-config branch July 7, 2017 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants