Interactive interface for browsing global, full-resolution satellite imagery
Remove unused dev dependencies, move browserstack to legacy, wip organize tasks
ZachTRice8f00213e42e1
diff --git a/.eslintignore b/.eslintignoreindex b7dc74bca..9f2ac4026 100644--- a/.eslintignore+++ b/.eslintignore@@ -2,14 +2,15 @@build/*dist/*+e2e/reports/*etc/*+legacy/*lib/*options/*reports/*-web/ext/*-web/dist/*-web/build/*+tasks/temp/*test/*-/tasks/temp/*+web/build/*+web/dist/*+web/ext/*web/js/lib/*-e2e/reports/*diff --git a/e2e/browserstack.conf.js b/legacy/e2e/browserstack.conf.jssimilarity index 100%rename from e2e/browserstack.conf.jsrename to legacy/e2e/browserstack.conf.jsdiff --git a/e2e/browserstack.js b/legacy/e2e/browserstack.jssimilarity index 100%rename from e2e/browserstack.jsrename to legacy/e2e/browserstack.jsdiff --git a/e2e/environments.js b/legacy/e2e/environments.jssimilarity index 100%rename from e2e/environments.jsrename to legacy/e2e/environments.jsdiff --git a/package-lock.json b/package-lock.jsonindex 7a5dfadac..1cfc6238d 100644--- a/package-lock.json+++ b/package-lock.json@@ -34,7 +34,6 @@"lodash": "^4.17.21","moment": "^2.29.4","moment-locales-webpack-plugin": "^1.2.0",- "node-dir": "^0.1.17","ol": "7.2.2","ol-mapbox-style": "9.4.0","p-queue": "^7.3.0",@@ -85,13 +84,10 @@"autoprefixer": "^10.4.12","axios": "^1.2.1","babel-loader": "^8.1.0",- "browserstack-capabilities": "^0.7.0",- "browserstack-local": "^1.4.4","cheerio": "^1.0.0-rc.2","chromedriver": "^108.0.0","clean-webpack-plugin": "^4.0.0","cross-env": "^7.0.2",- "css-hot-loader": "^1.4.1","css-loader": "^3.5.2","css-minimizer-webpack-plugin": "^4.1.0","css-url-relative-plugin": "^1.1.0",@@ -99,17 +95,13 @@"eslint": "^7.5.0","eslint-config-airbnb": "^18.0.1","eslint-config-standard": "^14.1.0",- "eslint-import-resolver-node": "^0.3.3","eslint-import-resolver-webpack": "^0.12.1","eslint-plugin-import": "^2.22.1","eslint-plugin-jest": "^23.8.2","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": "^4.2.1","eslint-plugin-react": "^7.18.3",- "eslint-plugin-react-hooks": "^4.5.0","eslint-plugin-standard": "^4.0.1","express": "^4.18.1","fetch-mock": "^9.1.1",@@ -27416,8 +27408,7 @@}},"browserstack-capabilities": {- "version": "0.7.0",- "resolved": "https://registry.npmjs.org/browserstack-capabilities/-/browserstack-capabilities-0.7.0.tgz",+ "version": "https://registry.npmjs.org/browserstack-capabilities/-/browserstack-capabilities-0.7.0.tgz","integrity": "sha512-XnMn74P3h9wybp9yJLv5Y7wNHPmLmXpLaIO9zP4WPWPZrjSnXmcrvFktItRFFBhvzFzBHaJI4/0fIIMOnjaBzQ==","dev": true,"requires": {@@ -27426,8 +27417,7 @@}},"browserstack-local": {- "version": "1.4.9",- "resolved": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.9.tgz",+ "version": "https://registry.npmjs.org/browserstack-local/-/browserstack-local-1.4.9.tgz","integrity": "sha512-V+q8HQwRQFr9nd32xR66ZZ3VDWa3Kct4IMMudhKgcuD7cWrvvFARZOibx71II+Rf7P5nMQpWWxl9z/3p927nbg==","dev": true,"requires": {@@ -28456,8 +28446,7 @@"dev": true},"css-hot-loader": {- "version": "1.4.4",- "resolved": "https://registry.npmjs.org/css-hot-loader/-/css-hot-loader-1.4.4.tgz",+ "version": "https://registry.npmjs.org/css-hot-loader/-/css-hot-loader-1.4.4.tgz","integrity": "sha512-J/qXHz+r7FOT92qMIJfxUk0LC9fecQNZVr0MswQ4FOpKLyOCBjofVMfc6R268bh/5ktkTShrweMr0wWqerC92g==","dev": true,"requires": {diff --git a/package.json b/package.jsonindex f3b8782da..5e46e9bb7 100644--- a/package.json+++ b/package.json@@ -32,7 +32,6 @@},"scripts": {"analyze": "cross-env ANALYZE_MODE=true NODE_ENV=production webpack",- "browserstack": "node e2e/browserstack.js -c e2e/browserstack.conf.js -e browserstack ","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'",@@ -61,7 +60,7 @@"e2e:headless:firefox:localStorageDisabled": "npx nightwatch -e firefoxLocalStorageDisabled --tag localStorageDisabled","getcapabilities": "bash -c 'FETCH_GC=1 npm run build:options'","generatePreviews": "python3 tasks/python3/fetchPreviewSnapshots.py",- "linkcheck": "node ./tasks/linkcheck",+ "linkcheck": "node ./tasks/link-check","lint": "run-s lint:js lint:scss","lint:scss": "npx stylelint ./web/scss/**/*.scss","lint:js": "npx eslint . --quiet",@@ -99,13 +98,10 @@"autoprefixer": "^10.4.12","axios": "^1.2.1","babel-loader": "^8.1.0",- "browserstack-capabilities": "^0.7.0",- "browserstack-local": "^1.4.4","cheerio": "^1.0.0-rc.2","chromedriver": "^108.0.0","clean-webpack-plugin": "^4.0.0","cross-env": "^7.0.2",- "css-hot-loader": "^1.4.1","css-loader": "^3.5.2","css-minimizer-webpack-plugin": "^4.1.0","css-url-relative-plugin": "^1.1.0",@@ -113,17 +109,13 @@"eslint": "^7.5.0","eslint-config-airbnb": "^18.0.1","eslint-config-standard": "^14.1.0",- "eslint-import-resolver-node": "^0.3.3","eslint-import-resolver-webpack": "^0.12.1","eslint-plugin-import": "^2.22.1","eslint-plugin-jest": "^23.8.2","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": "^4.2.1","eslint-plugin-react": "^7.18.3",- "eslint-plugin-react-hooks": "^4.5.0","eslint-plugin-standard": "^4.0.1","express": "^4.18.1","fetch-mock": "^9.1.1",@@ -188,7 +180,6 @@"lodash": "^4.17.21","moment": "^2.29.4","moment-locales-webpack-plugin": "^1.2.0",- "node-dir": "^0.1.17","ol": "7.2.2","ol-mapbox-style": "9.4.0","p-queue": "^7.3.0",diff --git a/tasks/linkCheck.js b/tasks/link-check/index.jssimilarity index 89%rename from tasks/linkCheck.jsrename to tasks/link-check/index.jsindex d9c6c1608..2ccd1a1f2 100755--- a/tasks/linkCheck.js+++ b/tasks/link-check/index.js@@ -5,9 +5,9 @@// ./build/options metadata and EONET natural events// *************************************************************************const fs = require('fs')-const getUrlStatusCodeCollection = require('./link-check/url-check')-const getHtmlUrls = require('./link-check/html-url-extract.js')-const getNaturalEventsUrls = require('./link-check/natural-event-url-extract.js')+const getUrlStatusCodeCollection = require('./url-check')+const getHtmlUrls = require('./html-url-extract.js')+const getNaturalEventsUrls = require('./natural-event-url-extract.js')const makeLine = (msg) => console.log(`${'-'.repeat(66)}\x1b[36m${msg}\x1b[0m`)diff --git a/tasks/node/extractConfigFromWMTS.js b/tasks/node/extractConfigFromWMTS.jsindex 8de0c6ab1..f0497a283 100755--- a/tasks/node/extractConfigFromWMTS.js+++ b/tasks/node/extractConfigFromWMTS.js@@ -60,8 +60,19 @@ const entries = config['wv-options-wmts']async function main () {for (entry of entries) {+ // const { errorCount, warningCount, layerCount } = processEntry(entry)processEntry(entry)}++ console.warn(`+ ${prog}:+ ${totalErrorCount.length} errors,+ ${totalWarningCount.length} warnings,+ ${totalLayerCount.length} layers+ `)+ if (totalErrorCount > 0) {+ throw new Error(`${prog}: Error: ${totalErrorCount.length} errors occured`)+ }}async function processLayer (gcLayer, wvLayers, entry) {diff --git a/web/.eslintrc b/web/.eslintrcindex a61750b72..8f090109e 100644--- a/web/.eslintrc+++ b/web/.eslintrc@@ -2,7 +2,6 @@"root": true,"env": {"browser": true,- "node": true,"jest/globals": true},"parserOptions": {@@ -24,7 +23,6 @@"version": "detect"},"import/resolver": {- "node": {}, // Needed for node core modules (https://github.com/benmosher/eslint-plugin-import/issues/1396)"webpack": {}}},diff --git a/webpack.config.js b/webpack.config.jsindex e62e35535..f9f225b98 100644--- a/webpack.config.js+++ b/webpack.config.js@@ -44,7 +44,7 @@ const babelLoaderExcludes = [/fixtures\.js$/,/core-js/]-// Inlucde any modules that need to be transpiled by babel-loader+// Include any modules that need to be transpiled by babel-loaderconst transpileDependencies = ['react-visibility-sensor']