Update babel and rxjs

.babelrc

 {
   "presets": [
-    "env",
-    "react",
+    "@babel/preset-env",
+    "@babel/preset-react"
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
   ]
 }

package.json

@@ -7,7 +7,7 @@
     "dev": "concurrently \"npm run server\" \"npm run client\"",
     "build": "npm run build-client && npm run build-server",
     "client": "webpack-dev-server --config webpack.client.dev.js",
-    "server": "nodemon src/server/index.js --exec babel-node ",
+    "server": "nodemon src/server/index.js --exec babel-node",
     "build-client": "webpack --progress --config webpack.client.prod.js",
     "build-server": "babel --no-babelrc --presets=es2015 src/server --out-dir ./dist/server",
     "serve": "NODE_ENV=production node dist/server/index.js",
@@ -20,48 +20,47 @@
   "author": "Esko Ikkala",
   "license": "MIT",
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.3",
+    "@babel/cli": "^7.0.0",
+    "@babel/core": "^7.0.0",
+    "@babel/node": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/preset-react": "^7.0.0",
     "babel-eslint": "^8.2.6",
     "babel-jest": "^22.4.4",
-    "babel-loader": "^7.1.5",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
+    "babel-loader": "^8.0.4",
     "clean-webpack-plugin": "^0.1.19",
     "concurrently": "^3.6.1",
     "copy-webpack-plugin": "^4.5.2",
     "css-loader": "^0.28.11",
-    "enzyme": "^3.6.0",
-    "enzyme-adapter-react-16": "^1.5.0",
+    "enzyme": "^3.7.0",
+    "enzyme-adapter-react-16": "^1.6.0",
     "eslint": "^4.19.1",
     "eslint-plugin-import": "^2.14.0",
-    "eslint-plugin-jest": "^21.22.0",
-    "eslint-plugin-jsx-a11y": "^6.1.1",
+    "eslint-plugin-jest": "^21.24.1",
+    "eslint-plugin-jsx-a11y": "^6.1.2",
     "eslint-plugin-react": "^7.11.1",
     "eslint-watch": "^3.1.5",
     "file-loader": "^1.1.11",
     "html-webpack-plugin": "^3.0.7",
     "jest": "^22.4.4",
-    "jest-enzyme": "^6.0.4",
-    "react-test-renderer": "^16.5.1",
+    "jest-enzyme": "^6.1.2",
+    "react-test-renderer": "^16.5.2",
     "style-loader": "^0.20.3",
-    "webpack": "^4.19.0",
-    "webpack-cli": "^2.1.5",
-    "webpack-dev-server": "^3.1.8",
+    "webpack": "^4.20.2",
+    "webpack-cli": "^3.1.2",
+    "webpack-dev-server": "^3.1.9",
     "webpack-merge": "^4.1.4"
   },
   "dependencies": {
-    "@material-ui/core": "^3.1.0",
+    "@material-ui/core": "^3.2.0",
     "@material-ui/icons": "^3.0.1",
-    "@material-ui/lab": "^3.0.0-alpha.16",
+    "@material-ui/lab": "^3.0.0-alpha.19",
     "Leaflet.Control.Opacity": "git+https://github.com/SemanticComputing/Leaflet.Control.Opacity.git",
     "Leaflet.extra-markers": "git+https://github.com/SemanticComputing/Leaflet.ExtraMarkers.git",
     "autosuggest-highlight": "^3.1.1",
-    "babel-preset-stage-2": "^6.24.1",
     "bootstrap": "^4.1.3",
     "express": "^4.16.3",
-    "geographiclib": "^1.49.0",
     "google-maps": "^3.3.0",
     "immutable": "^3.8.2",
     "leaflet": "^1.3.4",
@@ -70,11 +69,10 @@
     "leaflet.smooth_marker_bouncing": "^1.2.0",
     "lodash": "^4.17.11",
     "node-fetch": "^2.2.0",
-    "react": "^16.5.1",
+    "react": "^16.5.2",
     "react-alert-template-basic": "^1.0.0",
-    "react-autosuggest": "^9.4.1",
     "react-csv": "^1.0.15",
-    "react-dom": "^16.5.1",
+    "react-dom": "^16.5.2",
     "react-google-maps": "^9.4.5",
     "react-redux": "^5.0.7",
     "react-redux-toastr": "^7.4.0",
@@ -87,6 +85,8 @@
     "redux-observable": "^0.18.0",
     "redux-responsive": "^4.3.8",
     "reselect": "^3.0.1",
+    "rxjs": "^6.3.3",
+    "rxjs-compat": "^6.3.3",
     "superagent": "^3.8.3",
     "victory": "^0.26.1"
   }

src/client/epics/index.js

-import 'rxjs';
-import _ from 'lodash';
-import { ajax } from 'rxjs/observable/dom/ajax';
-import { combineEpics } from 'redux-observable';
-import { Observable } from 'rxjs/Observable';
+
+import { ajax } from 'rxjs/ajax';
+import { mergeMap, map } from 'rxjs/operators';
+import { combineEpics, ofType } from 'redux-observable';
 import {
   updateManuscripts,
   updatePlaces,
   updateFacet,
-  updateGeoJSON,
+  //updateGeoJSON,
   FETCH_FACET,
-  FETCH_FACET_FAILED,
+  //FETCH_FACET_FAILED,
   FETCH_MANUSCRIPTS,
-  FETCH_MANUSCRIPTS_FAILED,
+  //FETCH_MANUSCRIPTS_FAILED,
   FETCH_PLACES,
-  FETCH_PLACES_FAILED,
-  GET_GEOJSON,
-  GET_GEOJSON_FAILED
+  //FETCH_PLACES_FAILED,
+  //GET_GEOJSON,
+  //GET_GEOJSON_FAILED
 } from '../actions';
 
 const hiplaApiUrl = (process.env.NODE_ENV === 'development')
   ? 'http://localhost:3001/'
   : 'http://193.166.25.181:3006/';
 
