Skip to content

Refactor for readability (v2 branch)#214

Merged
evenstensberg merged 3 commits into
webpack:v2from
itsMapleLeaf:feature/add-cleanup
Dec 15, 2017
Merged

Refactor for readability (v2 branch)#214
evenstensberg merged 3 commits into
webpack:v2from
itsMapleLeaf:feature/add-cleanup

Conversation

@itsMapleLeaf

Copy link
Copy Markdown

No description provided.

@evenstensberg

Copy link
Copy Markdown
Member

I'll fix the conflicts, thank you so much @kingdaro !

@evenstensberg

Copy link
Copy Markdown
Member

Oh, wait, correct. Made some modifications to the add generator. Could you do that too? For the remove and update generator, just resolve the conflicts by setting it to your commit

@itsMapleLeaf

Copy link
Copy Markdown
Author

Resolving conflicts, and in update-generator and remove-generator, the linter is complaining about something being used called RawList. Where's that from?

@evenstensberg

Copy link
Copy Markdown
Member

const RawList = require("webpack-addons").rawList, comment it out if it's complaining on unused, need to work on those generators later anyways, so for ease, you could just have it export the class for now, like in the conflict

@itsMapleLeaf

Copy link
Copy Markdown
Author

Just to be 100% certain, here's the contents of the file: https://gist.github.com/kingdaro/f298dc8b7abf7ec8589ab6b23405e588

So the bottom bit is what's coming from v2, and the top is what's currently in my cleanup commit. I want the one on the bottom, yes?

@evenstensberg

Copy link
Copy Markdown
Member

yep, that's correct

@evenstensberg

Copy link
Copy Markdown
Member

Done @kingdaro ? No changes to add ?

@itsMapleLeaf

Copy link
Copy Markdown
Author

Yeah, that was a mistake, fixed now. Should be good to go 👍

@evenstensberg evenstensberg left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM :shipit: thanks!!!

@evenstensberg
evenstensberg merged commit b639c77 into webpack:v2 Dec 15, 2017
@evenstensberg evenstensberg mentioned this pull request Dec 15, 2017
@itsMapleLeaf
itsMapleLeaf deleted the feature/add-cleanup branch December 15, 2017 16:03
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