Commit 222487e5 authored by Andrew Hrdy's avatar Andrew Hrdy

Fixed issue with mapbox not being uglified properly

parent 04d81c83
Pipeline #2569 passed with stages
in 1 minute and 41 seconds
...@@ -13843,9 +13843,9 @@ ...@@ -13843,9 +13843,9 @@
} }
}, },
"uglifyjs-webpack-plugin": { "uglifyjs-webpack-plugin": {
"version": "1.2.5", "version": "1.2.6",
"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz", "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.6.tgz",
"integrity": "sha512-hIQJ1yxAPhEA2yW/i7Fr+SXZVMp+VEI3d42RTHBgQd2yhp/1UdBcR3QEWPV5ahBxlqQDMEMTuTEvDHSFINfwSw==", "integrity": "sha512-NDP94ahjW7ZH+qzdjxjIV04n5YGnrYD2jeHgKgnpUKmdAfcXEO5DbVo21fXAm/KPMyX9k21zWFBMYm9m9R2ptg==",
"dev": true, "dev": true,
"requires": { "requires": {
"cacache": "^10.0.4", "cacache": "^10.0.4",
...@@ -14833,6 +14833,12 @@ ...@@ -14833,6 +14833,12 @@
} }
} }
}, },
"commander": {
"version": "2.13.0",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
"integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
"dev": true
},
"expand-brackets": { "expand-brackets": {
"version": "2.1.4", "version": "2.1.4",
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
...@@ -15065,6 +15071,32 @@ ...@@ -15065,6 +15071,32 @@
"snapdragon": "^0.8.1", "snapdragon": "^0.8.1",
"to-regex": "^3.0.2" "to-regex": "^3.0.2"
} }
},
"uglify-es": {
"version": "3.3.9",
"resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
"integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
"dev": true,
"requires": {
"commander": "~2.13.0",
"source-map": "~0.6.1"
}
},
"uglifyjs-webpack-plugin": {
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.6.tgz",
"integrity": "sha512-NDP94ahjW7ZH+qzdjxjIV04n5YGnrYD2jeHgKgnpUKmdAfcXEO5DbVo21fXAm/KPMyX9k21zWFBMYm9m9R2ptg==",
"dev": true,
"requires": {
"cacache": "^10.0.4",
"find-cache-dir": "^1.0.0",
"schema-utils": "^0.4.5",
"serialize-javascript": "^1.4.0",
"source-map": "^0.6.1",
"uglify-es": "^3.3.4",
"webpack-sources": "^1.1.0",
"worker-farm": "^1.5.2"
}
} }
} }
}, },
......
...@@ -10,5 +10,6 @@ module.exports = { ...@@ -10,5 +10,6 @@ module.exports = {
appIndexJs: resolveApp('src/index.js'), appIndexJs: resolveApp('src/index.js'),
appBuild: resolveApp('build'), appBuild: resolveApp('build'),
appSrc: resolveApp('src'), appSrc: resolveApp('src'),
appOutputJs: 'static/js/bundle.js',
publicPath: '' publicPath: ''
}; };
\ No newline at end of file
...@@ -15,7 +15,7 @@ module.exports = { ...@@ -15,7 +15,7 @@ module.exports = {
], ],
output: { output: {
path: paths.appBuild, path: paths.appBuild,
filename: 'static/js/bundle.js', filename: paths.appOutputJs,
publicPath: paths.publicPath publicPath: paths.publicPath
}, },
resolve: { resolve: {
...@@ -36,7 +36,11 @@ module.exports = { ...@@ -36,7 +36,11 @@ module.exports = {
minimizer: [ minimizer: [
new UglifyJsPlugin({ new UglifyJsPlugin({
parallel: true, parallel: true,
sourceMap: true uglifyOptions: {
compress: {
typeofs: false // Causes issues with mapbox.
}
}
}), }),
new OptimizeCSSAssetsPlugin({}) new OptimizeCSSAssetsPlugin({})
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment