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

Update this addon to run before the new serve-file middleware #39

Merged
merged 2 commits into from
Jan 19, 2017

Conversation

kratiahuja
Copy link
Contributor

This PR needs to be merged on top of 1.4.1 since master is currently broken after ember-cli PR is merged. After this is merged, we will probably need a major version bump (which will be compatible with the ember-cli release that contains this PR.

cc: @rwjblue

This PR needs to be merged on top of 1.4.1 since master is currently broken. After this is merged, we will probably need a major version bump.
@@ -10,7 +10,7 @@
"ember-addon"
],
"ember-addon": {
"before": "serve-files-middleware"
"before": "ember-cli:broccoli:watcher"
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I believe that we can just list them both in an array. Only one will have an effect, but it shouldn't error...

"before": ["serve-files-middleware", "ember-cli:broccoli:watcher"]

@rwjblue
Copy link
Member

rwjblue commented Jan 19, 2017

Just tested this with current versions of ember-cli, and it does work. I'm going to add my changes to another commit here, and land as 1.6.0.

@rwjblue rwjblue merged commit f07d5e5 into ember-cli:master Jan 19, 2017
@rwjblue
Copy link
Member

rwjblue commented Jan 19, 2017

Published as v1.6.0.

@kratiahuja
Copy link
Contributor Author

Thank you @rwjblue!

homu added a commit to ember-cli/ember-cli that referenced this pull request Jan 19, 2017
Split serving assets into two different in-repo addons

Implementation of [RFC # 80 of ember-cli](ember-cli/rfcs#80). This PR primarily does the following:
- [x] Introduces `ember-cli:broccoli:watcher` addon that is responsible for setting the response headers for every asset request being served.
- [x] Introduces `ember-cli:broccoli:serve-files` addon that is responsible for serving the assets
- [x] Removes `serve-files` addon since the above two addon do the same work
- [x] Release and update `broccoli-middleware` version after [PR](ember-cli/broccoli-middleware#21) is merged.
- [x] Fix broken tests here after the `broccoli-middleware` version is updated.
- [x] Update `ember-cli-inject-livereload` from `serve-files` to `ember-cli:broccoli:serve-files` [here](ember-cli/ember-cli-inject-live-reload#39)

**Note**: `broccoli-middleware` output format is now changed but to maintain backward compatibility it still has the original one middleware that does both setting response headers and serving assets.

TODO:
- [ ] Release a major version of `ember-cli-inject-live-reload` that is compatible with the first release of ember-cli containing this PR.
- [ ] Update change log?
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.

None yet

2 participants