Skip to content

Commit 3f55200

Browse files
committed
Update some dependencies
1 parent 204b029 commit 3f55200

11 files changed

+2001
-681
lines changed

karma.conf.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default function (config) {
2727
},
2828

2929
webpack: {
30+
mode: 'development',
3031
node: webpackConfig.node,
3132
module: webpackConfig.module,
3233
devtool: 'inline-source-map'
@@ -56,6 +57,6 @@ export default function (config) {
5657

5758
// Continuous Integration mode
5859
// if true, Karma captures browsers, runs the tests and exits
59-
singleRun: false
60+
singleRun: true
6061
})
6162
}

package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"build": "webpack --progress --colors",
1717
"build:watch": "yarn build --watch",
1818
"release": "yarn build -p --config webpack.config.prod.babel.js",
19-
"upgrade": "yarn-upgrade-all && yarn remove d3 && yarn add d3@3.5.17",
19+
"upgrade": "yarn-upgrade-all && yarn remove d3 && yarn add d3@3.5.17 && yarn remove dagre-d3-renderer && yarn add dagre-d3-renderer@0.4.25 && yarn remove dagre-layout && yarn add dagre-layout@0.8.0 && yarn remove less && yarn add --dev less@2.7.3 && yarn remove puppeteer && yarn add --dev puppeteer@0.13.0 && yarn remove karma jasmine && yarn add --dev karma@1.7.1 jasmine@2.8.0",
2020
"lint": "standard",
21-
"karma": "node -r babel-register node_modules/.bin/karma start karma.conf.js --single-run",
21+
"karma": "node -r babel-register node_modules/.bin/karma start karma.conf.js",
2222
"test": "yarn lint && yarn karma",
2323
"jison": "node -r babel-register node_modules/.bin/gulp jison",
2424
"prepublishOnly": "yarn build && yarn release && yarn test"
@@ -37,41 +37,42 @@
3737
},
3838
"dependencies": {
3939
"d3": "3.5.17",
40-
"dagre-d3-renderer": "^0.4.25",
41-
"dagre-layout": "^0.8.0",
40+
"dagre-d3-renderer": "0.4.25",
41+
"dagre-layout": "0.8.0",
4242
"he": "^1.1.1",
43-
"lodash": "^4.17.4",
44-
"moment": "^2.20.1"
43+
"lodash": "^4.17.5",
44+
"moment": "^2.21.0"
4545
},
4646
"devDependencies": {
4747
"babel-core": "^6.26.0",
48-
"babel-loader": "^7.1.2",
48+
"babel-loader": "^7.1.3",
4949
"babel-plugin-lodash": "^3.3.2",
5050
"babel-preset-env": "^1.6.1",
5151
"codeclimate-test-reporter": "^0.5.0",
52-
"css-loader": "^0.28.7",
52+
"css-loader": "^0.28.10",
5353
"css-to-string-loader": "^0.1.3",
5454
"extract-text-webpack-plugin": "^3.0.2",
5555
"gulp": "^3.9.1",
5656
"gulp-filelog": "^0.4.1",
5757
"gulp-jison": "^1.2.0",
5858
"inject-loader": "^3.0.1",
59-
"jasmine": "^2.8.0",
59+
"jasmine": "2.8.0",
6060
"jasmine-es6": "^0.4.3",
6161
"jison": "^0.4.18",
62-
"karma": "^1.7.1",
62+
"karma": "1.7.1",
6363
"karma-chrome-launcher": "^2.2.0",
6464
"karma-jasmine": "^1.1.1",
6565
"karma-sourcemap-loader": "^0.3.7",
66-
"karma-webpack": "^2.0.9",
67-
"less": "^2.7.3",
68-
"less-loader": "^4.0.5",
69-
"puppeteer": "^0.13.0",
70-
"standard": "^10.0.3",
71-
"style-loader": "^0.19.1",
72-
"webpack": "^3.10.0",
66+
"karma-webpack": "^2.0.13",
67+
"less": "2.7.3",
68+
"less-loader": "^4.0.6",
69+
"puppeteer": "0.13.0",
70+
"standard": "^11.0.0",
71+
"style-loader": "^0.20.2",
72+
"webpack": "^4.1.0",
73+
"webpack-cli": "^2.0.10",
7374
"webpack-node-externals": "^1.6.0",
74-
"yarn-upgrade-all": "^0.2.0"
75+
"yarn-upgrade-all": "^0.3.0"
7576
},
7677
"files": [
7778
"dist",

src/diagrams/classDiagram/classRenderer.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,12 @@ const drawClass = function (elem, classDef) {
233233

234234
const titleHeight = title.node().getBBox().height
235235

236-
const membersLine = g.append('line') // text label for the x axis
236+
const membersLine = g.append('line') // text label for the x axis
237237
.attr('x1', 0)
238238
.attr('y1', conf.padding + titleHeight + conf.dividerMargin / 2)
239239
.attr('y2', conf.padding + titleHeight + conf.dividerMargin / 2)
240240

241-
const members = g.append('text') // text label for the x axis
241+
const members = g.append('text') // text label for the x axis
242242
.attr('x', conf.padding)
243243
.attr('y', titleHeight + (conf.dividerMargin) + conf.textHeight)
244244
.attr('fill', 'white')
@@ -252,12 +252,12 @@ const drawClass = function (elem, classDef) {
252252

253253
const membersBox = members.node().getBBox()
254254

255-
const methodsLine = g.append('line') // text label for the x axis
255+
const methodsLine = g.append('line') // text label for the x axis
256256
.attr('x1', 0)
257257
.attr('y1', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
258258
.attr('y2', conf.padding + titleHeight + conf.dividerMargin + membersBox.height)
259259

260-
const methods = g.append('text') // text label for the x axis
260+
const methods = g.append('text') // text label for the x axis
261261
.attr('x', conf.padding)
262262
.attr('y', titleHeight + 2 * conf.dividerMargin + membersBox.height + conf.textHeight)
263263
.attr('fill', 'white')

src/diagrams/example/exampleRenderer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export const draw = function (txt, id, ver) {
2121

2222
const g = svg.append('g')
2323

24-
g.append('text') // text label for the x axis
24+
g.append('text') // text label for the x axis
2525
.attr('x', 100)
2626
.attr('y', 40)
2727
.attr('class', 'version')

src/diagrams/gantt/ganttRenderer.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ export const draw = function (text, id) {
6464
.domain([d3.min(taskArray, function (d) {
6565
return d.startTime
6666
}),
67-
d3.max(taskArray, function (d) {
68-
return d.endTime
69-
})])
67+
d3.max(taskArray, function (d) {
68+
return d.endTime
69+
})])
7070
.rangeRound([0, w - conf.leftPadding - conf.rightPadding])
7171

7272
let categories = []

src/diagrams/sequenceDiagram/sequenceRenderer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ const drawMessage = function (elem, startx, stopx, verticalPos, msg) {
209209
const g = elem.append('g')
210210
const txtCenter = startx + (stopx - startx) / 2
211211

212-
const textElem = g.append('text') // text label for the x axis
212+
const textElem = g.append('text') // text label for the x axis
213213
.attr('x', txtCenter)
214214
.attr('y', verticalPos - 7)
215215
.style('text-anchor', 'middle')
@@ -258,7 +258,7 @@ const drawMessage = function (elem, startx, stopx, verticalPos, msg) {
258258

259259
line.attr('stroke-width', 2)
260260
line.attr('stroke', 'black')
261-
line.style('fill', 'none') // remove any fill colour
261+
line.style('fill', 'none') // remove any fill colour
262262
if (msg.type === parser.yy.LINETYPE.SOLID || msg.type === parser.yy.LINETYPE.DOTTED) {
263263
line.attr('marker-end', 'url(' + url + '#arrowhead)')
264264
}

src/diagrams/sequenceDiagram/svgDraw.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export const drawLoop = function (elem, bounds, labelText, conf) {
150150
txt.x = bounds.startx
151151
txt.y = bounds.starty
152152
txt.labelMargin = 1.5 * 10 // This is the small box that says "loop"
153-
txt.class = 'labelText' // Its size & position are fixed.
153+
txt.class = 'labelText' // Its size & position are fixed.
154154

155155
drawLabel(g, txt)
156156

src/mermaid.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ const init = function () {
6464
nodes = nodes === undefined ? document.querySelectorAll('.mermaid')
6565
: typeof nodes === 'string' ? document.querySelectorAll(nodes)
6666
: nodes instanceof window.Node ? [nodes]
67-
: nodes // Last case - sequence config was passed pick next
67+
: nodes // Last case - sequence config was passed pick next
6868

6969
if (typeof global.mermaid_config !== 'undefined') {
7070
mermaidAPI.initialize(global.mermaid_config)

webpack.config.base.js

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ const lessRule = { // load less to string
3232

3333
export const jsConfig = () => {
3434
return {
35+
mode: 'development',
3536
target: 'web',
3637
entry: {
3738
mermaid: './src/mermaid.js'

webpack.config.prod.babel.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { jsConfig } from './webpack.config.base'
22

33
const minConfig = jsConfig()
4+
minConfig.mode = 'production'
45
minConfig.output.filename = '[name].min.js'
56

67
export default [minConfig]

0 commit comments

Comments
 (0)