Disable amd parse for lodash

georgel · Jun 4, 2017 · 1076d67 · 1076d67
1 parent b023892
commit 1076d67
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/dist/demo/index.html b/dist/demo/index.html
@@ -100,7 +100,7 @@
   </div>
   <script src="../mermaid.js"></script>
   <script>
-    mermaid.initialize({startOnLoad:true});
+    mermaid.initialize({startOnLoad: true});
   </script>
 </body>
 </html>
diff --git a/package.json b/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": [

diff --git a/webpack.config.base.js b/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')