From 95712ea35781aafc9b30da48acd0fba4bd0ed04d Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Wed, 19 Apr 2017 18:37:55 +0800 Subject: [PATCH] Update package.json --- package.json | 37 ++++++++++--------------------------- yarn.lock | 51 +++------------------------------------------------ 2 files changed, 13 insertions(+), 75 deletions(-) diff --git a/package.json b/package.json index 88f2b3ed4..8d284241d 100644 --- a/package.json +++ b/package.json @@ -1,50 +1,34 @@ { "name": "mermaid", "version": "7.0.0", - "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams and gantt charts.", + "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.", "main": "src/mermaid.js", "keywords": [ "diagram", "markdown", "flowchart", "sequence diagram", - "gantt" + "gantt", + "class diagram", + "git graph" ], "bin": { "mermaid": "./bin/mermaid.js" }, - "watch": { - "lint": { - "patterns": [ - "bin", - "gulp", - "lib", - "src", - "test", - "*.js" - ], - "extensions": "js", - "ignore": [ - "src/d3.js", - "**/parser/*.js" - ] - } - }, "scripts": { + "watch": "yarn build -- --watch", "build": "node -r babel-register ./node_modules/.bin/webpack --progress --colors", "dist": "node -r babel-register ./node_modules/.bin/webpack --progress --colors -p --config webpack.config.prod.js", "upgrade": "rm -rf node_modules && rm yarn.lock && yarn install && ncu -ua && yarn upgrade && yarn remove d3 && yarn add d3@3.5.17", - "live": "live-server ./test/examples", "lint": "node_modules/.bin/standard", - "jison": "gulp jison_legacy", "karma": "node node_modules/karma/bin/karma start karma.conf.js --single-run", - "watch": "npm-watch", - "old_watch": "source ./scripts/watch.sh", - "doc": "rm -r build;rm -r dist/www;gulp vartree;cp dist/www/all.html ../mermaid-pages/index.html;cp dist/mermaid.js ../mermaid-pages/javascripts/lib;cp dist/mermaid.forest.css ../mermaid-pages/stylesheets", "tape": "node node_modules/tape/bin/tape test/cli_test-*.js", - "jasmine": "yarn run jison && node node_modules/jasmine-es6/bin/jasmine.js", "pretest": "yarn run jison && yarn lint", - "test": "yarn run tape && yarn run karma" + "test": "yarn run tape && yarn run karma", + "live": "live-server ./test/examples", + "jison": "gulp jison_legacy", + "old_watch": "source ./scripts/watch.sh", + "doc": "rm -r build;rm -r dist/www;gulp vartree;cp dist/www/all.html ../mermaid-pages/index.html;cp dist/mermaid.js ../mermaid-pages/javascripts/lib;cp dist/mermaid.forest.css ../mermaid-pages/stylesheets" }, "repository": { "type": "git", @@ -128,7 +112,6 @@ "marked": "^0.3.6", "mock-browser": "^0.92.14", "npm-check-updates": "^2.11.0", - "npm-watch": "^0.1.8", "phantomjs-prebuilt": "^2.1.14", "require-dir": "^0.3.1", "rimraf": "^2.6.1", diff --git a/yarn.lock b/yarn.lock index b1be86c3d..f0267ed9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2595,7 +2595,7 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -event-stream@^3.1.7, event-stream@^3.3.4, event-stream@latest, event-stream@~3.3.0: +event-stream@^3.1.7, event-stream@^3.3.4, event-stream@latest: version "3.3.4" resolved "https://registry.yarnpkg.com/event-stream/-/event-stream-3.3.4.tgz#4ab4c9a0f5a54db9338b4c34d86bfce8f4b35571" dependencies: @@ -3859,10 +3859,6 @@ iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" -ignore-by-default@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - ignore@^3.0.11, ignore@^3.0.9, ignore@^3.2.0: version "3.2.7" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd" @@ -4846,13 +4842,6 @@ lodash.cond@^4.3.0: version "4.5.2" resolved "https://registry.yarnpkg.com/lodash.cond/-/lodash.cond-4.5.2.tgz#f471a1da486be60f6ab955d17115523dd1d255d5" -lodash.defaults@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c" - dependencies: - lodash.assign "^3.0.0" - lodash.restparam "^3.0.0" - lodash.defaults@^4.0.1: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -5437,21 +5426,6 @@ node-uuid@~1.4.7: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" -nodemon@^1.3.8: - version "1.11.0" - resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c" - dependencies: - chokidar "^1.4.3" - debug "^2.2.0" - es6-promise "^3.0.2" - ignore-by-default "^1.0.0" - lodash.defaults "^3.1.2" - minimatch "^3.0.0" - ps-tree "^1.0.1" - touch "1.0.0" - undefsafe "0.0.3" - update-notifier "0.5.0" - nomnom@1.5.2, "nomnom@>= 1.5.x": version "1.5.2" resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.5.2.tgz#f4345448a853cfbd5c0d26320f2477ab0526fe2f" @@ -5459,7 +5433,7 @@ nomnom@1.5.2, "nomnom@>= 1.5.x": colors "0.5.x" underscore "1.1.x" -nopt@1.0.10, nopt@~1.0.10: +nopt@1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" dependencies: @@ -5558,13 +5532,6 @@ npm-user-validate@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/npm-user-validate/-/npm-user-validate-0.1.5.tgz#52465d50c2d20294a57125b996baedbf56c5004b" -npm-watch@^0.1.8: - version "0.1.8" - resolved "https://registry.yarnpkg.com/npm-watch/-/npm-watch-0.1.8.tgz#18caddb1f769e21c896e6ba79168aed8e0da7eb8" - dependencies: - nodemon "^1.3.8" - through2 "^2.0.0" - npm@^3, npm@^3.10.6: version "3.10.10" resolved "https://registry.yarnpkg.com/npm/-/npm-3.10.10.tgz#5b1d577e4c8869d6c8603bc89e9cd1637303e46e" @@ -6177,12 +6144,6 @@ prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" -ps-tree@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ps-tree/-/ps-tree-1.1.0.tgz#b421b24140d6203f1ed3c76996b4427b08e8c014" - dependencies: - event-stream "~3.3.0" - pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -7518,12 +7479,6 @@ to-fast-properties@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" -touch@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/touch/-/touch-1.0.0.tgz#449cbe2dbae5a8c8038e30d71fa0ff464947c4de" - dependencies: - nopt "~1.0.10" - tough-cookie@^2.3.2, tough-cookie@~2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" @@ -7654,7 +7609,7 @@ unzip-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe" -update-notifier@0.5.0, update-notifier@^0.5.0: +update-notifier@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-0.5.0.tgz#07b5dc2066b3627ab3b4f530130f7eddda07a4cc" dependencies: