Organize tools/tasks, remove unused deps, wip update all deps

.gitignore

@@ -18,7 +18,6 @@ python
 .pydevproject
 .DS_Store
 bitly.json
-tools
 *~
 *.swp
 options

package.json

@@ -35,13 +35,13 @@
  "build": "run-s clean getcapabilities build:config build:dev",
  "build:ci": "run-s getcapabilities build:config build:prod",
  "build:options": "bash -c 'tasks/buildOptions.sh'",
- "build:config": "run-s build:options && node ./tasks/config.js",
+ "build:config": "run-s build:options && node ./tasks/util/config.js",
  "build:dev": "cross-env NODE_ENV=development webpack",
  "build:prod": "cross-env NODE_ENV=production webpack",
- "clean": "node ./tasks/clean.js",
+ "clean": "node ./tasks/util/clean.js",
  "dist": "run-s clean getcapabilities build:config build:prod && node ./tasks/dist.js",
  "dist:dev": "run-s clean getcapabilities build:config build:dev && node ./tasks/dist.js",
- "distclean": "npm run clean && node ./tasks/distclean.js",
+ "distclean": "npm run clean && node ./tasks/util/distclean.js",
  "docker:ci": "npm run docker:restart && docker exec -it worldview /bin/bash /build/e2e/docker-ci.sh ; npm run docker:stop",
  "docker:image": "docker build -t worldview .",
  "docker:reimage": "docker rmi -f worldview && docker build --no-cache -t worldview .",
@@ -64,12 +64,12 @@
  "lint": "run-s lint:js lint:scss",
  "lint:scss": "npx stylelint ./web/scss/**/*.scss",
  "lint:js": "npx eslint . --quiet",
- "preinstall": "node tasks/checkNodeVersion.js",
+ "preinstall": "node tasks/util/checkNodeVersion.js",
  "postinstall": "patch-package && npm run python",
  "python": "run-script-os",
  "python:darwin:linux": "bash -c 'tasks/pythonInstall.sh linux'",
  "python:win32": "bash -c 'tasks/pythonInstall.sh'",
- "start": "node ./tasks/start.js",
+ "start": "node ./tasks/util/start.js",
  "test": "run-script-os",
  "test:coverage": "run-script-os",
  "test:coverage:default": "run-s test:unit:coverage test:unit:tz:coverage lint",
@@ -84,21 +84,21 @@
  "watch": "cross-env NODE_ENV=development webpack serve",
  "watch:debug:logger": "cross-env DEBUG=logger NODE_ENV=development webpack serve",
  "watch:debug:devtools": "cross-env DEBUG=devtools NODE_ENV=development webpack serve",