-const pickSelectedDatasets = (datasets) => {
-  let selected = [];
-  Object.keys(datasets).map(key => {
-    if (datasets[key].selected) {
-      selected.push(key);
-    }
-  });
-  return selected;
-};
-
-const getManuscripts = (action$) => {
-  const searchUrl = hiplaApiUrl + 'manuscripts';
-  return action$.ofType(FETCH_MANUSCRIPTS)
-    .switchMap(action => {
-      const requestUrl = `${searchUrl}?page=${action.page}`;
-      return ajax.getJSON(requestUrl)
-        .map(response => updateManuscripts({ manuscripts: response }))
-        .catch(error => Observable.of({
-          type: FETCH_MANUSCRIPTS_FAILED,
-          error: error,
-        }));
-    });
-};
+const getManuscripts = action$ => action$.pipe(
+  ofType(FETCH_MANUSCRIPTS),
+  mergeMap(action => {
+    const searchUrl = hiplaApiUrl + 'manuscripts';
+    const requestUrl = `${searchUrl}?page=${action.page}`;
+    return ajax.getJSON(requestUrl).pipe(
+      map(response => updateManuscripts({ manuscripts: response }))
+    );
+  })
+);
 
-const getPlaces = (action$, store) => {
-  const searchUrl = hiplaApiUrl + 'places';
-  return action$.ofType(FETCH_PLACES)
-    .switchMap(() => {
-      const { datasets } = store.getState().search;
-      const dsParams = _.map(pickSelectedDatasets(datasets), ds => `dataset=${ds}`).join('&');
-      const requestUrl = `${searchUrl}?${dsParams}`;
-      return ajax.getJSON(requestUrl)
-        .map(response => updatePlaces({ places: response }))
-        .catch(error => Observable.of({
-          type: FETCH_PLACES_FAILED,
-          error: error,
-        }));
-    });
-};
+const getPlaces = action$ => action$.pipe(
+  ofType(FETCH_PLACES),
+  mergeMap(() => {
+    const searchUrl = hiplaApiUrl + 'places';
+    const requestUrl = `${searchUrl}`;
+    return ajax.getJSON(requestUrl).pipe(
+      map(response => updatePlaces({ places: response }))
+    );
+  })
+);
 
-const getFacet = (action$) => {
-  const searchUrl = hiplaApiUrl + 'facet';
-  return action$.ofType(FETCH_FACET)
-    .switchMap((action) => {
-      const requestUrl = `${searchUrl}?property=${action.property}`;
-      return ajax.getJSON(requestUrl)
-        .map(response => updateFacet({ values: response }))
-        .catch(error => Observable.of({
-          type: FETCH_FACET_FAILED,
-          error: error,
-        }));
-    });
-};
+const getFacet = action$ => action$.pipe(
+  ofType(FETCH_FACET),
+  mergeMap((action) => {
+    const searchUrl = hiplaApiUrl + 'facet';
+    const requestUrl = `${searchUrl}?property=${action.property}`;
+    return ajax.getJSON(requestUrl).pipe(
+      map(response => updateFacet({ values: response }))
+    );
+  })
+);
 
-const getGeoJSONEpic = (action$) => {
-  const wfsUrl = hiplaApiUrl + 'wfs';
-  return action$.ofType(GET_GEOJSON)
-    .switchMap(action => {
-      let s = '';
-      action.layerIDs.map(layerID => {
-        s += `&layerID=${layerID}`;
-      });
-      const requestUrl = `${wfsUrl}?${s}`;
-      return ajax.getJSON(requestUrl)
-        // .map(response => {
-        //   console.log(response)
-        // })
-        .map(response => updateGeoJSON({ geoJSON: response }))
-        .catch(error => Observable.of({
-          type: GET_GEOJSON_FAILED,
-          error: error,
-        }));
-    });
-};
+// const getGeoJSONEpic = (action$) => {
+//   const wfsUrl = hiplaApiUrl + 'wfs';
+//   return action$.ofType(GET_GEOJSON)
+//     .switchMap(action => {
+//       let s = '';
+//       action.layerIDs.map(layerID => {
+//         s += `&layerID=${layerID}`;
+//       });
+//       const requestUrl = `${wfsUrl}?${s}`;
+//       return ajax.getJSON(requestUrl)
+//         // .map(response => {
+//         //   console.log(response)
+//         // })
+//         .map(response => updateGeoJSON({ geoJSON: response }))
+//         .catch(error => Observable.of({
+//           type: GET_GEOJSON_FAILED,
+//           error: error,
+//         }));
+//     });
+// };
 
 
 const rootEpic = combineEpics(
   getManuscripts,
   getPlaces,
   getFacet,
-  getGeoJSONEpic
+  // getGeoJSONEpic
 );
 
 export default rootEpic;

webpack.client.common.js

@@ -32,10 +32,7 @@ module.exports = {
       {
         test: /\.js$/,
         exclude: /node_modules/,
-        loader: 'babel-loader',
-        query: {
-          presets: ['es2015', 'react', 'stage-2']
-        },
+        use: ['babel-loader']
       },
       {
         test: /\.css$/,