Disable amd parse for lodash

dist/demo/index.html

@@ -62,45 +62,45 @@ Add another diagram to demo page    : 48h
   <hr/>
 
   <div class="mermaid">
-gitGraph :
+gitGraph:
 options
 {
-    "nodeSpacing" : 150,
+    "nodeSpacing": 150,
     "nodeRadius": 10
 }
 end
-    commit
+commit
-    branch newbranch
+branch newbranch
-    checkout newbranch
+checkout newbranch
-    commit
+commit
-    commit
+commit
-    checkout master
+checkout master
-    commit
+commit
-    commit
+commit
-    merge newbranch
+merge newbranch
   </div>
 
   <hr/>
 
   <div class="mermaid">
 classDiagram
-    Class01 <|-- AveryLongClass : Cool
+Class01 <|-- AveryLongClass : Cool
-    Class03 *-- Class04
+Class03 *-- Class04
-    Class05 o-- Class06
+Class05 o-- Class06
-    Class07 .. Class08
+Class07 .. Class08
-    Class09 --> C2 : Where am i?
+Class09 --> C2 : Where am i?
-    Class09 --* C3
+Class09 --* C3
-    Class09 --|> Class07
+Class09 --|> Class07
-    Class07 : equals()
+Class07 : equals()
-    Class07 : Object[] elementData
+Class07 : Object[] elementData
-    Class01 : size()
+Class01 : size()
-    Class01 : int chimp
+Class01 : int chimp
-    Class01 : int gorilla
+Class01 : int gorilla
-    Class08 <--> C2: Cool label
+Class08 <--> C2: Cool label
   </div>
   <script src="../mermaid.js"></script>
   <script>
-    mermaid.initialize({startOnLoad:true});
+    mermaid.initialize({startOnLoad: true});
   </script>
 </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mermaid",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
   "main": "src/mermaid.js",
   "keywords": [

todo.md

@@ -16,3 +16,4 @@
 - How to generate doc?
 - webpack warning: lodash too big
 - add converalls
+- git graph requires a blank line at the end. why?

webpack.config.base.js

@@ -2,6 +2,15 @@ import path from 'path'
 import nodeExternals from 'webpack-node-externals'
 import ExtractTextPlugin from 'extract-text-webpack-plugin'
 
+const rules = [
+  {
+    parser: {
+      amd: false
+    },
+    include: /node_modules\/lodash\//
+  }
+]
+
 export const webConfig = () => {
   return {
     target: 'web',
@@ -14,7 +23,7 @@ export const webConfig = () => {
       filename: '[name].js'
     },
     module: {
-      rules: [
+      rules: rules.concat([
         {
           test: /\.js$/,
           use: {
@@ -33,7 +42,7 @@ export const webConfig = () => {
             }
           }
         }
-      ]
+      ])
     }
   }
 }
@@ -51,7 +60,7 @@ export const nodeConfig = () => {
       libraryTarget: 'commonjs2'
     },
     module: {
-      rules: [
+      rules: rules.concat([
         {
           test: /\.js$/,
           use: {
@@ -67,7 +76,7 @@ export const nodeConfig = () => {
             }
           }
         }
-      ]
+      ])
     }
   }
 }
@@ -86,7 +95,7 @@ export const lessConfig = () => {
       filename: '[name].css'
     },
     module: {
-      rules: [
+      rules: rules.concat([
         {
           test: /\.less$/,
           use: ExtractTextPlugin.extract({
@@ -101,7 +110,7 @@ export const lessConfig = () => {
             ]
           })
         }
-      ]
+      ])
     },
     plugins: [
       new ExtractTextPlugin('[name].css')