diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js index 02a0836..837d781 100644 --- a/config/webpack.config.prod.js +++ b/config/webpack.config.prod.js @@ -258,7 +258,8 @@ module.exports = { }, filenameTransform: function(filename) { return `~${publicUrl}/${filename}`; - } + }, + suppressConflictError: true }), new webpack.ExtendedAPIPlugin() ], diff --git a/package.json b/package.json index ef0fb0f..ac39590 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "webpack": "1.14.0", "webpack-dev-server": "1.16.2", "webpack-manifest-plugin": "1.1.0", - "webpack-sentry-plugin": "^1.9.2", + "webpack-sentry-plugin": "^1.14.0", "webworkify": "^1.4.0", "whatwg-fetch": "2.0.2", "worker-loader": "^0.8.0" diff --git a/src/vega/CanPlot.js b/src/vega/CanPlot.js index 5c8e49e..6491da1 100644 --- a/src/vega/CanPlot.js +++ b/src/vega/CanPlot.js @@ -90,7 +90,7 @@ export default createClassFromSpec('CanPlot', { } ], "axes": [ - {"orient": "bottom", "scale": "xrelscale"}, + {"orient": "bottom", "scale": "xrelscale", labelOverlap: true}, {"orient": "left", "scale": "yscale"} ], "marks": [