Skip to content

Update concat strategy; Fix sourcemap support in Ember v2 pipeline #492

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 9 commits into from
Sep 3, 2020
Merged

Update concat strategy; Fix sourcemap support in Ember v2 pipeline #492

merged 9 commits into from
Sep 3, 2020

Conversation

timlindvall
Copy link
Contributor

@timlindvall timlindvall commented Aug 29, 2020 •
edited
Loading

Fixes #476. Fixes #485.

Tim Lindvall added 3 commits August 27, 2020 14:21
fix: Spelling - brocolli -> broccoli.
ce8aec6
fix: Exclude compiled blocks from vendor.css.
367d95a
feat: Update concatenation. WIP sourcemaps fix.
52a6077 
- Use broccoli-concat to merge files together, which can better handle
sourcemaps that are present.
- Update BaseImporter to ensure that sourcemaps are included in parsed
CSS content from compiled css files.
Tim Lindvall added 2 commits September 1, 2020 21:31
feat: End-to-end sourcemaps for ember v2 pipeline.
66c9cdb 
- Use raw Compiled CSS contents in the build pipeline. Trying to use
something else causes misaligment with embedded sourcemap char data.
- Remove some sourcemap logic from the prev. commit that's no longer
necessary.
feat: Provide ability to override concat settings.
c390f1c 
- Useful for apps that need to set a particular order of concatenation
for CSS files in the final build artifact (for stuff such as, for
instance, reset stylesheets, which are lower priority than CSS Blocks.)
@timlindvall timlindvall marked this pull request as ready for review September 2, 2020 05:30
ramitha
ramitha approved these changes Sep 2, 2020
View reviewed changes
Copy link
Contributor

@ramitha ramitha left a comment

Choose a reason for hiding this comment

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

Does this mean we won't need the the import 'css-blocks' within the app.(s)css file?

@timlindvall
Copy link
Contributor Author

Does this mean we won't need the the import 'css-blocks' within the app.(s)css file?

Yes, broccoli-concat will merge the files together. We'll provide the ability to override concat settings in the event there's multiple files to merge together or apps want to change the order.

chriseppstein
chriseppstein suggested changes Sep 2, 2020
View reviewed changes
Copy link
Contributor

@chriseppstein chriseppstein left a comment

Choose a reason for hiding this comment

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

This is great stuff. I'm glad you got this working, it's super important to the developer experience. I think it needs a few small changes and then it will be ready to merge.

Tim Lindvall and others added 3 commits September 2, 2020 17:04
@chriseppstein
refactor: Clean up config merging per feedback.
132ecbe 
Co-authored-by: Chris Eppstein <[email protected]>
@chriseppstein
fix: Typo in concat options docs.
12ffa36 
Co-authored-by: Chris Eppstein <[email protected]>
fix: Updates per PR feedback.
f425520 
- Use user settings to construct blocks file path.
- More granular options merging to build broccoli-concat settings, to
ensure sourceMapConfig is accurate.
- Use false instead of "SKIP" to disable concat.
chriseppstein
chriseppstein approved these changes Sep 3, 2020
View reviewed changes
Copy link
Contributor

@chriseppstein chriseppstein left a comment

Choose a reason for hiding this comment

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

One comment. Approved to merge once that's addressed.

refactor: Default for options.output.
27469d1 
Default to css-blocks.css if not declared. Unifies hardcoded defaults
from multiple locations.
@timlindvall timlindvall merged commit e6736e9 into master Sep 3, 2020
@timlindvall timlindvall deleted the work-concat-files branch September 3, 2020 22:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chriseppstein chriseppstein chriseppstein approved these changes

@ramitha ramitha ramitha approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Sourcemap Support Compiled Blocks from CSS from addons ends up in vendor.css
3 participants
@timlindvall @chriseppstein @ramitha