- "upload": "node tasks/upload.js"
+ "upload": "node tasks/util/upload.js"
  },
  "devDependencies": {
- "@babel/core": "^7.10.2",
- "@babel/eslint-parser": "^7.17.0",
- "@babel/plugin-proposal-class-properties": "^7.10.1",
- "@babel/preset-env": "^7.10.2",
- "@babel/preset-react": "^7.10.1",
- "@pmmmwh/react-refresh-webpack-plugin": "^0.5.7",
- "@webpack-cli/serve": "^1.7.0",
+ "@babel/core": "^7.20.5",
+ "@babel/eslint-parser": "^7.19.1",
+ "@babel/plugin-proposal-class-properties": "^7.18.6",
+ "@babel/preset-env": "^7.20.2",
+ "@babel/preset-react": "^7.18.6",
+ "@pmmmwh/react-refresh-webpack-plugin": "^0.5.10",
+ "@webpack-cli/serve": "^2.0.1",
  "ajv": "^8.11.2",
- "autoprefixer": "^10.4.12",
+ "autoprefixer": "^10.4.13",
  "axios": "^1.2.1",
- "babel-loader": "^8.1.0",
- "cheerio": "^1.0.0-rc.2",
+ "babel-loader": "^9.1.0",
+ "cheerio": "^1.0.0-rc.12",
  "chromedriver": "^108.0.0",
  "clean-webpack-plugin": "^4.0.0",
  "cross-env": "^7.0.2",
@@ -115,6 +115,8 @@
  "eslint-plugin-jsx-a11y": "^6.2.3",
  "eslint-plugin-n": "^15.6.0",
  "eslint-plugin-no-storage": "^1.0.2",
+ "eslint-plugin-node": "^11.1.0",
+ "eslint-plugin-promise": "^6.1.1",
  "eslint-plugin-react": "^7.18.3",
  "eslint-plugin-standard": "^4.0.1",
  "express": "^4.18.1",
@@ -149,7 +151,7 @@
  "terser-webpack-plugin": "^5.3.6",
  "webpack": "^5.74.0",
  "webpack-bundle-analyzer": "^4.6.1",
- "webpack-cli": "^4.10.0",
+ "webpack-cli": "^5.0.1",
  "webpack-dev-middleware": "^5.3.3",
  "webpack-dev-server": "^4.11.1",
  "xml-js": "^1.6.11",
@@ -184,7 +186,6 @@
  "ol-mapbox-style": "9.4.0",
  "p-queue": "^7.3.0",
  "proj4": "2.6.1",
- "promise-queue": "2.2.5",
  "prop-types": "^15.7.2",
  "rc-slider": "9.2.2",
  "react": "^16.14.0",
@@ -212,6 +213,7 @@
  "regenerator-runtime": "^0.13.3",
  "reselect": "^4.0.0",
  "rgbcolor": "^0.0.4",
+ "simplebar": "^5.3.9",
  "simplebar-react": "^2.1.0",
  "stackblur": "^1.0.0",
  "supercluster": "7.0.0",

tasks/README.md

@@ -0,0 +1,11 @@
+# tasks
+
+A collection of tasks used in ci/cd and to build worldview locally.
+
+## bamboo
+
+## link-check
+
+## build
+
+## util

tasks/bamboo/buildAll.sh

@@ -12,9 +12,9 @@ node node_modules/.bin/patch-package --allow-root
 
 # Replacement of npm run dist
 # Needed for bamboo to avoid permission errors with npm
-node $BASE/tasks/clean.js
+node $BASE/tasks/util/clean.js
 FETCH_GC=1 $BASE/tasks/buildOptions.sh
 $BASE/tasks/buildOptions.sh
-node $BASE/tasks/config.js
+node $BASE/tasks/util/config.js
 NODE_ENV=production npx webpack
-node $BASE/tasks/dist.js
+node $BASE/tasks/util/dist.js

tasks/bamboo/linkReport.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# TODO: this is a placeholder for the link-check ci/cd plan (to be built) that
+# will run once a month
+npm ci --production=false --ignore-scripts
+node $BASE/tasks/link-check/index.js

tasks/checkNodeVersion.js → tasks/util/checkNodeVersion.js

@@ -1,4 +1,4 @@
-const pkg = require('../package.json')
+const pkg = require('../../package.json')
 
 // modified versionCompare function from https://stackoverflow.com/a/6832721
 const versionCompare = (v1, v2) => {

tasks/dist.js → tasks/util/dist.js

@@ -2,7 +2,7 @@ const fs = require('fs')
 const moment = require('moment')
 const shell = require('shelljs')
 const tar = require('tar')
-const pkg = require('../package.json')
+const pkg = require('../../package.json')
 
 console.log('Preparing distribution')
 shell.rm('-rf', 'build/worldview')

tools/README.md

@@ -0,0 +1,17 @@
+# tools
+
+A collection of "run-once" scripts.
+
+## csv2colormap
+
+## generateColormapUnitDictionary
+
+## generateLayergroup
+
+## generatePreviewImage
+
+## migrateConfigs
+
+## removeProps
+
+## renameProps

tasks/removeProps.js → tools/removeProps.js

@@ -28,7 +28,7 @@ function processConfig (filePath) {
  const layerId = Object.keys(layerJson.layers)[0]
  removeKeys.forEach((key) => {
  const entry = layerJson.layers[layerId]
- // Leav ID prop on WMS entries
+ // Leave ID prop on WMS entries
  if (entry.type === 'wms' && key === 'id') return
  delete layerJson.layers[layerId][key]
  })

web/js/app.js

@@ -36,11 +36,11 @@ import keyPress from './modules/key-press/actions';
 import setScreenInfo from './modules/screen-size/actions';
 
 // Dependency CSS
-import '../../node_modules/bootstrap/dist/css/bootstrap.min.css';
-import '../../node_modules/ol/ol.css';
-import '../../node_modules/rc-slider/dist/rc-slider.min.css';
-import '../../node_modules/simplebar/dist/simplebar.min.css';
-import '../../node_modules/react-swipe-to-delete-component/dist/swipe-to-delete.css';
+import 'bootstrap/dist/css/bootstrap.min.css';
+import 'ol/ol.css';
+import 'rc-slider/dist/rc-slider.min.css';
+import 'simplebar/dist/simplebar.min.css';
+import 'react-swipe-to-delete-component/dist/swipe-to-delete.css';
 import 'react-image-crop/dist/ReactCrop.css';
 import 'react-resizable/css/styles.css';
 // App CSS