From 332ceb0da65ad935e5f85c109a37979099abad86 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Tue, 18 Apr 2017 22:14:02 +0800
Subject: [PATCH 01/33] Replace karma + PhantomJS with karma + Chrome headless

---
 karma.conf.js     | 22 ++++++++++++++--------
 package.json      |  4 ++--
 src/utils.spec.js | 20 ++++++++++----------
 todo.md           |  2 ++
 yarn.lock         | 48 ++++++++++++++++++++++++++++-------------------
 5 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 44a7021180..07c9efffb7 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -26,12 +26,8 @@ module.exports = function (config) {
       'src/**/*.spec.js': ['browserify']
     },
 
-    // list of files to exclude
-    // exclude: ['src/diagrams/*.js'],
-
     browserify: {
       debug: true,
-      // plugin: ['proxyquireify/plugin']
       extensions: ['.js'],
       configure: function (bundle) {
         bundle.on('prebundle', function () {
@@ -40,8 +36,6 @@ module.exports = function (config) {
         })
       }
     },
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
 
     // test results reporter to use
     // possible values: 'dots', 'progress'
@@ -61,12 +55,24 @@ module.exports = function (config) {
     // enable / disable watching file and executing tests whenever any file changes
     autoWatch: true,
 
+    customLaunchers: {
+      ChromeCanaryHeadless: {
+        base: 'ChromeCanary',
+        flags: [
+          '--headless',
+          '--disable-gpu',
+          // Without a remote debugging port, Google Chrome exits immediately.
+          '--remote-debugging-port=9222'
+        ]
+      }
+    },
+
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+    browsers: ['ChromeCanaryHeadless'],
     plugins: [
       'karma-jasmine',
-      'karma-phantomjs-launcher',
+      'karma-chrome-launcher',
       'karma-browserify',
       'karma-babel-preprocessor'
     ],
diff --git a/package.json b/package.json
index c6130ab684..c6f0ca5ea1 100644
--- a/package.json
+++ b/package.json
@@ -124,13 +124,13 @@
     "karma": "^1.6.0",
     "karma-babel-preprocessor": "^6.0.1",
     "karma-browserify": "^5.1.1",
+    "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
-    "karma-phantomjs-launcher": "^1.0.4",
     "live-server": "^1.2.0",
     "map-stream": "0.0.7",
     "marked": "^0.3.6",
     "mock-browser": "^0.92.14",
-    "npm-check-updates": "^2.10.5",
+    "npm-check-updates": "^2.11.0",
     "npm-watch": "^0.1.8",
     "phantomjs": "^2.1.7",
     "proxyquire": "^1.7.11",
diff --git a/src/utils.spec.js b/src/utils.spec.js
index 420c6bedea..a978b9b38c 100644
--- a/src/utils.spec.js
+++ b/src/utils.spec.js
@@ -64,13 +64,13 @@ describe('when cloning CSS ', function () {
 
   function addStyleToDocument () {
     var s = document.createElement('style')
-    s.innerHTML = '.node { stroke:#eeeeee; }\n.node-square { stroke:#bbbbbb; }\n'
+    s.innerHTML = '.node { stroke:rgb(238, 238, 238); }\n.node-square { stroke:rgb(187, 187, 187); }\n'
     document.body.appendChild(s)
   }
 
   function addSecondStyleToDocument () {
     var s = document.createElement('style')
-    s.innerHTML = '.node2 { stroke:#eeeeee; }\n.node-square { stroke:#beb; }\n'
+    s.innerHTML = '.node2 { stroke:rgb(238, 238, 238); }\n.node-square { stroke:#beb; }\n'
     document.body.appendChild(s)
   }
 
@@ -146,7 +146,7 @@ describe('when cloning CSS ', function () {
     var svg = generateSVG()
     addStyleToDocument()
     utils.cloneCssStyles(svg, {})
-    expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}'])
+    expect(stylesToArray(svg)).toEqual(['.node { stroke: rgb(238, 238, 238);}', '.node-square { stroke: rgb(187, 187, 187);}'])
   })
 
   it('should handle multiple stylesheets in document with classes in SVG', function () {
@@ -154,7 +154,7 @@ describe('when cloning CSS ', function () {
     addStyleToDocument()
     addSecondStyleToDocument()
     utils.cloneCssStyles(svg, {})
-    expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}', '.node-square { stroke: #bbeebb;}'])
+    expect(stylesToArray(svg)).toEqual(['.node { stroke: rgb(238, 238, 238);}', '.node-square { stroke: rgb(187, 187, 187);}', '.node-square { stroke: rgb(187, 238, 187);}'])
   })
 
   it('should handle multiple stylesheets + ignore styles in other mermaid SVG', function () {
@@ -163,14 +163,14 @@ describe('when cloning CSS ', function () {
     addSecondStyleToDocument()
     addMermaidSVGwithStyleToDocument()
     utils.cloneCssStyles(svg, {})
-    expect(stylesToArray(svg)).toEqual(['.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}', '.node-square { stroke: #bbeebb;}'])
+    expect(stylesToArray(svg)).toEqual(['.node { stroke: rgb(238, 238, 238);}', '.node-square { stroke: rgb(187, 187, 187);}', '.node-square { stroke: rgb(187, 238, 187);}'])
   })
 
   it('should handle a default class together with stylesheet in document with classes in SVG', function () {
     var svg = generateSVG()
     addStyleToDocument()
     utils.cloneCssStyles(svg, { 'default': { 'styles': ['stroke:#ffffff', 'stroke-width:1.5px'] } })
-    expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }', '.node { stroke: #eeeeee;}', '.node-square { stroke: #bbbbbb;}'])
+    expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }', '.node { stroke: rgb(238, 238, 238);}', '.node-square { stroke: rgb(187, 187, 187);}'])
   })
 
   it('should handle a default class together with stylesheet in document and classDefs', function () {
@@ -178,13 +178,13 @@ describe('when cloning CSS ', function () {
     addStyleToDocument()
     utils.cloneCssStyles(svg, {
       'default': { 'styles': ['stroke:#ffffff', 'stroke-width:1.5px'] },
-      'node-square': { 'styles': ['fill:#eeeeee', 'stroke:#aaaaaa'] },
+      'node-square': { 'styles': ['fill:rgb(238, 238, 238)', 'stroke:#aaaaaa'] },
       'node-circle': { 'styles': ['fill:#444444', 'stroke:#111111'] }
     })
     expect(stylesToArray(svg)).toEqual(['#mermaid-01 .node>rect { stroke:#ffffff; stroke-width:1.5px; }',
-      '.node { stroke: #eeeeee;}',
-      '.node-square { stroke: #bbbbbb;}',
-      '#mermaid-01 .node-square>rect, .node-square>polygon, .node-square>circle, .node-square>ellipse { fill:#eeeeee; stroke:#aaaaaa; }',
+      '.node { stroke: rgb(238, 238, 238);}',
+      '.node-square { stroke: rgb(187, 187, 187);}',
+      '#mermaid-01 .node-square>rect, .node-square>polygon, .node-square>circle, .node-square>ellipse { fill:rgb(238, 238, 238); stroke:#aaaaaa; }',
       '#mermaid-01 .node-circle>rect, .node-circle>polygon, .node-circle>circle, .node-circle>ellipse { fill:#444444; stroke:#111111; }'
     ])
   })
diff --git a/todo.md b/todo.md
index 358a48d798..3a0c65ffd1 100644
--- a/todo.md
+++ b/todo.md
@@ -12,3 +12,5 @@
 - d3 v3 doesn't support 'use strict'
     - babel-plugin-transform-remove-strict-mode
         - need to remove it after upgrading to d3 v4
+- use headless chrome provided by karma-chrome-launcher
+- https://github.com/karma-runner/karma-chrome-launcher
diff --git a/yarn.lock b/yarn.lock
index d8d15cc5cb..93c5319508 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -116,8 +116,8 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.6.tgz#947e93049790942b2a2d60a8289b28924d39f987"
+  version "4.11.7"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -244,8 +244,8 @@ arr-diff@^2.0.0:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.2.tgz#1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.3.tgz#a274ed85ac08849b6bd7847c4580745dc51adfb1"
 
 arr-union@^2.0.1:
   version "2.1.0"
@@ -3356,6 +3356,12 @@ front-matter@^2.0.0, front-matter@^2.1.2:
   dependencies:
     js-yaml "^3.4.6"
 
+fs-access@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/fs-access/-/fs-access-1.0.1.tgz#d6a87f262271cefebec30c553407fb995da8777a"
+  dependencies:
+    null-check "^1.0.0"
+
 fs-exists-sync@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
@@ -4979,17 +4985,17 @@ karma-browserify@^5.1.1:
     minimatch "^3.0.0"
     os-shim "^0.1.3"
 
+karma-chrome-launcher@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz#c2790c5a32b15577d0fff5a4d5a2703b3b439c25"
+  dependencies:
+    fs-access "^1.0.0"
+    which "^1.2.1"
+
 karma-jasmine@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
 
-karma-phantomjs-launcher@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz#d23ca34801bda9863ad318e3bb4bd4062b13acd2"
-  dependencies:
-    lodash "^4.0.1"
-    phantomjs-prebuilt "^2.1.7"
-
 karma@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-1.6.0.tgz#0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"
@@ -5539,7 +5545,7 @@ lodash@^3.10.0, lodash@^3.10.1, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.11.1, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -6068,9 +6074,9 @@ npm-cache-filename@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
 
-npm-check-updates@^2.10.5:
-  version "2.10.5"
-  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-2.10.5.tgz#2d047e3a24d676e0c99cf7221361088dcc247a6a"
+npm-check-updates@^2.11.0:
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/npm-check-updates/-/npm-check-updates-2.11.0.tgz#6073a2c022eaf27352e2a8b08de931776207b818"
   dependencies:
     bluebird "^3.4.3"
     chalk "^1.1.3"
@@ -6233,6 +6239,10 @@ npmlog@^4.0.2, npmlog@~4.0.0:
     gauge "~2.7.1"
     set-blocking "~2.0.0"
 
+null-check@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -6637,7 +6647,7 @@ pff@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pff/-/pff-1.0.0.tgz#ea5f09ee6571cae292a78fc280905a3865668e78"
 
-phantomjs-prebuilt@^2.1.3, phantomjs-prebuilt@^2.1.7:
+phantomjs-prebuilt@^2.1.3:
   version "2.1.14"
   resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
   dependencies:
@@ -7776,8 +7786,8 @@ snyk-try-require@^1.1.1, snyk-try-require@^1.2.0:
     then-fs "^2.0.0"
 
 snyk@^1.25.1:
-  version "1.28.1"
-  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.28.1.tgz#ae0faed0fcee7d5dbc0fa8a7a8c9ebacb03b6151"
+  version "1.29.0"
+  resolved "https://registry.yarnpkg.com/snyk/-/snyk-1.29.0.tgz#20be4eaddc9641ca004fb24368dc33d6f82d17dc"
   dependencies:
     abbrev "^1.0.7"
     ansi-escapes "^1.3.0"
@@ -8860,7 +8870,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1, which@^1.1.1, which@^1.2.12, which@^1.2.14, which@~1.2.10, which@~1.2.11, which@~1.2.2:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@~1.2.10, which@~1.2.11, which@~1.2.2:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:

From f0dc7f89e41b7c9eb06491f0f945399e5e96e979 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Tue, 18 Apr 2017 22:20:49 +0800
Subject: [PATCH 02/33] Replace phantomjs with phantomjs-prebuilt

---
 package.json |  2 +-
 yarn.lock    | 66 +++++++---------------------------------------------
 2 files changed, 10 insertions(+), 58 deletions(-)

diff --git a/package.json b/package.json
index c6f0ca5ea1..38803d3550 100644
--- a/package.json
+++ b/package.json
@@ -132,7 +132,7 @@
     "mock-browser": "^0.92.14",
     "npm-check-updates": "^2.11.0",
     "npm-watch": "^0.1.8",
-    "phantomjs": "^2.1.7",
+    "phantomjs-prebuilt": "^2.1.14",
     "proxyquire": "^1.7.11",
     "proxyquire-universal": "^1.0.8",
     "proxyquireify": "^3.2.1",
diff --git a/yarn.lock b/yarn.lock
index 93c5319508..77f9a87970 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1173,12 +1173,6 @@ binary-extensions@^1.0.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
 
-bl@~1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e"
-  dependencies:
-    readable-stream "~2.0.5"
-
 bl@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.1.2.tgz#fdca871a99713aa00d19e3bbba41c44787a65398"
@@ -3314,7 +3308,7 @@ fork-stream@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/fork-stream/-/fork-stream-0.0.4.tgz#db849fce77f6708a5f8f386ae533a0907b54ae70"
 
-form-data@~1.0.0-rc3, form-data@~1.0.0-rc4:
+form-data@~1.0.0-rc4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-1.0.1.tgz#ae315db9a4907fa065502304a66d7733475ee37c"
   dependencies:
@@ -3374,7 +3368,7 @@ fs-extra-promise-es6@^0.1.1:
     fs-extra "^0.26.5"
     node-promise-es6 "^0.3.1"
 
-fs-extra@^0.26.5, fs-extra@~0.26.4:
+fs-extra@^0.26.5:
   version "0.26.7"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.26.7.tgz#9ae1fdd94897798edab76d0918cf42d0c3184fa9"
   dependencies:
@@ -4048,7 +4042,7 @@ har-schema@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
 
-har-validator@~2.0.2, har-validator@~2.0.6:
+har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
   dependencies:
@@ -4128,7 +4122,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
   dependencies:
     inherits "^2.0.1"
 
-hasha@^2.2.0, hasha@~2.2.0:
+hasha@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/hasha/-/hasha-2.2.0.tgz#78d7cbfc1e6d66303fe79837365984517b2f6ee1"
   dependencies:
@@ -4139,7 +4133,7 @@ hat@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
 
-hawk@~3.1.0, hawk@~3.1.3:
+hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
   dependencies:
@@ -6251,7 +6245,7 @@ number-is-nan@^1.0.0:
   version "1.3.9"
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.3.9.tgz#8bab486ff7fa3dfd086656bbe8b17116d3692d2a"
 
-oauth-sign@~0.8.0, oauth-sign@~0.8.1:
+oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
@@ -6647,7 +6641,7 @@ pff@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pff/-/pff-1.0.0.tgz#ea5f09ee6571cae292a78fc280905a3865668e78"
 
-phantomjs-prebuilt@^2.1.3:
+phantomjs-prebuilt@^2.1.14, phantomjs-prebuilt@^2.1.3:
   version "2.1.14"
   resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
   dependencies:
@@ -6661,19 +6655,6 @@ phantomjs-prebuilt@^2.1.3:
     request-progress "~2.0.1"
     which "~1.2.10"
 
-phantomjs@^2.1.7:
-  version "2.1.7+deprecated"
-  resolved "https://registry.yarnpkg.com/phantomjs/-/phantomjs-2.1.7.tgz#c6910f67935c37285b6114329fc2f27d5f3e3134"
-  dependencies:
-    extract-zip "~1.5.0"
-    fs-extra "~0.26.4"
-    hasha "^2.2.0"
-    kew "~0.7.0"
-    progress "~1.1.8"
-    request "~2.67.0"
-    request-progress "~2.0.1"
-    which "~1.2.2"
-
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -6898,7 +6879,7 @@ qs@6.4.0, qs@~6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
-qs@^5.2.0, qs@~5.2.0:
+qs@^5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.1.tgz#801fee030e0b9450d6385adc48a4cc55b44aedfc"
 
@@ -7298,31 +7279,6 @@ request@2, request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@~2.67.0:
-  version "2.67.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.67.0.tgz#8af74780e2bf11ea0ae9aa965c11f11afd272742"
-  dependencies:
-    aws-sign2 "~0.6.0"
-    bl "~1.0.0"
-    caseless "~0.11.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.0"
-    forever-agent "~0.6.1"
-    form-data "~1.0.0-rc3"
-    har-validator "~2.0.2"
-    hawk "~3.1.0"
-    http-signature "~1.1.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.7"
-    node-uuid "~1.4.7"
-    oauth-sign "~0.8.0"
-    qs "~5.2.0"
-    stringstream "~0.0.4"
-    tough-cookie "~2.2.0"
-    tunnel-agent "~0.4.1"
-
 request@~2.74.0:
   version "2.74.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.74.0.tgz#7693ca768bbb0ea5c8ce08c084a45efa05b892ab"
@@ -8391,10 +8347,6 @@ tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   dependencies:
     punycode "^1.4.1"
 
-tough-cookie@~2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.2.2.tgz#c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"
-
 tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
@@ -8870,7 +8822,7 @@ which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@~1.2.10, which@~1.2.11, which@~1.2.2:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.12, which@^1.2.14, which@~1.2.10, which@~1.2.11:
   version "1.2.14"
   resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:

From 0ccc216a2cadc0430213fbb7242ba3514c8d92ce Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Tue, 18 Apr 2017 23:20:38 +0800
Subject: [PATCH 03/33] Replace karma-browserify with karma-webpack

---
 karma.conf.js                                 |  37 +++--
 package.json                                  |   6 +-
 .../sequenceDiagram/sequenceDiagram.spec.js   |   6 +-
 yarn.lock                                     | 155 +++++-------------
 4 files changed, 74 insertions(+), 130 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 07c9efffb7..ac3f3caf8f 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -9,7 +9,7 @@ module.exports = function (config) {
 
     // frameworks to use
     // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
-    frameworks: ['browserify', 'jasmine'],
+    frameworks: ['jasmine'],
 
     // list of files / patterns to load in the browser
     files: [
@@ -23,17 +23,32 @@ module.exports = function (config) {
     ],
 
     preprocessors: {
-      'src/**/*.spec.js': ['browserify']
+      'src/**/*.spec.js': ['webpack']
     },
 
-    browserify: {
-      debug: true,
-      extensions: ['.js'],
-      configure: function (bundle) {
-        bundle.on('prebundle', function () {
-          bundle
-            .plugin('proxyquire-universal')
-        })
+    webpack: {
+      externals: ['fs'],
+      module: {
+        rules: [
+          {
+            test: /\.js$/,
+            use: {
+              loader: 'babel-loader',
+              options: {
+                presets: [
+                  ['env', {
+                    'targets': {
+                      'browsers': ['last 3 versions']
+                    }
+                  }]
+                ],
+                plugins: [
+                  'transform-remove-strict-mode'
+                ]
+              }
+            }
+          }
+        ]
       }
     },
 
@@ -73,7 +88,7 @@ module.exports = function (config) {
     plugins: [
       'karma-jasmine',
       'karma-chrome-launcher',
-      'karma-browserify',
+      'karma-webpack',
       'karma-babel-preprocessor'
     ],
     // Continuous Integration mode
diff --git a/package.json b/package.json
index 38803d3550..63020a55ab 100644
--- a/package.json
+++ b/package.json
@@ -115,6 +115,7 @@
     "gulp-util": "^3.0.8",
     "gulp-vartree": "^2.0.1",
     "hogan.js": "^3.0.2",
+    "inject-loader": "^3.0.0",
     "jasmine": "2.5.3",
     "jasmine-es6": "0.4.0",
     "jison": "^0.4.17",
@@ -123,9 +124,9 @@
     "jshint-stylish": "^2.2.1",
     "karma": "^1.6.0",
     "karma-babel-preprocessor": "^6.0.1",
-    "karma-browserify": "^5.1.1",
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
+    "karma-webpack": "^2.0.3",
     "live-server": "^1.2.0",
     "map-stream": "0.0.7",
     "marked": "^0.3.6",
@@ -133,9 +134,6 @@
     "npm-check-updates": "^2.11.0",
     "npm-watch": "^0.1.8",
     "phantomjs-prebuilt": "^2.1.14",
-    "proxyquire": "^1.7.11",
-    "proxyquire-universal": "^1.0.8",
-    "proxyquireify": "^3.2.1",
     "require-dir": "^0.3.1",
     "rimraf": "^2.6.1",
     "standard": "^10.0.2",
diff --git a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
index 42cba7b5c3..7b03fc8a02 100644
--- a/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
+++ b/src/diagrams/sequenceDiagram/sequenceDiagram.spec.js
@@ -1,5 +1,4 @@
 /* eslint-env jasmine */
-var proxyquire = require('proxyquire')
 /**
  * Created by knut on 14-11-18.
  */
@@ -15,7 +14,10 @@ var d3 = {
     return new NewD3()
   }
 }
-var sd = proxyquire('./sequenceRenderer', { '../../d3': d3 })
+const MyModuleInjector = require('inject-loader!./sequenceRenderer') // eslint-disable-line import/no-webpack-loader-syntax
+var sd = MyModuleInjector({
+  '../../d3': d3
+})
 
 function addConf (conf, key, value) {
   if (value !== undefined) {
diff --git a/yarn.lock b/yarn.lock
index 77f9a87970..e96e04690e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -424,7 +424,7 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.0.0, babel-core@^6.16.0, babel-core@^6.24.1:
+babel-core@^6.0.0, babel-core@^6.16.0, babel-core@^6.24.1, babel-core@~6:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
   dependencies:
@@ -1287,7 +1287,7 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-browser-pack@^6.0.0, browser-pack@^6.0.1:
+browser-pack@^6.0.1:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.2.tgz#f86cd6cef4f5300c8e63e07a4d512f65fbff4531"
   dependencies:
@@ -1994,7 +1994,7 @@ content-type@~1.0.1, content-type@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.2.tgz#b7d113aee7a8dd27bd21133c4dc2529df1721eed"
 
-convert-source-map@^1.1.0, convert-source-map@^1.1.3, convert-source-map@^1.2.0:
+convert-source-map@^1.1.0, convert-source-map@^1.2.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
@@ -2318,7 +2318,7 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detective@^4.0.0, detective@~4.1.0:
+detective@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/detective/-/detective-4.1.1.tgz#9c4bac1e9fb8bb34f7f18cae080ea1d03aff2cda"
   dependencies:
@@ -2682,7 +2682,7 @@ escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
-escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
@@ -3146,13 +3146,6 @@ fileset@0.2.x:
     glob "5.x"
     minimatch "2.x"
 
-fill-keys@^1.0.0, fill-keys@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fill-keys/-/fill-keys-1.0.2.tgz#9a8fa36f4e8ad634e3bf6b4f3c8882551452eb20"
-  dependencies:
-    is-object "~1.0.1"
-    merge-descriptors "~1.0.0"
-
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -4094,12 +4087,6 @@ has-gulplog@^0.1.0:
   dependencies:
     sparkles "^1.0.0"
 
-has-require@^1.1.0, has-require@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/has-require/-/has-require-1.2.2.tgz#921675ab130dbd9768fc8da8f1a8e242dfa41774"
-  dependencies:
-    escape-string-regexp "^1.0.3"
-
 has-unicode@^2.0.0, has-unicode@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
@@ -4129,10 +4116,6 @@ hasha@~2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
-hat@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/hat/-/hat-0.0.3.tgz#bb014a9e64b3788aed8005917413d4ff3d502d8a"
-
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -4351,6 +4334,12 @@ init-package-json@~1.9.4:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
+inject-loader@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/inject-loader/-/inject-loader-3.0.0.tgz#0aea1f96e589e657bdbb6b26e7d9d41730e5b68f"
+  dependencies:
+    babel-core "~6"
+
 inline-source-map@~0.3.0:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.3.1.tgz#a528b514e689fce90db3089e870d92f527acb5eb"
@@ -4569,10 +4558,6 @@ is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
 
-is-object@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -4799,10 +4784,6 @@ jodid25519@^1.0.0:
   dependencies:
     jsbn "~0.1.0"
 
-js-string-escape@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef"
-
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
@@ -4968,17 +4949,6 @@ karma-babel-preprocessor@^6.0.1:
   dependencies:
     babel-core "^6.0.0"
 
-karma-browserify@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/karma-browserify/-/karma-browserify-5.1.1.tgz#f642d70d776d9ab3b73526c5732abcfea2400319"
-  dependencies:
-    convert-source-map "^1.1.3"
-    hat "^0.0.3"
-    js-string-escape "^1.0.0"
-    lodash "^3.10.1"
-    minimatch "^3.0.0"
-    os-shim "^0.1.3"
-
 karma-chrome-launcher@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz#c2790c5a32b15577d0fff5a4d5a2703b3b439c25"
@@ -4990,6 +4960,16 @@ karma-jasmine@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.0.tgz#22e4c06bf9a182e5294d1f705e3733811b810acf"
 
+karma-webpack@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-2.0.3.tgz#39cebf5ca2580139b27f9ae69b78816b9c82fae6"
+  dependencies:
+    async "~0.9.0"
+    loader-utils "^0.2.5"
+    lodash "^3.8.0"
+    source-map "^0.1.41"
+    webpack-dev-middleware "^1.0.11"
+
 karma@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-1.6.0.tgz#0e871d4527d5eac56c41d181f03c5c0a7e6dbf3e"
@@ -5194,7 +5174,7 @@ loader-runner@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
 
-loader-utils@^0.2.16:
+loader-utils@^0.2.16, loader-utils@^0.2.5:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
   dependencies:
@@ -5535,7 +5515,7 @@ lodash@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
 
-lodash@^3.10.0, lodash@^3.10.1, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0:
+lodash@^3.10.0, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
@@ -5668,7 +5648,7 @@ meow@^3.3.0:
     redent "^1.0.0"
     trim-newlines "^1.0.0"
 
-merge-descriptors@1.0.1, merge-descriptors@~1.0.0:
+merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
@@ -5848,10 +5828,6 @@ module-deps@~2.0.0:
     stream-combiner "~0.1.0"
     through2 "~0.4.1"
 
-module-not-found-error@^1.0.0, module-not-found-error@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
-
 moment@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
@@ -6413,10 +6389,6 @@ os-name@^1.0.3:
     osx-release "^1.0.0"
     win-release "^1.0.0"
 
-os-shim@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
-
 os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -6551,10 +6523,6 @@ parseurl@~1.3.0, parseurl@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.1.tgz#c8ab8c9223ba34888aa64a297b28853bec18da56"
 
-patch-text@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/patch-text/-/patch-text-1.0.2.tgz#4bf36e65e51733d6e98f0cf62e09034daa0348ac"
-
 path-array@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271"
@@ -6637,10 +6605,6 @@ performance-now@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
 
-pff@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/pff/-/pff-1.0.0.tgz#ea5f09ee6571cae292a78fc280905a3865668e78"
-
 phantomjs-prebuilt@^2.1.14, phantomjs-prebuilt@^2.1.3:
   version "2.1.14"
   resolved "https://registry.yarnpkg.com/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.14.tgz#d53d311fcfb7d1d08ddb24014558f1188c516da0"
@@ -6802,35 +6766,6 @@ proxy-middleware@latest:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
 
-proxyquire-universal@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/proxyquire-universal/-/proxyquire-universal-1.0.8.tgz#2d0884365f76baf8da910b1be6c7f9c942d8640a"
-  dependencies:
-    replace-requires "~1.0.1"
-    through2 "~0.6.3"
-    transformify "^0.1.2"
-
-proxyquire@^1.7.11:
-  version "1.7.11"
-  resolved "https://registry.yarnpkg.com/proxyquire/-/proxyquire-1.7.11.tgz#13b494eb1e71fb21cc3ebe3699e637d3bec1af9e"
-  dependencies:
-    fill-keys "^1.0.2"
-    module-not-found-error "^1.0.0"
-    resolve "~1.1.7"
-
-proxyquireify@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/proxyquireify/-/proxyquireify-3.2.1.tgz#15bee101360acc91dcd86ee4d9a445f8a971eea0"
-  dependencies:
-    browser-pack "^6.0.0"
-    detective "~4.1.0"
-    fill-keys "^1.0.0"
-    has-require "^1.1.0"
-    module-not-found-error "~1.0.1"
-    require-deps "~1.0.1"
-    through "~2.2.7"
-    xtend "^3.0.0"
-
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -6928,7 +6863,7 @@ randombytes@^2.0.0, randombytes@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
 
-range-parser@^1.2.0, range-parser@~1.2.0:
+range-parser@^1.0.3, range-parser@^1.2.0, range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
@@ -7237,15 +7172,6 @@ replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
 
-replace-requires@~1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/replace-requires/-/replace-requires-1.0.3.tgz#73e85df05bab562fe84df45d97d78c0fa13a7041"
-  dependencies:
-    detective "~4.1.0"
-    has-require "~1.2.1"
-    patch-text "~1.0.2"
-    xtend "~4.0.0"
-
 request-progress@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-2.0.1.tgz#5d36bb57961c673aa5b788dbc8141fdf23b44e08"
@@ -7356,12 +7282,6 @@ request@~2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
-require-deps@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-deps/-/require-deps-1.0.1.tgz#2415cf49c35bd36a5d3177395108d3f237205263"
-  dependencies:
-    pff "~1.0.0"
-
 require-dir@^0.3.0, require-dir@^0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/require-dir/-/require-dir-0.3.1.tgz#b5a8e28bae0343bb0d0cc38ab1f531e1931b264a"
@@ -7830,7 +7750,7 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.1.34, source-map@~0.1.30, source-map@~0.1.31, source-map@~0.1.33, source-map@~0.1.7:
+source-map@0.1.34:
   version "0.1.34"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.34.tgz#a7cfe89aec7b1682c3b198d0acfb47d7d090566b"
   dependencies:
@@ -7840,6 +7760,12 @@ source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, sourc
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
+source-map@^0.1.41, source-map@~0.1.30, source-map@~0.1.31, source-map@~0.1.33, source-map@~0.1.7:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
@@ -8351,12 +8277,6 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
-transformify@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/transformify/-/transformify-0.1.2.tgz#9a4f42a154433dd727b80575428a3c9e5489ebf1"
-  dependencies:
-    readable-stream "~1.1.9"
-
 trim-newlines@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
@@ -8754,6 +8674,15 @@ webidl-conversions@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
 
+webpack-dev-middleware@^1.0.11:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz#c6b4cf428139cf1aefbe06a0c00fdb4f8da2f893"
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^1.3.4"
+    path-is-absolute "^1.0.0"
+    range-parser "^1.0.3"
+
 webpack-node-externals@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.5.4.tgz#ea05ba17108a23e776c35c42e7bb0e86c225be00"
@@ -8920,7 +8849,7 @@ xmlhttprequest-ssl@1.5.3:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz#185a888c04eca46c3e4070d99f7b49de3528992d"
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
+"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 

From 941a7f9ff5a28a0767de0987ec2a4545c48fd8e7 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Tue, 18 Apr 2017 23:35:52 +0800
Subject: [PATCH 04/33] Get rid of browserify

---
 gulp/tasks/dev.js  |  18 -
 gulp/tasks/dist.js |  95 -----
 karma.conf.js      |   3 +-
 package.json       |   3 -
 yarn.lock          | 855 +++------------------------------------------
 5 files changed, 46 insertions(+), 928 deletions(-)

diff --git a/gulp/tasks/dev.js b/gulp/tasks/dev.js
index cd9a023b9a..881485ed31 100644
--- a/gulp/tasks/dev.js
+++ b/gulp/tasks/dev.js
@@ -4,10 +4,6 @@
 var gulp = require('gulp')
 var shell = require('gulp-shell')
 var liveServer = require('live-server')
-var rename = require('gulp-rename')
-var uglify = require('gulp-uglify')
-var browserify = require('gulp-browserify')
-var extReplace = require('gulp-ext-replace')
 
 var params = {
   port: 8080, // Set the server port. Defaults to 8080.
@@ -28,17 +24,3 @@ gulp.task('watch2', ['live-server'], function () {
     'yarn build -- --watch'
   ])
 })
-
-// Basic usage
-gulp.task('watch-mermaid', function () {
-  return gulp.src('src/mermaid.js')
-    .pipe(browserify({
-      entry: 'src/mermaid.js',
-      standalone: 'mermaid'
-    }))
-    .pipe(rename('mermaid.js'))
-    .pipe(gulp.dest('./dist/'))
-    .pipe(uglify())
-    .pipe(extReplace('.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
diff --git a/gulp/tasks/dist.js b/gulp/tasks/dist.js
index 28fff98c40..6ceceb3db3 100644
--- a/gulp/tasks/dist.js
+++ b/gulp/tasks/dist.js
@@ -1,96 +1,5 @@
 var gulp = require('gulp')
-var browserify = require('gulp-browserify')
-
 var concat = require('gulp-concat')
-var uglify = require('gulp-uglify')
-var extReplace = require('gulp-ext-replace')
-var rename = require('gulp-rename')
-var insert = require('gulp-insert')
-
-/**
- * dist targets
- * * dist - creates everything
- * * mermaidAPI
- * * mermaidAPI.slim
- * * legacy - uses old build creates mermaid.full and mermaid.slim
- * * mermaid - new build creates mermaid.js and mermaid.min.js, mermaid.no-d3.js mermaid.no-d3.min.js
- */
-
-// Basic usage
-gulp.task('slimDist', function () {
-  // Single entry point to browserify
-  return gulp.src('src/main.js')
-    .pipe(browserify())
-    .pipe(rename('mermaid-legacy.slim.js'))
-    .pipe(insert.prepend('(function () { var define = undefined; '))
-    .pipe(insert.append(' })();'))
-    .pipe(gulp.dest('./dist/'))
-    .pipe(uglify())
-    .pipe(extReplace('.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
-
-// Basic usage
-gulp.task('fullDist', ['slimDist'], function () {
-  // Single entry point to browserify
-  gulp.src(['node_modules/d3/d3.min.js', 'node_modules/dagre-d3/dist/dagre-d3.min.js', 'dist/mermaid.slim.js'])
-    .pipe(concat('mermaid-legacy.full.js'))
-    .pipe(gulp.dest('./dist/'))
-  return gulp.src(['node_modules/d3/d3.min.js', 'node_modules/dagre-d3/dist/dagre-d3.min.js', 'dist/mermaid.slim.min.js'])
-    .pipe(concat('mermaid.full.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
-
-// Basic usage
-gulp.task('mermaid.slim', function () {
-  return gulp.src('src/mermaid.js')
-    .pipe(browserify({
-      external: ['d3'],
-      entry: 'src/mermaid.js',
-      standalone: 'mermaid'
-    }))
-    .pipe(rename('mermaid.slim.js'))
-    .pipe(gulp.dest('./dist/'))
-    .pipe(uglify())
-    .pipe(extReplace('.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
-
-// Basic usage
-gulp.task('mermaid', function () {
-  return gulp.src('src/mermaid.js')
-    .pipe(browserify({
-      entry: 'src/mermaid.js',
-      standalone: 'mermaid'
-    }))
-    .pipe(rename('mermaid.js'))
-    .pipe(gulp.dest('./dist/'))
-    .pipe(uglify())
-    .pipe(extReplace('.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
-
-// Basic usage
-gulp.task('mermaidAPI', function () {
-  return gulp.src('src/mermaidAPI.js')
-    .pipe(browserify({
-    }))
-    .pipe(gulp.dest('./dist/'))
-})
-
-// Basic usage
-gulp.task('mermaidAPI.slim', function () {
-  return gulp.src('src/mermaidAPI.js')
-    .pipe(browserify({
-      debug: true,
-      external: ['d3']
-    }))
-    .pipe(rename('mermaidAPI.slim.js'))
-    .pipe(gulp.dest('./dist/'))
-    .pipe(uglify())
-    .pipe(extReplace('.min.js'))
-    .pipe(gulp.dest('./dist/'))
-})
 
 // Build editor
 gulp.task('editor', function () {
@@ -98,7 +7,3 @@ gulp.task('editor', function () {
     .pipe(concat('build.js'))
     .pipe(gulp.dest('./editor/'))
 })
-
-gulp.task('legacy', ['slimDist', 'fullDist'])
-
-gulp.task('dist', ['mermaidAPI', 'mermaidAPI.slim', 'mermaid.slim', 'mermaid'])
diff --git a/karma.conf.js b/karma.conf.js
index ac3f3caf8f..190f8384e0 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -88,8 +88,7 @@ module.exports = function (config) {
     plugins: [
       'karma-jasmine',
       'karma-chrome-launcher',
-      'karma-webpack',
-      'karma-babel-preprocessor'
+      'karma-webpack'
     ],
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
diff --git a/package.json b/package.json
index 63020a55ab..6674578641 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,6 @@
     "babel-loader": "^6.4.1",
     "babel-plugin-transform-remove-strict-mode": "^0.0.2",
     "babel-preset-env": "^1.4.0",
-    "browserify": "~14.3.0",
     "clone": "^2.1.1",
     "codeclimate-test-reporter": "0.4.1",
     "dox": "^0.9.0",
@@ -87,7 +86,6 @@
     "front-matter": "^2.1.2",
     "gulp": "~3.9.1",
     "gulp-bower": "0.0.13",
-    "gulp-browserify": "^0.5.1",
     "gulp-bump": "^2.7.0",
     "gulp-concat": "~2.6.1",
     "gulp-data": "^1.2.1",
@@ -123,7 +121,6 @@
     "jshint": "^2.9.4",
     "jshint-stylish": "^2.2.1",
     "karma": "^1.6.0",
-    "karma-babel-preprocessor": "^6.0.1",
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
     "karma-webpack": "^2.0.3",
diff --git a/yarn.lock b/yarn.lock
index e96e04690e..da81fa6df9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,35 +2,10 @@
 # yarn lockfile v1
 
 
-Base64@~0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/Base64/-/Base64-0.2.1.tgz#ba3a4230708e186705065e66babdd4c35cf60028"
-
 JSONSelect@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/JSONSelect/-/JSONSelect-0.4.0.tgz#a08edcc67eb3fcbe99ed630855344a0cf282bb8d"
 
-JSONStream@^1.0.3:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
-  dependencies:
-    jsonparse "^1.2.0"
-    through ">=2.2.7 <3"
-
-JSONStream@~0.6.4:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.6.4.tgz#4b2c8063f8f512787b2375f7ee9db69208fa2dcb"
-  dependencies:
-    jsonparse "0.0.5"
-    through "~2.2.7"
-
-JSONStream@~0.7.1:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.7.4.tgz#734290e41511eea7c2cfe151fbf9a563a97b9786"
-  dependencies:
-    jsonparse "0.0.5"
-    through ">=2.2.7 <3"
-
 "JSV@>= 4.0.x":
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57"
@@ -87,14 +62,6 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn@^1.0.3:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014"
-
-acorn@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-
 acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
@@ -259,10 +226,6 @@ array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
 
-array-filter@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-0.0.1.tgz#7da8cf2e26628ed732803581fd21f67cacd2eeec"
-
 array-find-index@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
@@ -278,14 +241,6 @@ array-index@^1.0.0:
     debug "^2.2.0"
     es6-symbol "^3.0.2"
 
-array-map@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-map/-/array-map-0.0.0.tgz#88a2bab73d1cf7bcd5c1b118a003f66f665fa662"
-
-array-reduce@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
-
 array-slice@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
@@ -343,24 +298,12 @@ assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert@^1.1.1, assert@^1.4.0:
+assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   dependencies:
     util "0.10.3"
 
-assert@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-1.1.2.tgz#adaa04c46bb58c6dd1f294da3eb26e6228eb6e44"
-  dependencies:
-    util "0.10.3"
-
-astw@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
-  dependencies:
-    acorn "^4.0.3"
-
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -375,10 +318,6 @@ async@^2.0.1, async@^2.1.2, async@^2.1.5, async@^2.3.0:
   dependencies:
     lodash "^4.14.0"
 
-async@~0.2.6:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
 async@~0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
@@ -424,7 +363,7 @@ babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.0.0, babel-core@^6.16.0, babel-core@^6.24.1, babel-core@~6:
+babel-core@^6.16.0, babel-core@^6.24.1, babel-core@~6:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.1.tgz#8c428564dce1e1f41fb337ec34f4c3b022b5ad83"
   dependencies:
@@ -1129,10 +1068,6 @@ base64-js@^1.0.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
-base64-js@~0.0.4:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-0.0.8.tgz#1101e9544f4a76b1bc3b26d452ca96d7a35e7978"
-
 base64id@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/base64id/-/base64id-1.0.0.tgz#47688cb99bb6804f0e06d3e763b1c32e57d8e6b6"
@@ -1287,36 +1222,6 @@ brorand@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
-browser-pack@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.2.tgz#f86cd6cef4f5300c8e63e07a4d512f65fbff4531"
-  dependencies:
-    JSONStream "^1.0.3"
-    combine-source-map "~0.7.1"
-    defined "^1.0.0"
-    through2 "^2.0.0"
-    umd "^3.0.0"
-
-browser-pack@~2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-2.0.1.tgz#5d1c527f56c582677411c4db2a128648ff6bf150"
-  dependencies:
-    JSONStream "~0.6.4"
-    combine-source-map "~0.3.0"
-    through "~2.3.4"
-
-browser-resolve@^1.11.0, browser-resolve@^1.7.0:
-  version "1.11.2"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.2.tgz#8ff09b0a2c421718a1051c260b32e48f442938ce"
-  dependencies:
-    resolve "1.1.7"
-
-browser-resolve@~1.2.1, browser-resolve@~1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.2.4.tgz#59ae7820a82955ecd32f5fb7c468ac21c4723806"
-  dependencies:
-    resolve "0.6.3"
-
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a"
@@ -1350,12 +1255,6 @@ browserify-rsa@^4.0.0:
     bn.js "^4.1.0"
     randombytes "^2.0.1"
 
-browserify-shim@~2.0.10:
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/browserify-shim/-/browserify-shim-2.0.10.tgz#74a0ed5b9b784a5a287906513a896d31f54a84b8"
-  dependencies:
-    through "~2.3.4"
-
 browserify-sign@^4.0.0:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
@@ -1368,116 +1267,12 @@ browserify-sign@^4.0.0:
     inherits "^2.0.1"
     parse-asn1 "^5.0.0"
 
-browserify-zlib@^0.1.4, browserify-zlib@~0.1.2:
+browserify-zlib@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
   dependencies:
     pako "~0.2.0"
 
-browserify@3.x:
-  version "3.46.1"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-3.46.1.tgz#2c2e4a7f2f408178e78c223b5b57b37c2185ad8e"
-  dependencies:
-    JSONStream "~0.7.1"
-    assert "~1.1.0"
-    browser-pack "~2.0.0"
-    browser-resolve "~1.2.1"
-    browserify-zlib "~0.1.2"
-    buffer "~2.1.4"
-    builtins "~0.0.3"
-    commondir "0.0.1"
-    concat-stream "~1.4.1"
-    console-browserify "~1.0.1"
-    constants-browserify "~0.0.1"
-    crypto-browserify "~1.0.9"
-    deep-equal "~0.1.0"
-    defined "~0.0.0"
-    deps-sort "~0.1.1"
-    derequire "~0.8.0"
-    domain-browser "~1.1.0"
-    duplexer "~0.1.1"
-    events "~1.0.0"
-    glob "~3.2.8"
-    http-browserify "~1.3.1"
-    https-browserify "~0.0.0"
-    inherits "~2.0.1"
-    insert-module-globals "~6.0.0"
-    module-deps "~2.0.0"
-    os-browserify "~0.1.1"
-    parents "~0.0.1"
-    path-browserify "~0.0.0"
-    process "^0.7.0"
-    punycode "~1.2.3"
-    querystring-es3 "0.2.0"
-    resolve "~0.6.1"
-    shallow-copy "0.0.1"
-    shell-quote "~0.0.1"
-    stream-browserify "~0.1.0"
-    stream-combiner "~0.0.2"
-    string_decoder "~0.0.0"
-    subarg "0.0.1"
-    syntax-error "~1.1.0"
-    through2 "~0.4.1"
-    timers-browserify "~1.0.1"
-    tty-browserify "~0.0.0"
-    umd "~2.0.0"
-    url "~0.10.1"
-    util "~0.10.1"
-    vm-browserify "~0.0.1"
-    xtend "^3.0.0"
-
-browserify@~14.3.0:
-  version "14.3.0"
-  resolved "https://registry.yarnpkg.com/browserify/-/browserify-14.3.0.tgz#fd003a2386ac1aec127f097885a3cc6373b745c4"
-  dependencies:
-    JSONStream "^1.0.3"
-    assert "^1.4.0"
-    browser-pack "^6.0.1"
-    browser-resolve "^1.11.0"
-    browserify-zlib "~0.1.2"
-    buffer "^5.0.2"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.1"
-    console-browserify "^1.1.0"
-    constants-browserify "~1.0.0"
-    crypto-browserify "^3.0.0"
-    defined "^1.0.0"
-    deps-sort "^2.0.0"
-    domain-browser "~1.1.0"
-    duplexer2 "~0.1.2"
-    events "~1.1.0"
-    glob "^7.1.0"
-    has "^1.0.0"
-    htmlescape "^1.1.0"
-    https-browserify "^1.0.0"
-    inherits "~2.0.1"
-    insert-module-globals "^7.0.0"
-    labeled-stream-splicer "^2.0.0"
-    module-deps "^4.0.8"
-    os-browserify "~0.1.1"
-    parents "^1.0.1"
-    path-browserify "~0.0.0"
-    process "~0.11.0"
-    punycode "^1.3.2"
-    querystring-es3 "~0.2.0"
-    read-only-stream "^2.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.1.4"
-    shasum "^1.0.0"
-    shell-quote "^1.6.1"
-    stream-browserify "^2.0.0"
-    stream-http "^2.0.0"
-    string_decoder "~0.10.0"
-    subarg "^1.0.0"
-    syntax-error "^1.1.1"
-    through2 "^2.0.0"
-    timers-browserify "^1.0.1"
-    tty-browserify "~0.0.0"
-    url "~0.11.0"
-    util "~0.10.1"
-    vm-browserify "~0.0.1"
-    xtend "^4.0.0"
-
 browserslist@^1.4.0:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
@@ -1501,20 +1296,6 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.2:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.0.6.tgz#2ea669f7eec0b6eda05b08f8b5ff661b28573588"
-  dependencies:
-    base64-js "^1.0.2"
-    ieee754 "^1.1.4"
-
-buffer@~2.1.4:
-  version "2.1.13"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-2.1.13.tgz#c88838ebf79f30b8b4a707788470bea8a62c2355"
-  dependencies:
-    base64-js "~0.0.4"
-    ieee754 "~1.1.1"
-
 bufferstreams@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/bufferstreams/-/bufferstreams-0.0.1.tgz#6ba7773de6acb6eb85dbce710c321808c79be849"
@@ -1533,7 +1314,7 @@ builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
 
-builtins@0.0.7, builtins@~0.0.3:
+builtins@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/builtins/-/builtins-0.0.7.tgz#355219cd6cf18dbe7c01cc7fd2dce765cfdc549a"
 
@@ -1556,17 +1337,13 @@ bytes@2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
 
-cached-path-relative@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
   dependencies:
     callsites "^0.2.0"
 
-callsite@1.0.0, callsite@~1.0.0:
+callsite@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
 
@@ -1817,23 +1594,6 @@ combine-lists@^1.0.0:
   dependencies:
     lodash "^4.5.0"
 
-combine-source-map@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.3.0.tgz#d9e74f593d9cd43807312cb5d846d451efaa9eb7"
-  dependencies:
-    convert-source-map "~0.3.0"
-    inline-source-map "~0.3.0"
-    source-map "~0.1.31"
-
-combine-source-map@~0.7.1:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e"
-  dependencies:
-    convert-source-map "~1.1.0"
-    inline-source-map "~0.6.0"
-    lodash.memoize "~3.0.3"
-    source-map "~0.5.3"
-
 combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
@@ -1846,10 +1606,6 @@ commander@2.9.0, commander@^2.8.1, commander@^2.9.0, commander@~2.9.0:
   dependencies:
     graceful-readlink ">= 1.0.0"
 
-commondir@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-0.0.1.tgz#89f00fdcd51b519c578733fec563e6a6da7f5be2"
-
 commondir@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
@@ -1882,7 +1638,7 @@ concat-stream@1.5.0:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
+concat-stream@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
   dependencies:
@@ -1890,14 +1646,6 @@ concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
     readable-stream "~2.0.0"
     typedarray "~0.0.5"
 
-concat-stream@~1.4.1, concat-stream@~1.4.5:
-  version "1.4.10"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.10.tgz#acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"
-  dependencies:
-    inherits "~2.0.1"
-    readable-stream "~1.1.9"
-    typedarray "~0.0.5"
-
 concat-with-sourcemaps@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6"
@@ -1962,22 +1710,14 @@ console-browserify@1.1.x, console-browserify@^1.1.0:
   dependencies:
     date-now "^0.1.4"
 
-console-browserify@~1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.0.3.tgz#d3898d2c3a93102f364197f8874b4f92b5286a8e"
-
 console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
 
-constants-browserify@^1.0.0, constants-browserify@~1.0.0:
+constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
 
-constants-browserify@~0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-0.0.1.tgz#92577db527ba6c4cf0a4568d84bc031f441e21f2"
-
 contains-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
@@ -1998,14 +1738,6 @@ convert-source-map@^1.1.0, convert-source-map@^1.2.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
-convert-source-map@~0.3.0:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
-
-convert-source-map@~1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
-
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
@@ -2064,7 +1796,7 @@ cryptiles@2.x.x:
   dependencies:
     boom "2.x.x"
 
-crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
+crypto-browserify@^3.11.0:
   version "3.11.0"
   resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522"
   dependencies:
@@ -2079,10 +1811,6 @@ crypto-browserify@^3.0.0, crypto-browserify@^3.11.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
-crypto-browserify@~1.0.9:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-1.0.9.tgz#cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0"
-
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -2194,10 +1922,6 @@ dedent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb"
 
-deep-equal@~0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-0.1.2.tgz#b246c2b80a570a47c11be1d9bd1070ec878b87ce"
-
 deep-equal@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.0.1.tgz#f5d260292b660e084eff4cdbc9f08ad3247448b5"
@@ -2223,14 +1947,10 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
-defined@^1.0.0, defined@~1.0.0:
+defined@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
-defined@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-0.0.0.tgz#f35eea7d705e933baf13b2f03b3f83d921403b3e"
-
 deglob@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/deglob/-/deglob-2.1.0.tgz#4d44abe16ef32c779b4972bd141a80325029a14a"
@@ -2270,31 +1990,6 @@ deprecated@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
 
-deps-sort@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
-  dependencies:
-    JSONStream "^1.0.3"
-    shasum "^1.0.0"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-
-deps-sort@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-0.1.2.tgz#daa2fb614a17c9637d801e2f55339ae370f3611a"
-  dependencies:
-    JSONStream "~0.6.4"
-    minimist "~0.0.1"
-    through "~2.3.4"
-
-derequire@~0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/derequire/-/derequire-0.8.0.tgz#c1f7f1da2cede44adede047378f03f444e9c4c0d"
-  dependencies:
-    esprima-fb "^3001.1.0-dev-harmony-fb"
-    esrefactor "~0.1.0"
-    estraverse "~1.5.0"
-
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -2318,21 +2013,6 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detective@^4.0.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.1.1.tgz#9c4bac1e9fb8bb34f7f18cae080ea1d03aff2cda"
-  dependencies:
-    acorn "^1.0.3"
-    defined "^1.0.0"
-    escodegen "^1.4.1"
-
-detective@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-3.1.0.tgz#77782444ab752b88ca1be2e9d0a0395f1da25eed"
-  dependencies:
-    escodegen "~1.1.0"
-    esprima-fb "3001.1.0-dev-harmony-fb"
-
 dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456"
@@ -2399,7 +2079,7 @@ dom-serializer@0:
     domelementtype "~1.1.1"
     entities "~1.1.1"
 
-domain-browser@^1.1.1, domain-browser@~1.1.0:
+domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
@@ -2452,7 +2132,7 @@ duplexer2@0.0.2:
   dependencies:
     readable-stream "~1.1.9"
 
-duplexer2@^0.1.2, duplexer2@^0.1.4, duplexer2@~0.1.0, duplexer2@~0.1.2:
+duplexer2@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
   dependencies:
@@ -2707,7 +2387,7 @@ escodegen@1.7.x:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@1.8.x, escodegen@^1.4.1, escodegen@^1.6.1:
+escodegen@1.8.x, escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -2718,16 +2398,6 @@ escodegen@1.8.x, escodegen@^1.4.1, escodegen@^1.6.1:
   optionalDependencies:
     source-map "~0.2.0"
 
-escodegen@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.1.0.tgz#c663923f6e20aad48d0c0fa49f31c6d4f49360cf"
-  dependencies:
-    esprima "~1.0.4"
-    estraverse "~1.5.0"
-    esutils "~1.0.0"
-  optionalDependencies:
-    source-map "~0.1.30"
-
 escope@^3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
@@ -2737,12 +2407,6 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-escope@~0.0.13:
-  version "0.0.16"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-0.0.16.tgz#418c7a0afca721dafe659193fd986283e746538f"
-  dependencies:
-    estraverse ">= 0.0.2"
-
 eslint-config-standard-jsx@4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-4.0.1.tgz#cd4e463d0268e2d9e707f61f42f73f5b3333c642"
@@ -2863,10 +2527,6 @@ espree@^3.4.0:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
-esprima-fb@3001.1.0-dev-harmony-fb, esprima-fb@^3001.1.0-dev-harmony-fb:
-  version "3001.1.0-dev-harmony-fb"
-  resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz#b77d37abcd38ea0b77426bb8bc2922ce6b426411"
-
 esprima@1.1.x, esprima@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.1.1.tgz#5b6f1547f4d102e670e140c509be6771d6aeb549"
@@ -2887,10 +2547,6 @@ esprima@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
-esprima@~1.0.2, esprima@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
-
 esquery@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
@@ -2904,25 +2560,13 @@ esrecurse@^4.1.0:
     estraverse "~4.1.0"
     object-assign "^4.0.1"
 
-esrefactor@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/esrefactor/-/esrefactor-0.1.0.tgz#d142795a282339ab81e936b5b7a21b11bf197b13"
-  dependencies:
-    escope "~0.0.13"
-    esprima "~1.0.2"
-    estraverse "~0.0.4"
-
-"estraverse@>= 0.0.2", estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
-
 estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@~0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-0.0.4.tgz#01a0932dfee574684a598af5a67c3bf9b6428db2"
+estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
 estraverse@~1.5.0:
   version "1.5.1"
@@ -2967,14 +2611,10 @@ eventemitter3@1.x.x:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508"
 
-events@^1.0.0, events@~1.1.0:
+events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
 
-events@~1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/events/-/events-1.0.2.tgz#75849dcfe93d10fb057c30055afdbd51d06a8e24"
-
 evp_bytestokey@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz#497b66ad9fef65cd7c08a6180824ba1476b66e53"
@@ -3555,7 +3195,7 @@ glob@^4.3.1:
     minimatch "^2.0.1"
     once "^1.3.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.0, glob@^7.1.1, glob@~7.1.0, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@~7.1.0, glob@~7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -3574,13 +3214,6 @@ glob@~3.1.21:
     inherits "1"
     minimatch "~0.2.11"
 
-glob@~3.2.8:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
 global-modules@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
@@ -3701,16 +3334,6 @@ gulp-bower@0.0.13:
     through2 "0.6.2"
     walk "2.3.3"
 
-gulp-browserify@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/gulp-browserify/-/gulp-browserify-0.5.1.tgz#820108ac2554a954adb8be17d23958b0c04be083"
-  dependencies:
-    browserify "3.x"
-    browserify-shim "~2.0.10"
-    gulp-util "~2.2.5"
-    readable-stream "~1.1.10"
-    through2 "~0.4.0"
-
 gulp-bump@^2.7.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/gulp-bump/-/gulp-bump-2.7.0.tgz#4c3750bce93c5d816fe9a154e6619dd509a852d8"
@@ -3977,7 +3600,7 @@ gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.2, gulp-util@^3.0.4, gulp-uti
     through2 "^2.0.0"
     vinyl "^0.5.0"
 
-gulp-util@~2.2.14, gulp-util@~2.2.5, gulp-util@~2.2.9:
+gulp-util@~2.2.14, gulp-util@~2.2.9:
   version "2.2.20"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-2.2.20.tgz#d7146e5728910bd8f047a6b0b1e549bc22dbd64c"
   dependencies:
@@ -4091,7 +3714,7 @@ has-unicode@^2.0.0, has-unicode@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
-has@^1.0.0, has@^1.0.1, has@~1.0.1:
+has@^1.0.1, has@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
@@ -4171,10 +3794,6 @@ html-encoding-sniffer@^1.0.1:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-htmlescape@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
-
 htmlparser2@3.8.x:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
@@ -4194,13 +3813,6 @@ http-auth@3.1.x:
     bcryptjs "^2.3.0"
     uuid "^3.0.0"
 
-http-browserify@~1.3.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/http-browserify/-/http-browserify-1.3.2.tgz#b562c34479349a690d7a6597df495aefa8c604f5"
-  dependencies:
-    Base64 "~0.2.0"
-    inherits "~2.0.1"
-
 http-errors@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.3.1.tgz#197e22cdebd4198585e8694ef6786197b91ed942"
@@ -4240,14 +3852,10 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-browserify@0.0.1, https-browserify@~0.0.0:
+https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-https-browserify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
-
 iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
@@ -4256,7 +3864,7 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-ieee754@^1.1.4, ieee754@~1.1.1:
+ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
@@ -4340,18 +3948,6 @@ inject-loader@^3.0.0:
   dependencies:
     babel-core "~6"
 
-inline-source-map@~0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.3.1.tgz#a528b514e689fce90db3089e870d92f527acb5eb"
-  dependencies:
-    source-map "~0.3.0"
-
-inline-source-map@~0.6.0:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/inline-source-map/-/inline-source-map-0.6.2.tgz#f9393471c18a79d1724f863fa38b586370ade2a5"
-  dependencies:
-    source-map "~0.5.3"
-
 inquirer@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.0.3.tgz#ebe3a0948571bcc46ccccbe2f9bcec251e984bd0"
@@ -4406,30 +4002,6 @@ inquirer@^0.12.0:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-insert-module-globals@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.1.tgz#c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3"
-  dependencies:
-    JSONStream "^1.0.3"
-    combine-source-map "~0.7.1"
-    concat-stream "~1.5.1"
-    is-buffer "^1.1.0"
-    lexical-scope "^1.2.0"
-    process "~0.11.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
-insert-module-globals@~6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-6.0.0.tgz#ee8aeb9dee16819e33aa14588a558824af0c15dc"
-  dependencies:
-    JSONStream "~0.7.1"
-    concat-stream "~1.4.1"
-    lexical-scope "~1.1.0"
-    process "~0.6.0"
-    through "~2.3.4"
-    xtend "^3.0.0"
-
 interpret@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
@@ -4469,7 +4041,7 @@ is-binary-path@^1.0.0:
   dependencies:
     binary-extensions "^1.0.0"
 
-is-buffer@^1.0.2, is-buffer@^1.1.0:
+is-buffer@^1.0.2:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
@@ -4642,7 +4214,7 @@ is-windows@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"
 
-isarray@0.0.1, isarray@~0.0.1:
+isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
 
@@ -4881,12 +4453,6 @@ json-stable-stringify@^1.0.0, json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stable-stringify@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz#611c23e814db375527df851193db59dd2af27f45"
-  dependencies:
-    jsonify "~0.0.0"
-
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -4916,14 +4482,6 @@ jsonlint@1.6.0:
     JSV ">= 4.0.x"
     nomnom ">= 1.5.x"
 
-jsonparse@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
-
-jsonparse@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.0.tgz#85fc245b1d9259acc6941960b905adf64e7de0e8"
-
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -4943,12 +4501,6 @@ jsx-ast-utils@^1.3.4:
   dependencies:
     object-assign "^4.1.0"
 
-karma-babel-preprocessor@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/karma-babel-preprocessor/-/karma-babel-preprocessor-6.0.1.tgz#7ae1d3e64950dbe11f421b74040ab08fb5a66c21"
-  dependencies:
-    babel-core "^6.0.0"
-
 karma-chrome-launcher@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.0.0.tgz#c2790c5a32b15577d0fff5a4d5a2703b3b439c25"
@@ -5022,14 +4574,6 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
-labeled-stream-splicer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59"
-  dependencies:
-    inherits "^2.0.1"
-    isarray "~0.0.1"
-    stream-splicer "^2.0.0"
-
 latest-version@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-1.0.1.tgz#72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb"
@@ -5097,18 +4641,6 @@ lex-parser@0.1.x, lex-parser@~0.1.3:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/lex-parser/-/lex-parser-0.1.4.tgz#64c4f025f17fd53bfb45763faeb16f015a747550"
 
-lexical-scope@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.2.0.tgz#fcea5edc704a4b3a8796cdca419c3a0afaf22df4"
-  dependencies:
-    astw "^2.0.0"
-
-lexical-scope@~1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/lexical-scope/-/lexical-scope-1.1.1.tgz#debac1067435f1359d90fcfd9e94bcb2ee47b2bf"
-  dependencies:
-    astw "^2.0.0"
-
 liftoff@^2.1.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
@@ -5417,10 +4949,6 @@ lodash.mapvalues@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
 
-lodash.memoize@~3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
-
 lodash.merge@^4.4.0, lodash.merge@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
@@ -5720,13 +5248,6 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
@@ -5764,10 +5285,6 @@ minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0, minimist@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-minimist@~0.0.7, minimist@~0.0.9:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
-
 mkdirp@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
@@ -5791,43 +5308,6 @@ mock-browser@^0.92.14:
     jsdom "^9.12.0"
     lodash "^4.5"
 
-module-deps@^4.0.8:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
-  dependencies:
-    JSONStream "^1.0.3"
-    browser-resolve "^1.7.0"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.5.0"
-    defined "^1.0.0"
-    detective "^4.0.0"
-    duplexer2 "^0.1.2"
-    inherits "^2.0.1"
-    parents "^1.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.1.3"
-    stream-combiner2 "^1.1.1"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
-module-deps@~2.0.0:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-2.0.6.tgz#b999321c73ac33580f00712c0f3075fdca42563f"
-  dependencies:
-    JSONStream "~0.7.1"
-    browser-resolve "~1.2.4"
-    concat-stream "~1.4.5"
-    detective "~3.1.0"
-    duplexer2 "0.0.2"
-    inherits "~2.0.1"
-    minimist "~0.0.9"
-    parents "0.0.2"
-    readable-stream "^1.0.27-1"
-    resolve "~0.6.3"
-    stream-combiner "~0.1.0"
-    through2 "~0.4.1"
-
 moment@^2.18.1:
   version "2.18.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
@@ -6320,12 +5800,6 @@ optimist@^0.6.1:
     minimist "~0.0.1"
     wordwrap "~0.0.2"
 
-optimist@~0.3.5:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
-  dependencies:
-    wordwrap "~0.0.2"
-
 optionator@^0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.5.0.tgz#b75a8995a2d417df25b6e4e3862f50aa88651368"
@@ -6368,10 +5842,6 @@ os-browserify@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
 
-os-browserify@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
-
 os-homedir@^1.0.0, os-homedir@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
@@ -6444,22 +5914,6 @@ pako@~0.2.0:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
 
-parents@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/parents/-/parents-0.0.2.tgz#67147826e497d40759aaf5ba4c99659b6034d302"
-
-parents@^1.0.0, parents@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parents/-/parents-1.0.1.tgz#fedd4d2bf193a77745fe71e371d73c3307d9c751"
-  dependencies:
-    path-platform "~0.11.15"
-
-parents@~0.0.1:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/parents/-/parents-0.0.3.tgz#fa212f024d9fa6318dbb6b4ce676c8be493b9c43"
-  dependencies:
-    path-platform "^0.0.1"
-
 parse-asn1@^5.0.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
@@ -6529,7 +5983,7 @@ path-array@^1.0.0:
   dependencies:
     array-index "^1.0.0"
 
-path-browserify@0.0.0, path-browserify@~0.0.0:
+path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
@@ -6551,18 +6005,6 @@ path-is-inside@^1.0.1, path-is-inside@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
 
-path-parse@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
-
-path-platform@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.0.1.tgz#b5585d7c3c463d89aa0060d86611cf1afd617e2a"
-
-path-platform@~0.11.15:
-  version "0.11.15"
-  resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
-
 path-root-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
@@ -6719,22 +6161,10 @@ process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
 
-process@^0.11.0, process@~0.11.0:
+process@^0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-process@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.7.0.tgz#c52208161a34adf3812344ae85d3e6150469389d"
-
-process@~0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
-
-process@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.6.0.tgz#7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f"
-
 progress@^1.1.8, progress@~1.1.8:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
@@ -6794,14 +6224,10 @@ punycode@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
 
-punycode@^1.2.4, punycode@^1.3.2, punycode@^1.4.1:
+punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
-punycode@~1.2.3:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.2.4.tgz#54008ac972aec74175def9cba6df7fa9d3918740"
-
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
@@ -6830,11 +6256,7 @@ qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
-querystring-es3@0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.0.tgz#c365a08a69c443accfeb3a9deab35e3f0abaa476"
-
-querystring-es3@^0.2.0, querystring-es3@~0.2.0:
+querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
 
@@ -6933,12 +6355,6 @@ read-installed@~4.0.3:
   optionalDependencies:
     graceful-fs "^4.1.2"
 
-read-only-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"
-  dependencies:
-    readable-stream "^2.0.2"
-
 "read-package-json@1 || 2", read-package-json@^2.0.0, read-package-json@~2.0.4:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/read-package-json/-/read-package-json-2.0.5.tgz#f93a64e641529df68a08c64de46389e8a3f88845"
@@ -6992,7 +6408,7 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@1.1, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1, readable-stream@^1.0.33, readable-stream@~1.1.10, readable-stream@~1.1.9:
+readable-stream@1.1, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, readable-stream@^1.0.33, readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
@@ -7316,24 +6732,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@0.6.3, resolve@~0.6.1, resolve@~0.6.3:
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.6.3.tgz#dd957982e7e736debdf53b58a4dd91754575dd46"
-
-resolve@1.1.7, resolve@1.1.x, resolve@~1.1.7:
+resolve@1.1.x, resolve@^1.1.6, resolve@^1.1.7, resolve@~1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
-  dependencies:
-    path-parse "^1.0.5"
-
-resolve@~0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.3.1.tgz#34c63447c664c70598d1c9b126fc43b2a24310a4"
-
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -7351,13 +6753,6 @@ retry@^0.10.0, retry@~0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-rfile@~1.0, rfile@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rfile/-/rfile-1.0.0.tgz#59708cf90ca1e74c54c3cfc5c36fdb9810435261"
-  dependencies:
-    callsite "~1.0.0"
-    resolve "~0.3.0"
-
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -7380,13 +6775,6 @@ ripemd160@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
 
-ruglify@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ruglify/-/ruglify-1.0.0.tgz#dc8930e2a9544a274301cc9972574c0d0986b675"
-  dependencies:
-    rfile "~1.0"
-    uglify-js "~2.2"
-
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -7509,7 +6897,7 @@ setprototypeof@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.0.3.tgz#66567e37043eeb4f04d91bd658c0cbefb55b8e04"
 
-sha.js@^2.3.6, sha.js@~2.4.4:
+sha.js@^2.3.6:
   version "2.4.8"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.8.tgz#37068c2c476b6baf402d14a49c67f597921f634f"
   dependencies:
@@ -7522,30 +6910,6 @@ sha@~2.0.1:
     graceful-fs "^4.1.2"
     readable-stream "^2.0.2"
 
-shallow-copy@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
-
-shasum@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
-  dependencies:
-    json-stable-stringify "~0.0.0"
-    sha.js "~2.4.4"
-
-shell-quote@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.6.1.tgz#f4781949cce402697127430ea3b3c5476f481767"
-  dependencies:
-    array-filter "~0.0.0"
-    array-map "~0.0.0"
-    array-reduce "~0.0.0"
-    jsonify "~0.0.0"
-
-shell-quote@~0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-0.0.1.tgz#1a41196f3c0333c482323593d6886ecf153dd986"
-
 shelljs@0.3.x:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
@@ -7750,17 +7114,11 @@ source-map-support@^0.4.2:
   dependencies:
     source-map "^0.5.6"
 
-source-map@0.1.34:
-  version "0.1.34"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.34.tgz#a7cfe89aec7b1682c3b198d0acfb47d7d090566b"
-  dependencies:
-    amdefine ">=0.0.4"
-
 source-map@0.5.6, source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
-source-map@^0.1.41, source-map@~0.1.30, source-map@~0.1.31, source-map@~0.1.33, source-map@~0.1.7:
+source-map@^0.1.41, source-map@~0.1.33:
   version "0.1.43"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
   dependencies:
@@ -7778,12 +7136,6 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.3.0.tgz#8586fb9a5a005e5b501e21cd18b6f21b457ad1f9"
-  dependencies:
-    amdefine ">=0.0.4"
-
 sourcemapped-stacktrace@^1.0.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.6.tgz#112d8749c942c3cd3b630dfac9514577b86a3a51"
@@ -7870,45 +7222,24 @@ statuses@1, "statuses@>= 1.3.1 < 2", statuses@~1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
 
-stream-browserify@^2.0.0, stream-browserify@^2.0.1:
+stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
   dependencies:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-browserify@~0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-0.1.3.tgz#95cf1b369772e27adaf46352265152689c6c4be9"
-  dependencies:
-    inherits "~2.0.1"
-    process "~0.5.1"
-
-stream-combiner2@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  dependencies:
-    duplexer2 "~0.1.0"
-    readable-stream "^2.0.2"
-
-stream-combiner@*, stream-combiner@~0.0.2, stream-combiner@~0.0.4:
+stream-combiner@*, stream-combiner@~0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
   dependencies:
     duplexer "~0.1.1"
 
-stream-combiner@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.1.0.tgz#0dc389a3c203f8f4d56368f95dde52eb9269b5be"
-  dependencies:
-    duplexer "~0.1.1"
-    through "~2.3.4"
-
 stream-consume@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
 
-stream-http@^2.0.0, stream-http@^2.3.1:
+stream-http@^2.3.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
   dependencies:
@@ -7922,13 +7253,6 @@ stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
 
-stream-splicer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/stream-splicer/-/stream-splicer-2.0.0.tgz#1b63be438a133e4b671cc1935197600175910d83"
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.2"
-
 streamqueue@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/streamqueue/-/streamqueue-0.0.6.tgz#66f5f5ec94e9b8af249e4aec2dd1f741bfe94de3"
@@ -7964,14 +7288,10 @@ string.prototype.trim@~1.1.2:
     es-abstract "^1.5.0"
     function-bind "^1.0.2"
 
-string_decoder@^0.10.25, string_decoder@~0.10.0, string_decoder@~0.10.x:
+string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~0.0.0:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.0.1.tgz#f5472d0a8d1650ec823752d24e6fd627b39bf141"
-
 string_decoder@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
@@ -8025,18 +7345,6 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
-subarg@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-0.0.1.tgz#3d56b07dacfbc45bbb63f7672b43b63e46368e3a"
-  dependencies:
-    minimist "~0.0.7"
-
-subarg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/subarg/-/subarg-1.0.0.tgz#f62cf17581e996b48fc965699f54c06ae268b8d2"
-  dependencies:
-    minimist "^1.1.0"
-
 supports-color@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -8055,18 +7363,6 @@ symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-syntax-error@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.3.0.tgz#1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"
-  dependencies:
-    acorn "^4.0.3"
-
-syntax-error@~1.1.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz#b4549706d386cc1c1dc7c2423f18579b6cade710"
-  dependencies:
-    acorn "^2.7.0"
-
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -8185,7 +7481,7 @@ through2@0.6.5, through2@^0.6.1, through2@~0.6.3:
     readable-stream ">=1.0.33-1 <1.1.0-0"
     xtend ">=4.0.0 <4.1.0-0"
 
-through2@^0.4.1, through2@~0.4.0, through2@~0.4.1:
+through2@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
   dependencies:
@@ -8199,14 +7495,10 @@ through2@^0.5.0:
     readable-stream "~1.0.17"
     xtend "~3.0.0"
 
-through@2, "through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.8:
+through@2, through@^2.3.6, through@^2.3.8, through@~2.3, through@~2.3.1, through@~2.3.4, through@~2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-through@~2.2.7:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.2.7.tgz#6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd"
-
 tildify@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
@@ -8225,24 +7517,12 @@ timed-out@^3.0.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
 
-timers-browserify@^1.0.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d"
-  dependencies:
-    process "~0.11.0"
-
 timers-browserify@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
   dependencies:
     setimmediate "^1.0.4"
 
-timers-browserify@~1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.0.3.tgz#ffba70c9c12eed916fd67318e629ac6f32295551"
-  dependencies:
-    process "~0.5.1"
-
 tmp@0.0.31, tmp@0.0.x:
   version "0.0.31"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.31.tgz#8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"
@@ -8289,7 +7569,7 @@ tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
 
-tty-browserify@0.0.0, tty-browserify@~0.0.0:
+tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
@@ -8337,22 +7617,6 @@ uglify-js@^2.6, uglify-js@^2.7.0, uglify-js@^2.8.5, uglify-js@~2.8.10:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-js@~2.2:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.2.5.tgz#a6e02a70d839792b9780488b7b8b184c095c99c7"
-  dependencies:
-    optimist "~0.3.5"
-    source-map "~0.1.7"
-
-uglify-js@~2.4.0:
-  version "2.4.24"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.4.24.tgz#fad5755c1e1577658bb06ff9ab6e548c95bebd6e"
-  dependencies:
-    async "~0.2.6"
-    source-map "0.1.34"
-    uglify-to-browserify "~1.0.0"
-    yargs "~3.5.4"
-
 uglify-save-license@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/uglify-save-license/-/uglify-save-license-0.4.1.tgz#95726c17cc6fd171c3617e3bf4d8d82aa8c4cce1"
@@ -8373,19 +7637,6 @@ umask@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
 
-umd@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e"
-
-umd@~2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/umd/-/umd-2.0.0.tgz#749683b0d514728ae0e1b6195f5774afc0ad4f8f"
-  dependencies:
-    rfile "~1.0.0"
-    ruglify "~1.0.0"
-    through "~2.3.4"
-    uglify-js "~2.4.0"
-
 unc-path-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
@@ -8472,20 +7723,13 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
-url@^0.11.0, url@~0.11.0:
+url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
   dependencies:
     punycode "1.3.2"
     querystring "0.2.0"
 
-url@~0.10.1:
-  version "0.10.3"
-  resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
-  dependencies:
-    punycode "1.3.2"
-    querystring "0.2.0"
-
 user-home@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190"
@@ -8511,7 +7755,7 @@ util-extend@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
 
-util@0.10.3, util@^0.10.3, util@~0.10.1:
+util@0.10.3, util@^0.10.3:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
   dependencies:
@@ -8636,7 +7880,7 @@ vinyl@^2.0.0:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-vm-browserify@0.0.4, vm-browserify@~0.0.1:
+vm-browserify@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
   dependencies:
@@ -8853,16 +8097,16 @@ xmlhttprequest-ssl@1.5.3:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
 
-xtend@^3.0.0, xtend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
-
 xtend@~2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
   dependencies:
     object-keys "~0.4.0"
 
+xtend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
+
 y18n@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
@@ -8939,15 +8183,6 @@ yargs@~3.15.0:
     decamelize "^1.0.0"
     window-size "^0.1.1"
 
-yargs@~3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.5.4.tgz#d8aff8f665e94c34bd259bdebd1bfaf0ddd35361"
-  dependencies:
-    camelcase "^1.0.2"
-    decamelize "^1.0.0"
-    window-size "0.1.0"
-    wordwrap "0.0.2"
-
 yauzl@2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005"

From d5178f61f1b0aef1e81d9e0d28b53f6476581b61 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Wed, 19 Apr 2017 00:02:38 +0800
Subject: [PATCH 05/33] Remove gulp-uglify

---
 gulpfile.js  | 10 ----------
 package.json |  1 -
 todo.md      |  2 +-
 yarn.lock    | 31 ++-----------------------------
 4 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index 48863b18f8..923af187f9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,13 +1,3 @@
-require('gulp')
-require('gulp-shell')
-require('gulp-concat')
-require('gulp-uglify')
-require('gulp-ext-replace')
-require('gulp-rename')
-require('gulp-istanbul')
-require('gulp-bump')
-require('gulp-tag-version')
-require('gulp-insert')
 var requireDir = require('require-dir')
 
 requireDir('./gulp/tasks')
diff --git a/package.json b/package.json
index 6674578641..88f2b3ed46 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,6 @@
     "gulp-rename": "~1.2.2",
     "gulp-shell": "^0.6.3",
     "gulp-tag-version": "^1.3.0",
-    "gulp-uglify": "~2.1.2",
     "gulp-util": "^3.0.8",
     "gulp-vartree": "^2.0.1",
     "hogan.js": "^3.0.2",
diff --git a/todo.md b/todo.md
index 3a0c65ffd1..ed1a255225 100644
--- a/todo.md
+++ b/todo.md
@@ -13,4 +13,4 @@
     - babel-plugin-transform-remove-strict-mode
         - need to remove it after upgrading to d3 v4
 - use headless chrome provided by karma-chrome-launcher
-- https://github.com/karma-runner/karma-chrome-launcher
+    - https://github.com/karma-runner/karma-chrome-launcher
diff --git a/yarn.lock b/yarn.lock
index da81fa6df9..b1be86c3da 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3564,19 +3564,6 @@ gulp-tag-version@^1.3.0:
     gulp-util "~2.2.14"
     map-stream "~0.1.0"
 
-gulp-uglify@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/gulp-uglify/-/gulp-uglify-2.1.2.tgz#6db85b1d0ee63d18058592b658649d65c2ec4541"
-  dependencies:
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash "^4.13.1"
-    make-error-cause "^1.1.1"
-    through2 "^2.0.0"
-    uglify-js "~2.8.10"
-    uglify-save-license "^0.4.1"
-    vinyl-sourcemaps-apply "^0.2.0"
-
 gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.2, gulp-util@^3.0.4, gulp-util@^3.0.6, gulp-util@^3.0.7, gulp-util@^3.0.8, gulp-util@~3.0.1, gulp-util@~3.0.4, gulp-util@~3.0.6:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
@@ -5047,7 +5034,7 @@ lodash@^3.10.0, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.12.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.12.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -5100,16 +5087,6 @@ lru-cache@^4.0.0:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
-make-error-cause@^1.1.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/make-error-cause/-/make-error-cause-1.2.2.tgz#df0388fcd0b37816dff0a5fb8108939777dcbc9d"
-  dependencies:
-    make-error "^1.2.0"
-
-make-error@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.2.3.tgz#6c4402df732e0977ac6faf754a5074b3d2b1d19d"
-
 map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -7608,7 +7585,7 @@ uc.micro@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.3.tgz#7ed50d5e0f9a9fb0a573379259f2a77458d50192"
 
-uglify-js@^2.6, uglify-js@^2.7.0, uglify-js@^2.8.5, uglify-js@~2.8.10:
+uglify-js@^2.6, uglify-js@^2.7.0, uglify-js@^2.8.5:
   version "2.8.22"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
   dependencies:
@@ -7617,10 +7594,6 @@ uglify-js@^2.6, uglify-js@^2.7.0, uglify-js@^2.8.5, uglify-js@~2.8.10:
   optionalDependencies:
     uglify-to-browserify "~1.0.0"
 
-uglify-save-license@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/uglify-save-license/-/uglify-save-license-0.4.1.tgz#95726c17cc6fd171c3617e3bf4d8d82aa8c4cce1"
-
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"

From 95712ea35781aafc9b30da48acd0fba4bd0ed04d Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Wed, 19 Apr 2017 18:37:55 +0800
Subject: [PATCH 06/33] 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 88f2b3ed46..8d284241d2 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 b1be86c3da..f0267ed9ce 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:

From 7fed3b408ec07bded0f2affb7510802f1e54b0ff Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Wed, 19 Apr 2017 20:17:57 +0800
Subject: [PATCH 07/33] Refactor git graph code

---
 src/diagrams/gitGraph/gitGraphAst.js      | 27 +++++++++++------------
 src/diagrams/gitGraph/gitGraphRenderer.js | 12 +++++-----
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/diagrams/gitGraph/gitGraphAst.js b/src/diagrams/gitGraph/gitGraphAst.js
index 537e871d08..dcedbb1bfc 100644
--- a/src/diagrams/gitGraph/gitGraphAst.js
+++ b/src/diagrams/gitGraph/gitGraphAst.js
@@ -1,6 +1,6 @@
-var Logger = require('../../logger')
-var log = Logger.Log
-var _ = require('lodash')
+const Logger = require('../../logger')
+const log = Logger.Log
+const _ = require('lodash')
 
 var commits = {}
 var head = null
@@ -136,19 +136,18 @@ exports.reset = function (commitRef) {
 }
 
 function upsert (arr, key, newval) {
-  var match = _.find(arr, key)
-  if (match) {
-    var index = _.indexOf(arr, _.find(arr, key))
-    arr.splice(index, 1, newval)
-  } else {
+  const index = arr.indexOf(key)
+  if (index === -1) {
     arr.push(newval)
+  } else {
+    arr.splice(index, 1, newval)
   }
 }
 
 function prettyPrintCommitHistory (commitArr) {
   var commit = _.maxBy(commitArr, 'seq')
   var line = ''
-  _.each(commitArr, function (c) {
+  commitArr.forEach(function (c) {
     if (c === commit) {
       line += '\t*'
     } else {
@@ -156,8 +155,8 @@ function prettyPrintCommitHistory (commitArr) {
     }
   })
   var label = [line, commit.id, commit.seq]
-  _.each(branches, function (v, k) {
-    if (v === commit.id) label.push(k)
+  _.each(branches, function (value, key) {
+    if (value === commit.id) label.push(key)
   })
   log.debug(label.join(' '))
   if (Array.isArray(commit.parent)) {
@@ -189,8 +188,8 @@ exports.clear = function () {
 }
 
 exports.getBranchesAsObjArray = function () {
-  var branchArr = _.map(branches, function (v, k) {
-    return { 'name': k, 'commit': commits[v] }
+  const branchArr = _.map(branches, function (value, key) {
+    return { 'name': key, 'commit': commits[value] }
   })
   return branchArr
 }
@@ -201,7 +200,7 @@ exports.getCommitsArray = function () {
   var commitArr = Object.keys(commits).map(function (key) {
     return commits[key]
   })
-  _.each(commitArr, function (o) { log.debug(o.id) })
+  commitArr.forEach(function (o) { log.debug(o.id) })
   return _.orderBy(commitArr, ['seq'], ['desc'])
 }
 exports.getCurrentBranch = function () { return curBranch }
diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js
index 1c3ae9ef6b..3d2da3a494 100644
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -1,9 +1,9 @@
-var db = require('./gitGraphAst')
-var _ = require('lodash')
-var gitGraphParser = require('./parser/gitGraph')
-var d3 = require('../../d3')
-var Logger = require('../../logger')
-var log = Logger.Log
+const db = require('./gitGraphAst')
+const _ = require('lodash')
+const gitGraphParser = require('./parser/gitGraph')
+const d3 = require('../../d3')
+const Logger = require('../../logger')
+const log = Logger.Log
 
 var allCommitsDict = {}
 var branchNum

From 3ebae8f3319be67dfabb15f4253097acd63719a9 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Fri, 21 Apr 2017 10:25:16 +0800
Subject: [PATCH 08/33] Use Chrome stable instead of Chrome Canary

---
 karma.conf.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/karma.conf.js b/karma.conf.js
index 190f8384e0..291c304bc5 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -71,8 +71,8 @@ module.exports = function (config) {
     autoWatch: true,
 
     customLaunchers: {
-      ChromeCanaryHeadless: {
-        base: 'ChromeCanary',
+      ChromeHeadless: {
+        base: 'Chrome',
         flags: [
           '--headless',
           '--disable-gpu',
@@ -84,7 +84,7 @@ module.exports = function (config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['ChromeCanaryHeadless'],
+    browsers: ['ChromeHeadless'],
     plugins: [
       'karma-jasmine',
       'karma-chrome-launcher',

From a4d06742c34572174a30e22659a8424e67dd44bb Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Fri, 21 Apr 2017 11:21:42 +0800
Subject: [PATCH 09/33] Remove jshint because we are using standard style based
 on ESLint

---
 gulp/tasks/test.js                |   9 --
 package.json                      |   3 -
 src/diagrams/flowchart/graphDb.js |   2 +-
 yarn.lock                         | 248 +++++++-----------------------
 4 files changed, 58 insertions(+), 204 deletions(-)

diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index 9096e821ef..912440ed23 100644
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -2,18 +2,9 @@ var gulp = require('gulp')
 var jasmine = require('gulp-jasmine')
 var shell = require('gulp-shell')
 var istanbul = require('gulp-istanbul')
-var jshint = require('gulp-jshint')
-var stylish = require('jshint-stylish')
 var qunit = require('gulp-qunit')
 var bower = require('gulp-bower')
 
-// Using gulp-jshint and jshint-stylish
-gulp.task('lint', function () {
-  return gulp.src(['./src/**/*.js', '!**/parser/*.js'])
-    .pipe(jshint())
-    .pipe(jshint.reporter(stylish))
-})
-
 gulp.task('test', ['coverage', 'tape', 'jasmine', 'qunit'])
 
 gulp.task('jasmine', ['jison', 'lint'], function () {
diff --git a/package.json b/package.json
index 8d284241d2..fbd3dbae26 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,6 @@
     "gulp-jasmine": "~2.4.2",
     "gulp-jasmine-browser": "^1.7.1",
     "gulp-jison": "~1.2.0",
-    "gulp-jshint": "^2.0.4",
     "gulp-less": "^3.3.0",
     "gulp-livereload": "^3.8.1",
     "gulp-marked": "^1.0.0",
@@ -101,8 +100,6 @@
     "jasmine-es6": "0.4.0",
     "jison": "^0.4.17",
     "jsdom": "^9.12.0",
-    "jshint": "^2.9.4",
-    "jshint-stylish": "^2.2.1",
     "karma": "^1.6.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
diff --git a/src/diagrams/flowchart/graphDb.js b/src/diagrams/flowchart/graphDb.js
index f8b2675293..12dfe12e24 100644
--- a/src/diagrams/flowchart/graphDb.js
+++ b/src/diagrams/flowchart/graphDb.js
@@ -188,7 +188,7 @@ var setLink = function (id, linkStr) {
       var elem = d3.select(element).select('#' + id)
       if (elem !== null) {
         elem.on('click', function () {
-          window.open(linkStr, 'newTab') // jshint ignore:line
+          window.open(linkStr, 'newTab')
         })
       }
     })
diff --git a/yarn.lock b/yarn.lock
index f0267ed9ce..de8fd90148 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1049,8 +1049,8 @@ babel@^6.5.2:
   resolved "https://registry.yarnpkg.com/babel/-/babel-6.23.0.tgz#d0d1e7d803e974765beea3232d4e153c0efb90f4"
 
 babylon@^6.11.0, babylon@^6.15.0:
-  version "6.16.1"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+  version "6.17.0"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932"
 
 backo2@1.0.2:
   version "1.0.2"
@@ -1090,7 +1090,7 @@ bcryptjs@^2.3.0:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
 
-beeper@^1.0.0, beeper@^1.1.0:
+beeper@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
 
@@ -1371,8 +1371,8 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
 caniuse-db@^1.0.30000639:
-  version "1.0.30000655"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874"
+  version "1.0.30000656"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1476,13 +1476,6 @@ cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
 
-cli@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cli/-/cli-1.0.1.tgz#22817534f24bfa4950c34d532d48ecbc621b8c14"
-  dependencies:
-    exit "0.1.2"
-    glob "^7.1.1"
-
 clite@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/clite/-/clite-0.3.0.tgz#e7fcbc8cc5bd3e7f8b84ed48db12e9474cc73441"
@@ -1639,12 +1632,12 @@ concat-stream@1.5.0:
     typedarray "~0.0.5"
 
 concat-stream@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
   dependencies:
-    inherits "~2.0.1"
-    readable-stream "~2.0.0"
-    typedarray "~0.0.5"
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
 
 concat-with-sourcemaps@^1.0.0:
   version "1.0.4"
@@ -1696,15 +1689,15 @@ connect@3.5.x:
     utils-merge "1.0.0"
 
 connect@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.0.tgz#f09a4f7dcd17324b663b725c815bdb1c4158a46e"
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.1.tgz#b7760693a74f0454face1d9378edb3f885b43227"
   dependencies:
-    debug "2.6.1"
-    finalhandler "1.0.0"
+    debug "2.6.3"
+    finalhandler "1.0.1"
     parseurl "~1.3.1"
     utils-merge "1.0.0"
 
-console-browserify@1.1.x, console-browserify@^1.1.0:
+console-browserify@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
   dependencies:
@@ -1904,12 +1897,18 @@ debug@2.6.1:
   dependencies:
     ms "0.7.2"
 
-debug@2.6.3, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
+debug@2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
   dependencies:
     ms "0.7.2"
 
+debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
+  version "2.6.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.4.tgz#7586a9b3c39741c0282ae33445c4e8ac74734fe0"
+  dependencies:
+    ms "0.7.3"
+
 debuglog@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -2072,38 +2071,10 @@ dom-serialize@^2.2.0:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.0.tgz#073c697546ce0780ce23be4a28e293e40bc30c82"
-  dependencies:
-    domelementtype "~1.1.1"
-    entities "~1.1.1"
-
 domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-domelementtype@1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.0.tgz#b17aed82e8ab59e52dd9c19b1756e0fc187204c2"
-
-domelementtype@~1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.1.3.tgz#bd28773e2642881aec51544924299c5cd822185b"
-
-domhandler@2.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.3.0.tgz#2de59a0822d5027fabff6f032c2b25a2a8abe738"
-  dependencies:
-    domelementtype "1"
-
-domutils@1.5:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
-
 dot-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177"
@@ -2170,8 +2141,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.3.tgz#651eb63fe89f39db70ffc8dbd5d9b66958bc6a0e"
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.5.tgz#6cd6ff2106224a6130e235f21050f9546bc3e729"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2257,10 +2228,6 @@ ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
 
-entities@1.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-1.0.0.tgz#b2987aa3821347fcde642b24fdfc9e4fb712bf26"
-
 entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
@@ -2625,7 +2592,7 @@ exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
 
-exit@0.1.2, exit@0.1.x, exit@^0.1.2:
+exit@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
 
@@ -2810,19 +2777,7 @@ finalhandler@0.5.1:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.0.tgz#b5691c2c0912092f18ac23e9416bde5cd7dc6755"
-  dependencies:
-    debug "2.6.1"
-    encodeurl "~1.0.1"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.1"
-    statuses "~1.3.1"
-    unpipe "~1.0.0"
-
-finalhandler@~1.0.0:
+finalhandler@1.0.1, finalhandler@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.0.1.tgz#bcd15d1689c0e5ed729b6f7f541a6df984117db8"
   dependencies:
@@ -3478,16 +3433,6 @@ gulp-jison@~1.2.0:
     jison "~0.4.15"
     through2 "~0.6.3"
 
-gulp-jshint@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/gulp-jshint/-/gulp-jshint-2.0.4.tgz#f382b18564b1072def0c9aaf753c146dadb4f0e8"
-  dependencies:
-    gulp-util "^3.0.0"
-    lodash "^4.12.0"
-    minimatch "^3.0.3"
-    rcloader "^0.2.2"
-    through2 "^2.0.0"
-
 gulp-less@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/gulp-less/-/gulp-less-3.3.0.tgz#d085565da3c810307fde7c7874e86520dc503234"
@@ -3781,16 +3726,6 @@ html-encoding-sniffer@^1.0.1:
   dependencies:
     whatwg-encoding "^1.0.1"
 
-htmlparser2@3.8.x:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.8.3.tgz#996c28b191516a8be86501a7d79757e5c70c1068"
-  dependencies:
-    domelementtype "1"
-    domhandler "2.3"
-    domutils "1.5"
-    entities "1.0"
-    readable-stream "1.1"
-
 http-auth@3.1.x:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/http-auth/-/http-auth-3.1.3.tgz#945cfadd66521eaf8f7c84913d377d7b15f24e31"
@@ -3900,7 +3835,7 @@ inherits@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -3986,8 +3921,8 @@ inquirer@^0.12.0:
     through "^2.3.6"
 
 interpret@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
 
 invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
@@ -4003,10 +3938,6 @@ ipaddr.js@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
 
-irregular-plurals@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
-
 is-absolute@^0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
@@ -4392,30 +4323,6 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
-jshint-stylish@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/jshint-stylish/-/jshint-stylish-2.2.1.tgz#242082a2c035ae03fd81044e0570cc4208cf6e61"
-  dependencies:
-    beeper "^1.1.0"
-    chalk "^1.0.0"
-    log-symbols "^1.0.0"
-    plur "^2.1.0"
-    string-length "^1.0.0"
-    text-table "^0.2.0"
-
-jshint@^2.9.4:
-  version "2.9.4"
-  resolved "https://registry.yarnpkg.com/jshint/-/jshint-2.9.4.tgz#5e3ba97848d5290273db514aee47fe24cf592934"
-  dependencies:
-    cli "~1.0.0"
-    console-browserify "1.1.x"
-    exit "0.1.x"
-    htmlparser2 "3.8.x"
-    lodash "3.7.x"
-    minimatch "~3.0.2"
-    shelljs "0.3.x"
-    strip-json-comments "1.0.x"
-
 json-loader@^0.5.4:
   version "0.5.4"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de"
@@ -4479,10 +4386,8 @@ jsprim@^1.2.2:
     verror "1.3.6"
 
 jsx-ast-utils@^1.3.4:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.0.tgz#5afe38868f56bc8cc7aeaef0100ba8c75bd12591"
-  dependencies:
-    object-assign "^4.1.0"
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
 
 karma-chrome-launcher@^2.0.0:
   version "2.0.0"
@@ -4822,7 +4727,7 @@ lodash.assign@^3.0.0:
     lodash._createassigner "^3.0.0"
     lodash.keys "^3.0.0"
 
-lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
+lodash.assign@^4.0.3, lodash.assign@^4.0.6:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
 
@@ -4834,7 +4739,7 @@ lodash.clone@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
 
-lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.3.1, lodash.clonedeep@^4.3.2, lodash.clonedeep@~4.5.0:
+lodash.clonedeep@^4.3.0, lodash.clonedeep@^4.3.1, lodash.clonedeep@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
 
@@ -4887,10 +4792,6 @@ lodash.isempty@^4.2.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
 
-lodash.isobject@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-3.0.2.tgz#3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"
-
 lodash.isobject@~2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/lodash.isobject/-/lodash.isobject-2.4.1.tgz#5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"
@@ -4925,7 +4826,7 @@ lodash.mapvalues@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
 
-lodash.merge@^4.4.0, lodash.merge@^4.6.0:
+lodash.merge@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
 
@@ -5011,10 +4912,6 @@ lodash@3.6.*:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.6.0.tgz#5266a8f49dd989be4f9f681b6f2a0c55285d0d9a"
 
-lodash@3.7.x:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.7.0.tgz#3678bd8ab995057c07ade836ed2ef087da811d45"
-
 lodash@^2.4.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
@@ -5023,7 +4920,7 @@ lodash@^3.10.0, lodash@^3.3.1, lodash@^3.7.0, lodash@^3.8.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.12.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
+lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.5, lodash@^4.5.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -5031,12 +4928,6 @@ lodash@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
 
-log-symbols@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
-  dependencies:
-    chalk "^1.0.0"
-
 log4js@^0.6.31:
   version "0.6.38"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-0.6.38.tgz#2c494116695d6fb25480943d3fc872e662a522fd"
@@ -5214,7 +5105,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@~3.0.2:
+"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
@@ -5296,6 +5187,10 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
+ms@0.7.3:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.3.tgz#708155a5e44e33f5fd0fc53e81d0d40a91be1fff"
+
 ms@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-1.0.0.tgz#59adcd22edc543f7b5381862d31387b1f4bc9473"
@@ -5457,8 +5352,8 @@ normalize-git-url@~3.0.2:
   resolved "https://registry.yarnpkg.com/normalize-git-url/-/normalize-git-url-3.0.2.tgz#8e5f14be0bdaedb73e07200310aa416c27350fc4"
 
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0", normalize-package-data@~2.3.5:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.8.tgz#d819eda2a9dedbd1ffa563ea4071d936782295bb"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -6063,12 +5958,6 @@ plugin-log@^0.1.0:
     chalk "^1.1.1"
     dateformat "^1.0.11"
 
-plur@^2.1.0:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
-  dependencies:
-    irregular-plurals "^1.0.0"
-
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -6252,21 +6141,6 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-rcfinder@^0.1.6:
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/rcfinder/-/rcfinder-0.1.9.tgz#f3e80f387ddf9ae80ae30a4100329642eae81115"
-  dependencies:
-    lodash.clonedeep "^4.3.2"
-
-rcloader@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/rcloader/-/rcloader-0.2.2.tgz#58d2298b462d0b9bfd2133d2a1ec74fbd705c717"
-  dependencies:
-    lodash.assign "^4.2.0"
-    lodash.isobject "^3.0.2"
-    lodash.merge "^4.6.0"
-    rcfinder "^0.1.6"
-
 read-all-stream@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
@@ -6334,7 +6208,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:
@@ -6346,18 +6220,18 @@ read@1, read@~1.0.1, read@~1.0.7:
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@1.1, readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, readable-stream@^1.0.33, readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+"readable-stream@>=1.0.28 <1.1.0-0", "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2:
+  version "1.0.34"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@>=1.0.28 <1.1.0-0", "readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.17, readable-stream@~1.0.2:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+readable-stream@^1.0.26-2, readable-stream@^1.0.26-4, readable-stream@^1.0.33, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
@@ -6469,8 +6343,8 @@ register-module@^0.0.2:
   resolved "https://registry.yarnpkg.com/register-module/-/register-module-0.0.2.tgz#8b6f363ec604f86ba6df20eeb4bda8cc9787c89d"
 
 registry-auth-token@^3.0.1:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.1.2.tgz#1b9e51a185c930da34a9894b12a52ea998f1adaf"
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-3.2.0.tgz#5bf3bd4608a2dd9242542c44d66ad8a5f9cdd3b0"
   dependencies:
     rc "^1.1.6"
 
@@ -6848,10 +6722,6 @@ sha@~2.0.1:
     graceful-fs "^4.1.2"
     readable-stream "^2.0.2"
 
-shelljs@0.3.x:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.3.0.tgz#3596e6307a781544f591f37da618360f31db57b1"
-
 shelljs@^0.7.5:
   version "0.7.7"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
@@ -7275,10 +7145,6 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@1.0.x:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -7371,7 +7237,7 @@ ternary-stream@^2.0.1:
     merge-stream "^1.0.0"
     through2 "^2.0.1"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -7532,7 +7398,7 @@ type-is@~1.6.10, type-is@~1.6.14:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
-typedarray@~0.0.5:
+typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
@@ -7702,8 +7568,8 @@ uuid@^3.0.0, uuid@^3.0.1:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
 v8flags@^2.0.10, v8flags@^2.0.2:
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.12.tgz#73235d9f7176f8e8833fb286795445f7938d84e5"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.1.1.tgz#aab1a1fa30d45f88dd321148875ac02c0b55e5b4"
   dependencies:
     user-home "^1.1.1"
 
@@ -7797,8 +7663,8 @@ vinyl@^1.2.0:
     replace-ext "0.0.1"
 
 vinyl@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.1.tgz#1c3b4931e7ac4c1efee743f3b91a74c094407bb6"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.0.2.tgz#0a3713d8d4e9221c58f10ca16c0116c9e25eda7c"
   dependencies:
     clone "^1.0.0"
     clone-buffer "^1.0.0"

From 99de6580937ada7b53fec34d6da3669dbbe533b6 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Fri, 21 Apr 2017 20:31:49 +0800
Subject: [PATCH 10/33] Add documentation for contributors

---
 README.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++------
 todo.md   |  1 +
 2 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index eef20656bb..b6d6393cec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-mermaid [![Build Status](https://travis-ci.org/knsv/mermaid.svg?branch=master)](https://travis-ci.org/knsv/mermaid) [![Code Climate](https://codeclimate.com/github/knsv/mermaid/badges/gpa.svg)](https://codeclimate.com/github/knsv/mermaid)
-=======
+# mermaid [![Build Status](https://travis-ci.org/knsv/mermaid.svg?branch=master)](https://travis-ci.org/knsv/mermaid)
 
+[![Code Climate](https://codeclimate.com/github/knsv/mermaid/badges/gpa.svg)](https://codeclimate.com/github/knsv/mermaid)
 [![Join the chat at https://gitter.im/knsv/mermaid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/knsv/mermaid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Generation of diagrams and flowcharts from text in a similar manner as markdown.
@@ -108,6 +108,7 @@ end
 
 </table>
 
+
 ## Further reading
 
 * [Usage](http://knsv.github.io/mermaid/#usage)
@@ -116,6 +117,7 @@ end
 * [Mermaid client](http://knsv.github.io/mermaid/#mermaid-cli)
 * [Demos](http://knsv.github.io/mermaid/#demos)
 
+
 # Request for assistance
 
 Things are piling up and I have hard time keeping up. To remedy this
@@ -134,11 +136,50 @@ Together we could continue the work with things like:
 
 Don't hesitate to contact me if you want to get involved.
 
+
+# For contributors
+
+## Setup
+
+Make sure you have Chrome browser installed, this project uses Chrome headless to running tests.
+
+    yarn install
+
+
+## Build
+
+    yarn build
+
+If you want real time incremental build:
+
+    yarn watch
+
+
+## Lint
+
+    yarn lint
+
+We use [JavaScript Standard Style](https://github.com/feross/standard).
+We recommend you installing [editor plugins](https://github.com/feross/standard#are-there-text-editor-plugins) so you can get real time lint result.
+
+
+## Test
+
+    yarn test
+
+
+## Distribtion
+
+    yarn dist
+
+Command above generates files into the `dist` folder, then you can publish them to npmjs.org.
+
+
 # Credits
-Many thanks to the [d3](http://d3js.org/) and [dagre-d3](https://github.com/cpettitt/dagre-d3) projects for providing
-the graphical layout and drawing libraries! Thanks also to the
-[js-sequence-diagram](http://bramp.github.io/js-sequence-diagrams) project for usage of the grammar for the
-sequence diagrams. Thanks to Jessica Peter for inspiration and starting point for gantt rendering.
+
+Many thanks to the [d3](http://d3js.org/) and [dagre-d3](https://github.com/cpettitt/dagre-d3) projects for providing the graphical layout and drawing libraries!
+
+Thanks also to the [js-sequence-diagram](http://bramp.github.io/js-sequence-diagrams) project for usage of the grammar for the sequence diagrams. Thanks to Jessica Peter for inspiration and starting point for gantt rendering.
 
 *Mermaid was created by Knut Sveidqvist for easier documentation.*
 
diff --git a/todo.md b/todo.md
index ed1a255225..c6a3a4d27f 100644
--- a/todo.md
+++ b/todo.md
@@ -14,3 +14,4 @@
         - need to remove it after upgrading to d3 v4
 - use headless chrome provided by karma-chrome-launcher
     - https://github.com/karma-runner/karma-chrome-launcher
+- rewrite live editor

From 0bd8aabd7c434f53e268f896acc52b00341d6461 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Fri, 21 Apr 2017 20:49:35 +0800
Subject: [PATCH 11/33] Add instructions for manual test

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index b6d6393cec..591060455b 100644
--- a/README.md
+++ b/README.md
@@ -167,6 +167,14 @@ We recommend you installing [editor plugins](https://github.com/feross/standard#
 
     yarn test
 
+Manual test in browser:
+
+    open dist/demo/index.html
+
+Manual test in Node.js:
+
+    node dist/demo/index.js
+
 
 ## Distribtion
 

From acab3a5ee1d28a419aae665bf7a671d3b96b1baf Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 10:46:42 +0800
Subject: [PATCH 12/33] Remove css files from dist folder

---
 .gitignore              |   1 +
 dist/demo/index.html    |   2 +-
 dist/mermaid.css        | 273 -------------------------------
 dist/mermaid.dark.css   | 275 -------------------------------
 dist/mermaid.forest.css | 353 ----------------------------------------
 todo.md                 |   2 +
 6 files changed, 4 insertions(+), 902 deletions(-)
 delete mode 100644 dist/mermaid.css
 delete mode 100644 dist/mermaid.dark.css
 delete mode 100644 dist/mermaid.forest.css

diff --git a/.gitignore b/.gitignore
index d10c651127..12e502a9d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ test/tmp_*
 test/fixtures/samples/*.actual*
 
 dist/*.js
+dist/*.css
diff --git a/dist/demo/index.html b/dist/demo/index.html
index baa3d968fb..6cef521152 100644
--- a/dist/demo/index.html
+++ b/dist/demo/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <title>Mermaid Quick Test Page</title>
   <link rel="icon" type="image/png" href="data:image/png;base64,iVBORw0KGgo=">
-  <link rel="stylesheet" href="../mermaid.forest.css">
+  <link rel="stylesheet" href="../mermaid.css">
 </head>
 <body>
   <div class="mermaid">
diff --git a/dist/mermaid.css b/dist/mermaid.css
deleted file mode 100644
index 769933f0af..0000000000
--- a/dist/mermaid.css
+++ /dev/null
@@ -1,273 +0,0 @@
-/* Flowchart variables */
-/* Sequence Diagram variables */
-/* Gantt chart variables */
-.mermaid .label {
-  color: #333;
-}
-.node rect,
-.node circle,
-.node ellipse,
-.node polygon {
-  fill: #ECECFF;
-  stroke: #CCCCFF;
-  stroke-width: 1px;
-}
-.edgePath .path {
-  stroke: #333333;
-}
-.edgeLabel {
-  background-color: #e8e8e8;
-}
-.cluster rect {
-  fill: #ffffde !important;
-  rx: 4 !important;
-  stroke: #aaaa33 !important;
-  stroke-width: 1px !important;
-}
-.cluster text {
-  fill: #333;
-}
-.actor {
-  stroke: #CCCCFF;
-  fill: #ECECFF;
-}
-text.actor {
-  fill: black;
-  stroke: none;
-}
-.actor-line {
-  stroke: grey;
-}
-.messageLine0 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: #333;
-}
-.messageLine1 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  stroke: #333;
-}
-#arrowhead {
-  fill: #333;
-}
-#crosshead path {
-  fill: #333 !important;
-  stroke: #333 !important;
-}
-.messageText {
-  fill: #333;
-  stroke: none;
-}
-.labelBox {
-  stroke: #CCCCFF;
-  fill: #ECECFF;
-}
-.labelText {
-  fill: black;
-  stroke: none;
-}
-.loopText {
-  fill: black;
-  stroke: none;
-}
-.loopLine {
-  stroke-width: 2;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: #CCCCFF;
-}
-.note {
-  stroke: #aaaa33;
-  fill: #fff5ad;
-}
-.noteText {
-  fill: black;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-/** Section styling */
-.section {
-  stroke: none;
-  opacity: 0.2;
-}
-.section0 {
-  fill: rgba(102, 102, 255, 0.49);
-}
-.section2 {
-  fill: #fff400;
-}
-.section1,
-.section3 {
-  fill: white;
-  opacity: 0.2;
-}
-.sectionTitle0 {
-  fill: #333;
-}
-.sectionTitle1 {
-  fill: #333;
-}
-.sectionTitle2 {
-  fill: #333;
-}
-.sectionTitle3 {
-  fill: #333;
-}
-.sectionTitle {
-  text-anchor: start;
-  font-size: 11px;
-  text-height: 14px;
-}
-/* Grid and axis */
-.grid .tick {
-  stroke: lightgrey;
-  opacity: 0.3;
-  shape-rendering: crispEdges;
-}
-.grid path {
-  stroke-width: 0;
-}
-/* Today line */
-.today {
-  fill: none;
-  stroke: red;
-  stroke-width: 2px;
-}
-/* Task styling */
-/* Default task */
-.task {
-  stroke-width: 2;
-}
-.taskText {
-  text-anchor: middle;
-  font-size: 11px;
-}
-.taskTextOutsideRight {
-  fill: black;
-  text-anchor: start;
-  font-size: 11px;
-}
-.taskTextOutsideLeft {
-  fill: black;
-  text-anchor: end;
-  font-size: 11px;
-}
-/* Specific task settings for the sections*/
-.taskText0,
-.taskText1,
-.taskText2,
-.taskText3 {
-  fill: white;
-}
-.task0,
-.task1,
-.task2,
-.task3 {
-  fill: #8a90dd;
-  stroke: #534fbc;
-}
-.taskTextOutside0,
-.taskTextOutside2 {
-  fill: black;
-}
-.taskTextOutside1,
-.taskTextOutside3 {
-  fill: black;
-}
-/* Active task */
-.active0,
-.active1,
-.active2,
-.active3 {
-  fill: #bfc7ff;
-  stroke: #534fbc;
-}
-.activeText0,
-.activeText1,
-.activeText2,
-.activeText3 {
-  fill: black !important;
-}
-/* Completed task */
-.done0,
-.done1,
-.done2,
-.done3 {
-  stroke: grey;
-  fill: lightgrey;
-  stroke-width: 2;
-}
-.doneText0,
-.doneText1,
-.doneText2,
-.doneText3 {
-  fill: black !important;
-}
-/* Tasks on the critical line */
-.crit0,
-.crit1,
-.crit2,
-.crit3 {
-  stroke: #ff8888;
-  fill: red;
-  stroke-width: 2;
-}
-.activeCrit0,
-.activeCrit1,
-.activeCrit2,
-.activeCrit3 {
-  stroke: #ff8888;
-  fill: #bfc7ff;
-  stroke-width: 2;
-}
-.doneCrit0,
-.doneCrit1,
-.doneCrit2,
-.doneCrit3 {
-  stroke: #ff8888;
-  fill: lightgrey;
-  stroke-width: 2;
-  cursor: pointer;
-  shape-rendering: crispEdges;
-}
-.doneCritText0,
-.doneCritText1,
-.doneCritText2,
-.doneCritText3 {
-  fill: black !important;
-}
-.activeCritText0,
-.activeCritText1,
-.activeCritText2,
-.activeCritText3 {
-  fill: black !important;
-}
-.titleText {
-  text-anchor: middle;
-  font-size: 18px;
-  fill: black;
-}
-/*
-
-
-*/
-.node text {
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-div.mermaidTooltip {
-  position: absolute;
-  text-align: center;
-  max-width: 200px;
-  padding: 2px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 12px;
-  background: #ffffde;
-  border: 1px solid #aaaa33;
-  border-radius: 2px;
-  pointer-events: none;
-  z-index: 100;
-}
diff --git a/dist/mermaid.dark.css b/dist/mermaid.dark.css
deleted file mode 100644
index df49a4e118..0000000000
--- a/dist/mermaid.dark.css
+++ /dev/null
@@ -1,275 +0,0 @@
-/* Flowchart variables */
-/* Sequence Diagram variables */
-/* Gantt chart variables */
-.mermaid .label {
-  color: #323D47;
-}
-.node rect,
-.node circle,
-.node ellipse,
-.node polygon {
-  fill: #BDD5EA;
-  stroke: #81B1DB;
-  stroke-width: 1px;
-}
-.edgePath .path {
-  stroke: lightgrey;
-}
-.edgeLabel {
-  background-color: #e8e8e8;
-}
-.cluster rect {
-  fill: #6D6D65 !important;
-  rx: 4 !important;
-  stroke: rgba(255, 255, 255, 0.25) !important;
-  stroke-width: 1px !important;
-}
-.cluster text {
-  fill: #F9FFFE;
-}
-.actor {
-  stroke: #81B1DB;
-  fill: #BDD5EA;
-}
-text.actor {
-  fill: black;
-  stroke: none;
-}
-.actor-line {
-  stroke: lightgrey;
-}
-.messageLine0 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: lightgrey;
-}
-.messageLine1 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  stroke: lightgrey;
-}
-#arrowhead {
-  fill: lightgrey !important;
-}
-#crosshead path {
-  fill: lightgrey !important;
-  stroke: lightgrey !important;
-}
-.messageText {
-  fill: lightgrey;
-  stroke: none;
-}
-.labelBox {
-  stroke: #81B1DB;
-  fill: #BDD5EA;
-}
-.labelText {
-  fill: #323D47;
-  stroke: none;
-}
-.loopText {
-  fill: lightgrey;
-  stroke: none;
-}
-.loopLine {
-  stroke-width: 2;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: #81B1DB;
-}
-.note {
-  stroke: rgba(255, 255, 255, 0.25);
-  fill: #fff5ad;
-}
-.noteText {
-  fill: black;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-/** Section styling */
-.section {
-  stroke: none;
-  opacity: 0.2;
-}
-.section0 {
-  fill: rgba(255, 255, 255, 0.3);
-}
-.section2 {
-  fill: #EAE8B9;
-}
-.section1,
-.section3 {
-  fill: white;
-  opacity: 0.2;
-}
-.sectionTitle0 {
-  fill: #F9FFFE;
-}
-.sectionTitle1 {
-  fill: #F9FFFE;
-}
-.sectionTitle2 {
-  fill: #F9FFFE;
-}
-.sectionTitle3 {
-  fill: #F9FFFE;
-}
-.sectionTitle {
-  text-anchor: start;
-  font-size: 11px;
-  text-height: 14px;
-}
-/* Grid and axis */
-.grid .tick {
-  stroke: rgba(255, 255, 255, 0.3);
-  opacity: 0.3;
-  shape-rendering: crispEdges;
-}
-.grid .tick text {
-  fill: lightgrey;
-  opacity: 0.5;
-}
-.grid path {
-  stroke-width: 0;
-}
-/* Today line */
-.today {
-  fill: none;
-  stroke: #DB5757;
-  stroke-width: 2px;
-}
-/* Task styling */
-/* Default task */
-.task {
-  stroke-width: 1;
-}
-.taskText {
-  text-anchor: middle;
-  font-size: 11px;
-}
-.taskTextOutsideRight {
-  fill: #323D47;
-  text-anchor: start;
-  font-size: 11px;
-}
-.taskTextOutsideLeft {
-  fill: #323D47;
-  text-anchor: end;
-  font-size: 11px;
-}
-/* Specific task settings for the sections*/
-.taskText0,
-.taskText1,
-.taskText2,
-.taskText3 {
-  fill: #323D47;
-}
-.task0,
-.task1,
-.task2,
-.task3 {
-  fill: #BDD5EA;
-  stroke: rgba(255, 255, 255, 0.5);
-}
-.taskTextOutside0,
-.taskTextOutside2 {
-  fill: lightgrey;
-}
-.taskTextOutside1,
-.taskTextOutside3 {
-  fill: lightgrey;
-}
-/* Active task */
-.active0,
-.active1,
-.active2,
-.active3 {
-  fill: #81B1DB;
-  stroke: rgba(255, 255, 255, 0.5);
-}
-.activeText0,
-.activeText1,
-.activeText2,
-.activeText3 {
-  fill: #323D47 !important;
-}
-/* Completed task */
-.done0,
-.done1,
-.done2,
-.done3 {
-  fill: lightgrey;
-}
-.doneText0,
-.doneText1,
-.doneText2,
-.doneText3 {
-  fill: #323D47 !important;
-}
-/* Tasks on the critical line */
-.crit0,
-.crit1,
-.crit2,
-.crit3 {
-  stroke: #E83737;
-  fill: #E83737;
-  stroke-width: 2;
-}
-.activeCrit0,
-.activeCrit1,
-.activeCrit2,
-.activeCrit3 {
-  stroke: #E83737;
-  fill: #81B1DB;
-  stroke-width: 2;
-}
-.doneCrit0,
-.doneCrit1,
-.doneCrit2,
-.doneCrit3 {
-  stroke: #E83737;
-  fill: lightgrey;
-  stroke-width: 1;
-  cursor: pointer;
-  shape-rendering: crispEdges;
-}
-.doneCritText0,
-.doneCritText1,
-.doneCritText2,
-.doneCritText3 {
-  fill: lightgrey !important;
-}
-.activeCritText0,
-.activeCritText1,
-.activeCritText2,
-.activeCritText3 {
-  fill: #323D47 !important;
-}
-.titleText {
-  text-anchor: middle;
-  font-size: 18px;
-  fill: lightgrey;
-}
-/*
-
-
-*/
-.node text {
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-div.mermaidTooltip {
-  position: absolute;
-  text-align: center;
-  max-width: 200px;
-  padding: 2px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 12px;
-  background: #6D6D65;
-  border: 1px solid rgba(255, 255, 255, 0.25);
-  border-radius: 2px;
-  pointer-events: none;
-  z-index: 100;
-}
diff --git a/dist/mermaid.forest.css b/dist/mermaid.forest.css
deleted file mode 100644
index ecfbe7fe22..0000000000
--- a/dist/mermaid.forest.css
+++ /dev/null
@@ -1,353 +0,0 @@
-/* Flowchart variables */
-/* Sequence Diagram variables */
-/* Gantt chart variables */
-.mermaid .label {
-  font-family: 'trebuchet ms', verdana, arial;
-  color: #333;
-}
-.node rect,
-.node circle,
-.node ellipse,
-.node polygon {
-  fill: #cde498;
-  stroke: #13540c;
-  stroke-width: 1px;
-}
-.edgePath .path {
-  stroke: green;
-  stroke-width: 1.5px;
-}
-.edgeLabel {
-  background-color: #e8e8e8;
-}
-.cluster rect {
-  fill: #cdffb2 !important;
-  rx: 4  !important;
-  stroke: #6eaa49 !important;
-  stroke-width: 1px !important;
-}
-.cluster text {
-  fill: #333;
-}
-.actor {
-  stroke: #13540c;
-  fill: #cde498;
-}
-text.actor {
-  fill: black;
-  stroke: none;
-}
-.actor-line {
-  stroke: grey;
-}
-.messageLine0 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: #333;
-}
-.messageLine1 {
-  stroke-width: 1.5;
-  stroke-dasharray: "2 2";
-  stroke: #333;
-}
-#arrowhead {
-  fill: #333;
-}
-#crosshead path {
-  fill: #333 !important;
-  stroke: #333 !important;
-}
-.messageText {
-  fill: #333;
-  stroke: none;
-}
-.labelBox {
-  stroke: #326932;
-  fill: #cde498;
-}
-.labelText {
-  fill: black;
-  stroke: none;
-}
-.loopText {
-  fill: black;
-  stroke: none;
-}
-.loopLine {
-  stroke-width: 2;
-  stroke-dasharray: "2 2";
-  marker-end: "url(#arrowhead)";
-  stroke: #326932;
-}
-.note {
-  stroke: #6eaa49;
-  fill: #fff5ad;
-}
-.noteText {
-  fill: black;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-/** Section styling */
-.section {
-  stroke: none;
-  opacity: 0.2;
-}
-.section0 {
-  fill: #6eaa49;
-}
-.section2 {
-  fill: #6eaa49;
-}
-.section1,
-.section3 {
-  fill: white;
-  opacity: 0.2;
-}
-.sectionTitle0 {
-  fill: #333;
-}
-.sectionTitle1 {
-  fill: #333;
-}
-.sectionTitle2 {
-  fill: #333;
-}
-.sectionTitle3 {
-  fill: #333;
-}
-.sectionTitle {
-  text-anchor: start;
-  font-size: 11px;
-  text-height: 14px;
-}
-/* Grid and axis */
-.grid .tick {
-  stroke: lightgrey;
-  opacity: 0.3;
-  shape-rendering: crispEdges;
-}
-.grid path {
-  stroke-width: 0;
-}
-/* Today line */
-.today {
-  fill: none;
-  stroke: red;
-  stroke-width: 2px;
-}
-/* Task styling */
-/* Default task */
-.task {
-  stroke-width: 2;
-}
-.taskText {
-  text-anchor: middle;
-  font-size: 11px;
-}
-.taskTextOutsideRight {
-  fill: black;
-  text-anchor: start;
-  font-size: 11px;
-}
-.taskTextOutsideLeft {
-  fill: black;
-  text-anchor: end;
-  font-size: 11px;
-}
-/* Specific task settings for the sections*/
-.taskText0,
-.taskText1,
-.taskText2,
-.taskText3 {
-  fill: white;
-}
-.task0,
-.task1,
-.task2,
-.task3 {
-  fill: #487e3a;
-  stroke: #13540c;
-}
-.taskTextOutside0,
-.taskTextOutside2 {
-  fill: black;
-}
-.taskTextOutside1,
-.taskTextOutside3 {
-  fill: black;
-}
-/* Active task */
-.active0,
-.active1,
-.active2,
-.active3 {
-  fill: #cde498;
-  stroke: #13540c;
-}
-.activeText0,
-.activeText1,
-.activeText2,
-.activeText3 {
-  fill: black !important;
-}
-/* Completed task */
-.done0,
-.done1,
-.done2,
-.done3 {
-  stroke: grey;
-  fill: lightgrey;
-  stroke-width: 2;
-}
-.doneText0,
-.doneText1,
-.doneText2,
-.doneText3 {
-  fill: black !important;
-}
-/* Tasks on the critical line */
-.crit0,
-.crit1,
-.crit2,
-.crit3 {
-  stroke: #ff8888;
-  fill: red;
-  stroke-width: 2;
-}
-.activeCrit0,
-.activeCrit1,
-.activeCrit2,
-.activeCrit3 {
-  stroke: #ff8888;
-  fill: #cde498;
-  stroke-width: 2;
-}
-.doneCrit0,
-.doneCrit1,
-.doneCrit2,
-.doneCrit3 {
-  stroke: #ff8888;
-  fill: lightgrey;
-  stroke-width: 2;
-  cursor: pointer;
-  shape-rendering: crispEdges;
-}
-.doneCritText0,
-.doneCritText1,
-.doneCritText2,
-.doneCritText3 {
-  fill: black !important;
-}
-.activeCritText0,
-.activeCritText1,
-.activeCritText2,
-.activeCritText3 {
-  fill: black !important;
-}
-.titleText {
-  text-anchor: middle;
-  font-size: 18px;
-  fill: black;
-}
-/*
-
-
-*/
-g.classGroup text {
-  fill: #13540c;
-  stroke: none;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-g.classGroup rect {
-  fill: #cde498;
-  stroke: #13540c;
-}
-g.classGroup line {
-  stroke: #13540c;
-  stroke-width: 1;
-}
-svg .classLabel .box {
-  stroke: none;
-  stroke-width: 0;
-  fill: #cde498;
-  opacity: 0.5;
-}
-svg .classLabel .label {
-  fill: #13540c;
-}
-.relation {
-  stroke: #13540c;
-  stroke-width: 1;
-  fill: none;
-}
-.composition {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#compositionStart {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#compositionEnd {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-.aggregation {
-  fill: #cde498;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#aggregationStart {
-  fill: #cde498;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#aggregationEnd {
-  fill: #cde498;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#dependencyStart {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#dependencyEnd {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#extensionStart {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-#extensionEnd {
-  fill: #13540c;
-  stroke: #13540c;
-  stroke-width: 1;
-}
-.node text {
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
-}
-div.mermaidTooltip {
-  position: absolute;
-  text-align: center;
-  max-width: 200px;
-  padding: 2px;
-  font-family: 'trebuchet ms', verdana, arial;
-  font-size: 12px;
-  background: #cdffb2;
-  border: 1px solid #6eaa49;
-  border-radius: 2px;
-  pointer-events: none;
-  z-index: 100;
-}
diff --git a/todo.md b/todo.md
index c6a3a4d27f..639c89b255 100644
--- a/todo.md
+++ b/todo.md
@@ -15,3 +15,5 @@
 - use headless chrome provided by karma-chrome-launcher
     - https://github.com/karma-runner/karma-chrome-launcher
 - rewrite live editor
+- Fix Travis CI
+- Fix CodeClimate

From c52a8fc44279ccf9632579127d7ac88ae686f393 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 15:40:35 +0800
Subject: [PATCH 13/33] Webpack compile less to css

---
 package.json           |   5 +
 webpack.config.base.js |  38 +++
 webpack.config.js      |   6 +-
 yarn.lock              | 610 ++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 644 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index fbd3dbae26..a28125b7e3 100644
--- a/package.json
+++ b/package.json
@@ -65,8 +65,10 @@
     "babel-preset-env": "^1.4.0",
     "clone": "^2.1.1",
     "codeclimate-test-reporter": "0.4.1",
+    "css-loader": "^0.28.0",
     "dox": "^0.9.0",
     "event-stream": "^3.3.4",
+    "extract-text-webpack-plugin": "^2.1.0",
     "front-matter": "^2.1.2",
     "gulp": "~3.9.1",
     "gulp-bower": "0.0.13",
@@ -104,6 +106,8 @@
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
     "karma-webpack": "^2.0.3",
+    "less": "^2.7.2",
+    "less-loader": "^4.0.3",
     "live-server": "^1.2.0",
     "map-stream": "0.0.7",
     "marked": "^0.3.6",
@@ -113,6 +117,7 @@
     "require-dir": "^0.3.1",
     "rimraf": "^2.6.1",
     "standard": "^10.0.2",
+    "style-loader": "^0.16.1",
     "tape": "^4.6.3",
     "webpack": "^2.4.1",
     "webpack-node-externals": "^1.5.4"
diff --git a/webpack.config.base.js b/webpack.config.base.js
index efc9b9c077..d3170c7d21 100644
--- a/webpack.config.base.js
+++ b/webpack.config.base.js
@@ -1,5 +1,6 @@
 import path from 'path'
 import nodeExternals from 'webpack-node-externals'
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
 export const webConfig = () => {
   return {
@@ -70,3 +71,40 @@ export const nodeConfig = () => {
     }
   }
 }
+
+export const lessConfig = () => {
+  return {
+    target: 'web',
+    entry: {
+      'mermaid': './src/less/default/mermaid.less',
+      'mermaid.dark': './src/less/dark/mermaid.less',
+      'mermaid.forest': './src/less/forest/mermaid.less',
+      'mermaid.neutral': './src/less/neutral/mermaid.less'
+    },
+    output: {
+      path: path.join(__dirname, './dist/'),
+      filename: '[name].css'
+    },
+    module: {
+      rules: [
+        {
+          test: /\.less$/,
+          use: ExtractTextPlugin.extract({
+            fallback: 'style-loader',
+            use: [
+              {
+                loader: 'css-loader'
+              },
+              {
+                loader: 'less-loader'
+              }
+            ]
+          })
+        }
+      ]
+    },
+    plugins: [
+      new ExtractTextPlugin('[name].css')
+    ]
+  }
+}
diff --git a/webpack.config.js b/webpack.config.js
index 722e978d8a..be6d27a3f4 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,4 +1,4 @@
-import { webConfig, nodeConfig } from './webpack.config.base.js'
+import { webConfig, nodeConfig, lessConfig } from './webpack.config.base.js'
 
 const config1 = webConfig()
 
@@ -8,4 +8,6 @@ config2.output.filename = '[name].slim.js'
 
 const config3 = nodeConfig()
 
-export default [config1, config2, config3]
+const config4 = lessConfig()
+
+export default [config1, config2, config3, config4]
diff --git a/yarn.lock b/yarn.lock
index de8fd90148..fcec34ef88 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -82,7 +82,7 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.7.0, ajv@^4.9.1:
+ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.7.tgz#8655a5d86d0824985cc471a1d913fb6729a0ec48"
   dependencies:
@@ -97,6 +97,10 @@ align-text@^0.1.1, align-text@^0.1.3:
     longest "^1.0.1"
     repeat-string "^1.5.2"
 
+alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -326,6 +330,17 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
+autoprefixer@^6.3.1:
+  version "6.7.7"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
+  dependencies:
+    browserslist "^1.7.6"
+    caniuse-db "^1.0.30000634"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.16"
+    postcss-value-parser "^3.2.3"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -355,7 +370,7 @@ babel-cli@^6.16.0:
   optionalDependencies:
     chokidar "^1.6.1"
 
-babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
@@ -1056,7 +1071,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@^0.4.1:
+balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -1273,7 +1288,7 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.4.0:
+browserslist@^1.3.6, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
@@ -1370,7 +1385,16 @@ camelcase@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
-caniuse-db@^1.0.30000639:
+caniuse-api@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
+  dependencies:
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
+
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000656"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45"
 
@@ -1452,6 +1476,12 @@ cjson@0.3.0:
   dependencies:
     jsonlint "1.6.0"
 
+clap@^1.0.9:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/clap/-/clap-1.1.3.tgz#b3bd36e93dd4cbfb395a3c26896352445265c05b"
+  dependencies:
+    chalk "^1.1.3"
+
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
@@ -1549,6 +1579,12 @@ co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
+coa@~1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.1.tgz#7f959346cfc8719e3f7233cd6852854a7c67d8a3"
+  dependencies:
+    q "^1.1.2"
+
 code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
@@ -1562,6 +1598,38 @@ codeclimate-test-reporter@0.4.1:
     lcov-parse "0.0.10"
     request "~2.74.0"
 
+color-convert@^1.3.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.0.tgz#1accf97dd739b983bf994d56fec8f95853641b7a"
+  dependencies:
+    color-name "^1.1.1"
+
+color-name@^1.0.0, color-name@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
+
+color-string@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
+  dependencies:
+    color-name "^1.0.0"
+
+color@^0.11.0:
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
+  dependencies:
+    clone "^1.0.2"
+    color-convert "^1.3.0"
+    color-string "^0.3.0"
+
+colormin@^1.0.5:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
+  dependencies:
+    color "^0.11.0"
+    css-color-names "0.0.4"
+    has "^1.0.1"
+
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
@@ -1570,7 +1638,7 @@ colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
-colors@^1.1.0, colors@latest:
+colors@^1.1.0, colors@latest, colors@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63"
 
@@ -1804,6 +1872,91 @@ crypto-browserify@^3.11.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
+css-color-names@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
+
+css-loader@^0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad"
+  dependencies:
+    babel-code-frame "^6.11.0"
+    css-selector-tokenizer "^0.7.0"
+    cssnano ">=2.6.1 <4"
+    loader-utils "^1.0.2"
+    lodash.camelcase "^4.3.0"
+    object-assign "^4.0.1"
+    postcss "^5.0.6"
+    postcss-modules-extract-imports "^1.0.0"
+    postcss-modules-local-by-default "^1.0.1"
+    postcss-modules-scope "^1.0.0"
+    postcss-modules-values "^1.1.0"
+    source-list-map "^0.1.7"
+
+css-selector-tokenizer@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+css-selector-tokenizer@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
+  dependencies:
+    cssesc "^0.1.0"
+    fastparse "^1.1.1"
+    regexpu-core "^1.0.0"
+
+cssesc@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-0.1.0.tgz#c814903e45623371a0477b40109aaafbeeaddbb4"
+
+"cssnano@>=2.6.1 <4":
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
+  dependencies:
+    autoprefixer "^6.3.1"
+    decamelize "^1.1.2"
+    defined "^1.0.0"
+    has "^1.0.1"
+    object-assign "^4.0.1"
+    postcss "^5.0.14"
+    postcss-calc "^5.2.0"
+    postcss-colormin "^2.1.8"
+    postcss-convert-values "^2.3.4"
+    postcss-discard-comments "^2.0.4"
+    postcss-discard-duplicates "^2.0.1"
+    postcss-discard-empty "^2.0.1"
+    postcss-discard-overridden "^0.1.1"
+    postcss-discard-unused "^2.2.1"
+    postcss-filter-plugins "^2.0.0"
+    postcss-merge-idents "^2.1.5"
+    postcss-merge-longhand "^2.0.1"
+    postcss-merge-rules "^2.0.3"
+    postcss-minify-font-values "^1.0.2"
+    postcss-minify-gradients "^1.0.1"
+    postcss-minify-params "^1.0.4"
+    postcss-minify-selectors "^2.0.4"
+    postcss-normalize-charset "^1.1.0"
+    postcss-normalize-url "^3.0.7"
+    postcss-ordered-values "^2.1.0"
+    postcss-reduce-idents "^2.2.2"
+    postcss-reduce-initial "^1.0.0"
+    postcss-reduce-transforms "^1.0.3"
+    postcss-svgo "^2.1.1"
+    postcss-unique-selectors "^2.0.2"
+    postcss-value-parser "^3.2.3"
+    postcss-zindex "^2.0.1"
+
+csso@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
+  dependencies:
+    clap "^1.0.9"
+    source-map "^0.5.3"
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
@@ -1946,7 +2099,7 @@ define-properties@^1.1.2:
     foreach "^2.0.5"
     object-keys "^1.0.8"
 
-defined@~1.0.0:
+defined@^1.0.0, defined@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
@@ -2502,7 +2655,7 @@ esprima@2.5.x:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.5.0.tgz#f387a46fd344c1b1a39baf8c20bfb43b6d0058cc"
 
-esprima@2.7.x, esprima@^2.7.1:
+esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -2678,6 +2831,15 @@ extglob@^0.3.1:
   dependencies:
     is-extglob "^1.0.0"
 
+extract-text-webpack-plugin@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.1.0.tgz#69315b885f876dbf96d3819f6a9f1cca7aebf159"
+  dependencies:
+    ajv "^4.11.2"
+    async "^2.1.2"
+    loader-utils "^1.0.2"
+    webpack-sources "^0.1.0"
+
 extract-zip@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.5.0.tgz#92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4"
@@ -2710,6 +2872,10 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+fastparse@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
+
 faye-websocket@0.11.x:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.1.tgz#f0efe18c4f56e4f40afc7e06c719fd5ee6188f38"
@@ -2864,6 +3030,10 @@ flat-map@^0.1.0:
     is-stream "^1.1.0"
     through "^2.3.8"
 
+flatten@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
+
 for-each@~0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.2.tgz#2c40450b9348e97f281322593ba96704b9abd4d4"
@@ -3720,6 +3890,10 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.1.5, hosted-git-info@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.1.5.tgz#0ba81d90da2e25ab34a332e6ec77936e1598118b"
 
+html-comment-regex@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.1.tgz#668b93776eaae55ebde8f3ad464b307a4963625e"
+
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz#79bf7a785ea495fe66165e734153f363ff5437da"
@@ -3786,6 +3960,10 @@ iconv-lite@0.4.15:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
+icss-replace-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.0.2.tgz#cb0b6054eb3af6edc9ab1d62d01933e2d4c8bfa5"
+
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -3812,6 +3990,10 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indexes-of@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
+
 indexof@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
@@ -3938,6 +4120,10 @@ ipaddr.js@1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.3.0.tgz#1e03a52fdad83a8bbb2b25cbf4998b4cffcd3dec"
 
+is-absolute-url@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
+
 is-absolute@^0.2.3:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
@@ -4060,6 +4246,10 @@ is-path-inside@^1.0.0:
   dependencies:
     path-is-inside "^1.0.1"
 
+is-plain-obj@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
+
 is-posix-bracket@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
@@ -4106,6 +4296,12 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-svg@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
+  dependencies:
+    html-comment-regex "^1.1.0"
+
 is-symbol@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
@@ -4270,6 +4466,10 @@ jodid25519@^1.0.0:
   dependencies:
     jsbn "~0.1.0"
 
+js-base64@^2.1.9:
+  version "2.1.9"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce"
+
 js-tokens@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
@@ -4281,6 +4481,13 @@ js-yaml@3.x, js-yaml@^3.4.6, js-yaml@^3.5.1, js-yaml@^3.5.3:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
+js-yaml@~3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^2.6.0"
+
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -4498,7 +4705,15 @@ lcov-parse@0.0.10:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
 
-"less@2.6.x || ^2.7.1":
+less-loader@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.0.3.tgz#d1e6462ca2f090c11248455e14b8dda4616d0521"
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^2.3.0"
+
+"less@2.6.x || ^2.7.1", less@^2.7.2:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/less/-/less-2.7.2.tgz#368d6cc73e1fb03981183280918743c5dcf9b3df"
   optionalDependencies:
@@ -4603,6 +4818,14 @@ loader-utils@^0.2.16, loader-utils@^0.2.5:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
+loader-utils@^1.0.2, loader-utils@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -4735,6 +4958,10 @@ lodash.assignwith@^4.0.7:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
 
+lodash.camelcase@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
+
 lodash.clone@^4.3.2:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6"
@@ -4826,6 +5053,10 @@ lodash.mapvalues@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
 
+lodash.memoize@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+
 lodash.merge@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
@@ -4894,7 +5125,7 @@ lodash.union@~4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
 
-lodash.uniq@^4.3.0, lodash.uniq@~4.5.0:
+lodash.uniq@^4.3.0, lodash.uniq@^4.5.0, lodash.uniq@~4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
@@ -4967,6 +5198,10 @@ lru-cache@^4.0.0:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
+macaddress@^0.2.8:
+  version "0.2.8"
+  resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12"
+
 map-cache@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
@@ -4997,6 +5232,10 @@ marked@^0.3.6, marked@~0.3.2, marked@~0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.6.tgz#b2c6c618fccece4ef86c4fc6cb8a7cbf5aeda8d7"
 
+math-expression-evaluator@^1.2.14:
+  version "1.2.16"
+  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.16.tgz#b357fa1ca9faefb8e48d10c14ef2bcb2d9f0a7c9"
+
 mdurl@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -5366,6 +5605,19 @@ normalize-path@^2.0.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-range@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+
+normalize-url@^1.4.0:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
+  dependencies:
+    object-assign "^4.0.1"
+    prepend-http "^1.0.0"
+    query-string "^4.1.0"
+    sort-keys "^1.0.0"
+
 npm-cache-filename@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11"
@@ -5532,6 +5784,10 @@ null-check@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/null-check/-/null-check-1.0.0.tgz#977dffd7176012b9ec30d2a39db5cf72a0439edd"
 
+num2fraction@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
+
 number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
@@ -5900,7 +6156,7 @@ phantomjs-prebuilt@^2.1.14, phantomjs-prebuilt@^2.1.3:
     request-progress "~2.0.1"
     which "~1.2.10"
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
 
@@ -5970,6 +6226,244 @@ portfinder@^1.0.7:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
+postcss-calc@^5.2.0:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
+  dependencies:
+    postcss "^5.0.2"
+    postcss-message-helpers "^2.0.0"
+    reduce-css-calc "^1.2.6"
+
+postcss-colormin@^2.1.8:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
+  dependencies:
+    colormin "^1.0.5"
+    postcss "^5.0.13"
+    postcss-value-parser "^3.2.3"
+
+postcss-convert-values@^2.3.4:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
+  dependencies:
+    postcss "^5.0.11"
+    postcss-value-parser "^3.1.2"
+
+postcss-discard-comments@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-duplicates@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-discard-empty@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
+  dependencies:
+    postcss "^5.0.14"
+
+postcss-discard-overridden@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
+  dependencies:
+    postcss "^5.0.16"
+
+postcss-discard-unused@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
+  dependencies:
+    postcss "^5.0.14"
+    uniqs "^2.0.0"
+
+postcss-filter-plugins@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz#6d85862534d735ac420e4a85806e1f5d4286d84c"
+  dependencies:
+    postcss "^5.0.4"
+    uniqid "^4.0.0"
+
+postcss-merge-idents@^2.1.5:
+  version "2.1.7"
+  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.10"
+    postcss-value-parser "^3.1.1"
+
+postcss-merge-longhand@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-merge-rules@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
+  dependencies:
+    browserslist "^1.5.2"
+    caniuse-api "^1.5.2"
+    postcss "^5.0.4"
+    postcss-selector-parser "^2.2.2"
+    vendors "^1.0.0"
+
+postcss-message-helpers@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
+
+postcss-minify-font-values@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
+  dependencies:
+    object-assign "^4.0.1"
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-minify-gradients@^1.0.1:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
+  dependencies:
+    postcss "^5.0.12"
+    postcss-value-parser "^3.3.0"
+
+postcss-minify-params@^1.0.4:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.2"
+    postcss-value-parser "^3.0.2"
+    uniqs "^2.0.0"
+
+postcss-minify-selectors@^2.0.4:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
+  dependencies:
+    alphanum-sort "^1.0.2"
+    has "^1.0.1"
+    postcss "^5.0.14"
+    postcss-selector-parser "^2.0.0"
+
+postcss-modules-extract-imports@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.0.1.tgz#8fb3fef9a6dd0420d3f6d4353cf1ff73f2b2a341"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-modules-local-by-default@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.1.1.tgz#29a10673fa37d19251265ca2ba3150d9040eb4ce"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-scope@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.0.2.tgz#ff977395e5e06202d7362290b88b1e8cd049de29"
+  dependencies:
+    css-selector-tokenizer "^0.6.0"
+    postcss "^5.0.4"
+
+postcss-modules-values@^1.1.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.2.2.tgz#f0e7d476fe1ed88c5e4c7f97533a3e772ad94ca1"
+  dependencies:
+    icss-replace-symbols "^1.0.2"
+    postcss "^5.0.14"
+
+postcss-normalize-charset@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
+  dependencies:
+    postcss "^5.0.5"
+
+postcss-normalize-url@^3.0.7:
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
+  dependencies:
+    is-absolute-url "^2.0.0"
+    normalize-url "^1.4.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+
+postcss-ordered-values@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.1"
+
+postcss-reduce-idents@^2.2.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
+  dependencies:
+    postcss "^5.0.4"
+    postcss-value-parser "^3.0.2"
+
+postcss-reduce-initial@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
+  dependencies:
+    postcss "^5.0.4"
+
+postcss-reduce-transforms@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.8"
+    postcss-value-parser "^3.0.1"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
+  dependencies:
+    flatten "^1.0.2"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
+postcss-svgo@^2.1.1:
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
+  dependencies:
+    is-svg "^2.0.0"
+    postcss "^5.0.14"
+    postcss-value-parser "^3.2.3"
+    svgo "^0.7.0"
+
+postcss-unique-selectors@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
+  dependencies:
+    alphanum-sort "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
+
+postcss-zindex@^2.0.1:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
+  dependencies:
+    has "^1.0.1"
+    postcss "^5.0.4"
+    uniqs "^2.0.0"
+
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16:
+  version "5.2.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
 prelude-ls@~1.1.0, prelude-ls@~1.1.1, prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -6055,6 +6549,10 @@ punycode@^1.2.4, punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
+q@^1.1.2:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
+
 qjobs@^1.1.4:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.1.5.tgz#659de9f2cf8dcc27a1481276f205377272382e73"
@@ -6083,6 +6581,13 @@ qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
 
+query-string@^4.1.0:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
+  dependencies:
+    object-assign "^4.1.0"
+    strict-uri-encode "^1.0.0"
+
 querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
@@ -6307,6 +6812,20 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
+reduce-css-calc@^1.2.6:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
+  dependencies:
+    balanced-match "^0.4.2"
+    math-expression-evaluator "^1.2.14"
+    reduce-function-call "^1.0.1"
+
+reduce-function-call@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
+  dependencies:
+    balanced-match "^0.4.2"
+
 regenerate@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
@@ -6330,6 +6849,14 @@ regex-cache@^0.4.2:
     is-equal-shallow "^0.1.3"
     is-primitive "^2.0.0"
 
+regexpu-core@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
 regexpu-core@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
@@ -6615,7 +7142,7 @@ safe-buffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
 
-sax@^1.2.1:
+sax@^1.2.1, sax@~1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
@@ -6908,10 +7435,20 @@ socket.io@1.7.3:
     socket.io-client "1.7.3"
     socket.io-parser "2.3.1"
 
+sort-keys@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
+  dependencies:
+    is-plain-obj "^1.0.0"
+
 sorted-object@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-2.0.1.tgz#7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"
 
+source-list-map@^0.1.7, source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
 source-list-map@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-1.1.1.tgz#1a33ac210ca144d1e561f906ebccab5669ff4cb4"
@@ -7067,6 +7604,10 @@ streamqueue@0.0.6:
   dependencies:
     readable-stream "^1.0.26-2"
 
+strict-uri-encode@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
+
 string-length@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-1.0.1.tgz#56970fb1c38558e9e70b728bf3de269ac45adfac"
@@ -7149,6 +7690,12 @@ strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 
+style-loader@^0.16.1:
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.16.1.tgz#50e325258d4e78421dd9680636b41e8661595d10"
+  dependencies:
+    loader-utils "^1.0.2"
+
 supports-color@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -7157,12 +7704,24 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0:
+supports-color@^3.1.0, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
     has-flag "^1.0.0"
 
+svgo@^0.7.0:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
+  dependencies:
+    coa "~1.0.1"
+    colors "~1.1.2"
+    csso "~2.3.1"
+    js-yaml "~3.7.0"
+    mkdirp "~0.5.1"
+    sax "~1.2.1"
+    whet.extend "~0.9.9"
+
 symbol-tree@^3.2.1:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
@@ -7447,6 +8006,16 @@ uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
 
+uniqid@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/uniqid/-/uniqid-4.1.1.tgz#89220ddf6b751ae52b5f72484863528596bb84c1"
+  dependencies:
+    macaddress "^0.2.8"
+
+uniqs@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
+
 unique-filename@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.0.tgz#d05f2fe4032560871f30e93cbe735eea201514f3"
@@ -7602,6 +8171,10 @@ vary@^1, vary@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.1.tgz#67535ebb694c1d52257457984665323f587e8d37"
 
+vendors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
+
 verror@1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
@@ -7725,6 +8298,13 @@ webpack-node-externals@^1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.5.4.tgz#ea05ba17108a23e776c35c42e7bb0e86c225be00"
 
+webpack-sources@^0.1.0:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.5.tgz#aa1f3abf0f0d74db7111c40e500b84f966640750"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.5.3"
+
 webpack-sources@^0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
@@ -7785,6 +8365,10 @@ when@^3.7.7:
   version "3.7.8"
   resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82"
 
+whet.extend@~0.9.9:
+  version "0.9.9"
+  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"

From 73027d5cec0cb297daf0f713383fb4ffdd6516ef Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 16:04:16 +0800
Subject: [PATCH 14/33] yarn dist generates minified css files

---
 package.json           | 5 +++--
 webpack.config.prod.js | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index a28125b7e3..8e17eca1f5 100644
--- a/package.json
+++ b/package.json
@@ -23,12 +23,13 @@
     "lint": "node_modules/.bin/standard",
     "karma": "node node_modules/karma/bin/karma start karma.conf.js --single-run",
     "tape": "node node_modules/tape/bin/tape test/cli_test-*.js",
-    "pretest": "yarn run jison && yarn lint",
     "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"
+    "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",
+    "pretest": "yarn jison && yarn lint",
+    "prepublish": "yarn build && yarn dist && yarn test"
   },
   "repository": {
     "type": "git",
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 769751e69b..7254977e4e 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -1,4 +1,5 @@
-import { webConfig, nodeConfig } from './webpack.config.base.js'
+import ExtractTextPlugin from 'extract-text-webpack-plugin'
+import { webConfig, nodeConfig, lessConfig } from './webpack.config.base.js'
 
 const config1 = webConfig()
 config1.output.filename = '[name].min.js'
@@ -10,4 +11,8 @@ config2.output.filename = '[name].slim.min.js'
 const config3 = nodeConfig()
 config3.output.filename = '[name].min.js'
 
-export default [config1, config2, config3]
+const config4 = lessConfig()
+config4.output.filename = '[name].min.css'
+config4.plugins = [ new ExtractTextPlugin('[name].min.css') ]
+
+export default [config1, config2, config3, config4]

From 1927ed47ff2f945ca27ea2128ed68408ae68958f Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 17:09:51 +0800
Subject: [PATCH 15/33] Update some config files

---
 .gitignore                   | 1 -
 bower.json                   | 6 ++++--
 test/usageTests/package.json | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12e502a9d7..234172c9cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 node_modules
-#dist
 bower_components
 
 *.sublime-project
diff --git a/bower.json b/bower.json
index 85601b60a9..c1f15b251e 100644
--- a/bower.json
+++ b/bower.json
@@ -3,14 +3,16 @@
   "authors": [
     "knsv <knut@sveido.com>"
   ],
-  "description": "Markdownish syntax for generating flowcharts, sequence diagrams and gantt charts.",
+  "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "dist/mermaid.slim.js",
   "keywords": [
     "diagram",
     "markdown",
     "flowchart",
     "sequence diagram",
-    "gantt"
+    "gantt",
+    "class diagram",
+    "git graph"
   ],
   "license": "MIT",
   "ignore": [
diff --git a/test/usageTests/package.json b/test/usageTests/package.json
index 6ddeafcf26..633011c1bd 100644
--- a/test/usageTests/package.json
+++ b/test/usageTests/package.json
@@ -6,10 +6,6 @@
   "dependencies": {
     "gulp": "^3.8.10"
   },
-  "devDependencies": {},
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
   "author": "",
   "license": "MIT"
 }

From 7bb988c48bf0b4767b58d40d98196545d8f90b00 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 17:10:37 +0800
Subject: [PATCH 16/33] Update contributing.md

---
 CONTRIBUTING.md | 22 +++++++++++++++++-----
 todo.md         |  6 ++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index df012db676..bbd86efb71 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,6 +13,7 @@ Some important guidlines:
 
 The issue list and the items marked with **help wanted** is a good starting point if you want to do some work.
 
+
 ## Guidelines for avoiding duplicate work
 
 Contributing is great. It is not so fun when you are done with your issue and just before you're about to push your
@@ -26,6 +27,7 @@ place to prevent this:
 
 
 ## Submitting changes
+
 Please send a GitHub Pull Request with a clear list of what you've done (read more about pull requests). When you send
 a pull request, we will love you forever if you include jasmine tests. We can always use more test coverage.
 
@@ -47,6 +49,7 @@ Also for the CDN, always use cwd-relative paths rather than root-relative paths
 url('/images/blah.gif'), use url('../images/blah.gif').
 
 # Build instructions
+
 Fork, then:
 
 ```
@@ -63,14 +66,23 @@ for instance:
 ```
 gulp jison
 ```
-To run the tests:
+
+To build:
+
 ```
-yarn run karma
+yarn build
 ```
 
-To build the /dist directory
+To run the tests:
+
 ```
-yarn run dist
+yarn test
 ```
 
-Thanks, Knut Sveidqvist
+Make sure you have Chrome browser installed. We use Chrome headless for testing.
+
+Manual test:
+
+```
+open dist/demo/index.html
+```
diff --git a/todo.md b/todo.md
index 639c89b255..47214801fb 100644
--- a/todo.md
+++ b/todo.md
@@ -3,10 +3,8 @@
     - Problem is it's for d3 v4 only
 - node console output colors like Chrome console
 - default theme doesn't work for class diagram
-- compile less to css
 - don't version control generated content, move them to outside project
     - editor
-    - dist
     - docs
 - what's the correct way to change logLevel as an end user?
 - d3 v3 doesn't support 'use strict'
@@ -17,3 +15,7 @@
 - rewrite live editor
 - Fix Travis CI
 - Fix CodeClimate
+- What is live-server ?
+- Get familar with jison
+- How to generate doc?
+- webpack warning: lodash too big

From 391149dbd8fb95a225e097a7838a632713febb83 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 17:12:12 +0800
Subject: [PATCH 17/33] Refactor webpack config code

---
 package.json           |  8 ++++----
 webpack.config.js      | 14 +++++++-------
 webpack.config.prod.js | 22 +++++++++++-----------
 yarn.lock              | 33 ++++++++++++++++-----------------
 4 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index 8e17eca1f5..3b373998b4 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,10 @@
     "test": "yarn run tape && yarn run karma",
     "live": "live-server ./test/examples",
     "jison": "gulp jison_legacy",
-    "old_watch": "source  ./scripts/watch.sh",
+    "live_server": "gulp live-server",
     "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",
-    "pretest": "yarn jison && yarn lint",
-    "prepublish": "yarn build && yarn dist && yarn test"
+    "pretest": "yarn lint",
+    "prepublishOnly": "yarn build && yarn dist && yarn test"
   },
   "repository": {
     "type": "git",
@@ -61,7 +61,7 @@
   "devDependencies": {
     "async": "^2.3.0",
     "babel-core": "^6.24.1",
-    "babel-loader": "^6.4.1",
+    "babel-loader": "^7.0.0",
     "babel-plugin-transform-remove-strict-mode": "^0.0.2",
     "babel-preset-env": "^1.4.0",
     "clone": "^2.1.1",
diff --git a/webpack.config.js b/webpack.config.js
index be6d27a3f4..262f5fed6c 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,13 +1,13 @@
 import { webConfig, nodeConfig, lessConfig } from './webpack.config.base.js'
 
-const config1 = webConfig()
+const config = webConfig()
 
-const config2 = webConfig()
-config2.externals = ['fs', 'd3']
-config2.output.filename = '[name].slim.js'
+const slimConfig = webConfig()
+slimConfig.externals = ['fs', 'd3']
+slimConfig.output.filename = '[name].slim.js'
 
-const config3 = nodeConfig()
+const apiConfig = nodeConfig()
 
-const config4 = lessConfig()
+const cssConfig = lessConfig()
 
-export default [config1, config2, config3, config4]
+export default [config, slimConfig, apiConfig, cssConfig]
diff --git a/webpack.config.prod.js b/webpack.config.prod.js
index 7254977e4e..5d99d20a23 100644
--- a/webpack.config.prod.js
+++ b/webpack.config.prod.js
@@ -1,18 +1,18 @@
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 import { webConfig, nodeConfig, lessConfig } from './webpack.config.base.js'
 
-const config1 = webConfig()
-config1.output.filename = '[name].min.js'
+const minConfig = webConfig()
+minConfig.output.filename = '[name].min.js'
 
-const config2 = webConfig()
-config2.externals = ['fs', 'd3']
-config2.output.filename = '[name].slim.min.js'
+const slimMinConfig = webConfig()
+slimMinConfig.externals = ['fs', 'd3']
+slimMinConfig.output.filename = '[name].slim.min.js'
 
-const config3 = nodeConfig()
-config3.output.filename = '[name].min.js'
+const apiMinConfig = nodeConfig()
+apiMinConfig.output.filename = '[name].min.js'
 
-const config4 = lessConfig()
-config4.output.filename = '[name].min.css'
-config4.plugins = [ new ExtractTextPlugin('[name].min.css') ]
+const cssMinConfig = lessConfig()
+cssMinConfig.output.filename = '[name].min.css'
+cssMinConfig.plugins = [ new ExtractTextPlugin('[name].min.css') ]
 
-export default [config1, config2, config3, config4]
+export default [minConfig, slimMinConfig, apiMinConfig, cssMinConfig]
diff --git a/yarn.lock b/yarn.lock
index fcec34ef88..7885fc23d7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -189,11 +189,11 @@ archy@^1.0.0, archy@~1.0.0:
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
 
 are-we-there-yet@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d"
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.0 || ^1.1.13"
+    readable-stream "^2.0.6"
 
 argparse@^1.0.7:
   version "1.0.9"
@@ -533,14 +533,13 @@ babel-helpers@^6.24.1:
     babel-runtime "^6.22.0"
     babel-template "^6.24.1"
 
-babel-loader@^6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+babel-loader@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-7.0.0.tgz#2e43a66bee1fff4470533d0402c8a4532fafbaf7"
   dependencies:
     find-cache-dir "^0.1.1"
-    loader-utils "^0.2.16"
+    loader-utils "^1.0.2"
     mkdirp "^0.5.1"
-    object-assign "^4.0.1"
 
 babel-messages@^6.23.0:
   version "6.23.0"
@@ -1395,8 +1394,8 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000656"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000656.tgz#127c8c6e655e7464e58f039558f1e878fcca3c45"
+  version "1.0.30000657"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000657.tgz#8192aec745019cc050217ad049c60dad21e3d1bc"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2294,8 +2293,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.5.tgz#6cd6ff2106224a6130e235f21050f9546bc3e729"
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.7.tgz#9fb75a2417f28114425d364de118d1cfd681432b"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -2641,8 +2640,8 @@ esnext-async@^0.0.9:
     zen-observable "^0.3.0"
 
 espree@^3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
+  version "3.4.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.2.tgz#38dbdedbedc95b8961a1fbf04734a8f6a9c8c592"
   dependencies:
     acorn "^5.0.1"
     acorn-jsx "^3.0.0"
@@ -3219,8 +3218,8 @@ gauge@~2.6.0:
     wide-align "^1.1.0"
 
 gauge@~2.7.1:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
+  version "2.7.4"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
   dependencies:
     aproba "^1.0.3"
     console-control-strings "^1.0.0"
@@ -6713,7 +6712,7 @@ read@1, read@~1.0.1, read@~1.0.7:
   dependencies:
     mute-stream "~0.0.4"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:

From 1c7c1099607c91996b23bbaa774a3c5b3a8d8ea6 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 17:13:05 +0800
Subject: [PATCH 18/33] Refactor or remove some file

---
 gulp/tasks/less.js                 | 20 +-------------------
 gulp/tasks/test.js                 |  5 +----
 scripts/watch.sh                   |  3 ---
 test/examples/apiTest.html         |  5 +----
 test/seq.css                       |  7 ++-----
 test/usageTests/browserifyUsage.js |  6 ------
 6 files changed, 5 insertions(+), 41 deletions(-)
 delete mode 100644 scripts/watch.sh
 delete mode 100644 test/usageTests/browserifyUsage.js

diff --git a/gulp/tasks/less.js b/gulp/tasks/less.js
index 9be400d2a9..86b932b68d 100644
--- a/gulp/tasks/less.js
+++ b/gulp/tasks/less.js
@@ -1,7 +1,6 @@
 var gulp = require('gulp')
 var path = require('path')
 var less = require('gulp-less')
-var rename = require('gulp-rename')
 var concat = require('gulp-concat')
 
 gulp.task('editor-less', function () {
@@ -14,21 +13,4 @@ gulp.task('editor-less', function () {
     .pipe(gulp.dest('./editor/css/'))
 })
 
-gulp.task('mermaid-less', function () {
-  gulp.src(['./src/less/*/mermaid.less'])
-    .pipe(less({
-      generateSourceMap: false, // default true
-      paths: [path.join(__dirname, 'less', 'includes')]
-    }))
-    .pipe(rename(function (path) {
-      if (path.dirname === 'default') {
-        path.basename = 'mermaid'
-      } else {
-        path.basename = 'mermaid.' + path.dirname
-      }
-      path.dirname = ''
-    }))
-    .pipe(gulp.dest('./dist/'))
-})
-
-gulp.task('less', ['mermaid-less', 'editor-less'])
+gulp.task('less', ['editor-less'])
diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index 912440ed23..1561d958a1 100644
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -1,11 +1,10 @@
 var gulp = require('gulp')
 var jasmine = require('gulp-jasmine')
-var shell = require('gulp-shell')
 var istanbul = require('gulp-istanbul')
 var qunit = require('gulp-qunit')
 var bower = require('gulp-bower')
 
-gulp.task('test', ['coverage', 'tape', 'jasmine', 'qunit'])
+gulp.task('test', ['coverage', 'jasmine', 'qunit'])
 
 gulp.task('jasmine', ['jison', 'lint'], function () {
   return gulp.src(['src/**/*.spec.js'])
@@ -17,8 +16,6 @@ gulp.task('jas', function () {
     .pipe(jasmine({ includeStackTrace: true }))
 })
 
-gulp.task('tape', shell.task(['node_modules/.bin/tape ./test/cli_test-*.js']))
-
 gulp.task('coverage', function (cb) {
   gulp.src(['src/**/*.js', '!src/**/*.spec.js'])
     .pipe(istanbul()) // Covering files
diff --git a/scripts/watch.sh b/scripts/watch.sh
deleted file mode 100644
index 445dfe6b9d..0000000000
--- a/scripts/watch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-yarn build-mermaid -- --watch & gulp live-server
diff --git a/test/examples/apiTest.html b/test/examples/apiTest.html
index c2b15148d2..012f8b815d 100644
--- a/test/examples/apiTest.html
+++ b/test/examples/apiTest.html
@@ -13,9 +13,6 @@
         });
         $(function(){
             var graphDefinition = 'graph TB\na-->b';
-//            var cb = function(html){
-//                console.log(html);
-//            }
             console.log(mermaidAPI.render(graphDefinition));
             console.log(mermaidAPI.render('id',graphDefinition));
         });
@@ -24,4 +21,4 @@
 <body>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/test/seq.css b/test/seq.css
index 6b8f2fb794..e67e5ba5b3 100644
--- a/test/seq.css
+++ b/test/seq.css
@@ -1,11 +1,8 @@
-
 body {
     background: #fcfcfe;
     font-family: Helvetica;
 }
-.mermaid {
-    /* width:400px;*/
-}
+
 .actor {
     stroke: #CCCCFF;
     fill: #ECECFF;
@@ -80,4 +77,4 @@ text.actor {
     stroke:none;
     font-family: 'trebuchet ms', verdana, arial;
     font-size:14px;
-}
\ No newline at end of file
+}
diff --git a/test/usageTests/browserifyUsage.js b/test/usageTests/browserifyUsage.js
deleted file mode 100644
index 9ac47c12ba..0000000000
--- a/test/usageTests/browserifyUsage.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * Created by knut on 14-12-02.
- */
-const mermaid = require('mermaid')
-
-console.log('Test page! mermaid version' + mermaid.version())

From 727f6c0e28c11062377de7f2b6edfffe0f5c9957 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 20:26:53 +0800
Subject: [PATCH 19/33] Format less code

---
 src/less/dark/classDiagram.less       | 2 +-
 src/less/dark/gantt.less              | 4 ----
 src/less/dark/sequenceDiagram.less    | 2 --
 src/less/default/classDiagram.less    | 2 +-
 src/less/default/gantt.less           | 4 ----
 src/less/default/mermaid.less         | 2 +-
 src/less/default/sequenceDiagram.less | 4 +---
 src/less/default/variables.less       | 2 +-
 src/less/forest/classDiagram.less     | 2 +-
 src/less/forest/flow.less             | 2 +-
 src/less/forest/gantt.less            | 4 ----
 src/less/forest/mermaid.less          | 2 +-
 src/less/forest/sequenceDiagram.less  | 4 +---
 src/less/forest/variables.less        | 2 +-
 src/less/neutral/classDiagram.less    | 2 +-
 src/less/neutral/gantt.less           | 1 -
 src/less/neutral/mermaid.less         | 2 +-
 src/less/neutral/sequenceDiagram.less | 4 +---
 src/less/neutral/variables.less       | 2 +-
 19 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/less/dark/classDiagram.less b/src/less/dark/classDiagram.less
index 8671bd7c98..b53bd20b07 100644
--- a/src/less/dark/classDiagram.less
+++ b/src/less/dark/classDiagram.less
@@ -66,4 +66,4 @@ svg .classLabel .label {
 }
 #extensionEnd {
   .composition;
-}
\ No newline at end of file
+}
diff --git a/src/less/dark/gantt.less b/src/less/dark/gantt.less
index 338fcd2d21..d5e735af30 100644
--- a/src/less/dark/gantt.less
+++ b/src/less/dark/gantt.less
@@ -134,7 +134,3 @@
   font-size: 18px;
   fill: @taskTextLightColor;
 }
-/*
-
-
-*/
diff --git a/src/less/dark/sequenceDiagram.less b/src/less/dark/sequenceDiagram.less
index c330f5d5d1..636a314120 100644
--- a/src/less/dark/sequenceDiagram.less
+++ b/src/less/dark/sequenceDiagram.less
@@ -1,5 +1,3 @@
-
-
 .actor {
   stroke: @actorBorder;
   fill: @actorBkg;
diff --git a/src/less/default/classDiagram.less b/src/less/default/classDiagram.less
index 8671bd7c98..b53bd20b07 100644
--- a/src/less/default/classDiagram.less
+++ b/src/less/default/classDiagram.less
@@ -66,4 +66,4 @@ svg .classLabel .label {
 }
 #extensionEnd {
   .composition;
-}
\ No newline at end of file
+}
diff --git a/src/less/default/gantt.less b/src/less/default/gantt.less
index 3a8bd3020b..a7f9d20412 100644
--- a/src/less/default/gantt.less
+++ b/src/less/default/gantt.less
@@ -132,7 +132,3 @@
   font-size:18px;
   fill:@taskTextDarkColor;
 }
-/*
-
-
-*/
diff --git a/src/less/default/mermaid.less b/src/less/default/mermaid.less
index 6470a354db..a37e3ee0b8 100644
--- a/src/less/default/mermaid.less
+++ b/src/less/default/mermaid.less
@@ -21,4 +21,4 @@ div.mermaidTooltip {
   border-radius: 2px;
   pointer-events: none;
   z-index:100;
-}
\ No newline at end of file
+}
diff --git a/src/less/default/sequenceDiagram.less b/src/less/default/sequenceDiagram.less
index 1139df3457..e4a540e263 100644
--- a/src/less/default/sequenceDiagram.less
+++ b/src/less/default/sequenceDiagram.less
@@ -1,5 +1,3 @@
-
-
 .actor {
   stroke: @actorBorder;
   fill: @actorBkg;
@@ -72,4 +70,4 @@ text.actor {
   stroke:none;
   font-family: 'trebuchet ms', verdana, arial;
   font-size:14px;
-}
\ No newline at end of file
+}
diff --git a/src/less/default/variables.less b/src/less/default/variables.less
index 3a69d86d4e..efe7022f21 100644
--- a/src/less/default/variables.less
+++ b/src/less/default/variables.less
@@ -58,4 +58,4 @@
 @taskTextLightColor: white;
 @taskTextDarkColor: black;
 
-@todayLineColor: red;
\ No newline at end of file
+@todayLineColor: red;
diff --git a/src/less/forest/classDiagram.less b/src/less/forest/classDiagram.less
index 8671bd7c98..b53bd20b07 100644
--- a/src/less/forest/classDiagram.less
+++ b/src/less/forest/classDiagram.less
@@ -66,4 +66,4 @@ svg .classLabel .label {
 }
 #extensionEnd {
   .composition;
-}
\ No newline at end of file
+}
diff --git a/src/less/forest/flow.less b/src/less/forest/flow.less
index 26ca2dae73..70da2de75e 100644
--- a/src/less/forest/flow.less
+++ b/src/less/forest/flow.less
@@ -1,4 +1,4 @@
-.mermaid .label { 
+.mermaid .label {
   font-family: 'trebuchet ms', verdana, arial;
 color:#333
 }
diff --git a/src/less/forest/gantt.less b/src/less/forest/gantt.less
index 3a8bd3020b..a7f9d20412 100644
--- a/src/less/forest/gantt.less
+++ b/src/less/forest/gantt.less
@@ -132,7 +132,3 @@
   font-size:18px;
   fill:@taskTextDarkColor;
 }
-/*
-
-
-*/
diff --git a/src/less/forest/mermaid.less b/src/less/forest/mermaid.less
index 6470a354db..a37e3ee0b8 100644
--- a/src/less/forest/mermaid.less
+++ b/src/less/forest/mermaid.less
@@ -21,4 +21,4 @@ div.mermaidTooltip {
   border-radius: 2px;
   pointer-events: none;
   z-index:100;
-}
\ No newline at end of file
+}
diff --git a/src/less/forest/sequenceDiagram.less b/src/less/forest/sequenceDiagram.less
index 1139df3457..e4a540e263 100644
--- a/src/less/forest/sequenceDiagram.less
+++ b/src/less/forest/sequenceDiagram.less
@@ -1,5 +1,3 @@
-
-
 .actor {
   stroke: @actorBorder;
   fill: @actorBkg;
@@ -72,4 +70,4 @@ text.actor {
   stroke:none;
   font-family: 'trebuchet ms', verdana, arial;
   font-size:14px;
-}
\ No newline at end of file
+}
diff --git a/src/less/forest/variables.less b/src/less/forest/variables.less
index d797c96f4f..9a0795fc9a 100644
--- a/src/less/forest/variables.less
+++ b/src/less/forest/variables.less
@@ -59,4 +59,4 @@
 @taskTextLightColor: white;
 @taskTextDarkColor: black;
 
-@todayLineColor: red;
\ No newline at end of file
+@todayLineColor: red;
diff --git a/src/less/neutral/classDiagram.less b/src/less/neutral/classDiagram.less
index cb7bf0fe3f..12e8bdf48b 100644
--- a/src/less/neutral/classDiagram.less
+++ b/src/less/neutral/classDiagram.less
@@ -66,4 +66,4 @@ svg .classLabel .label {
 }
 #extensionEnd {
   .composition;
-}
\ No newline at end of file
+}
diff --git a/src/less/neutral/gantt.less b/src/less/neutral/gantt.less
index 76368387e0..8569e423e6 100644
--- a/src/less/neutral/gantt.less
+++ b/src/less/neutral/gantt.less
@@ -132,4 +132,3 @@
   font-size: 18px;
   fill: @taskTextDarkColor;
 }
-
diff --git a/src/less/neutral/mermaid.less b/src/less/neutral/mermaid.less
index 06568095d9..f383ee5b6e 100644
--- a/src/less/neutral/mermaid.less
+++ b/src/less/neutral/mermaid.less
@@ -21,4 +21,4 @@ div.mermaidTooltip {
   border-radius: 2px;
   pointer-events: none;
   z-index:100;
-}
\ No newline at end of file
+}
diff --git a/src/less/neutral/sequenceDiagram.less b/src/less/neutral/sequenceDiagram.less
index e42c061deb..1549625f8c 100644
--- a/src/less/neutral/sequenceDiagram.less
+++ b/src/less/neutral/sequenceDiagram.less
@@ -1,5 +1,3 @@
-
-
 .actor {
   stroke: @actorBorder;
   fill: @actorBkg;
@@ -72,4 +70,4 @@ text.actor {
   stroke: none;
   font-family: Arial, Helvetica, sans-serif;
   font-size: 14px;
-}
\ No newline at end of file
+}
diff --git a/src/less/neutral/variables.less b/src/less/neutral/variables.less
index ccf93fb019..9ffa493ffe 100644
--- a/src/less/neutral/variables.less
+++ b/src/less/neutral/variables.less
@@ -63,4 +63,4 @@
 @taskTextLightColor: white;
 @taskTextDarkColor: @text;
 
-@todayLineColor: @critBkgColor;
\ No newline at end of file
+@todayLineColor: @critBkgColor;

From 7072979cfc6b0cc26eada4d6e9bd4ba0958517b9 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 20:37:43 +0800
Subject: [PATCH 20/33] beautify less code

---
 src/less/dark/classDiagram.less       |  32 +++--
 src/less/dark/flow.less               |   7 +-
 src/less/dark/gantt.less              | 114 ++++++++++++---
 src/less/dark/mermaid.less            |   5 +-
 src/less/dark/sequenceDiagram.less    |   3 +-
 src/less/dark/variables.less          |  30 ++--
 src/less/default/classDiagram.less    |  32 +++--
 src/less/default/flow.less            |  10 +-
 src/less/default/gantt.less           | 191 ++++++++++++++++++--------
 src/less/default/mermaid.less         |   5 +-
 src/less/default/sequenceDiagram.less |  46 ++++---
 src/less/default/variables.less       |  33 ++---
 src/less/forest/classDiagram.less     |  32 +++--
 src/less/forest/flow.less             |   8 +-
 src/less/forest/gantt.less            | 191 ++++++++++++++++++--------
 src/less/forest/mermaid.less          |   5 +-
 src/less/forest/sequenceDiagram.less  |  46 ++++---
 src/less/forest/variables.less        |  32 ++---
 src/less/neutral/classDiagram.less    |  30 ++--
 src/less/neutral/flow.less            |   4 +-
 src/less/neutral/gantt.less           | 122 ++++++++++++----
 src/less/neutral/mermaid.less         |   5 +-
 src/less/neutral/sequenceDiagram.less |   4 +-
 src/less/neutral/variables.less       |  38 ++---
 24 files changed, 660 insertions(+), 365 deletions(-)

diff --git a/src/less/dark/classDiagram.less b/src/less/dark/classDiagram.less
index b53bd20b07..31ef1845de 100644
--- a/src/less/dark/classDiagram.less
+++ b/src/less/dark/classDiagram.less
@@ -1,23 +1,23 @@
 g.classGroup text {
-  fill:@nodeBorder;
-  stroke:none;
+  fill: @nodeBorder;
+  stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-size: 14px;
 }
 
 g.classGroup rect {
-  fill:@nodeBkg;
+  fill: @nodeBkg;
   stroke: @nodeBorder;
 }
 
 g.classGroup line {
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
 
 svg .classLabel .box {
   stroke: none;
-  stroke-width:0;
+  stroke-width: 0;
   fill: @nodeBkg;
   opacity: 0.5;
 }
@@ -29,28 +29,33 @@ svg .classLabel .label {
 .relation {
   stroke: @nodeBorder;
   stroke-width: 1;
-  fill:none;
+  fill: none;
 }
 
-.composition{
-  fill : @nodeBorder;
+.composition {
+  fill: @nodeBorder;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #compositionStart {
   .composition;
 }
+
 #compositionEnd {
   .composition;
 }
-.aggregation{
-  fill : @nodeBkg;
+
+.aggregation {
+  fill: @nodeBkg;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #aggregationStart {
   .aggregation;
 }
+
 #aggregationEnd {
   .aggregation;
 }
@@ -58,12 +63,15 @@ svg .classLabel .label {
 #dependencyStart {
   .composition;
 }
+
 #dependencyEnd {
   .composition;
 }
+
 #extensionStart {
   .composition;
 }
+
 #extensionEnd {
   .composition;
 }
diff --git a/src/less/dark/flow.less b/src/less/dark/flow.less
index a108bbccd6..fc9fbed15e 100644
--- a/src/less/dark/flow.less
+++ b/src/less/dark/flow.less
@@ -1,4 +1,6 @@
-.mermaid .label { color: @darkTextColor }
+.mermaid .label {
+  color: @darkTextColor
+}
 
 .node rect,
 .node circle,
@@ -9,7 +11,6 @@
   stroke-width: 1px;
 }
 
-
 .arrowheadPath {
   fill: @arrowheadColor;
 }
@@ -22,7 +23,7 @@
   background-color: @edgeLabelBackground;
 }
 
-.cluster rect{
+.cluster rect {
   fill: @secondBkg !important;
   rx: 4 !important;
   stroke: @clusterBorder !important;
diff --git a/src/less/dark/gantt.less b/src/less/dark/gantt.less
index d5e735af30..82e5460099 100644
--- a/src/less/dark/gantt.less
+++ b/src/less/dark/gantt.less
@@ -1,24 +1,39 @@
 /** Section styling */
+
 .section {
   stroke: none;
   opacity: 0.2;
 }
-.section0{
+
+.section0 {
   fill: @sectionBkgColor;
 }
+
 .section2 {
   fill: @sectionBkgColor2;
 }
-.section1,.section3 {
+
+.section1,
+.section3 {
   fill: @altSectionBkgColor;
   opacity: 0.2;
 }
 
-.sectionTitle0 { fill: @titleColor;}
-.sectionTitle1 { fill: @titleColor;}
-.sectionTitle2 { fill: @titleColor;}
-.sectionTitle3 { fill: @titleColor;}
+.sectionTitle0 {
+  fill: @titleColor;
+}
+
+.sectionTitle1 {
+  fill: @titleColor;
+}
+
+.sectionTitle2 {
+  fill: @titleColor;
+}
 
+.sectionTitle3 {
+  fill: @titleColor;
+}
 
 .sectionTitle {
   text-anchor: start;
@@ -26,29 +41,39 @@
   text-height: 14px;
 }
 
+
 /* Grid and axis */
+
 .grid .tick {
   stroke: @sectionBkgColor;
   opacity: 0.3;
   shape-rendering: crispEdges;
 }
+
 .grid .tick text {
   fill: @taskTextLightColor;
   opacity: 0.5;
 }
+
 .grid path {
   stroke-width: 0;
 }
 
+
 /* Today line */
+
 .today {
   fill: none;
   stroke: @todayLineColor;
   stroke-width: 2px;
 }
 
+
 /* Task styling */
+
+
 /* Default task */
+
 .task {
   stroke-width: 1;
 }
@@ -57,75 +82,126 @@
   text-anchor: middle;
   font-size: 11px;
 }
+
 .taskTextOutsideRight {
   fill: @taskTextDarkColor;
   text-anchor: start;
   font-size: 11px;
 }
+
 .taskTextOutsideLeft {
   fill: @taskTextDarkColor;
   text-anchor: end;
   font-size: 11px;
 }
 
+
 /* Specific task settings for the sections*/
 
-.taskText0, .taskText1, .taskText2, .taskText3 {
+.taskText0,
+.taskText1,
+.taskText2,
+.taskText3 {
   fill: @taskTextColor;
 }
 
-.task0, .task1, .task2, .task3 {
+.task0,
+.task1,
+.task2,
+.task3 {
   fill: @taskBkgColor;
   stroke: @taskBorderColor;
 }
 
-.taskTextOutside0,.taskTextOutside2, {
+.taskTextOutside0,
+.taskTextOutside2,
+{
   fill: @taskTextOutsideColor;
 }
-.taskTextOutside1, .taskTextOutside3 {
+
+.taskTextOutside1,
+.taskTextOutside3 {
   fill: @taskTextOutsideColor;
 }
 
+
 /* Active task */
-.active0, .active1, .active2, .active3 {
+
+.active0,
+.active1,
+.active2,
+.active3 {
   fill: @activeTaskBkgColor;
   stroke: @activeTaskBorderColor;
 }
 
-.activeText0, .activeText1, .activeText2, .activeText3 {
+.activeText0,
+.activeText1,
+.activeText2,
+.activeText3 {
   fill: @taskTextDarkColor !important;
 }
+
+
 /* Completed task */
-.done0, .done1, .done2, .done3 {
+
+.done0,
+.done1,
+.done2,
+.done3 {
   fill: @doneTaskBkgColor;
 }
 
-.doneText0, .doneText1, .doneText2, .doneText3 {
+.doneText0,
+.doneText1,
+.doneText2,
+.doneText3 {
   fill: @taskTextDarkColor !important;
 }
 
+
 /* Tasks on the critical line */
-.crit0, .crit1, .crit2, .crit3 {
+
+.crit0,
+.crit1,
+.crit2,
+.crit3 {
   stroke: @critBorderColor;
   fill: @critBkgColor;
   stroke-width: 2;
 }
-.activeCrit0, .activeCrit1, .activeCrit2, .activeCrit3 {
+
+.activeCrit0,
+.activeCrit1,
+.activeCrit2,
+.activeCrit3 {
   stroke: @critBorderColor;
   fill: @activeTaskBkgColor;
   stroke-width: 2;
 }
-.doneCrit0, .doneCrit1, .doneCrit2, .doneCrit3 {
+
+.doneCrit0,
+.doneCrit1,
+.doneCrit2,
+.doneCrit3 {
   stroke: @critBorderColor;
   fill: @doneTaskBkgColor;
   stroke-width: 1;
   cursor: pointer;
   shape-rendering: crispEdges;
 }
-.doneCritText0, .doneCritText1, .doneCritText2, .doneCritText3 {
+
+.doneCritText0,
+.doneCritText1,
+.doneCritText2,
+.doneCritText3 {
   fill: @taskTextLightColor !important;
 }
-.activeCritText0, .activeCritText1, .activeCritText2, .activeCritText3 {
+
+.activeCritText0,
+.activeCritText1,
+.activeCritText2,
+.activeCritText3 {
   fill: @taskTextDarkColor !important;
 }
 
diff --git a/src/less/dark/mermaid.less b/src/less/dark/mermaid.less
index a37e3ee0b8..53ba6c146a 100644
--- a/src/less/dark/mermaid.less
+++ b/src/less/dark/mermaid.less
@@ -3,10 +3,9 @@
 @import "sequenceDiagram";
 @import "gantt";
 @import "classDiagram";
-
 .node text {
   font-family: 'trebuchet ms', verdana, arial;
-  font-size:14px;
+  font-size: 14px;
 }
 
 div.mermaidTooltip {
@@ -20,5 +19,5 @@ div.mermaidTooltip {
   border: 1px solid @border2;
   border-radius: 2px;
   pointer-events: none;
-  z-index:100;
+  z-index: 100;
 }
diff --git a/src/less/dark/sequenceDiagram.less b/src/less/dark/sequenceDiagram.less
index 636a314120..c2ee2fde8b 100644
--- a/src/less/dark/sequenceDiagram.less
+++ b/src/less/dark/sequenceDiagram.less
@@ -2,6 +2,7 @@
   stroke: @actorBorder;
   fill: @actorBkg;
 }
+
 text.actor {
   fill: @actorTextColor;
   stroke: none;
@@ -31,8 +32,8 @@ text.actor {
 #crosshead path {
   fill: @signalColor !important;
   stroke: @signalColor !important;
-
 }
+
 .messageText {
   fill: @signalTextColor;
   stroke: none;
diff --git a/src/less/dark/variables.less b/src/less/dark/variables.less
index c77932990f..4bbb8b49ef 100644
--- a/src/less/dark/variables.less
+++ b/src/less/dark/variables.less
@@ -7,58 +7,46 @@
 @border2: rgba(255, 255, 255, 0.25);
 @arrowheadColor: @mainContrastColor;
 
-
 /* Flowchart variables */
-@nodeBkg:@mainBkg;
-@nodeBorder:@border1;
-
-@clusterBkg:@secondBkg;
-@clusterBorder:@border2;
-
-@defaultLinkColor:@lineColor;
 
+@nodeBkg: @mainBkg;
+@nodeBorder: @border1;
+@clusterBkg: @secondBkg;
+@clusterBorder: @border2;
+@defaultLinkColor: @lineColor;
 @titleColor: #F9FFFE;
-
 @edgeLabelBackground: #e8e8e8;
 
 /* Sequence Diagram variables */
+
 @actorBorder: @border1;
-@actorBkg:    @mainBkg;
+@actorBkg: @mainBkg;
 @actorTextColor: black;
 @actorLineColor: @mainContrastColor;
-
 @signalColor: @mainContrastColor;
 @signalTextColor: @mainContrastColor;
-
 @labelBoxBkgColor: @actorBkg;
 @labelBoxBorderColor: @actorBorder;
 @labelTextColor: @mainContrastColor;
-
 @noteBorderColor: @border2;
-@noteBkgColor:    #fff5ad;
+@noteBkgColor: #fff5ad;
 
 /* Gantt chart variables */
+
 @sectionBkgColor: rgba(255, 255, 255, 0.3);
 @altSectionBkgColor: white;
 @sectionBkgColor2: #EAE8B9;
-
 @taskBorderColor: rgba(255, 255, 255, 0.5);
 @taskBkgColor: @mainBkg;
 @taskTextColor: @darkTextColor;
 @taskTextOutsideColor: @taskTextLightColor;
-
 @activeTaskBorderColor: rgba(255, 255, 255, 0.5);
 @activeTaskBkgColor: #81B1DB;
-
 @gridColor: @mainContrastColor;
-
 @doneTaskBkgColor: @mainContrastColor;
 @doneTaskBorderColor: grey;
-
 @critBorderColor: #E83737;
 @critBkgColor: #E83737;
-
 @taskTextLightColor: @mainContrastColor;
 @taskTextDarkColor: @darkTextColor;
-
 @todayLineColor: #DB5757;
diff --git a/src/less/default/classDiagram.less b/src/less/default/classDiagram.less
index b53bd20b07..31ef1845de 100644
--- a/src/less/default/classDiagram.less
+++ b/src/less/default/classDiagram.less
@@ -1,23 +1,23 @@
 g.classGroup text {
-  fill:@nodeBorder;
-  stroke:none;
+  fill: @nodeBorder;
+  stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-size: 14px;
 }
 
 g.classGroup rect {
-  fill:@nodeBkg;
+  fill: @nodeBkg;
   stroke: @nodeBorder;
 }
 
 g.classGroup line {
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
 
 svg .classLabel .box {
   stroke: none;
-  stroke-width:0;
+  stroke-width: 0;
   fill: @nodeBkg;
   opacity: 0.5;
 }
@@ -29,28 +29,33 @@ svg .classLabel .label {
 .relation {
   stroke: @nodeBorder;
   stroke-width: 1;
-  fill:none;
+  fill: none;
 }
 
-.composition{
-  fill : @nodeBorder;
+.composition {
+  fill: @nodeBorder;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #compositionStart {
   .composition;
 }
+
 #compositionEnd {
   .composition;
 }
-.aggregation{
-  fill : @nodeBkg;
+
+.aggregation {
+  fill: @nodeBkg;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #aggregationStart {
   .aggregation;
 }
+
 #aggregationEnd {
   .aggregation;
 }
@@ -58,12 +63,15 @@ svg .classLabel .label {
 #dependencyStart {
   .composition;
 }
+
 #dependencyEnd {
   .composition;
 }
+
 #extensionStart {
   .composition;
 }
+
 #extensionEnd {
   .composition;
 }
diff --git a/src/less/default/flow.less b/src/less/default/flow.less
index dcd66c1bac..47de95fff7 100644
--- a/src/less/default/flow.less
+++ b/src/less/default/flow.less
@@ -1,4 +1,6 @@
-.mermaid .label { color:#333}
+.mermaid .label {
+  color: #333
+}
 
 .node rect,
 .node circle,
@@ -21,13 +23,13 @@
   background-color: @edgeLabelBackground;
 }
 
-.cluster rect{
+.cluster rect {
   fill: @secondBkg !important;
-  rx:4 !important;
+  rx: 4 !important;
   stroke: @clusterBorder !important;
   stroke-width: 1px !important;
 }
 
 .cluster text {
-  fill:@titleColor;
+  fill: @titleColor;
 }
diff --git a/src/less/default/gantt.less b/src/less/default/gantt.less
index a7f9d20412..8cab68007c 100644
--- a/src/less/default/gantt.less
+++ b/src/less/default/gantt.less
@@ -1,134 +1,209 @@
 /** Section styling */
+
 .section {
-  stroke:none;
-  opacity:0.2;
+  stroke: none;
+  opacity: 0.2;
 }
-.section0{
-  fill:@sectionBkgColor;
+
+.section0 {
+  fill: @sectionBkgColor;
 }
+
 .section2 {
-  fill:@sectionBkgColor2;
+  fill: @sectionBkgColor2;
 }
-.section1,.section3 {
-  fill:@altSectionBkgColor;
-  opacity:0.2;
+
+.section1,
+.section3 {
+  fill: @altSectionBkgColor;
+  opacity: 0.2;
 }
 
-.sectionTitle0 { fill:@titleColor;}
-.sectionTitle1 { fill:@titleColor;}
-.sectionTitle2 { fill:@titleColor;}
-.sectionTitle3 { fill:@titleColor;}
+.sectionTitle0 {
+  fill: @titleColor;
+}
 
+.sectionTitle1 {
+  fill: @titleColor;
+}
+
+.sectionTitle2 {
+  fill: @titleColor;
+}
+
+.sectionTitle3 {
+  fill: @titleColor;
+}
 
 .sectionTitle {
-  text-anchor:start;
-  font-size:11px;
-  text-height:14px;
+  text-anchor: start;
+  font-size: 11px;
+  text-height: 14px;
 }
 
+
 /* Grid and axis */
+
 .grid .tick {
   stroke: @gridColor;
   opacity: 0.3;
   shape-rendering: crispEdges;
 }
+
 .grid path {
   stroke-width: 0;
 }
 
+
 /* Today line */
+
 .today {
-  fill:none;
-  stroke:@todayLineColor;
-  stroke-width:2px;
+  fill: none;
+  stroke: @todayLineColor;
+  stroke-width: 2px;
 }
 
+
 /* Task styling */
+
+
 /* Default task */
+
 .task {
-  stroke-width:2;
+  stroke-width: 2;
 }
 
 .taskText {
-  text-anchor:middle;
-  font-size:11px;
+  text-anchor: middle;
+  font-size: 11px;
 }
+
 .taskTextOutsideRight {
-  fill:@taskTextDarkColor;
-  text-anchor:start;
-  font-size:11px;
+  fill: @taskTextDarkColor;
+  text-anchor: start;
+  font-size: 11px;
 }
+
 .taskTextOutsideLeft {
-  fill:@taskTextDarkColor;
-  text-anchor:end;
-  font-size:11px;
+  fill: @taskTextDarkColor;
+  text-anchor: end;
+  font-size: 11px;
 }
 
+
 /* Specific task settings for the sections*/
 
-.taskText0, .taskText1, .taskText2, .taskText3 {
-  fill:@taskTextColor;
+.taskText0,
+.taskText1,
+.taskText2,
+.taskText3 {
+  fill: @taskTextColor;
 }
 
-.task0, .task1, .task2, .task3 {
+.task0,
+.task1,
+.task2,
+.task3 {
   fill: @taskBkgColor;
   stroke: @taskBorderColor;
 }
 
-.taskTextOutside0,.taskTextOutside2, {
-  fill:@taskTextOutsideColor;
+.taskTextOutside0,
+.taskTextOutside2,
+{
+  fill: @taskTextOutsideColor;
 }
-.taskTextOutside1, .taskTextOutside3 {
-  fill:@taskTextOutsideColor;
+
+.taskTextOutside1,
+.taskTextOutside3 {
+  fill: @taskTextOutsideColor;
 }
 
+
 /* Active task */
-.active0, .active1, .active2, .active3 {
+
+.active0,
+.active1,
+.active2,
+.active3 {
   fill: @activeTaskBkgColor;
   stroke: @activeTaskBorderColor;
 }
 
-.activeText0, .activeText1, .activeText2, .activeText3 {
-  fill:@taskTextDarkColor !important;
+.activeText0,
+.activeText1,
+.activeText2,
+.activeText3 {
+  fill: @taskTextDarkColor !important;
 }
+
+
 /* Completed task */
-.done0, .done1, .done2, .done3 {
-  stroke:@doneTaskBorderColor;
+
+.done0,
+.done1,
+.done2,
+.done3 {
+  stroke: @doneTaskBorderColor;
   fill: @doneTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
 
-.doneText0, .doneText1, .doneText2, .doneText3 {
-  fill:@taskTextDarkColor !important;
+.doneText0,
+.doneText1,
+.doneText2,
+.doneText3 {
+  fill: @taskTextDarkColor !important;
 }
 
+
 /* Tasks on the critical line */
-.crit0, .crit1, .crit2, .crit3 {
-  stroke:@critBorderColor;
+
+.crit0,
+.crit1,
+.crit2,
+.crit3 {
+  stroke: @critBorderColor;
   fill: @critBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
-.activeCrit0, .activeCrit1, .activeCrit2, .activeCrit3 {
-  stroke:@critBorderColor;
+
+.activeCrit0,
+.activeCrit1,
+.activeCrit2,
+.activeCrit3 {
+  stroke: @critBorderColor;
   fill: @activeTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
-.doneCrit0, .doneCrit1, .doneCrit2, .doneCrit3 {
-  stroke:@critBorderColor;
+
+.doneCrit0,
+.doneCrit1,
+.doneCrit2,
+.doneCrit3 {
+  stroke: @critBorderColor;
   fill: @doneTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges;
 }
-.doneCritText0, .doneCritText1, .doneCritText2, .doneCritText3 {
-  fill:@taskTextDarkColor !important;
+
+.doneCritText0,
+.doneCritText1,
+.doneCritText2,
+.doneCritText3 {
+  fill: @taskTextDarkColor !important;
 }
-.activeCritText0, .activeCritText1, .activeCritText2, .activeCritText3 {
-  fill:@taskTextDarkColor !important;
+
+.activeCritText0,
+.activeCritText1,
+.activeCritText2,
+.activeCritText3 {
+  fill: @taskTextDarkColor !important;
 }
 
 .titleText {
-  text-anchor:middle;
-  font-size:18px;
-  fill:@taskTextDarkColor;
+  text-anchor: middle;
+  font-size: 18px;
+  fill: @taskTextDarkColor;
 }
diff --git a/src/less/default/mermaid.less b/src/less/default/mermaid.less
index a37e3ee0b8..53ba6c146a 100644
--- a/src/less/default/mermaid.less
+++ b/src/less/default/mermaid.less
@@ -3,10 +3,9 @@
 @import "sequenceDiagram";
 @import "gantt";
 @import "classDiagram";
-
 .node text {
   font-family: 'trebuchet ms', verdana, arial;
-  font-size:14px;
+  font-size: 14px;
 }
 
 div.mermaidTooltip {
@@ -20,5 +19,5 @@ div.mermaidTooltip {
   border: 1px solid @border2;
   border-radius: 2px;
   pointer-events: none;
-  z-index:100;
+  z-index: 100;
 }
diff --git a/src/less/default/sequenceDiagram.less b/src/less/default/sequenceDiagram.less
index e4a540e263..3b468fd784 100644
--- a/src/less/default/sequenceDiagram.less
+++ b/src/less/default/sequenceDiagram.less
@@ -2,39 +2,41 @@
   stroke: @actorBorder;
   fill: @actorBkg;
 }
+
 text.actor {
-  fill:@actorTextColor;
-  stroke:none;
+  fill: @actorTextColor;
+  stroke: none;
 }
 
 .actor-line {
-  stroke:@actorLineColor;
+  stroke: @actorLineColor;
 }
 
 .messageLine0 {
-  stroke-width:1.5;
+  stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  marker-end:"url(#arrowhead)";
-  stroke:@signalColor;
+  marker-end: "url(#arrowhead)";
+  stroke: @signalColor;
 }
 
 .messageLine1 {
-  stroke-width:1.5;
+  stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  stroke:@signalColor;
+  stroke: @signalColor;
 }
 
 #arrowhead {
-  fill:@signalColor;
+  fill: @signalColor;
 }
+
 #crosshead path {
-  fill:@signalColor !important;
+  fill: @signalColor !important;
   stroke: @signalColor !important;
-
 }
+
 .messageText {
-  fill:@signalTextColor;
-  stroke:none;
+  fill: @signalTextColor;
+  stroke: none;
 }
 
 .labelBox {
@@ -43,19 +45,19 @@ text.actor {
 }
 
 .labelText {
-  fill:@labelTextColor;
-  stroke:none;
+  fill: @labelTextColor;
+  stroke: none;
 }
 
 .loopText {
-  fill:@labelTextColor;
-  stroke:none;
+  fill: @labelTextColor;
+  stroke: none;
 }
 
 .loopLine {
-  stroke-width:2;
+  stroke-width: 2;
   stroke-dasharray: "2 2";
-  marker-end:"url(#arrowhead)";
+  marker-end: "url(#arrowhead)";
   stroke: @labelBoxBorderColor;
 }
 
@@ -66,8 +68,8 @@ text.actor {
 }
 
 .noteText {
-  fill:black;
-  stroke:none;
+  fill: black;
+  stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
-  font-size:14px;
+  font-size: 14px;
 }
diff --git a/src/less/default/variables.less b/src/less/default/variables.less
index efe7022f21..d67b9817ba 100644
--- a/src/less/default/variables.less
+++ b/src/less/default/variables.less
@@ -1,61 +1,50 @@
 @mainBkg: #ECECFF;
 @secondBkg: #ffffde;
 @lineColor: #333333;
-@border1:#CCCCFF;
-@border2:#aaaa33;
+@border1: #CCCCFF;
+@border2: #aaaa33;
 @arrowheadColor: #333333;
 
 /* Flowchart variables */
-@nodeBkg:@mainBkg;
-@nodeBorder:@border1;
-
-@clusterBkg:@secondBkg;
-@clusterBorder:@border2;
-
-@defaultLinkColor:@lineColor;
 
+@nodeBkg: @mainBkg;
+@nodeBorder: @border1;
+@clusterBkg: @secondBkg;
+@clusterBorder: @border2;
+@defaultLinkColor: @lineColor;
 @titleColor: #333;
-
 @edgeLabelBackground: #e8e8e8;
 
 /* Sequence Diagram variables */
+
 @actorBorder: @border1;
-@actorBkg:    @mainBkg;
+@actorBkg: @mainBkg;
 @actorTextColor: black;
 @actorLineColor: grey;
-
 @signalColor: #333;
 @signalTextColor: #333;
-
 @labelBoxBkgColor: @actorBkg;
 @labelBoxBorderColor: @actorBorder;
 @labelTextColor: @actorTextColor;
-
 @noteBorderColor: @border2;
-@noteBkgColor:    #fff5ad;
+@noteBkgColor: #fff5ad;
 
 /* Gantt chart variables */
+
 @sectionBkgColor: rgba(102, 102, 255, 0.49);
 @altSectionBkgColor: white;
 @sectionBkgColor2: #fff400;
-
 @taskBorderColor: #534fbc;
 @taskBkgColor: #8a90dd;
 @taskTextColor: @taskTextLightColor;
 @taskTextOutsideColor: @taskTextDarkColor;
-
 @activeTaskBorderColor: #534fbc;
 @activeTaskBkgColor: #bfc7ff;
-
 @gridColor: lightgrey;
-
 @doneTaskBkgColor: lightgrey;
 @doneTaskBorderColor: grey;
-
 @critBorderColor: #ff8888;
 @critBkgColor: red;
-
 @taskTextLightColor: white;
 @taskTextDarkColor: black;
-
 @todayLineColor: red;
diff --git a/src/less/forest/classDiagram.less b/src/less/forest/classDiagram.less
index b53bd20b07..31ef1845de 100644
--- a/src/less/forest/classDiagram.less
+++ b/src/less/forest/classDiagram.less
@@ -1,23 +1,23 @@
 g.classGroup text {
-  fill:@nodeBorder;
-  stroke:none;
+  fill: @nodeBorder;
+  stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-size: 14px;
 }
 
 g.classGroup rect {
-  fill:@nodeBkg;
+  fill: @nodeBkg;
   stroke: @nodeBorder;
 }
 
 g.classGroup line {
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
 
 svg .classLabel .box {
   stroke: none;
-  stroke-width:0;
+  stroke-width: 0;
   fill: @nodeBkg;
   opacity: 0.5;
 }
@@ -29,28 +29,33 @@ svg .classLabel .label {
 .relation {
   stroke: @nodeBorder;
   stroke-width: 1;
-  fill:none;
+  fill: none;
 }
 
-.composition{
-  fill : @nodeBorder;
+.composition {
+  fill: @nodeBorder;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #compositionStart {
   .composition;
 }
+
 #compositionEnd {
   .composition;
 }
-.aggregation{
-  fill : @nodeBkg;
+
+.aggregation {
+  fill: @nodeBkg;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #aggregationStart {
   .aggregation;
 }
+
 #aggregationEnd {
   .aggregation;
 }
@@ -58,12 +63,15 @@ svg .classLabel .label {
 #dependencyStart {
   .composition;
 }
+
 #dependencyEnd {
   .composition;
 }
+
 #extensionStart {
   .composition;
 }
+
 #extensionEnd {
   .composition;
 }
diff --git a/src/less/forest/flow.less b/src/less/forest/flow.less
index 70da2de75e..2b3469b6ed 100644
--- a/src/less/forest/flow.less
+++ b/src/less/forest/flow.less
@@ -1,6 +1,6 @@
 .mermaid .label {
   font-family: 'trebuchet ms', verdana, arial;
-color:#333
+  color: #333
 }
 
 .node rect,
@@ -25,13 +25,13 @@ color:#333
   background-color: @edgeLabelBackground;
 }
 
-.cluster rect{
+.cluster rect {
   fill: @secondBkg !important;
-  rx:4  !important;
+  rx: 4 !important;
   stroke: @clusterBorder !important;
   stroke-width: 1px !important;
 }
 
 .cluster text {
-  fill:@titleColor;
+  fill: @titleColor;
 }
diff --git a/src/less/forest/gantt.less b/src/less/forest/gantt.less
index a7f9d20412..8cab68007c 100644
--- a/src/less/forest/gantt.less
+++ b/src/less/forest/gantt.less
@@ -1,134 +1,209 @@
 /** Section styling */
+
 .section {
-  stroke:none;
-  opacity:0.2;
+  stroke: none;
+  opacity: 0.2;
 }
-.section0{
-  fill:@sectionBkgColor;
+
+.section0 {
+  fill: @sectionBkgColor;
 }
+
 .section2 {
-  fill:@sectionBkgColor2;
+  fill: @sectionBkgColor2;
 }
-.section1,.section3 {
-  fill:@altSectionBkgColor;
-  opacity:0.2;
+
+.section1,
+.section3 {
+  fill: @altSectionBkgColor;
+  opacity: 0.2;
 }
 
-.sectionTitle0 { fill:@titleColor;}
-.sectionTitle1 { fill:@titleColor;}
-.sectionTitle2 { fill:@titleColor;}
-.sectionTitle3 { fill:@titleColor;}
+.sectionTitle0 {
+  fill: @titleColor;
+}
 
+.sectionTitle1 {
+  fill: @titleColor;
+}
+
+.sectionTitle2 {
+  fill: @titleColor;
+}
+
+.sectionTitle3 {
+  fill: @titleColor;
+}
 
 .sectionTitle {
-  text-anchor:start;
-  font-size:11px;
-  text-height:14px;
+  text-anchor: start;
+  font-size: 11px;
+  text-height: 14px;
 }
 
+
 /* Grid and axis */
+
 .grid .tick {
   stroke: @gridColor;
   opacity: 0.3;
   shape-rendering: crispEdges;
 }
+
 .grid path {
   stroke-width: 0;
 }
 
+
 /* Today line */
+
 .today {
-  fill:none;
-  stroke:@todayLineColor;
-  stroke-width:2px;
+  fill: none;
+  stroke: @todayLineColor;
+  stroke-width: 2px;
 }
 
+
 /* Task styling */
+
+
 /* Default task */
+
 .task {
-  stroke-width:2;
+  stroke-width: 2;
 }
 
 .taskText {
-  text-anchor:middle;
-  font-size:11px;
+  text-anchor: middle;
+  font-size: 11px;
 }
+
 .taskTextOutsideRight {
-  fill:@taskTextDarkColor;
-  text-anchor:start;
-  font-size:11px;
+  fill: @taskTextDarkColor;
+  text-anchor: start;
+  font-size: 11px;
 }
+
 .taskTextOutsideLeft {
-  fill:@taskTextDarkColor;
-  text-anchor:end;
-  font-size:11px;
+  fill: @taskTextDarkColor;
+  text-anchor: end;
+  font-size: 11px;
 }
 
+
 /* Specific task settings for the sections*/
 
-.taskText0, .taskText1, .taskText2, .taskText3 {
-  fill:@taskTextColor;
+.taskText0,
+.taskText1,
+.taskText2,
+.taskText3 {
+  fill: @taskTextColor;
 }
 
-.task0, .task1, .task2, .task3 {
+.task0,
+.task1,
+.task2,
+.task3 {
   fill: @taskBkgColor;
   stroke: @taskBorderColor;
 }
 
-.taskTextOutside0,.taskTextOutside2, {
-  fill:@taskTextOutsideColor;
+.taskTextOutside0,
+.taskTextOutside2,
+{
+  fill: @taskTextOutsideColor;
 }
-.taskTextOutside1, .taskTextOutside3 {
-  fill:@taskTextOutsideColor;
+
+.taskTextOutside1,
+.taskTextOutside3 {
+  fill: @taskTextOutsideColor;
 }
 
+
 /* Active task */
-.active0, .active1, .active2, .active3 {
+
+.active0,
+.active1,
+.active2,
+.active3 {
   fill: @activeTaskBkgColor;
   stroke: @activeTaskBorderColor;
 }
 
-.activeText0, .activeText1, .activeText2, .activeText3 {
-  fill:@taskTextDarkColor !important;
+.activeText0,
+.activeText1,
+.activeText2,
+.activeText3 {
+  fill: @taskTextDarkColor !important;
 }
+
+
 /* Completed task */
-.done0, .done1, .done2, .done3 {
-  stroke:@doneTaskBorderColor;
+
+.done0,
+.done1,
+.done2,
+.done3 {
+  stroke: @doneTaskBorderColor;
   fill: @doneTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
 
-.doneText0, .doneText1, .doneText2, .doneText3 {
-  fill:@taskTextDarkColor !important;
+.doneText0,
+.doneText1,
+.doneText2,
+.doneText3 {
+  fill: @taskTextDarkColor !important;
 }
 
+
 /* Tasks on the critical line */
-.crit0, .crit1, .crit2, .crit3 {
-  stroke:@critBorderColor;
+
+.crit0,
+.crit1,
+.crit2,
+.crit3 {
+  stroke: @critBorderColor;
   fill: @critBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
-.activeCrit0, .activeCrit1, .activeCrit2, .activeCrit3 {
-  stroke:@critBorderColor;
+
+.activeCrit0,
+.activeCrit1,
+.activeCrit2,
+.activeCrit3 {
+  stroke: @critBorderColor;
   fill: @activeTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
 }
-.doneCrit0, .doneCrit1, .doneCrit2, .doneCrit3 {
-  stroke:@critBorderColor;
+
+.doneCrit0,
+.doneCrit1,
+.doneCrit2,
+.doneCrit3 {
+  stroke: @critBorderColor;
   fill: @doneTaskBkgColor;
-  stroke-width:2;
+  stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges;
 }
-.doneCritText0, .doneCritText1, .doneCritText2, .doneCritText3 {
-  fill:@taskTextDarkColor !important;
+
+.doneCritText0,
+.doneCritText1,
+.doneCritText2,
+.doneCritText3 {
+  fill: @taskTextDarkColor !important;
 }
-.activeCritText0, .activeCritText1, .activeCritText2, .activeCritText3 {
-  fill:@taskTextDarkColor !important;
+
+.activeCritText0,
+.activeCritText1,
+.activeCritText2,
+.activeCritText3 {
+  fill: @taskTextDarkColor !important;
 }
 
 .titleText {
-  text-anchor:middle;
-  font-size:18px;
-  fill:@taskTextDarkColor;
+  text-anchor: middle;
+  font-size: 18px;
+  fill: @taskTextDarkColor;
 }
diff --git a/src/less/forest/mermaid.less b/src/less/forest/mermaid.less
index a37e3ee0b8..53ba6c146a 100644
--- a/src/less/forest/mermaid.less
+++ b/src/less/forest/mermaid.less
@@ -3,10 +3,9 @@
 @import "sequenceDiagram";
 @import "gantt";
 @import "classDiagram";
-
 .node text {
   font-family: 'trebuchet ms', verdana, arial;
-  font-size:14px;
+  font-size: 14px;
 }
 
 div.mermaidTooltip {
@@ -20,5 +19,5 @@ div.mermaidTooltip {
   border: 1px solid @border2;
   border-radius: 2px;
   pointer-events: none;
-  z-index:100;
+  z-index: 100;
 }
diff --git a/src/less/forest/sequenceDiagram.less b/src/less/forest/sequenceDiagram.less
index e4a540e263..3b468fd784 100644
--- a/src/less/forest/sequenceDiagram.less
+++ b/src/less/forest/sequenceDiagram.less
@@ -2,39 +2,41 @@
   stroke: @actorBorder;
   fill: @actorBkg;
 }
+
 text.actor {
-  fill:@actorTextColor;
-  stroke:none;
+  fill: @actorTextColor;
+  stroke: none;
 }
 
 .actor-line {
-  stroke:@actorLineColor;
+  stroke: @actorLineColor;
 }
 
 .messageLine0 {
-  stroke-width:1.5;
+  stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  marker-end:"url(#arrowhead)";
-  stroke:@signalColor;
+  marker-end: "url(#arrowhead)";
+  stroke: @signalColor;
 }
 
 .messageLine1 {
-  stroke-width:1.5;
+  stroke-width: 1.5;
   stroke-dasharray: "2 2";
-  stroke:@signalColor;
+  stroke: @signalColor;
 }
 
 #arrowhead {
-  fill:@signalColor;
+  fill: @signalColor;
 }
+
 #crosshead path {
-  fill:@signalColor !important;
+  fill: @signalColor !important;
   stroke: @signalColor !important;
-
 }
+
 .messageText {
-  fill:@signalTextColor;
-  stroke:none;
+  fill: @signalTextColor;
+  stroke: none;
 }
 
 .labelBox {
@@ -43,19 +45,19 @@ text.actor {
 }
 
 .labelText {
-  fill:@labelTextColor;
-  stroke:none;
+  fill: @labelTextColor;
+  stroke: none;
 }
 
 .loopText {
-  fill:@labelTextColor;
-  stroke:none;
+  fill: @labelTextColor;
+  stroke: none;
 }
 
 .loopLine {
-  stroke-width:2;
+  stroke-width: 2;
   stroke-dasharray: "2 2";
-  marker-end:"url(#arrowhead)";
+  marker-end: "url(#arrowhead)";
   stroke: @labelBoxBorderColor;
 }
 
@@ -66,8 +68,8 @@ text.actor {
 }
 
 .noteText {
-  fill:black;
-  stroke:none;
+  fill: black;
+  stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
-  font-size:14px;
+  font-size: 14px;
 }
diff --git a/src/less/forest/variables.less b/src/less/forest/variables.less
index 9a0795fc9a..e18b8ca176 100644
--- a/src/less/forest/variables.less
+++ b/src/less/forest/variables.less
@@ -7,56 +7,46 @@
 @arrowheadColor: green;
 
 /* Flowchart variables */
-@nodeBkg:@mainBkg;
-@nodeBorder:@border1;
-
-@clusterBkg:@secondBkg;
-@clusterBorder:@border2;
-
-@defaultLinkColor:@lineColor;
 
+@nodeBkg: @mainBkg;
+@nodeBorder: @border1;
+@clusterBkg: @secondBkg;
+@clusterBorder: @border2;
+@defaultLinkColor: @lineColor;
 @titleColor: #333;
-
 @edgeLabelBackground: #e8e8e8;
 
 /* Sequence Diagram variables */
+
 @actorBorder: @border1;
-@actorBkg:    @mainBkg;
+@actorBkg: @mainBkg;
 @actorTextColor: black;
 @actorLineColor: grey;
-
 @signalColor: #333;
 @signalTextColor: #333;
-
 @labelBoxBkgColor: @actorBkg;
 @labelBoxBorderColor: #326932;
 @labelTextColor: @actorTextColor;
-
 @noteBorderColor: @border2;
-@noteBkgColor:    #fff5ad;
+@noteBkgColor: #fff5ad;
 
 /* Gantt chart variables */
-@sectionBkgColor: #6eaa49;;
+
+@sectionBkgColor: #6eaa49;
+;
 @altSectionBkgColor: white;
 @sectionBkgColor2: #6eaa49;
-
 @taskBorderColor: @border1;
 @taskBkgColor: #487e3a;
 @taskTextColor: @taskTextLightColor;
 @taskTextOutsideColor: @taskTextDarkColor;
-
 @activeTaskBorderColor: @taskBorderColor;
 @activeTaskBkgColor: @mainBkg;
-
 @gridColor: lightgrey;
-
 @doneTaskBkgColor: lightgrey;
 @doneTaskBorderColor: grey;
-
 @critBorderColor: #ff8888;
 @critBkgColor: red;
-
 @taskTextLightColor: white;
 @taskTextDarkColor: black;
-
 @todayLineColor: red;
diff --git a/src/less/neutral/classDiagram.less b/src/less/neutral/classDiagram.less
index 12e8bdf48b..df1dd8ac40 100644
--- a/src/less/neutral/classDiagram.less
+++ b/src/less/neutral/classDiagram.less
@@ -1,23 +1,23 @@
 g.classGroup text {
   fill: @nodeBorder;
-  stroke:none;
+  stroke: none;
   font-family: Arial, Helvetica, sans-serif;
   font-size: 14px;
 }
 
 g.classGroup rect {
-  fill:@nodeBkg;
+  fill: @nodeBkg;
   stroke: @nodeBorder;
 }
 
 g.classGroup line {
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
 
 svg .classLabel .box {
   stroke: none;
-  stroke-width:0;
+  stroke-width: 0;
   fill: @nodeBkg;
   opacity: 0.5;
 }
@@ -29,28 +29,33 @@ svg .classLabel .label {
 .relation {
   stroke: @nodeBorder;
   stroke-width: 1;
-  fill:none;
+  fill: none;
 }
 
-.composition{
-  fill : @nodeBorder;
+.composition {
+  fill: @nodeBorder;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #compositionStart {
   .composition;
 }
+
 #compositionEnd {
   .composition;
 }
-.aggregation{
-  fill : @nodeBkg;
+
+.aggregation {
+  fill: @nodeBkg;
   stroke: @nodeBorder;
-  stroke-width:1;
+  stroke-width: 1;
 }
+
 #aggregationStart {
   .aggregation;
 }
+
 #aggregationEnd {
   .aggregation;
 }
@@ -58,12 +63,15 @@ svg .classLabel .label {
 #dependencyStart {
   .composition;
 }
+
 #dependencyEnd {
   .composition;
 }
+
 #extensionStart {
   .composition;
 }
+
 #extensionEnd {
   .composition;
 }
diff --git a/src/less/neutral/flow.less b/src/less/neutral/flow.less
index 270d5f3f01..26791adc24 100644
--- a/src/less/neutral/flow.less
+++ b/src/less/neutral/flow.less
@@ -1,4 +1,6 @@
-.mermaid .label { color: @text }
+.mermaid .label {
+  color: @text
+}
 
 .node rect,
 .node circle,
diff --git a/src/less/neutral/gantt.less b/src/less/neutral/gantt.less
index 8569e423e6..78cc0444cf 100644
--- a/src/less/neutral/gantt.less
+++ b/src/less/neutral/gantt.less
@@ -1,24 +1,39 @@
 /** Section styling */
+
 .section {
   stroke: none;
-  opacity:0.2;
+  opacity: 0.2;
 }
-.section0{
+
+.section0 {
   fill: @sectionBkgColor;
 }
+
 .section2 {
   fill: @sectionBkgColor2;
 }
-.section1,.section3 {
+
+.section1,
+.section3 {
   fill: @altSectionBkgColor;
   opacity: 0.2;
 }
 
-.sectionTitle0 { fill: @titleColor;}
-.sectionTitle1 { fill: @titleColor;}
-.sectionTitle2 { fill: @titleColor;}
-.sectionTitle3 { fill: @titleColor;}
+.sectionTitle0 {
+  fill: @titleColor;
+}
 
+.sectionTitle1 {
+  fill: @titleColor;
+}
+
+.sectionTitle2 {
+  fill: @titleColor;
+}
+
+.sectionTitle3 {
+  fill: @titleColor;
+}
 
 .sectionTitle {
   text-anchor: start;
@@ -26,25 +41,34 @@
   text-height: 14px;
 }
 
+
 /* Grid and axis */
+
 .grid .tick {
   stroke: @gridColor;
   opacity: 0.3;
   shape-rendering: crispEdges;
 }
+
 .grid path {
   stroke-width: 0;
 }
 
+
 /* Today line */
+
 .today {
   fill: none;
   stroke: @todayLineColor;
   stroke-width: 2px;
 }
 
+
 /* Task styling */
+
+
 /* Default task */
+
 .task {
   stroke-width: 2;
 }
@@ -53,77 +77,127 @@
   text-anchor: middle;
   font-size: 11px;
 }
+
 .taskTextOutsideRight {
   fill: @taskTextDarkColor;
   text-anchor: start;
   font-size: 11px;
 }
+
 .taskTextOutsideLeft {
   fill: @taskTextDarkColor;
   text-anchor: end;
   font-size: 11px;
 }
 
+
 /* Specific task settings for the sections*/
 
-.taskText0, .taskText1, .taskText2, .taskText3 {
+.taskText0,
+.taskText1,
+.taskText2,
+.taskText3 {
   fill: @taskTextColor;
 }
 
-.task0, .task1, .task2, .task3 {
+.task0,
+.task1,
+.task2,
+.task3 {
   fill: @taskBkgColor;
   stroke: @taskBorderColor;
 }
 
-.taskTextOutside0,.taskTextOutside2, {
+.taskTextOutside0,
+.taskTextOutside2,
+{
   fill: @taskTextOutsideColor;
 }
-.taskTextOutside1, .taskTextOutside3 {
+
+.taskTextOutside1,
+.taskTextOutside3 {
   fill: @taskTextOutsideColor;
 }
 
+
 /* Active task */
-.active0, .active1, .active2, .active3 {
+
+.active0,
+.active1,
+.active2,
+.active3 {
   fill: @activeTaskBkgColor;
   stroke: @activeTaskBorderColor;
 }
 
-.activeText0, .activeText1, .activeText2, .activeText3 {
+.activeText0,
+.activeText1,
+.activeText2,
+.activeText3 {
   fill: @taskTextDarkColor !important;
 }
+
+
 /* Completed task */
-.done0, .done1, .done2, .done3 {
+
+.done0,
+.done1,
+.done2,
+.done3 {
   stroke: @doneTaskBorderColor;
   fill: @doneTaskBkgColor;
   stroke-width: 2;
 }
 
-.doneText0, .doneText1, .doneText2, .doneText3 {
+.doneText0,
+.doneText1,
+.doneText2,
+.doneText3 {
   fill: @taskTextDarkColor !important;
 }
 
+
 /* Tasks on the critical line */
-.crit0, .crit1, .crit2, .crit3 {
-  stroke:@critBorderColor;
+
+.crit0,
+.crit1,
+.crit2,
+.crit3 {
+  stroke: @critBorderColor;
   fill: @critBkgColor;
   stroke-width: 2;
 }
-.activeCrit0, .activeCrit1, .activeCrit2, .activeCrit3 {
+
+.activeCrit0,
+.activeCrit1,
+.activeCrit2,
+.activeCrit3 {
   stroke: @critBorderColor;
   fill: @activeTaskBkgColor;
   stroke-width: 2;
 }
-.doneCrit0, .doneCrit1, .doneCrit2, .doneCrit3 {
+
+.doneCrit0,
+.doneCrit1,
+.doneCrit2,
+.doneCrit3 {
   stroke: @critBorderColor;
-  fill:  @doneTaskBkgColor;
+  fill: @doneTaskBkgColor;
   stroke-width: 2;
-  cursor: pointer;
-  //shape-rendering: crispEdges;
+  cursor: pointer; //shape-rendering: crispEdges;
 }
-.doneCritText0, .doneCritText1, .doneCritText2, .doneCritText3 {
+
+.doneCritText0,
+.doneCritText1,
+.doneCritText2,
+.doneCritText3 {
   fill: @taskTextDarkColor !important;
 }
-.activeCritText0, .activeCritText1, .activeCritText2, .activeCritText3 {
+
+.activeCritText0,
+.activeCritText1,
+.activeCritText2,
+.activeCritText3 {
   fill: @taskTextDarkColor !important;
 }
 
diff --git a/src/less/neutral/mermaid.less b/src/less/neutral/mermaid.less
index f383ee5b6e..d19b3d81a1 100644
--- a/src/less/neutral/mermaid.less
+++ b/src/less/neutral/mermaid.less
@@ -3,10 +3,9 @@
 @import "sequenceDiagram";
 @import "gantt";
 @import "classDiagram";
-
 .node text {
   font-family: Arial, Helvetica, sans-serif;
-  font-size:14px;
+  font-size: 14px;
 }
 
 div.mermaidTooltip {
@@ -20,5 +19,5 @@ div.mermaidTooltip {
   border: 1px solid @border2;
   border-radius: 2px;
   pointer-events: none;
-  z-index:100;
+  z-index: 100;
 }
diff --git a/src/less/neutral/sequenceDiagram.less b/src/less/neutral/sequenceDiagram.less
index 1549625f8c..ca62a3c1f1 100644
--- a/src/less/neutral/sequenceDiagram.less
+++ b/src/less/neutral/sequenceDiagram.less
@@ -2,6 +2,7 @@
   stroke: @actorBorder;
   fill: @actorBkg;
 }
+
 text.actor {
   fill: @actorTextColor;
   stroke: none;
@@ -27,11 +28,12 @@ text.actor {
 #arrowhead {
   fill: @signalColor;
 }
+
 #crosshead path {
   fill: @signalColor !important;
   stroke: @signalColor !important;
-
 }
+
 .messageText {
   fill: @signalTextColor;
   stroke: none;
diff --git a/src/less/neutral/variables.less b/src/less/neutral/variables.less
index 9ffa493ffe..8813285b7f 100644
--- a/src/less/neutral/variables.less
+++ b/src/less/neutral/variables.less
@@ -1,66 +1,54 @@
-@mainBkg:   #eee;
+@mainBkg: #eee;
 @secondBkg: lighten(@contrast, 55%);
 @lineColor: #666;
-@border1:   #999;
-@border2:   @contrast;
-
-@note:      #ffa;
-@text:      #333;
-@contrast:  #26a;
-@critical:  #d42;
-@done:      #bbb;
+@border1: #999;
+@border2: @contrast;
+@note: #ffa;
+@text: #333;
+@contrast: #26a;
+@critical: #d42;
+@done: #bbb;
 
 /* Flowchart variables */
+
 @nodeBkg: @mainBkg;
 @nodeBorder: @border1;
-
 @clusterBkg: @secondBkg;
 @clusterBorder: @border2;
-
 @defaultLinkColor: @lineColor;
-
 @titleColor: @text;
-
 @edgeLabelBackground: white;
 
 /* Sequence Diagram variables */
+
 @actorBorder: @border1;
-@actorBkg:    @mainBkg;
+@actorBkg: @mainBkg;
 @actorTextColor: @text;
 @actorLineColor: @lineColor;
-
 @signalColor: @text;
 @signalTextColor: @text;
-
 @labelBoxBkgColor: @contrast;
 @labelBoxBorderColor: @contrast;
 @labelTextColor: white;
-
 @noteBorderColor: darken(@note, 60%);
-@noteBkgColor:    @note;
+@noteBkgColor: @note;
 
 /* Gantt chart variables */
+
 @sectionBkgColor: lighten(@contrast, 30%);
 @altSectionBkgColor: white;
 @sectionBkgColor2: lighten(@contrast, 30%);
-
 @taskBorderColor: darken(@contrast, 10%);
 @taskBkgColor: @contrast;
 @taskTextColor: @taskTextLightColor;
 @taskTextOutsideColor: @taskTextDarkColor;
-
 @activeTaskBorderColor: @taskBorderColor;
 @activeTaskBkgColor: @mainBkg;
-
 @gridColor: lighten(@border1, 30%);
-
 @doneTaskBkgColor: @done;
 @doneTaskBorderColor: @lineColor;
-
 @critBorderColor: darken(@critBkgColor, 10%);
 @critBkgColor: @critical;
-
 @taskTextLightColor: white;
 @taskTextDarkColor: @text;
-
 @todayLineColor: @critBkgColor;

From c56ac30d3936f6e77a1b43fe1acbeef5d75c591f Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 21:24:21 +0800
Subject: [PATCH 21/33] Fix labelBox style issue

---
 src/diagrams/sequenceDiagram/svgDraw.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/diagrams/sequenceDiagram/svgDraw.js b/src/diagrams/sequenceDiagram/svgDraw.js
index 3300c6d88e..8cdb1b00b6 100644
--- a/src/diagrams/sequenceDiagram/svgDraw.js
+++ b/src/diagrams/sequenceDiagram/svgDraw.js
@@ -58,11 +58,10 @@ exports.drawLabel = function (elem, txtObject) {
   }
   var polygon = elem.append('polygon')
   polygon.attr('points', genPoints(txtObject.x, txtObject.y, 50, 20, 7))
-  polygon.attr('style', 'fill:#526e52;stroke:none')
+  polygon.attr('class', 'labelBox')
 
   txtObject.y = txtObject.y + txtObject.labelMargin
   txtObject.x = txtObject.x + 0.5 * txtObject.labelMargin
-  txtObject.fill = 'white'
   exports.drawText(elem, txtObject)
 }
 var actorCnt = -1
@@ -137,8 +136,6 @@ exports.drawLoop = function (elem, bounds, labelText, conf) {
       .attr('y1', starty)
       .attr('x2', stopx)
       .attr('y2', stopy)
-      .attr('stroke-width', 2)
-      .attr('stroke', '#526e52')
       .attr('class', 'loopLine')
   }
   drawLoopLine(bounds.startx, bounds.starty, bounds.stopx, bounds.starty)
@@ -157,7 +154,6 @@ exports.drawLoop = function (elem, bounds, labelText, conf) {
   txt.y = bounds.starty
   txt.labelMargin = 1.5 * 10 // This is the small box that says "loop"
   txt.class = 'labelText'    // Its size & position are fixed.
-  txt.fill = 'white'
 
   exports.drawLabel(g, txt)
 

From 4ba3ff6769b678afa92a31f734500321d23d11d9 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 21:43:07 +0800
Subject: [PATCH 22/33] Fix class diagram default theme color issue

---
 src/less/default/flow.less      | 2 +-
 src/less/default/variables.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/less/default/flow.less b/src/less/default/flow.less
index 47de95fff7..aa97b01775 100644
--- a/src/less/default/flow.less
+++ b/src/less/default/flow.less
@@ -7,7 +7,7 @@
 .node ellipse,
 .node polygon {
   fill: @mainBkg;
-  stroke: @nodeBorder;
+  stroke: @border1;
   stroke-width: 1px;
 }
 
diff --git a/src/less/default/variables.less b/src/less/default/variables.less
index d67b9817ba..e448f488c5 100644
--- a/src/less/default/variables.less
+++ b/src/less/default/variables.less
@@ -8,7 +8,7 @@
 /* Flowchart variables */
 
 @nodeBkg: @mainBkg;
-@nodeBorder: @border1;
+@nodeBorder: #9370DB;
 @clusterBkg: @secondBkg;
 @clusterBorder: @border2;
 @defaultLinkColor: @lineColor;

From b4e8cffd0ad40191ddac6da975693352af6c0159 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 22:12:10 +0800
Subject: [PATCH 23/33] Fix git graph default style issue

---
 dist/demo/index.html                      | 5 ++---
 src/diagrams/gitGraph/gitGraphRenderer.js | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dist/demo/index.html b/dist/demo/index.html
index 6cef521152..382b1df0d0 100644
--- a/dist/demo/index.html
+++ b/dist/demo/index.html
@@ -65,9 +65,8 @@
 gitGraph :
 options
 {
-    "key": "value",
-    "nodeWidth": 150,
-    "nodeSpacing" : 150
+    "nodeSpacing" : 150,
+    "nodeRadius": 10
 }
 end
     commit
diff --git a/src/diagrams/gitGraph/gitGraphRenderer.js b/src/diagrams/gitGraph/gitGraphRenderer.js
index 3d2da3a494..1c7cdb0595 100644
--- a/src/diagrams/gitGraph/gitGraphRenderer.js
+++ b/src/diagrams/gitGraph/gitGraphRenderer.js
@@ -8,7 +8,7 @@ const log = Logger.Log
 var allCommitsDict = {}
 var branchNum
 var config = {
-  nodeSpacing: 75,
+  nodeSpacing: 150,
   nodeFillColor: 'yellow',
   nodeStrokeWidth: 2,
   nodeStrokeColor: 'grey',
@@ -17,12 +17,12 @@ var config = {
   lineColor: 'grey',
   leftMargin: 50,
   branchColors: ['#442f74', '#983351', '#609732', '#AA9A39'],
-  nodeRadius: 15,
+  nodeRadius: 10,
   nodeLabel: {
     width: 75,
     height: 100,
     x: -25,
-    y: 15
+    y: 0
   }
 }
 var apiConfig = {}

From c63d556cf87824df10d4dc4dc08bbd7f6960b7d3 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 22:25:07 +0800
Subject: [PATCH 24/33] Fix class diagram display issue

---
 src/diagrams/classDiagram/classRenderer.js | 6 +++---
 src/less/default/classDiagram.less         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/diagrams/classDiagram/classRenderer.js b/src/diagrams/classDiagram/classRenderer.js
index 3ff016e5ee..d5e144774f 100644
--- a/src/diagrams/classDiagram/classRenderer.js
+++ b/src/diagrams/classDiagram/classRenderer.js
@@ -17,7 +17,7 @@ var classCnt = 0
 var conf = {
   dividerMargin: 10,
   padding: 5,
-  textHeight: 14
+  textHeight: 10
 }
 
 // Todo optimize
@@ -259,8 +259,8 @@ var drawClass = function (elem, classDef) {
 
   var methodsLine = g.append('line')      // text label for the x axis
     .attr('x1', 0)
-    .attr('y1', conf.padding + titleHeight + 3 * conf.dividerMargin / 2 + membersBox.height)
-    .attr('y2', conf.padding + titleHeight + 3 * conf.dividerMargin / 2 + membersBox.height)
+    .attr('y1', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
+    .attr('y2', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
 
   var methods = g.append('text')      // text label for the x axis
     .attr('x', conf.padding)
diff --git a/src/less/default/classDiagram.less b/src/less/default/classDiagram.less
index 31ef1845de..94ff27b8d7 100644
--- a/src/less/default/classDiagram.less
+++ b/src/less/default/classDiagram.less
@@ -2,7 +2,7 @@ g.classGroup text {
   fill: @nodeBorder;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
+  font-size: 10px;
 }
 
 g.classGroup rect {

From 97b9edf7c3673f7ad8889d6bf057f0fa5312bb6b Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 22:31:18 +0800
Subject: [PATCH 25/33] Adjust class diagram label size

---
 src/diagrams/classDiagram/classRenderer.js | 4 ++--
 src/less/default/classDiagram.less         | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/diagrams/classDiagram/classRenderer.js b/src/diagrams/classDiagram/classRenderer.js
index d5e144774f..caf9bfebc2 100644
--- a/src/diagrams/classDiagram/classRenderer.js
+++ b/src/diagrams/classDiagram/classRenderer.js
@@ -200,8 +200,8 @@ var drawEdge = function (elem, path, relation) {
       .attr('class', 'box')
       .attr('x', bounds.x - conf.padding / 2)
       .attr('y', bounds.y - conf.padding / 2)
-      .attr('width', bounds.width + 2 * conf.padding / 2)
-      .attr('height', bounds.height + 2 * conf.padding / 2)
+      .attr('width', bounds.width + conf.padding)
+      .attr('height', bounds.height + conf.padding)
   }
 
   edgeCount++
diff --git a/src/less/default/classDiagram.less b/src/less/default/classDiagram.less
index 94ff27b8d7..b69e1f5b3e 100644
--- a/src/less/default/classDiagram.less
+++ b/src/less/default/classDiagram.less
@@ -24,6 +24,7 @@ svg .classLabel .box {
 
 svg .classLabel .label {
   fill: @nodeBorder;
+  font-size: 10px;
 }
 
 .relation {

From 12af9b0b66738f6bbca2352ab7cb727ff496e555 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 23:10:22 +0800
Subject: [PATCH 26/33] Fix class diagram css style in other themes

---
 src/less/dark/classDiagram.less    | 3 ++-
 src/less/forest/classDiagram.less  | 3 ++-
 src/less/neutral/classDiagram.less | 5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/less/dark/classDiagram.less b/src/less/dark/classDiagram.less
index 31ef1845de..b69e1f5b3e 100644
--- a/src/less/dark/classDiagram.less
+++ b/src/less/dark/classDiagram.less
@@ -2,7 +2,7 @@ g.classGroup text {
   fill: @nodeBorder;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
+  font-size: 10px;
 }
 
 g.classGroup rect {
@@ -24,6 +24,7 @@ svg .classLabel .box {
 
 svg .classLabel .label {
   fill: @nodeBorder;
+  font-size: 10px;
 }
 
 .relation {
diff --git a/src/less/forest/classDiagram.less b/src/less/forest/classDiagram.less
index 31ef1845de..b69e1f5b3e 100644
--- a/src/less/forest/classDiagram.less
+++ b/src/less/forest/classDiagram.less
@@ -2,7 +2,7 @@ g.classGroup text {
   fill: @nodeBorder;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
-  font-size: 14px;
+  font-size: 10px;
 }
 
 g.classGroup rect {
@@ -24,6 +24,7 @@ svg .classLabel .box {
 
 svg .classLabel .label {
   fill: @nodeBorder;
+  font-size: 10px;
 }
 
 .relation {
diff --git a/src/less/neutral/classDiagram.less b/src/less/neutral/classDiagram.less
index df1dd8ac40..b69e1f5b3e 100644
--- a/src/less/neutral/classDiagram.less
+++ b/src/less/neutral/classDiagram.less
@@ -1,8 +1,8 @@
 g.classGroup text {
   fill: @nodeBorder;
   stroke: none;
-  font-family: Arial, Helvetica, sans-serif;
-  font-size: 14px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-size: 10px;
 }
 
 g.classGroup rect {
@@ -24,6 +24,7 @@ svg .classLabel .box {
 
 svg .classLabel .label {
   fill: @nodeBorder;
+  font-size: 10px;
 }
 
 .relation {

From ccec3810df2802b36fb240392b8e509c91b46dd0 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 23:15:50 +0800
Subject: [PATCH 27/33] Fix neutral theme sequence diagram issue

---
 src/less/neutral/variables.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/less/neutral/variables.less b/src/less/neutral/variables.less
index 8813285b7f..e618d5c7db 100644
--- a/src/less/neutral/variables.less
+++ b/src/less/neutral/variables.less
@@ -27,8 +27,8 @@
 @actorLineColor: @lineColor;
 @signalColor: @text;
 @signalTextColor: @text;
-@labelBoxBkgColor: @contrast;
-@labelBoxBorderColor: @contrast;
+@labelBoxBkgColor: @actorBkg;
+@labelBoxBorderColor: @actorBorder;
 @labelTextColor: white;
 @noteBorderColor: darken(@note, 60%);
 @noteBkgColor: @note;

From 2134dbb2fd7f379ad73829cd36cbf739cd6756c9 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 23:27:19 +0800
Subject: [PATCH 28/33] Fix git graph dark theme text color issue

---
 src/less/dark/gitGraph.less | 6 ++++++
 src/less/dark/mermaid.less  | 1 +
 2 files changed, 7 insertions(+)
 create mode 100644 src/less/dark/gitGraph.less

diff --git a/src/less/dark/gitGraph.less b/src/less/dark/gitGraph.less
new file mode 100644
index 0000000000..f4072ef652
--- /dev/null
+++ b/src/less/dark/gitGraph.less
@@ -0,0 +1,6 @@
+.commit-id,
+.commit-msg,
+.branch-label {
+  fill: lightgrey;
+  color: lightgrey;
+}
diff --git a/src/less/dark/mermaid.less b/src/less/dark/mermaid.less
index 53ba6c146a..c516a0ef06 100644
--- a/src/less/dark/mermaid.less
+++ b/src/less/dark/mermaid.less
@@ -3,6 +3,7 @@
 @import "sequenceDiagram";
 @import "gantt";
 @import "classDiagram";
+@import "gitGraph";
 .node text {
   font-family: 'trebuchet ms', verdana, arial;
   font-size: 14px;

From 42846cce5097ecaf7784053a1a76323bc66072fb Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 23:33:54 +0800
Subject: [PATCH 29/33] Fix class diagram in dark theme issue

---
 src/less/dark/flow.less      | 2 +-
 src/less/dark/variables.less | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/less/dark/flow.less b/src/less/dark/flow.less
index fc9fbed15e..dcabafdd0c 100644
--- a/src/less/dark/flow.less
+++ b/src/less/dark/flow.less
@@ -7,7 +7,7 @@
 .node ellipse,
 .node polygon {
   fill: @mainBkg;
-  stroke: @nodeBorder;
+  stroke: @border1;
   stroke-width: 1px;
 }
 
diff --git a/src/less/dark/variables.less b/src/less/dark/variables.less
index 4bbb8b49ef..03d8109363 100644
--- a/src/less/dark/variables.less
+++ b/src/less/dark/variables.less
@@ -10,7 +10,7 @@
 /* Flowchart variables */
 
 @nodeBkg: @mainBkg;
-@nodeBorder: @border1;
+@nodeBorder: purple;
 @clusterBkg: @secondBkg;
 @clusterBorder: @border2;
 @defaultLinkColor: @lineColor;

From d38b9be891eef3f516b608dc5ac6ec9ac44de23a Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Sat, 22 Apr 2017 23:37:23 +0800
Subject: [PATCH 30/33] Update todo list

---
 todo.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/todo.md b/todo.md
index 47214801fb..d47a931494 100644
--- a/todo.md
+++ b/todo.md
@@ -1,17 +1,14 @@
-- upgrade d3 to version 4
-- use external d3-textwrap library
+- Upgrade d3 to version 4
+- Use external d3-textwrap library
     - Problem is it's for d3 v4 only
-- node console output colors like Chrome console
-- default theme doesn't work for class diagram
-- don't version control generated content, move them to outside project
+- Make node console output colors like Chrome console
+- Don't version control generated content, move them to outside project
     - editor
     - docs
-- what's the correct way to change logLevel as an end user?
+- What's the correct way to change logLevel as an end user?
 - d3 v3 doesn't support 'use strict'
     - babel-plugin-transform-remove-strict-mode
         - need to remove it after upgrading to d3 v4
-- use headless chrome provided by karma-chrome-launcher
-    - https://github.com/karma-runner/karma-chrome-launcher
 - rewrite live editor
 - Fix Travis CI
 - Fix CodeClimate

From dcffde3e98cb2b60ed279b80f314a451728d306e Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Mon, 24 Apr 2017 22:42:07 +0800
Subject: [PATCH 31/33] Update travis config

---
 .travis.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d9fd78ef9c..818f099fe7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,20 @@
-language: node_js
-osx_image: xcode8.1
-os:
-  - linux
-  - osx
-sudo: false
-node_js:
-  - "6.9"
-  - "7.9"
-env:
-  - CXX=g++-4.8
+sudo: required
+dist: xenial
 addons:
-  code_climate:
-    repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
   apt:
     sources:
-      - ubuntu-toolchain-r-test
+      - google-chrome
     packages:
-      - g++-4.8
+      - google-chrome-stable
+  code_climate:
+    repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
+language: node_js
+node_js:
+  - "6"
+  - "7"
+before_script:
+  - yarn build
+script:
+  - yarn test
 after_script:
   - cat coverage/lcov.info | codeclimate

From 7889e35340ceffd138f69c8223ac083dccb49b40 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Mon, 24 Apr 2017 23:00:51 +0800
Subject: [PATCH 32/33] Run Chrome with --no-sandbox

---
 karma.conf.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/karma.conf.js b/karma.conf.js
index 291c304bc5..3e43f9a750 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -76,6 +76,7 @@ module.exports = function (config) {
         flags: [
           '--headless',
           '--disable-gpu',
+          '--no-sandbox',
           // Without a remote debugging port, Google Chrome exits immediately.
           '--remote-debugging-port=9222'
         ]

From 5cd8ac1facee95f8c208d974b88fdfd15f9f3442 Mon Sep 17 00:00:00 2001
From: Tyler Long <tyler4long@gmail.com>
Date: Mon, 24 Apr 2017 23:11:55 +0800
Subject: [PATCH 33/33] Try to fix travis chrome headless issue

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 818f099fe7..f098df05b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,9 @@ language: node_js
 node_js:
   - "6"
   - "7"
+before_install:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 before_script:
   - yarn build
 script: