diff --git a/examples/custom-interactions/webpack.config.js b/examples/custom-interactions/webpack.config.js index efb2ec06..b58b5115 100644 --- a/examples/custom-interactions/webpack.config.js +++ b/examples/custom-interactions/webpack.config.js @@ -2,7 +2,7 @@ const {resolve} = require('path'); const webpack = require('webpack'); -module.exports = { +const config = { // Example entry point entry: { app: resolve('./app.js') @@ -54,6 +54,6 @@ module.exports = { ] }; -// DELETE THIS LINE WHEN COPYING THIS EXAMPLE FOLDER OUTSIDE OF DECK.GL -// It enables bundling against src in this repo rather than the installed version -module.exports = require('../webpack.config.local')(module.exports); +// Enables bundling against src in this repo rather than the installed version +module.exports = (env) => env && env.local ? + require('../webpack.config.local')(config)(env) : config; diff --git a/examples/main/webpack.config.js b/examples/main/webpack.config.js index 48917e9e..9d3e4540 100644 --- a/examples/main/webpack.config.js +++ b/examples/main/webpack.config.js @@ -2,7 +2,7 @@ const {resolve} = require('path'); const webpack = require('webpack'); -module.exports = { +const config = { // Example entry point entry: { app: resolve('./root.js') @@ -49,6 +49,6 @@ module.exports = { ] }; -// DELETE THIS LINE WHEN COPYING THIS EXAMPLE FOLDER OUTSIDE OF DECK.GL -// It enables bundling against src in this repo rather than the installed version -module.exports = require('../webpack.config.local')(module.exports); +// Enables bundling against src in this repo rather than the installed version +module.exports = (env) => env && env.local ? + require('../webpack.config.local')(config)(env) : config; diff --git a/package.json b/package.json index 1574ef6d..d18f5873 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "bowser": "^1.2.0", "hammerjs": "^2.0.8", "immutable": "*", - "mapbox-gl": "0.37.0", + "mapbox-gl": "0.38.0", "prop-types": "^15.5.7", "viewport-mercator-project": "^4.0.1" }, diff --git a/yarn.lock b/yarn.lock index ede2a076..d5e2a428 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2868,9 +2868,9 @@ mapbox-gl@0.26.0: webworkify "^1.4.0" whoots-js "^2.0.0" -mapbox-gl@0.37.0: - version "0.37.0" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.37.0.tgz#20103b0ae73a0e77fe9405439749318b87c04f10" +mapbox-gl@0.38.0: + version "0.38.0" + resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.38.0.tgz#64731bb55eabdaa520270815175fcf31e5a3cd80" dependencies: "@mapbox/gl-matrix" "^0.0.1" "@mapbox/shelf-pack" "^3.0.0"