From 15bdaca2f9114b2e0815ca179c21ab0d6cc855a9 Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Thu, 13 Apr 2017 22:21:09 +0800 Subject: [PATCH] Use yarn install of npm --- .ackrc | 1 + CONTRIBUTING.md | 10 +++--- package.json | 11 +++---- src/diagrams/gantt/ganttRenderer.js | 4 +-- yarn.lock | 51 +++++------------------------ 5 files changed, 21 insertions(+), 56 deletions(-) diff --git a/.ackrc b/.ackrc index 3eeec45ce..ba1f07dc8 100644 --- a/.ackrc +++ b/.ackrc @@ -1,3 +1,4 @@ --ignore-dir=dist --ignore-dir=docs --ignore-dir=editor +--ignore-file=match:/^yarn\.lock$/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 63c9af8dc..df012db67 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ a pull request, we will love you forever if you include jasmine tests. We can al Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this: $ git commit -m "A brief summary of the commit -> +> > A paragraph describing what changed and its impact." Coding conventions Start reading our code and you'll get the hang of it. We optimize for readability: @@ -50,10 +50,10 @@ url('/images/blah.gif'), use url('../images/blah.gif'). Fork, then: ``` -npm install +yarn install ``` -Then the dependencies will have been installed. You use gulp and npm calls as build tools. +Then the dependencies will have been installed. You use gulp and yarn calls as build tools. The following targets are probably interesting: @@ -65,12 +65,12 @@ gulp jison ``` To run the tests: ``` -npm run karma +yarn run karma ``` To build the /dist directory ``` -npm run dist +yarn run dist ``` Thanks, Knut Sveidqvist diff --git a/package.json b/package.json index eb93c532e..5046dabd7 100644 --- a/package.json +++ b/package.json @@ -22,15 +22,15 @@ "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": "npm run jison &&node node_modules/jasmine-es6/bin/jasmine.js", - "pretest": "npm run jison", - "test": "npm run tape && npm run karma", + "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", "dist-slim-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -s mermaid -o dist/mermaid.slim.js -x d3 && cat dist/mermaid.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.slim.min.js", "dist-slim-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -s mermaidAPI -o dist/mermaidAPI.slim.js -x d3 && cat dist/mermaidAPI.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.slim.min.js", "dist-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -s mermaid -o dist/mermaid.js && cat dist/mermaid.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.min.js", "dist-mermaid-nomin": "node node_modules/browserify/bin/cmd.js src/mermaid.js -s mermaid -o dist/mermaid.js", "dist-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -s mermaidAPI -o dist/mermaidAPI.js && cat dist/mermaidAPI.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.min.js", - "dist": "npm run dist-slim-mermaid && npm run dist-slim-mermaidAPI && npm run dist-mermaid && npm run dist-mermaidAPI" + "dist": "yarn run dist-slim-mermaid && yarn run dist-slim-mermaidAPI && yarn run dist-mermaid && yarn run dist-mermaidAPI" }, "repository": { "type": "git", @@ -62,15 +62,12 @@ }, "devDependencies": { "async": "^2.3.0", - "babel-eslint": "^7.2.1", "babelify": "^7.3.0", "browserify": "~14.3.0", "clone": "^2.1.1", "codeclimate-test-reporter": "0.4.1", "dateformat": "^2.0.0", "dox": "^0.9.0", - "eslint": "^3.19.0", - "eslint-watch": "^3.0.1", "event-stream": "^3.3.4", "foundation": "^4.2.1-1", "front-matter": "^2.1.2", diff --git a/src/diagrams/gantt/ganttRenderer.js b/src/diagrams/gantt/ganttRenderer.js index 0f87d6173..4dc7272ba 100644 --- a/src/diagrams/gantt/ganttRenderer.js +++ b/src/diagrams/gantt/ganttRenderer.js @@ -109,7 +109,7 @@ module.exports.draw = function (text, id) { drawToday(leftPadding, topPadding, pageWidth, pageHeight) } - function drawRects (theArray, theGap, theTopPad, theSidePad, theBarHeight, theColorScale, w, h) { // eslint-disable-line no-unused-vars + function drawRects (theArray, theGap, theTopPad, theSidePad, theBarHeight, theColorScale, w, h) { svg.append('g') .selectAll('rect') .data(theArray) @@ -123,7 +123,7 @@ module.exports.draw = function (text, id) { return w - conf.rightPadding / 2 }) .attr('height', theGap) - .attr('class', function (d) { // eslint-disable-line no-unused-vars + .attr('class', function (d) { for (var i = 0; i < categories.length; i++) { if (d.type === categories[i]) { return 'section section' + (i % conf.numberSectionStyles) diff --git a/yarn.lock b/yarn.lock index 6af751e36..b173bf0c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -448,15 +448,6 @@ babel-core@^6.0.0, babel-core@^6.0.14, babel-core@^6.16.0, babel-core@^6.24.1: slash "^1.0.0" source-map "^0.5.0" -babel-eslint@^7.2.1: - version "7.2.1" - resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.1.tgz#079422eb73ba811e3ca0865ce87af29327f8c52f" - dependencies: - babel-code-frame "^6.22.0" - babel-traverse "^6.23.1" - babel-types "^6.23.0" - babylon "^6.16.1" - babel-generator@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.1.tgz#e715f486c58ded25649d888944d52aa07c5d9497" @@ -922,7 +913,7 @@ babel-plugin-transform-strict-mode@^6.24.1: babel-runtime "^6.22.0" babel-types "^6.24.1" -babel-polyfill@^6.20.0, babel-polyfill@^6.23.0, babel-polyfill@^6.3.14: +babel-polyfill@^6.23.0, babel-polyfill@^6.3.14: version "6.23.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d" dependencies: @@ -1044,7 +1035,7 @@ babel-template@^6.24.1, babel-template@^6.3.0: babylon "^6.11.0" lodash "^4.2.0" -babel-traverse@^6.23.1, babel-traverse@^6.24.1: +babel-traverse@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" dependencies: @@ -1058,7 +1049,7 @@ babel-traverse@^6.23.1, babel-traverse@^6.24.1: invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.19.0, babel-types@^6.23.0, babel-types@^6.24.1: +babel-types@^6.19.0, babel-types@^6.24.1: version "6.24.1" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" dependencies: @@ -1078,7 +1069,7 @@ babelify@^7.3.0: babel-core "^6.0.14" object-assign "^4.0.0" -babylon@^6.11.0, babylon@^6.15.0, babylon@^6.16.1: +babylon@^6.11.0, babylon@^6.15.0: version "6.16.1" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3" @@ -1160,7 +1151,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.3.0, bluebird@^3.4.3, bluebird@^3.4.7: +bluebird@^3.3.0, bluebird@^3.4.3: version "3.5.0" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.0.tgz#791420d7f551eea2897453a8a77653f96606d67c" @@ -1592,7 +1583,7 @@ chalk@^1.0.0, chalk@^1.1.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.4.3, chokidar@^1.6.0, chokidar@^1.6.1: +chokidar@^1.0.0, chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2" dependencies: @@ -2110,7 +2101,7 @@ debug-log@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" -debug@*, debug@2.6.3, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0: +debug@*, debug@2.6.3, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0: version "2.6.3" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d" dependencies: @@ -2748,23 +2739,7 @@ eslint-plugin-standard@~3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-3.0.1.tgz#34d0c915b45edc6f010393c7eef3823b08565cf2" -eslint-watch@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-watch/-/eslint-watch-3.0.1.tgz#1de7262c01ca5cf6b5b9ba617966f26abe4eb283" - dependencies: - babel-polyfill "^6.20.0" - bluebird "^3.4.7" - chalk "^1.1.3" - chokidar "^1.4.3" - debug "^2.6.0" - keypress "^0.2.1" - lodash "^4.17.4" - optionator "^0.8.2" - source-map-support "^0.4.8" - text-table "^0.2.0" - unicons "0.0.3" - -eslint@^3.19.0, eslint@~3.19.0: +eslint@~3.19.0: version "3.19.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc" dependencies: @@ -4994,10 +4969,6 @@ kew@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b" -keypress@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/keypress/-/keypress-0.2.1.tgz#1e80454250018dbad4c3fe94497d6e67b6269c77" - kind-of@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44" @@ -7752,7 +7723,7 @@ sorted-object@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc" -source-map-support@^0.4.2, source-map-support@^0.4.8: +source-map-support@^0.4.2: version "0.4.14" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef" dependencies: @@ -8421,10 +8392,6 @@ underscore@1.1.x: version "1.1.7" resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.1.7.tgz#40bab84bad19d230096e8d6ef628bff055d83db0" -unicons@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/unicons/-/unicons-0.0.3.tgz#6e6a7a1a6eaebb01ca3d8b12ad9687279eaba524" - uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"