Skip to content
Permalink
Browse files

FIX: Break dist javascript and onto newlines.

This doesn’t have much impact on resulting JS size, but it will
hopefully make merge conflicts much less frequent.

The CSS growth is a little higher (6.5% increase in size) but is not
material.

If this materially reduces the number of merge conflicts we have, by
letting the git merge tools resolve some dist file mergers, I think it
would be worth it.

See silverstripe/silverstripe-framework#6051
  • Loading branch information
chillu committed Sep 22, 2016
1 parent 07ba92c commit 4b2c6b05035de2b309ebd2fa4136aff7e2e7e85a
Showing with 273 additions and 5 deletions.
  1. +9 −1 client/dist/js/SilverStripeNavigator.js
  2. +169 −1 client/dist/js/bundle.js
  3. +87 −1 client/dist/styles/bundle.css
  4. +8 −2 webpack.config.js

Some generated files are not rendered by default. Learn more.

0 comments on commit 4b2c6b0

Please sign in to comment.
You can’t perform that action at this time.