Skip to content

Commit

Permalink
Merge pull request #120 from iwatakeshi/master
Browse files Browse the repository at this point in the history
:rocket
  • Loading branch information
iwatakeshi committed May 17, 2016
2 parents d8c9ff2 + 0aa7449 commit c0cd8ff
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
4 changes: 2 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const Option = require('mr-doc-utils').Option;
const Output = require('mr-doc-utils').Output;
const Promise = require('bluebird');
const VinylFS = require('vinyl-fs');
const Parser = require('parser');
const Compiler = require('compiler');
const Parser = require('mr-doc-parser');
const Compiler = require('mr-doc-compiler');
const log = new Log();

class MrDoc {
Expand Down
15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,15 @@
"node": ">= 5.0.0"
},
"dependencies": {
"compiler": "github:mr-doc/compiler#v1.0.0",
"fs-extra": "^0.26.7",
"bluebird": "^3.3.5",
"gulp-if": "^2.0.0",
"is-glob": "^2.0.1",
"json-stringify": "^1.0.0",
"liftoff": "^2.2.0",
"lodash": "^4.6.1",
"mr-doc-compiler": "1.0.0",
"mr-doc-parser": "1.0.0",
"mr-doc-utils": "^2.2.2",
"parser": "github:mr-doc/parser#v1.0.0",
"rc": "^1.1.6",
"shortid": "^2.2.4",
"v8flags": "^2.0.11",
"vinyl": "^1.1.1",
"vinyl-fs": "^2.4.3",
"yargs": "^4.3.2"
},
Expand All @@ -51,8 +47,7 @@
"eslint-plugin-react": "^4.2.3",
"gulp": "^3.9.1",
"gulp-eslint": "^2.0.0",
"gulp-mocha": "^2.2.0",
"through2": "^2.0.1"
"gulp-mocha": "^2.2.0"
},
"keywords": [
"dox",
Expand All @@ -65,4 +60,4 @@
"javascript",
"coffeescript"
]
}
}

0 comments on commit c0cd8ff

Please sign in to comment.