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.

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

[DO NOT MERGE] #6617 on top of #6449 #6650

Closed
wants to merge 35 commits into from
Closed

[DO NOT MERGE] #6617 on top of #6449 #6650

wants to merge 35 commits into from

Conversation

nathanhammond
Copy link
Contributor

Should demonstrate any failures introduced in #6617.

@nathanhammond
Fixture helpers.
b84e90d
@nathanhammond
Clean up fixture helpers.
3f0912b
@nathanhammond
Make it possible to use blueprint values in the fixtures.
68a3538
@nathanhammond
Continue fixture work.
1b955fd
@nathanhammond
Enable caching of npm and bower packages.
47ba794
@nathanhammond
First pass at global caching.
7381dd0
@nathanhammond
Adopt yarn for package cache.
fe37d79
@nathanhammond
Clean up and add notes.
46da3ed
@nathanhammond
Use real blueprint.
6943977
@nathanhammond
Almost fully-sync blueprint helper.
6bc5a51
@nathanhammond
Able to run a blueprint and directly turn it into a fixture.
d6a7270
@nathanhammond
Cleanup.
7acd87a
@nathanhammond
Rework fixture helpers to reduce complexity.
b74a7b0
@nathanhammond
(App|Addon|InRepoAddon)Fixture work.
ece5374
@nathanhammond
Small fixes, addMethod.
01c513e
@nathanhammond
Nested preprocessor tests.
a6b1275
@nathanhammond
Add test fixtures.
c8123f8
@nathanhammond
Remove CSS preprocessor because it is bonkers.
0b797f2
@nathanhammond
Refactor the Fixture class.
3b8d0a1
@nathanhammond
Complete nested preprocessor tests.
f379fdd
@nathanhammond
Add in preprocessTree and postprocessTree tests.
5894d7f
@nathanhammond
Move some deck chairs.
856e308
@nathanhammond
Remove last vestiges of original CSS work.
a7aebeb
@nathanhammond
Add and test markers.
5ef4fd3
@nathanhammond
Make linter happy.
7e33364
@nathanhammond
Increase timeout.
9696a78
@nathanhammond
Fix remaining test failures.
75f927a
@nathanhammond
Rename test.
bca19a1
@nathanhammond
Move fixturify, use propagated project reference.
259f0a9
@nathanhammond
Link in Ember CLI by default.
e48ea17
nathanhammond and others added 5 commits January 6, 2017 17:54
@nathanhammond
Make linter happy.
be48674
@nathanhammond
Update for ember-cli#6516 changes.
3e6f217
@nathanhammond
Tests for ember-cli#6617.
df3442d
@nathanhammond
Add expectations for vendor output.
37f93e9
@rwjblue @nathanhammond
Remove wasted work around addon's addon trees.
9846133 
Prior to this change, after retrieving the `addon` trees for all addons
we then immediately concat the assets down into a single `addons.{js,css}`
file (after merging and funneling to a different location).

The long term objective is to keep "loose modules" throughout the entire
pipeline and eventually replace the final concat stages that we are currently
using with a higher level "packager". This takes a very small step towards
that future...

The good news is that this is actually a win regardless of that future state.
@nathanhammond
Copy link
Contributor Author

nathanhammond commented Jan 7, 2017 •
edited

Output change identified so far:

Before 6617 
.child-addon { content: "addon/styles/_import.css"; }
.child-addon { content: "addon/styles/alpha.css"; }
.child-addon { content: "addon/styles/app.css"; }
.child-addon { content: "addon/styles/child-addon.css"; }
.grandchild-addon { content: "addon/styles/grandchild-addon.css"; }
.child-addon { content: "addon/styles/_import.css"; }
.child-addon { content: "addon/styles/addon.css"; }
.child-addon { content: "addon/styles/alpha.css"; }
.child-addon { content: "addon/styles/app.css"; }
.child-addon { content: "addon/styles/child-addon.css"; }
.child-addon { content: "addon/styles/zeta.css"; }
.grandchild-addon { content: "addon/styles/_import.css"; }
.grandchild-addon { content: "addon/styles/addon.css"; }
.grandchild-addon { content: "addon/styles/alpha.css"; }
.grandchild-addon { content: "addon/styles/app.css"; }
.grandchild-addon { content: "addon/styles/grandchild-addon.css"; }
.grandchild-addon { content: "addon/styles/zeta.css"; }
.child-addon { content: "addon/styles/zeta.css"; }
After 6617 
.child-addon { content: "addon/styles/_import.css"; }
.child-addon { content: "addon/styles/alpha.css"; }
.child-addon { content: "addon/styles/app.css"; }
.child-addon { content: "addon/styles/child-addon.css"; }
.child-addon { content: "addon/styles/_import.css"; }
.child-addon { content: "addon/styles/addon.css"; }
.child-addon { content: "addon/styles/alpha.css"; }
.child-addon { content: "addon/styles/app.css"; }
.child-addon { content: "addon/styles/child-addon.css"; }
.child-addon { content: "addon/styles/zeta.css"; }
.grandchild-addon { content: "addon/styles/grandchild-addon.css"; }
.grandchild-addon { content: "addon/styles/_import.css"; }
.grandchild-addon { content: "addon/styles/addon.css"; }
.grandchild-addon { content: "addon/styles/alpha.css"; }
.grandchild-addon { content: "addon/styles/app.css"; }
.grandchild-addon { content: "addon/styles/grandchild-addon.css"; }
.grandchild-addon { content: "addon/styles/zeta.css"; }
.child-addon { content: "addon/styles/zeta.css"; }

The trick is to identify which section came from vendor.css as opposed to being inserted via other methods to understand why it changed.

@homu
Copy link
Contributor

homu commented Jan 11, 2017

☔ The latest upstream changes (presumably #6664) made this pull request unmergeable. Please resolve the merge conflicts.

@nathanhammond nathanhammond deleted the remove-extra-work branch March 28, 2017 21:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nathanhammond @homu @rwjblue