archive-gh-me/react-map-gl
1
0
Fork 0
mirror of https://github.com/visgl/react-map-gl.git synced 2026-01-18 15:54:22 +00:00
Code Issues Projects Releases Wiki Activity

Update to mapbox-gl-js v0.38.0 & fix examples (#285)

Browse Source
This commit is contained in:
Anh Mai 2017-06-23 00:59:32 -07:00 committed by GitHub
parent 6c72167769
commit ea22992e1d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
examples/custom-interactions/webpack.config.js
View File

@ -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;

8
examples/main/webpack.config.js
View File

@ -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;

2
package.json
View File

@ -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"
},

6
yarn.lock
View File

@ -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"