search

atlassian / cz-lerna-changelog

A commitizen adapter for the angular preset of https://github.com/conventional-changelog/conventional-changelog
110 stars 39 forks source link

Move lerna dependencies to mainlines #5

Closed Siilwyn closed 7 years ago

Siilwyn commented 7 years ago

Move lerna dependencies to mainlines like described in #2.

vovacodes commented 7 years ago

@Siilwyn could you please resolve the conflict

@jpnelson is the conflict the only reason this PR cannot be merged?

vovacodes commented 7 years ago

Don't mind the deleted comment, this PR is broken, since the file structure of cz-conventional-changelog is changed, i.e. :

// prompt and format files are not there anymore
import conventionalPrompt from 'cz-conventional-changelog/prompt';
import conventionalFormat from 'cz-conventional-changelog/format';
Siilwyn commented 7 years ago

❓ I don't get what's going on. "Don't mind the deleted comment", which comment? What does the FS structure of cz-conventional-changelog have to do with this? If it breaks the module why are the tests passing?

vovacodes commented 7 years ago

If it breaks the module why are the tests passing?

There are no tests here :)

I don't get what's going on. "Don't mind the deleted comment", which comment?

I added the comment that it works locally for me, but it turned out that I forgot to npm install after checking out your branch, that's why I removed that comment, but it still may appear in an email notification or smth.

What does the FS structure of cz-conventional-changelog have to do with this?

import conventionalPrompt from 'cz-conventional-changelog/prompt';
import conventionalFormat from 'cz-conventional-changelog/format';

We have these two imports from cz-conventional-changelog in our src/index.js . Files prompt.js and format.js are not in cz-conventional-changelog@1.2.0, that's why it's broken

Siilwyn commented 7 years ago

Okay, thank you for the detailed explanation! Don't worry I don't have email notifications for GH that would be way too much. ^^