Merge pull request #519 from tylingsoft/master

Modernize mermaid

.ackrc

@@ -0,0 +1,4 @@
+--ignore-dir=dist
+--ignore-dir=docs
+--ignore-dir=editor
+--ignore-file=match:/^yarn\.lock$/

.babelrc

@@ -0,0 +1,12 @@
+{
+  "presets": [
+    [
+      "env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ]
+  ]
+}

.codeclimate.yml

@@ -1,14 +1,14 @@
 engines:
- duplication:
-   enabled: true
-   config:
-     languages:
-     - javascript
- eslint:
-   enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+        - javascript
+eslint:
+  enabled: true
 ratings:
- paths:
- - "**.js"
+  paths:
+    - "**.js"
 exclude_paths:
-- node_modules/
-- dist/
+  - node_modules/
+  - dist/

.editorconfig

@@ -0,0 +1,11 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+indent_size = 4

.gitattributes

@@ -1 +1 @@
-*.js text eol=lf
+*.js text eol=lf

.gitignore

@@ -10,4 +10,6 @@ bower_components
 coverage
 
 test/tmp_*
-test/fixtures/samples/*.actual.*
+test/fixtures/samples/*.actual*
+
+dist/*.js

.travis.yml

@@ -1,15 +1,21 @@
-    language: node_js
-    osx_image: xcode7.3
-    os:
-        - linux
-        - osx
-    sudo: false
-    node_js:
-        - "6.2"
-        - "4.4"
-        - "5.9"
-    addons:
-       code_climate:
-         repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
-    after_script:
-        - cat coverage/lcov.info | codeclimate
+language: node_js
+osx_image: xcode8.1
+os:
+  - linux
+  - osx
+sudo: false
+node_js:
+  - "6.9"
+  - "7.9"
+env:
+  - CXX=g++-4.8
+addons:
+  code_climate:
+    repo_token: e87e6bf1c253e0555437ebd23235fdfe2749b889358e7c6d100e4ea5b4f2e091
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8
+after_script:
+  - cat coverage/lcov.info | codeclimate

CONTRIBUTING.md

@@ -32,7 +32,7 @@ a pull request, we will love you forever if you include jasmine tests. We can al
 Always write a clear log message for your commits. One-line messages are fine for small changes, but bigger changes should look like this:
 
 $ git commit -m "A brief summary of the commit
-> 
+>
 > A paragraph describing what changed and its impact."
 Coding conventions
 Start reading our code and you'll get the hang of it. We optimize for readability:
@@ -50,10 +50,10 @@ url('/images/blah.gif'), use url('../images/blah.gif').
 Fork, then:
 
 ```
-npm install
+yarn install
 ```
 
-Then the dependencies will have been installed. You use gulp and npm calls as build tools.
+Then the dependencies will have been installed. You use gulp and yarn calls as build tools.
 
 The following targets are probably interesting:
 
@@ -65,12 +65,12 @@ gulp jison
 ```
 To run the tests:
 ```
-npm run karma
+yarn run karma
 ```
 
 To build the /dist directory
 ```
-npm run dist
+yarn run dist
 ```
 
 Thanks, Knut Sveidqvist

LICENSE

@@ -19,4 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-

README.md

@@ -1,4 +1,3 @@
-
 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)
 =======