Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modernize mermaid #519

Merged
merged 66 commits into from
Apr 17, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
3b2b0da
Add .editorconfig
tylerlong Apr 10, 2017
2deacb8
Format files in root folder
tylerlong Apr 10, 2017
2525929
Add yarn.lock file
tylerlong Apr 10, 2017
23dd96b
Update .gitignore
tylerlong Apr 10, 2017
e1e7be0
Remove auto generated js file from dist folder
tylerlong Apr 10, 2017
e48ff4c
Update chalk, he and lodash
tylerlong Apr 10, 2017
3caa755
Update some libraries
tylerlong Apr 10, 2017
176ffa8
Update phantomjs
tylerlong Apr 10, 2017
19212eb
Upgrade all libraries except d3
tylerlong Apr 10, 2017
432f344
Minor change to d3 version
tylerlong Apr 10, 2017
8222063
package.json scripts test should do dist
tylerlong Apr 10, 2017
546e766
Add JavaScript Standard Style
tylerlong Apr 10, 2017
69ceab9
Change cli_test-output.js to ES6
tylerlong Apr 10, 2017
c1e5fe3
Change cli_test-parser.js to ES6
tylerlong Apr 10, 2017
bc94fc3
Convert test/cli_test-sample.js to ES6
tylerlong Apr 10, 2017
fc96360
Get all tape tests correct
tylerlong Apr 11, 2017
d46fda5
Use JavaScript Standard Style for lint
tylerlong Apr 11, 2017
620f3e8
Auto fix standard style voilations
tylerlong Apr 11, 2017
7d1c1e3
Add index.html to dist folder
tylerlong Apr 11, 2017
413162d
Fix some code style issues
tylerlong Apr 11, 2017
f136a7f
Add .ackrc
tylerlong Apr 11, 2017
e91229f
Fix style issue of mermaid.js and mermaidAPI.js
tylerlong Apr 11, 2017
dc4edf7
Fix style issue of logger.js
tylerlong Apr 11, 2017
a2ce9e6
Fix code style issues
tylerlong Apr 13, 2017
ab398c6
Fix code style issues
tylerlong Apr 13, 2017
f04d415
Fix gulpfile.js style issue
tylerlong Apr 13, 2017
df8085b
Fix all code style issues
tylerlong Apr 13, 2017
15bdaca
Use yarn install of npm
tylerlong Apr 13, 2017
d87da68
eslint watch
tylerlong Apr 13, 2017
e945bf8
First try of webpack
tylerlong Apr 14, 2017
7b93582
First working version of webpack
tylerlong Apr 15, 2017
7166ade
Debug flowchart
tylerlong Apr 15, 2017
173899f
First fully working version of webpack
tylerlong Apr 15, 2017
dffc53b
Minor changes
tylerlong Apr 15, 2017
58a787b
Upgrade D3 to 3.5.12
tylerlong Apr 15, 2017
fd5b308
Update d3 to 3.5.17
tylerlong Apr 15, 2017
ea11f8b
Use external d3-textwrap
tylerlong Apr 15, 2017
9d56595
Update libraries to latest version
tylerlong Apr 15, 2017
869a64e
Generate all the dist files using webpack
tylerlong Apr 15, 2017
e17ec3e
Don't use d3-textwrap before it's for d3 v4 only
tylerlong Apr 15, 2017
053388a
Add todo.md
tylerlong Apr 15, 2017
736d57f
Create demo folder
tylerlong Apr 16, 2017
538d2c2
Remove getTransformToElement polyfill because it's fixed in dagre-d3
tylerlong Apr 16, 2017
a730225
Replace window.console with console in order to support node
tylerlong Apr 16, 2017
262a917
Test mermaidAPI
tylerlong Apr 16, 2017
ebf00ee
Remove useless file
tylerlong Apr 16, 2017
52d03f3
Remove useless file
tylerlong Apr 16, 2017
701e638
Add demo for all the 5 diagram types
tylerlong Apr 16, 2017
b9b991c
Refactor code in lib/ folder
tylerlong Apr 16, 2017
3d50080
Refactor code
tylerlong Apr 16, 2017
8536c97
Refactor code of gulp scripts
tylerlong Apr 16, 2017
e16e501
mermaidAPI should target node
tylerlong Apr 16, 2017
8832aa6
Remove useless jasmine config file
tylerlong Apr 16, 2017
6a7a5b9
Format code of src/d3.js
tylerlong Apr 16, 2017
110e4ee
Refactor code
tylerlong Apr 16, 2017
87c7f73
Refactor code
tylerlong Apr 16, 2017
5624453
Refactor code
tylerlong Apr 16, 2017
8b44401
Update some configuration files
tylerlong Apr 16, 2017
3ac23c2
Refactor code
tylerlong Apr 16, 2017
15bfc12
Remove useless dependencies
tylerlong Apr 16, 2017
166acad
Remove some dependencies
tylerlong Apr 16, 2017
0ebf162
Try babel
tylerlong Apr 17, 2017
4032824
Format code
tylerlong Apr 17, 2017
5d68359
First working version of babel
tylerlong Apr 17, 2017
a8ff7a6
Fix Travis CI env issue
tylerlong Apr 17, 2017
2fa4df2
yarn doesn't support node 4
tylerlong Apr 17, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .ackrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
--ignore-dir=dist
--ignore-dir=docs
--ignore-dir=editor
--ignore-file=match:/^yarn\.lock$/
12 changes: 12 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"presets": [
[
"env",
{
"targets": {
"node": "current"
}
}
]
]
}
22 changes: 11 additions & 11 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -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/
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

229 changes: 0 additions & 229 deletions .eslintrc

This file was deleted.

2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
*.js text eol=lf
*.js text eol=lf
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ bower_components
coverage

test/tmp_*
test/fixtures/samples/*.actual.*
test/fixtures/samples/*.actual*

dist/*.js
36 changes: 21 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:

Expand All @@ -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
1 change: 0 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
=======

Expand Down
Loading