From a583daf712b8d80d8d06390509f31915695f7982 Mon Sep 17 00:00:00 2001 From: knsv Date: Sat, 24 Oct 2015 20:33:52 +0200 Subject: [PATCH] Using the latest jison in build --- package.json | 4 ++-- scripts/jison.sh | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 2cef95803..0cd7ee2aa 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,9 @@ "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/.bin/tape test/cli_test-*.js", - "jasmine": "node node_modules/jasmine-es6/bin/jasmine.js", + "jasmine": "npm run jison &&node node_modules/jasmine-es6/bin/jasmine.js", "posttest": "npm run jison", - "test": "npm run jison &&npm run dist && npm run jasmine && npm run tape", + "test": "npm run dist && npm run jasmine && npm run tape", "dist-slim-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.slim.js -x d3 && cat dist/mermaid.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.slim.min.js", "dist-slim-mermaidAPI": "node node_modules/browserify/bin/cmd.js src/mermaidAPI.js -t babelify -s mermaidAPI -o dist/mermaidAPI.slim.js -x d3 && cat dist/mermaidAPI.slim.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaidAPI.slim.min.js", "dist-mermaid": "node node_modules/browserify/bin/cmd.js src/mermaid.js -t babelify -s mermaid -o dist/mermaid.js && cat dist/mermaid.js | node node_modules/uglifyjs/bin/uglifyjs -mc > dist/mermaid.min.js", diff --git a/scripts/jison.sh b/scripts/jison.sh index a2f125f3f..c1a8b2e07 100644 --- a/scripts/jison.sh +++ b/scripts/jison.sh @@ -1,4 +1,3 @@ -node node_modules/jison/lib/cli.js src/diagrams/classDiagram/parser/classDiagram.jison -o src/diagrams/classDiagram/parser/classDiagram.js node node_modules/jison/lib/cli.js src/diagrams/sequenceDiagram/parser/sequenceDiagram.jison -o src/diagrams/sequenceDiagram/parser/sequenceDiagram.js node node_modules/jison/lib/cli.js src/diagrams/example/parser/example.jison -o src/diagrams/example/parser/example.js node node_modules/jison/lib/cli.js src/diagrams/flowchart/parser/flow.jison -o src/diagrams/flowchart/parser/flow.js