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

Add JSPM browser field #186

Merged
merged 3 commits into from
Apr 4, 2016
Merged

Add JSPM browser field #186

merged 3 commits into from
Apr 4, 2016

Conversation

MeoMix
Copy link
Contributor

@MeoMix MeoMix commented Mar 7, 2016

Add @empty statements for load-content and resolve-id so that their deps aren't loaded in browser environment. This allows for JSPM to not error out. Custom resolve/load functions will need to be provided as options for proper functionality.

(New PR cuz I'm a terrible Git wizard and failed to squash properly after a few attempts.)

Add @empty statements for load-content and resolve-id so that their deps aren't loaded in browser environment. This allows for JSPM to not error out. Custom resolve/load functions will need to be provided as options for proper functionality.
@MoOx
Copy link
Contributor

MoOx commented Mar 14, 2016

Can you squash to a single commit please?

@MoOx
Copy link
Contributor

MoOx commented Apr 4, 2016

ping

@MeoMix
Copy link
Contributor Author

MeoMix commented Apr 4, 2016

You should be able to do that with the new squash + merge ability on GitHub, yeah? I can clean it up if you'd prefer, though.

https://github.com/blog/2141-squash-your-commits

@MoOx MoOx merged commit b958915 into postcss:master Apr 4, 2016
@MoOx
Copy link
Contributor

MoOx commented Apr 4, 2016

@MeoMix yeah :)

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.

2 participants