This is the result of `make npm-update`. I also fixed a minor linting issue which came up with the eslint 6.7 update.tags/v1.11.0-rc1
@@ -5,25 +5,25 @@ | |||
"node": ">=10" | |||
}, | |||
"devDependencies": { | |||
"@babel/core": "7.7.2", | |||
"@babel/plugin-transform-runtime": "7.6.2", | |||
"@babel/preset-env": "7.7.1", | |||
"@babel/runtime": "7.7.2", | |||
"autoprefixer": "9.7.1", | |||
"@babel/core": "7.7.4", | |||
"@babel/plugin-transform-runtime": "7.7.4", | |||
"@babel/preset-env": "7.7.4", | |||
"@babel/runtime": "7.7.4", | |||
"autoprefixer": "9.7.3", | |||
"babel-loader": "8.0.6", | |||
"core-js": "3.4.1", | |||
"css-loader": "3.2.0", | |||
"core-js": "3.4.7", | |||
"css-loader": "3.2.1", | |||
"cssnano": "4.1.10", | |||
"eslint": "6.6.0", | |||
"eslint": "6.7.2", | |||
"eslint-config-airbnb-base": "14.0.0", | |||
"eslint-plugin-import": "2.18.2", | |||
"less": "3.10.3", | |||
"postcss-cli": "6.1.3", | |||
"style-loader": "1.0.0", | |||
"stylelint": "11.1.1", | |||
"style-loader": "1.0.1", | |||
"stylelint": "12.0.0", | |||
"stylelint-config-standard": "19.0.0", | |||
"terser-webpack-plugin": "2.2.1", | |||
"updates": "9.0.1", | |||
"updates": "9.3.0", | |||
"webpack": "4.41.2", | |||
"webpack-cli": "3.3.10" | |||
}, |
@@ -250,16 +250,14 @@ export default function gitGraph(canvas, rawGraphList, config) { | |||
} | |||
} | |||
/* eslint-disable-next-line */ | |||
if (condensePrevLength < condenseCurrentLength | |||
&& ((nodePos = findColomn('*', currentRow)) !== -1 | |||
&& ((nodePos = findColomn('*', currentRow)) !== -1 // eslint-disable-line no-cond-assign | |||
&& (findColomn('_', currentRow) === -1))) { | |||
flows.splice(nodePos - 1, 0, genNewFlow()); | |||
} | |||
/* eslint-disable-next-line */ | |||
if (prevRowLength > currentRow.length | |||
&& (nodePos = findColomn('*', prevRow)) !== -1) { | |||
&& (nodePos = findColomn('*', prevRow)) !== -1) { // eslint-disable-line no-cond-assign | |||
if (findColomn('_', currentRow) === -1 | |||
&& findColomn('/', currentRow) === -1 | |||
&& findColomn('\\', currentRow) === -1) { |