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

compile-loader: Remove babel-merge export #1220

Merged
merged 1 commit into from Nov 26, 2018

Conversation

@edmorley
Copy link
Member

edmorley commented Nov 23, 2018

Since it's no longer a custom implementation and instead just the babel-merge package exported. As such it makes more sense for packages to import babel-merge directly iff they need it.

This also avoids the naming clash between merge from this preset and the typical import style used for deepmerge in this repository, that contributed to the bug fixed by #1219.

@edmorley edmorley added this to the v9 milestone Nov 23, 2018
@edmorley edmorley self-assigned this Nov 23, 2018
@edmorley edmorley force-pushed the edmorley:rm-compile-loader-merge branch 2 times, most recently from e84b9d3 to e1048f6 Nov 23, 2018
@edmorley edmorley requested a review from eliperelman Nov 23, 2018
@edmorley edmorley force-pushed the edmorley:rm-compile-loader-merge branch 3 times, most recently from 75ff906 to 3e1feb2 Nov 23, 2018
Since it's no longer a custom implementation and instead just the
`babel-merge` package exported. As such it makes more sense for
packages to import `babel-merge` directly iff they need it.

This also avoids the naming clash between `merge` from this preset
and the typical import style used for `deepmerge` in this repository,
that contributed to the bug fixed by #1219.
@edmorley edmorley force-pushed the edmorley:rm-compile-loader-merge branch from 3e1feb2 to 1dfb28b Nov 26, 2018
@edmorley edmorley merged commit e9c21b8 into neutrinojs:master Nov 26, 2018
6 checks passed
6 checks passed
Header rules No header rules processed
Details
Pages changed 3 new files uploaded
Details
Mixed content No mixed content detected
Details
Redirect rules 2 redirect rules processed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details
@edmorley edmorley deleted the edmorley:rm-compile-loader-merge branch Nov 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.