Module loaders

.eslintrc

@@ -5,7 +5,10 @@
   },
   "parserOptions": {
     "ecmaVersion": 6,
-    "sourceType": "script"
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "jsx": false
+    }
   },
   "extends": "standard",
   "rules": {
@@ -15,13 +18,6 @@
   "overrides": [
     {
       "files": [ "web/**/*.js", "test/**/*.js" ],
-      "parserOptions": {
-        "ecmaVersion": 5,
-        "sourceType": "script",
-        "ecmaFeatures": {
-          "jsx": false
-        }
-      },
       "rules": {
         "no-octal": "warn",
         "no-unused-vars": "warn",
@@ -56,15 +52,6 @@
         "standard/computed-property-even-spacing": "warn",
         "wrap-iife": "warn",
         "new-cap": "warn"
-      },
-      "globals": {
-        "wv": true,
-        "wvx": true,
-        "WVC": true,
-        "buster": true,
-        "jQuery": true,
-        "$": true,
-        "_": true
       }
     }
   ]

.gitignore

@@ -1,4 +1,5 @@
 /build
+/web/build
 /dist
 /node_modules
 /web/ext/node_modules/*

Gruntfile.js

@@ -18,9 +18,7 @@ var nodeModuleFiles = [
   'node_modules/gifshot/build/custom/gifshot.custom.js',
   'node_modules/gifshot/build/custom/gifshot.custom.min.js',
   'node_modules/promise-queue/lib/index.js',
-  'node_modules/openlayers/dist/ol-debug.js',
-  'node_modules/openlayers/dist/ol.css',
-  'node_modules/openlayers/dist/ol-debug.css',
+  'node_modules/ol/ol.css',
   'node_modules/font-awesome/css/font-awesome.min.css',
   'node_modules/font-awesome/fonts/*',
   'node_modules/isotope-layout/dist/*',
@@ -45,7 +43,7 @@ module.exports = function(grunt) {
 
   var hasOptionsDirectory = fs.existsSync('options');
   var optionsPath = hasOptionsDirectory ? 'options' : 'node_modules/worldview-options-eosdis';
-  var options = hasOptionsDirectory ? grunt.file.readJSON("options/package.json") : grunt.file.readJSON("node_modules/worldview-options-eosdis/package.json");
+  var options = hasOptionsDirectory ? grunt.file.readJSON('options/package.json') : grunt.file.readJSON('node_modules/worldview-options-eosdis/package.json');
 
   // Lists of JavaScript and CSS files to include and in the correct
   // order
@@ -611,27 +609,6 @@ module.exports = function(grunt) {
         files: nodeModuleFiles,
         tasks: ['update']
       }
-    },
-
-    uglify: {
-      // Minifiy the concatenated Worldview JavaScript file.
-      options: {
-        compress: {
-          // drop_console: true,
-          // drop_debugger: true,
-          unused: true
-        }
-      },
-      wv_js: {
-        files: {
-          'build/worldview/web/js/wv.js': ['build/worldview/web/js/wv.js']
-        }
-      },
-      ol_js: {
-        files: {
-          'build/worldview/web/js/ol.js': ['build/worldview/web/js/ol.js']
-        }
-      }
     }
   });
 
@@ -683,7 +660,6 @@ module.exports = function(grunt) {
     'remove:source',
     'exec:empty',
     'copy:release',
-    'uglify',
     'cssmin',
     'replace:links',
     'lineremover',