Compare commits

...

2 Commits
7.0.2 ... 7.0.3

Author SHA1 Message Date
Tyler Long
1076d67137 Disable amd parse for lodash 2017-06-04 12:13:22 +08:00
Tyler Long
b023892c57 Format demo code 2017-06-02 14:42:04 +08:00
4 changed files with 42 additions and 32 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "mermaid", "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.", "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
"main": "src/mermaid.js", "main": "src/mermaid.js",
"keywords": [ "keywords": [

View File

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

View File

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