Skip to content

Wiser, safer vendor includes#78

Closed
jakeleboeuf wants to merge 8 commits intoFutoRicky:devfrom
jakeleboeuf:master
Closed

Wiser, safer vendor includes#78
jakeleboeuf wants to merge 8 commits intoFutoRicky:devfrom
jakeleboeuf:master

Conversation

@jakeleboeuf
Copy link
Contributor

This fixes #76- @kratiahuja, maybe you could give your 2 cents?

@kratiahuja
Copy link

We discussed offline over slack. Please move the css tree to treeForStyles. Also please make sure to test these scenarios too: https://gist.github.com/kratiahuja/d22de0fb1660cf0ef58f07a6bcbf1a1c#testing-guidelines

Rest LGTM.

index.js Outdated
content => `if (typeof FastBoot === 'undefined') { ${content} }`
);

return new MergeTrees(vendorTree, dropzoneJs);

Choose a reason for hiding this comment

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

new MergeTrees([vendorTree, dropzoneJs]);

index.js Outdated
}
);

return new MergeTrees(styleTree, dropzoneCss);

Choose a reason for hiding this comment

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

Same here.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Seems trying to merge with a null tree throws an error Expected Broccoli node, got undefined for inputNodes[0]

@FutoRicky
Copy link
Owner

Hey, this looks good. Could you rebase with the latest changes on the dev branch? Thanks!

@FutoRicky FutoRicky changed the base branch from master to dev June 10, 2017 04:39
@FutoRicky
Copy link
Owner

Had to rebase with newer changes. Added these changes to most recent commit d9355e3

@FutoRicky FutoRicky closed this Aug 5, 2017
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.

3 participants