From d12d998c33015bbfba737626f7e6dfa608155b4e Mon Sep 17 00:00:00 2001 From: Xintong Xia Date: Thu, 19 Sep 2019 15:30:40 -0700 Subject: [PATCH] Fix example and bump package in website (#891) --- examples/draw-polygon/src/app.js | 2 +- website/.eslintrc | 6 ++++++ website/package.json | 2 +- website/webpack/dev.js | 13 +++---------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/examples/draw-polygon/src/app.js b/examples/draw-polygon/src/app.js index d2316319..bc2bdab1 100644 --- a/examples/draw-polygon/src/app.js +++ b/examples/draw-polygon/src/app.js @@ -69,7 +69,7 @@ export default class App extends Component { _renderControlPanel = () => { const features = this._editorRef && this._editorRef.getFeatures(); let featureIndex = this.state.selectedFeatureIndex; - if (featureIndex === null) { + if (features && featureIndex === null) { featureIndex = features.length - 1; } const polygon = features && features.length ? features[featureIndex] : null; diff --git a/website/.eslintrc b/website/.eslintrc index 9dd093a5..6abb0a16 100644 --- a/website/.eslintrc +++ b/website/.eslintrc @@ -7,6 +7,12 @@ "eslint-config-uber-jsx", "eslint-config-uber-es2015" ], + "overrides": [{ + "files": ["webpack/*.js"], + "rules": { + "import/no-extraneous-dependencies": 0 + } + }], "rules": { "guard-for-in": 0, "camelcase": 0, diff --git a/website/package.json b/website/package.json index fe32f0fc..2d1947f7 100644 --- a/website/package.json +++ b/website/package.json @@ -29,7 +29,7 @@ "prop-types": "^15.5.8", "react": "^16.3.0", "react-dom": "^16.3.0", - "react-map-gl-draw": "^0.14.10", + "react-map-gl-draw": "^0.15.0", "react-redux": "^4.4.5", "react-router": "^3.2.0", "redux": "^3.6.0", diff --git a/website/webpack/dev.js b/website/webpack/dev.js index 155102a3..0eeef67d 100644 --- a/website/webpack/dev.js +++ b/website/webpack/dev.js @@ -4,24 +4,17 @@ const {resolve} = require('path'); const config = require('./config'); module.exports = Object.assign(config, { - mode: 'development', - entry: [ - 'webpack-hot-middleware/client', - './src/main' - ], + entry: ['webpack-hot-middleware/client', './src/main'], devServer: { port: 3000, progress: true, - contentBase: resolve(__dirname, '../src/static') + contentBase: [resolve(__dirname, '../src/static'), resolve(__dirname, '../../')] }, devtool: 'cheap-source-maps', - plugins: config.plugins.concat([ - new webpack.HotModuleReplacementPlugin() - ]) - + plugins: config.plugins.concat([new webpack.HotModuleReplacementPlugin()]) });