Fix problems on plugin build system

Author: willemarcel

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 Log of changes since the 1.1.0 version
 
+#### 1.9.0
+
+- Add option to load selected feature on OSM website (#224)
+- Fix problems on plugin build system (#225)
+
 #### 1.8.2
 
 - Add createBbox function to the named exports

lib/helpers.js

@@ -1,7 +1,7 @@
 import mapboxgl from 'mapbox-gl';
 import { featureCollection } from '@turf/helpers';
 import bbox from '@turf/bbox';
-import turfBboxPolygon from '@turf/bbox-polygon';
+import bboxPolygon from '@turf/bbox-polygon';
 
 export function getBounds(bbox) {
   var left = +bbox.left,
@@ -28,14 +28,9 @@ export function getBoundingBox(bounds) {
     padY = Math.max((top - bottom) / 5, 0.0001);
   }
 
-  var bboxPolygon = turfBboxPolygon([
-    left - padX,
-    bottom - padY,
-    right + padX,
-    top + padY
+  return featureCollection([
+    bboxPolygon([left - padX, bottom - padY, right + padX, top + padY])
   ]);
-
-  return featureCollection([bboxPolygon]);
 }
 
 export function getFeatureBBOX(features) {

lib/query.js

@@ -1,6 +1,5 @@
 import moment from 'moment';
 import { config } from './config';
-import React from 'react';
 export function query(changesetID) {
   var url = config.osmBase + 'changeset/' + changesetID;
   var options = {
@@ -43,44 +42,3 @@ export function query(changesetID) {
       };
     });
 }
-
-var x = (
-  <section className="cmap-filter-type-section">
-    <h6 className="cmap-heading">Filter by type</h6>
-    <ul className="cmap-hlist">
-      <li>
-        <label className="cmap-hlist-item cmap-noselect cmap-pointer">
-          <className
-            type="checkbox"
-            value="nodes"
-            checked="true"
-            id="cmap-type-selector-nodes"
-          />
-          <span className="cmap-label-text">Nodes</span>
-        </label>
-      </li>
-      <li>
-        <label className="cmap-hlist-item cmap-noselect cmap-pointer">
-          <className
-            type="checkbox"
-            value="ways"
-            checked="true"
-            id="cmap-type-selector-ways"
-          />
-          <span className="cmap-label-text">Ways</span>
-        </label>
-      </li>
-      <li>
-        <label className="cmap-hlist-item cmap-noselect cmap-pointer">
-          <className
-            type="checkbox"
-            value="relations"
-            checked="true"
-            id="cmap-type-selector-relations"
-          />
-          <span className="cmap-label-text">Relations</span>
-        </label>
-      </li>
-    </ul>
-  </section>
-);

lib/render.js

@@ -1,6 +1,6 @@
 import mapboxgl from 'mapbox-gl';
 import { EventEmitter as Events } from 'events';
-import { render as reactDOM } from 'react-dom';
+import ReactDom from 'react-dom';
 import React from 'react';
 
 import { getChangeset } from './getChangeset';
@@ -93,7 +93,7 @@ function renderHTML(container, changesetId, result, disableSidebar) {
     feature.properties.tagsCount = Object.keys(tags).length;
   });
 
-  reactDOM(
+  ReactDom.render(
     <div>
       <div className="cmap-map" />
 
@@ -102,7 +102,7 @@ function renderHTML(container, changesetId, result, disableSidebar) {
         <div className="cmap-diff-tags cmap-scroll-styled" />
         <div className="cmap-diff-members cmap-scroll-styled" />
       </div>
-      {!disableSidebar &&
+      {!disableSidebar && (
         <Sidebar
           result={result}
           changesetId={changesetId}
@@ -124,7 +124,8 @@ function renderHTML(container, changesetId, result, disableSidebar) {
               map.renderMap('mapbox://styles/mapbox/streets-v9', result);
             }
           }}
-        />}
+        />
+      )}
     </div>,
     info
   );

package.json

@@ -1,6 +1,6 @@
 {
   "name": "changeset-map",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "Provide visualization of changesets to OSMCha & to the OSM community",
   "main": "dist/bundle.js",
   "scripts": {
@@ -46,7 +46,7 @@
     "@rollup/plugin-node-resolve": "^9.0.0",
     "@rollup/plugin-replace": "^2.3.3",
     "eslint-config-mourner": "^2.0.1",
-    "eslint-plugin-react": "^7.0.0",
+    "eslint-plugin-react": "^7.22.0",
     "gh-pages": "^1.0.0",
     "http-server": "^0.12.3",
     "husky": "^0.13.3",
@@ -58,8 +58,7 @@
     "rollup": "^2.26.9",
     "rollup-plugin-eslint": "^3.0.0",
     "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.4.0",
-    "rollup-plugin-node-polyfills": "^0.2.1"
+    "rollup-plugin-node-globals": "^1.4.0"
   },
   "lint-staged": {
     "*.js": [

rollup.plugin.config.js

@@ -5,7 +5,7 @@ import { nodeResolve } from '@rollup/plugin-node-resolve';
 import globals from 'rollup-plugin-node-globals';
 import eslint from 'rollup-plugin-eslint';
 import json from '@rollup/plugin-json';
-import nodePolyfills from 'rollup-plugin-node-polyfills';
+import builtins from 'rollup-plugin-node-builtins';
 
 export default {
   input: 'lib/index.js',
@@ -21,10 +21,11 @@ export default {
     replace({
       'process.env.NODE_ENV': JSON.stringify('production')
     }),
-    nodePolyfills(),
+    builtins(),
     nodeResolve({
-      mainFields: ['browser', 'main'],
-      modulesOnly: true
+      jsnext: true,
+      main: true,
+      browser: true
     }),
     commonjs({
       include: ['node_modules/**'],
@@ -34,14 +35,15 @@ export default {
           'Children',
           'Component',
           'PropTypes',
-          'createElement',
-          'createBbox'
+          'createElement'
         ],
         'node_modules/react-dom/index.js': ['render']
       }
     }),
     json({ indent: '' }),
-    babel(),
+    babel({
+      exclude: 'node_modules/**'
+    }),
     globals()
   ]
 };

rollup.website.config.js

@@ -35,8 +35,7 @@ export default {
           'Children',
           'Component',
           'PropTypes',
-          'createElement',
-          'createBbox'
+          'createElement'
         ],
         'node_modules/react-dom/index.js': ['render']
       }