From 1076d671374898a1e75b778911832da01f57b88f Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Sun, 4 Jun 2017 12:13:22 +0800 Subject: [PATCH] Disable amd parse for lodash --- dist/demo/index.html | 2 +- package.json | 2 +- webpack.config.base.js | 21 +++++++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dist/demo/index.html b/dist/demo/index.html index bb6bf5f8e..a71dba085 100644 --- a/dist/demo/index.html +++ b/dist/demo/index.html @@ -100,7 +100,7 @@ Class08 <--> C2: Cool label diff --git a/package.json b/package.json index 53dd915be..39337fc4b 100644 --- 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 index 574a0360d..dec540b7d 100644 --- 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')