Remove require

web/client/actions/snapshot.js

@@ -5,7 +5,7 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-// const axios = require('axios');
+// import axios from 'axios';
 import {downloadCanvasDataURL} from '../utils/FileUtils';
 
 export const CHANGE_SNAPSHOT_STATE = 'CHANGE_SNAPSHOT_STATE';

web/client/api/searchText.js

@@ -9,6 +9,7 @@
 import { nominatimToGeoJson } from '../utils/GeoCodeUtils';
 import { generateTemplateString } from '../utils/TemplateUtils';
 import * as WFS from './WFS';
+import NominatimApi from "./Nominatim";
 
 const defaultFromTextToFilter = ({searchText, staticFilter, blacklist, item, queriableAttributes, predicate} ) => {
     // split into words and remove blacklisted words
@@ -36,8 +37,7 @@ let Services = {
     nominatim: (searchText, options = {
         returnFullData: false
     }) =>
-        require('./Nominatim').default
-            .geocode(searchText, options)
+        NominatimApi.geocode(searchText, options)
             .then( res => {return options.returnFullData ? res : nominatimToGeoJson(res.data); }),
     wfs: (searchText, {url, typeName, queriableAttributes = [], outputFormat = "application/json", predicate = "ILIKE", staticFilter = "", blacklist = [], item, fromTextToFilter = defaultFromTextToFilter, returnFullData = false, ...params }) => {
         const filter = fromTextToFilter({searchText, staticFilter, blacklist, item, queriableAttributes, predicate});

web/client/components/TOC/fragments/template/index.js

@@ -6,9 +6,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 /* eslint-disable */
-const Bootstrap = require('react-bootstrap');
-const Message = require('../../../I18N/Message').default;
-const React = require('react');
+import Bootstrap from 'react-bootstrap';
+import Message from '../../../I18N/Message';
+import React from 'react';
 
 const RenderTemplate = function(comp, props) {
     let model = props.model;

web/client/components/buttons/__tests__/ConfirmButton-test.jsx

@@ -10,6 +10,7 @@ import expect from 'expect';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import ConfirmButton from '../ConfirmButton';
+import ReactTestUtils from 'react-dom/test-utils';
 
 describe("test the ConfirmButton", () => {
     beforeEach((done) => {
@@ -34,7 +35,6 @@ describe("test the ConfirmButton", () => {
         expect(tb).toExist();
         const tbNode = ReactDOM.findDOMNode(tb);
         expect(tbNode).toExist();
-        const ReactTestUtils = require('react-dom/test-utils');
         ReactTestUtils.Simulate.click(tbNode);
         expect(tb).toExist();
         const txt = tbNode.textContent || tbNode.innerText;
@@ -49,7 +49,6 @@ describe("test the ConfirmButton", () => {
         expect(tb).toExist();
         const tbNode = ReactDOM.findDOMNode(tb);
         expect(tbNode).toExist();
-        const ReactTestUtils = require('react-dom/test-utils');
         ReactTestUtils.Simulate.click(tbNode);
         expect(tb).toExist();
         ReactTestUtils.Simulate.click(tbNode);
@@ -64,7 +63,6 @@ describe("test the ConfirmButton", () => {
         expect(tb).toExist();
         const tbNode = ReactDOM.findDOMNode(tb);
         expect(tbNode).toExist();
-        const ReactTestUtils = require('react-dom/test-utils');
         ReactTestUtils.Simulate.click(tbNode);
         ReactTestUtils.Simulate.focus(tbNode);
         ReactTestUtils.Simulate.blur(tbNode);
@@ -81,7 +79,6 @@ describe("test the ConfirmButton", () => {
         expect(tb).toExist();
         const tbNode = ReactDOM.findDOMNode(tb);
         expect(tbNode).toExist();
-        const ReactTestUtils = require('react-dom/test-utils');
         ReactTestUtils.Simulate.click(tbNode);
         ReactTestUtils.Simulate.click(tbNode);
         expect(tbNode.disabled).toBe(true);

web/client/components/catalog/CatalogServiceSelector.jsx

@@ -6,9 +6,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 import React from 'react';
+import ReactSelect from 'react-select';
 import { InputGroup, Glyphicon } from 'react-bootstrap';
 import localizedProps from '../misc/enhancers/localizedProps';
-const Select = localizedProps(['placeholder', 'clearValueText', 'noResultsText'])(require('react-select').default);
+const Select = localizedProps(['placeholder', 'clearValueText', 'noResultsText'])(ReactSelect);
 
 export default ({
     services,

web/client/components/data/template/jsx/Template.jsx

@@ -5,12 +5,12 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const React = require('react');
-const PropTypes = require('prop-types');
-const isEqual = require("lodash/isEqual");
-const {parseTemplate} = require('../../../../utils/TemplateUtils');
+import React from 'react';
+import PropTypes from 'prop-types';
+import isEqual from 'lodash/isEqual';
+import { parseTemplate } from '../../../../utils/TemplateUtils';
 
-class Template extends React.Component {
+export default class Template extends React.Component {
     static propTypes = {
         template: PropTypes.oneOfType([PropTypes.string, PropTypes.func]),
         model: PropTypes.object,
@@ -67,5 +67,3 @@ class Template extends React.Component {
         });
     };
 }
-
-module.exports = Template;

web/client/components/development/Debug.jsx

@@ -7,6 +7,7 @@
  */
 
 import React from 'react';
+import DevTools from './DevTools';
 
 import url from 'url';
 
@@ -15,7 +16,6 @@ const urlQuery = url.parse(window.location.href, true).query;
 class Debug extends React.Component {
     render() {
         if (urlQuery && urlQuery.debug && __DEVTOOLS__ && !window.__REDUX_DEVTOOLS_EXTENSION__) {
-            const DevTools = require('./DevTools').default;
             return (
                 <DevTools/>
             );

web/client/components/layout/enhancers/__tests__/gridLayout-test.js

@@ -5,11 +5,11 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-const React = require('react');
-const ReactDOM = require('react-dom');
-const {createSink} = require('recompose');
-const expect = require('expect');
-const {widthProvider, heightProvider} = require('../gridLayout');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { createSink } from 'recompose';
+import expect from "expect";
+import {widthProvider, heightProvider} from '../gridLayout';
 
 describe('gridLayout enhancers', () => {
     beforeEach((done) => {

web/client/components/manager/rulesmanager/ruleseditor/attributeselectors/index.js

@@ -1,14 +1,25 @@
+import Role from './Role';
+import User from './User';
+import Service from './Service';
+import Request from './Request';
+import Workspace from './Workspace';
+import Layer from './Layer';
+import Access from './Access';
+import Ip from './IpAddress';
+import Priority from './Priority';
+import ValidityPeriod from './ValidityPeriod';
+import GSInstance from './GSInstance';
+
 export default {
-    Role: require("./Role").default,
-    User: require("./User").default,
-    Service: require("./Service").default,
-    Request: require("./Request").default,
-    Workspace: require("./Workspace").default,
-    Layer: require("./Layer").default,
-    Access: require("./Access").default,
-    Ip: require("./IpAddress").default,
-    Priority: require("./Priority").default,
-    ValidityPeriod: require("./ValidityPeriod").default,
-    GSInstance: require("./GSInstance").default
+    Role,
+    User,
+    Service,
+    Request,
+    Workspace,
+    Layer,
+    Access,
+    Ip,
+    Priority,
+    ValidityPeriod,
+    GSInstance
 };
-

web/client/components/manager/rulesmanager/rulesgrid/filterRenderers/index.js

@@ -1,11 +1,21 @@
+import RolesFilter from './RolesFilter';
+import UsersFilter from './UsersFilter';
+import WorkspacesFilter from './WorkspacesFilter';
+import LayersFilter from './LayersFilter';
+import ServicesFilter from './ServicesFilter';
+import RequestsFilter from './RequestsFilter';
+import DateFilter from './DateFilter';
+import IPAddressFilter from './IPAddressFilter';
+import GSInstanceFilter from './GSInstanceFilter';
+
 export default {
-    RolesFilter: require('./RolesFilter').default,
-    UsersFilter: require('./UsersFilter').default,
-    WorkspacesFilter: require('./WorkspacesFilter').default,
-    LayersFilter: require('./LayersFilter').default,
-    ServicesFilter: require('./ServicesFilter').default,
-    RequestsFilter: require('./RequestsFilter').default,
-    DateFilter: require('./DateFilter').default,
-    IPAddressFilter: require('./IPAddressFilter').default,
-    GSInstanceFilter: require('./GSInstanceFilter').default
+    RolesFilter,
+    UsersFilter,
+    WorkspacesFilter,
+    LayersFilter,
+    ServicesFilter,
+    RequestsFilter,
+    DateFilter,
+    IPAddressFilter,
+    GSInstanceFilter
 };

web/client/components/map/leaflet/DrawSupport.jsx

@@ -31,7 +31,7 @@ L.Draw.Polygon.prototype._calculateFinishDistance = function(t) {
 import {isSimpleGeomType, getSimpleGeomType} from '../../../utils/MapUtils';
 import {boundsToOLExtent} from '../../../utils/leaflet/DrawSupportUtils';
 
-const {reproject, reprojectBbox, calculateCircleCoordinates, reprojectGeoJson} = require('../../../utils/CoordinatesUtils');
+import {reproject, reprojectBbox, calculateCircleCoordinates, reprojectGeoJson} from '../../../utils/CoordinatesUtils';
 
 const {pointToLayer} = require('../../../utils/leaflet/Vector');
 

web/client/components/map/leaflet/Feature.jsx

@@ -11,7 +11,7 @@ import React from 'react';
 import {isEqual, isArray, castArray} from 'lodash';
 import axios from 'axios';
 
-import {geometryToLayer} from '../../../utils/leaflet/Vector';
+import VectorUtils from '../../../utils/leaflet/Vector';
 import {createStylesAsync} from '../../../utils/VectorStyleUtils';
 
 class FeatureComponent extends React.Component {
@@ -85,7 +85,7 @@ class FeatureComponent extends React.Component {
     }
 
     addLayer(props, styles) {
-        const layer = geometryToLayer({
+        const layer = VectorUtils.geometryToLayer({
             type: props.type,
             geometry: props.geometry,
             properties: props.properties,

web/client/components/map/leaflet/Overview.jsx

@@ -1,10 +1,10 @@
 
-var PropTypes = require('prop-types');
-var React = require('react');
-var MiniMap = require('leaflet-minimap');
-var L = require('leaflet');
-var Layers = require('../../../utils/leaflet/Layers');
-require('./overview.css');
+import PropTypes from 'prop-types';
+import React from 'react';
+import MiniMap from 'leaflet-minimap';
+import L from 'leaflet';
+import Layers from '../../../utils/leaflet/Layers';
+import './overview.css';
 
 const defaultOpt = { // For all configuration options refer to https://github.com/Norkart/Leaflet-MiniMap
     position: 'bottomright',
@@ -20,7 +20,7 @@ const defaultOpt = { // For all configuration options refer to https://github.co
     minimized: true
 };
 
-class Overview extends React.Component {
+export default class Overview extends React.Component {
     static displayName = 'Overview';
 
     static propTypes = {
@@ -57,5 +57,3 @@ class Overview extends React.Component {
         return null;
     }
 }
-
-module.exports = Overview;

web/client/components/map/leaflet/ScaleBar.jsx

@@ -6,11 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-var PropTypes = require('prop-types');
-var React = require('react');
-var L = require('leaflet');
+import PropTypes from 'prop-types';
+import React from 'react';
+import L from 'leaflet';
 
-class ScaleBar extends React.Component {
+export default class ScaleBar extends React.Component {
     static propTypes = {
         map: PropTypes.object,
         position: PropTypes.oneOf(['topleft', 'topright', 'bottomleft', 'bottomright']),
@@ -58,5 +58,3 @@ class ScaleBar extends React.Component {
         return null;
     }
 }
-
-module.exports = ScaleBar;

web/client/components/map/leaflet/SingleClick.js

@@ -11,7 +11,7 @@
  *  Please change when upgrading as indicated in
  *  the github page above.
  */
-var L = require('leaflet');
+import L from 'leaflet';
 
 L.Evented.addInitHook(function() {
     this._singleClickTimeout = null;

web/client/components/map/leaflet/__tests__/Map-test.jsx

@@ -12,7 +12,7 @@ import LeafLetLayer from '../Layer.jsx';
 import LeafLetFeature from '../Feature.jsx';
 import expect from 'expect';
 import {isNumber} from 'lodash';
-const {
+import {
     clearHooks,
     getBbox,
     registerHook,
@@ -21,15 +21,15 @@ const {
     getHook,
     createRegisterHooks,
     ZOOM_TO_EXTENT_HOOK
-} = require('../../../../utils/MapUtils');
+} from '../../../../utils/MapUtils';
 
-require('leaflet-draw');
+import 'leaflet-draw';
 
-require('../../../../utils/leaflet/Layers');
-require('../plugins/OSMLayer');
+import '../../../../utils/leaflet/Layers';
+import '../plugins/OSMLayer';
 
 // required for elevation tests
-require('../plugins/WMSLayer');
+import '../plugins/WMSLayer';
 
 describe('LeafletMap', () => {
 

web/client/components/map/leaflet/__tests__/Overview-test.jsx

@@ -5,11 +5,11 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var React = require('react');
-var ReactDOM = require('react-dom');
-var L = require('leaflet');
-var Overview = require('../Overview');
-var expect = require('expect');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import L from 'leaflet';
+import Overview from '../Overview';
+import expect from 'expect';
 
 describe('leaflet Overview component', () => {
     let map;

web/client/components/map/leaflet/__tests__/ScaleBar-test.jsx

@@ -5,11 +5,11 @@
  * This source code is licensed under the BSD-style license found in the
  * LICENSE file in the root directory of this source tree.
  */
-var React = require('react');
-var ReactDOM = require('react-dom');
-var L = require('leaflet');
-var ScaleBar = require('../ScaleBar');
-var expect = require('expect');
+import React from 'react';
+import ReactDOM from 'react-dom';
+import L from 'leaflet';
+import ScaleBar from '../ScaleBar';
+import expect from 'expect';
 
 describe('leaflet ScaleBar component', () => {
     let map;

web/client/components/map/leaflet/plugins/ArcGISLayer.js

@@ -6,11 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { registerType } from '../../../../utils/leaflet/Layers';
+import Layers from '../../../../utils/leaflet/Layers';
 import * as LEsri from 'esri-leaflet';
 import { isImageServerUrl } from '../../../../utils/ArcGISUtils';
 
-registerType('arcgis', (options) => {
+Layers.registerType('arcgis', (options) => {
     // dynamicMapLayer and imageMapLayer work as a single tile request
     if (isImageServerUrl(options.url)) {
         return LEsri.imageMapLayer({

web/client/components/map/leaflet/plugins/Commons.js

@@ -9,7 +9,7 @@
 /**
  * Layer initializer for a tile source
  */
-var L = require('leaflet');
+import L from 'leaflet';
 
 module.exports =  L.TileLayer.extend({
     initialize: function(options) {