Merge cli repo for better dependency management #139#169
Merge cli repo for better dependency management #139#169acjh merged 236 commits intoMarkBind:masterfrom
Conversation
Ensures that users of the npm package use the forked version of htmlparser2
|
It should be easy to merge changes from MarkBind/markbind-cli when existing PRs there are merged. |
|
If this PR is merged, I can release markbind-cli@1.6.1 from this merged repo tomorrow (or Monday). |
Or we could sync the release versions, and then we can use the same Milestone and tags for both! |
|
To clarify
If we're using local markbind in c36f595 we don't have to run the |
|
You should have run it before, but that was the unmerged markbind-cli folder:
|
|
Thanks @acjh for the efforts!!! The merge is not easy 👏
Also we need to migrate the Wiki page, which works similar to change a git remote address (Wikis are just a repo). |
There was a problem hiding this comment.
Migration looks good to me. But make sure we test:
- All functions are working, including publish.
- Try publish the
markbind-corein the merged repo, after that try install it (using a new node project) to see if it could correctly identify the package.
Also might need to mark the markbind-cli repo as deprecated (remove the code and update the README).
package.json
Outdated
| }, | ||
| "repository": { | ||
| "type": "git", | ||
| "url": "https://github.com/MarkBind/markbind-cli.git" |
There was a problem hiding this comment.
Should change this to MarkBind/markbind
|
Published markbind@1.6.0 and tested like this: $ cd ~/Desktop
$ mkdir tmp
$ cd tmp
$ npm init
$ # Press enter 10 times.
$ npm install markbind@1.6.0
$ echo "const MarkBind = require('markbind');" > index.js
$ echo "console.log(new MarkBind());" >> index.js
$ node index.jsOutput: Parser {
_options: {},
_onError: [Function: bound consoleCall],
_fileCache: {},
dynamicIncludeSrc: [],
staticIncludeSrc: [],
boilerplateIncludeSrc: [],
missingIncludeSrc: [] } |
Add htmlparser2 as a dependency
Ignore updates to source files while live-reloading is in progress MarkBind#155
# Conflicts: # package.json
|
Merge worked fine. |
I was thinking of going straight to #135. Easier to track future changes and PRs.
I updated the README. I'll remove the code when the remaining PRs are closed. |
|
@Gisonrg Can you activate Travis on this repo? 🙈 |
Resolves #139
I did
git merge cli --allow-unrelated-historiesto preserve histories from both repos.As such, there are 200+ commits. Here are the newest commits that are specific to this PR:
9962681 Use local markbind(overwritten by force-push)cdto themarkbindfolder, pull this branch, and then run (sudo)npm link.npm version, tagging is now committed for cli but not the core library.