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

Set dynamically aboslute public path on 'npm run watch'; fix http/htt… #1696

Merged
merged 3 commits into from
Aug 26, 2016

Conversation

ptrckvzn
Copy link

A new proposition to set public-path dynamically when runnning npm run watch. Simpler config and watch.js that fixes http/https.

This addresses the issues in #1661.

@retlehs
Copy link
Member

retlehs commented Aug 26, 2016

thanks! if you rebase we can merge

Patrick Vézina added 2 commits August 26, 2016 13:39
* upstream/sage-9:
  move assets found in node_modules/ to dist/vendor; simpler assets/config.json (roots#1697)

# Conflicts:
#	assets/config.json
@ptrckvzn
Copy link
Author

Ok, done.

@retlehs retlehs merged commit 7623ad0 into roots:sage-9 Aug 26, 2016
@ptrckvzn ptrckvzn deleted the sage-9-public-path branch August 26, 2016 17:46
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