Interactive interface for browsing global, full-resolution satellite imagery
wip
ZachTRicebd6f8f4eb641
diff --git a/.eslintignore b/.eslintignoreindex d35236e4c..82ac99721 100644--- a/.eslintignore+++ b/.eslintignore@@ -12,4 +12,5 @@ web/build/*test/*/tasks/temp/*web/js/lib/*-e2e/reports/*\ No newline at end of file+e2e/reports/*+# tasks/build/*diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.ymlindex 736b14976..2d48f5748 100644--- a/.github/workflows/ci-cd.yml+++ b/.github/workflows/ci-cd.yml@@ -12,7 +12,7 @@ jobs:fail-fast: falsematrix:os: [macOS-latest, ubuntu-latest, windows-latest]- node: [16]+ node: [18]steps:- name: Checkout the codediff --git a/.nvmrc b/.nvmrcnew file mode 100644index 000000000..94f5f26dc--- /dev/null+++ b/.nvmrc@@ -0,0 +1 @@+16.18.0diff --git a/tasks/buildAll.sh b/legacy/tasks/buildAll.shsimilarity index 100%rename from tasks/buildAll.shrename to legacy/tasks/buildAll.shdiff --git a/tasks/python3/util.py b/legacy/tasks/python3/util.pysimilarity index 100%rename from tasks/python3/util.pyrename to legacy/tasks/python3/util.pydiff --git a/package-lock.json b/package-lock.jsonindex 409011089..20c87478f 100644--- a/package-lock.json+++ b/package-lock.json@@ -120,7 +120,7 @@"node-dir": "^0.1.17","node-fetch": "^2.6.7","node-ssh": "^13.0.0",- "npm-run-all": "^4.1.1",+ "npm-run-all": "^4.1.5","patch-package": "^6.4.7","postcss": "^8.4.16","postcss-loader": "^7.0.1",@@ -143,10 +143,10 @@"webpack-cli": "^4.10.0","webpack-dev-middleware": "^5.3.3","webpack-dev-server": "^4.11.1",- "yargs": "^15.3.0"+ "yargs": "^17.6.2"},"engines": {- "node": "16.18.0"+ "node": ">= 16.18.0"}},"node_modules/@ampproject/remapping": {@@ -3968,35 +3968,6 @@"string-width": "^4.1.0"}},- "node_modules/ansi-align/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/ansi-align/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/ansi-align/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/ansi-colors": {"version": "4.1.1","resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",@@ -5087,12 +5058,6 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},- "node_modules/boxen/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"node_modules/boxen/node_modules/has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",@@ -5102,29 +5067,6 @@"node": ">=8"}},- "node_modules/boxen/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/boxen/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/boxen/node_modules/supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -5149,23 +5091,6 @@"url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/boxen/node_modules/wrap-ansi": {- "version": "7.0.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",- "dev": true,- "dependencies": {- "ansi-styles": "^4.0.0",- "string-width": "^4.1.0",- "strip-ansi": "^6.0.0"- },- "engines": {- "node": ">=10"- },- "funding": {- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"- }- },"node_modules/brace-expansion": {"version": "1.1.11","resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",@@ -6014,43 +5939,17 @@}},"node_modules/cliui": {- "version": "6.0.0",- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==","dev": true,"dependencies": {"string-width": "^4.2.0",- "strip-ansi": "^6.0.0",- "wrap-ansi": "^6.2.0"- }- },- "node_modules/cliui/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/cliui/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/cliui/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"+ "strip-ansi": "^6.0.1",+ "wrap-ansi": "^7.0.0"},"engines": {- "node": ">=8"+ "node": ">=12"}},"node_modules/clone": {@@ -11327,6 +11226,15 @@"node": ">=0.10.0"}},+ "node_modules/is-fullwidth-code-point": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",+ "dev": true,+ "engines": {+ "node": ">=8"+ }+ },"node_modules/is-generator-fn": {"version": "2.1.0","resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",@@ -11916,6 +11824,17 @@"url": "https://github.com/chalk/chalk?sponsor=1"}},+ "node_modules/jest-cli/node_modules/cliui": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "dev": true,+ "dependencies": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.0",+ "wrap-ansi": "^6.2.0"+ }+ },"node_modules/jest-cli/node_modules/color-convert": {"version": "2.0.1","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",@@ -11934,6 +11853,19 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},+ "node_modules/jest-cli/node_modules/find-up": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",+ "dev": true,+ "dependencies": {+ "locate-path": "^5.0.0",+ "path-exists": "^4.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/jest-cli/node_modules/has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",@@ -11943,6 +11875,45 @@"node": ">=8"}},+ "node_modules/jest-cli/node_modules/locate-path": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",+ "dev": true,+ "dependencies": {+ "p-locate": "^4.1.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-cli/node_modules/p-limit": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",+ "dev": true,+ "dependencies": {+ "p-try": "^2.0.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/jest-cli/node_modules/p-locate": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",+ "dev": true,+ "dependencies": {+ "p-limit": "^2.2.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/jest-cli/node_modules/supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -11955,6 +11926,55 @@"node": ">=8"}},+ "node_modules/jest-cli/node_modules/wrap-ansi": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "dev": true,+ "dependencies": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-cli/node_modules/yargs": {+ "version": "15.4.1",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "dev": true,+ "dependencies": {+ "cliui": "^6.0.0",+ "decamelize": "^1.2.0",+ "find-up": "^4.1.0",+ "get-caller-file": "^2.0.1",+ "require-directory": "^2.1.1",+ "require-main-filename": "^2.0.0",+ "set-blocking": "^2.0.0",+ "string-width": "^4.2.0",+ "which-module": "^2.0.0",+ "y18n": "^4.0.0",+ "yargs-parser": "^18.1.2"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-cli/node_modules/yargs-parser": {+ "version": "18.1.3",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",+ "dev": true,+ "dependencies": {+ "camelcase": "^5.0.0",+ "decamelize": "^1.2.0"+ },+ "engines": {+ "node": ">=6"+ }+ },"node_modules/jest-config": {"version": "26.6.3","resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",@@ -12918,6 +12938,17 @@"url": "https://github.com/chalk/chalk?sponsor=1"}},+ "node_modules/jest-runtime/node_modules/cliui": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "dev": true,+ "dependencies": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.0",+ "wrap-ansi": "^6.2.0"+ }+ },"node_modules/jest-runtime/node_modules/color-convert": {"version": "2.0.1","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",@@ -12936,6 +12967,19 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},+ "node_modules/jest-runtime/node_modules/find-up": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",+ "dev": true,+ "dependencies": {+ "locate-path": "^5.0.0",+ "path-exists": "^4.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/jest-runtime/node_modules/has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",@@ -12945,6 +12989,45 @@"node": ">=8"}},+ "node_modules/jest-runtime/node_modules/locate-path": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",+ "dev": true,+ "dependencies": {+ "p-locate": "^4.1.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-runtime/node_modules/p-limit": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",+ "dev": true,+ "dependencies": {+ "p-try": "^2.0.0"+ },+ "engines": {+ "node": ">=6"+ },+ "funding": {+ "url": "https://github.com/sponsors/sindresorhus"+ }+ },+ "node_modules/jest-runtime/node_modules/p-locate": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",+ "dev": true,+ "dependencies": {+ "p-limit": "^2.2.0"+ },+ "engines": {+ "node": ">=8"+ }+ },"node_modules/jest-runtime/node_modules/supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -12957,6 +13040,55 @@"node": ">=8"}},+ "node_modules/jest-runtime/node_modules/wrap-ansi": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "dev": true,+ "dependencies": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-runtime/node_modules/yargs": {+ "version": "15.4.1",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "dev": true,+ "dependencies": {+ "cliui": "^6.0.0",+ "decamelize": "^1.2.0",+ "find-up": "^4.1.0",+ "get-caller-file": "^2.0.1",+ "require-directory": "^2.1.1",+ "require-main-filename": "^2.0.0",+ "set-blocking": "^2.0.0",+ "string-width": "^4.2.0",+ "which-module": "^2.0.0",+ "y18n": "^4.0.0",+ "yargs-parser": "^18.1.2"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/jest-runtime/node_modules/yargs-parser": {+ "version": "18.1.3",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",+ "dev": true,+ "dependencies": {+ "camelcase": "^5.0.0",+ "decamelize": "^1.2.0"+ },+ "engines": {+ "node": ">=6"+ }+ },"node_modules/jest-serializer": {"version": "26.6.2","resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",@@ -14653,21 +14785,6 @@"url": "https://opencollective.com/mochajs"}},- "node_modules/mocha/node_modules/ansi-styles": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",- "dev": true,- "dependencies": {- "color-convert": "^2.0.1"- },- "engines": {- "node": ">=8"- },- "funding": {- "url": "https://github.com/chalk/ansi-styles?sponsor=1"- }- },"node_modules/mocha/node_modules/argparse": {"version": "2.0.1","resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",@@ -14685,24 +14802,6 @@"wrap-ansi": "^7.0.0"}},- "node_modules/mocha/node_modules/color-convert": {- "version": "2.0.1",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",- "dev": true,- "dependencies": {- "color-name": "~1.1.4"- },- "engines": {- "node": ">=7.0.0"- }- },- "node_modules/mocha/node_modules/color-name": {- "version": "1.1.4",- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",- "dev": true- },"node_modules/mocha/node_modules/debug": {"version": "4.3.3","resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",@@ -14726,12 +14825,6 @@"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==","dev": true},- "node_modules/mocha/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"node_modules/mocha/node_modules/escape-string-regexp": {"version": "4.0.0","resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",@@ -14785,15 +14878,6 @@"node": ">=8"}},- "node_modules/mocha/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },"node_modules/mocha/node_modules/js-yaml": {"version": "4.1.0","resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",@@ -14836,20 +14920,6 @@"node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"}},- "node_modules/mocha/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/mocha/node_modules/supports-color": {"version": "8.1.1","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",@@ -14865,23 +14935,6 @@"url": "https://github.com/chalk/supports-color?sponsor=1"}},- "node_modules/mocha/node_modules/wrap-ansi": {- "version": "7.0.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",- "dev": true,- "dependencies": {- "ansi-styles": "^4.0.0",- "string-width": "^4.1.0",- "strip-ansi": "^6.0.0"- },- "engines": {- "node": ">=10"- },- "funding": {- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"- }- },"node_modules/mocha/node_modules/y18n": {"version": "5.0.8","resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",@@ -20059,15 +20112,6 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},- "node_modules/slice-ansi/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },"node_modules/snapdragon": {"version": "0.8.2","resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",@@ -20749,6 +20793,26 @@"node": ">=10"}},+ "node_modules/string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "dev": true,+ "dependencies": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ },+ "engines": {+ "node": ">=8"+ }+ },+ "node_modules/string-width/node_modules/emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "dev": true+ },"node_modules/string.prototype.matchall": {"version": "4.0.7","resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",@@ -21045,12 +21109,6 @@"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==","dev": true},- "node_modules/stylelint/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"node_modules/stylelint/node_modules/get-stdin": {"version": "8.0.0","resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",@@ -21072,15 +21130,6 @@"node": ">= 4"}},- "node_modules/stylelint/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },"node_modules/stylelint/node_modules/resolve-from": {"version": "5.0.0","resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",@@ -21090,20 +21139,6 @@"node": ">=8"}},- "node_modules/stylelint/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/stylelint/node_modules/write-file-atomic": {"version": "4.0.1","resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",@@ -21281,41 +21316,12 @@"url": "https://github.com/sponsors/epoberezkin"}},- "node_modules/table/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/table/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },"node_modules/table/node_modules/json-schema-traverse": {"version": "1.0.0","resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz","integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==","dev": true},- "node_modules/table/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/tapable": {"version": "0.1.10","resolved": "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz",@@ -23052,35 +23058,6 @@"node": ">=8"}},- "node_modules/widest-line/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/widest-line/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/widest-line/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/wildcard": {"version": "2.0.0","resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",@@ -23108,9 +23085,9 @@"dev": true},"node_modules/wrap-ansi": {- "version": "6.2.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==","dev": true,"dependencies": {"ansi-styles": "^4.0.0",@@ -23118,7 +23095,10 @@"strip-ansi": "^6.0.0"},"engines": {- "node": ">=8"+ "node": ">=10"+ },+ "funding": {+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"}},"node_modules/wrap-ansi/node_modules/ansi-styles": {@@ -23154,35 +23134,6 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},- "node_modules/wrap-ansi/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/wrap-ansi/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/wrap-ansi/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },- "engines": {- "node": ">=8"- }- },"node_modules/wrappy": {"version": "1.0.2","resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",@@ -23269,25 +23220,21 @@}},"node_modules/yargs": {- "version": "15.4.1",- "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",- "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "version": "17.6.2",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==","dev": true,"dependencies": {- "cliui": "^6.0.0",- "decamelize": "^1.2.0",- "find-up": "^4.1.0",- "get-caller-file": "^2.0.1",+ "cliui": "^8.0.1",+ "escalade": "^3.1.1",+ "get-caller-file": "^2.0.5","require-directory": "^2.1.1",- "require-main-filename": "^2.0.0",- "set-blocking": "^2.0.0",- "string-width": "^4.2.0",- "which-module": "^2.0.0",- "y18n": "^4.0.0",- "yargs-parser": "^18.1.2"+ "string-width": "^4.2.3",+ "y18n": "^5.0.5",+ "yargs-parser": "^21.1.1"},"engines": {- "node": ">=8"+ "node": ">=12"}},"node_modules/yargs-parser": {@@ -23347,98 +23294,22 @@"node": ">=8"}},- "node_modules/yargs/node_modules/emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "node_modules/yargs/node_modules/find-up": {- "version": "4.1.0",- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",- "dev": true,- "dependencies": {- "locate-path": "^5.0.0",- "path-exists": "^4.0.0"- },- "engines": {- "node": ">=8"- }- },- "node_modules/yargs/node_modules/is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true,- "engines": {- "node": ">=8"- }- },- "node_modules/yargs/node_modules/locate-path": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",- "dev": true,- "dependencies": {- "p-locate": "^4.1.0"- },- "engines": {- "node": ">=8"- }- },- "node_modules/yargs/node_modules/p-limit": {- "version": "2.3.0",- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",- "dev": true,- "dependencies": {- "p-try": "^2.0.0"- },- "engines": {- "node": ">=6"- },- "funding": {- "url": "https://github.com/sponsors/sindresorhus"- }- },- "node_modules/yargs/node_modules/p-locate": {- "version": "4.1.0",- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",- "dev": true,- "dependencies": {- "p-limit": "^2.2.0"- },- "engines": {- "node": ">=8"- }- },- "node_modules/yargs/node_modules/string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "node_modules/yargs/node_modules/y18n": {+ "version": "5.0.8",+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==","dev": true,- "dependencies": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- },"engines": {- "node": ">=8"+ "node": ">=10"}},"node_modules/yargs/node_modules/yargs-parser": {- "version": "18.1.3",- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",- "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",+ "version": "21.1.1",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==","dev": true,- "dependencies": {- "camelcase": "^5.0.0",- "decamelize": "^1.2.0"- },"engines": {- "node": ">=6"+ "node": ">=12"}},"node_modules/yauzl": {@@ -26370,31 +26241,6 @@"dev": true,"requires": {"string-width": "^4.1.0"- },- "dependencies": {- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- }}},"ansi-colors": {@@ -27236,35 +27082,12 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz","integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true},- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- },"supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -27279,17 +27102,6 @@"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz","integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==","dev": true- },- "wrap-ansi": {- "version": "7.0.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",- "dev": true,- "requires": {- "ansi-styles": "^4.0.0",- "string-width": "^4.1.0",- "strip-ansi": "^6.0.0"- }}}},@@ -27952,39 +27764,14 @@"dev": true},"cliui": {- "version": "6.0.0",- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "version": "8.0.1",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==","dev": true,"requires": {"string-width": "^4.2.0",- "strip-ansi": "^6.0.0",- "wrap-ansi": "^6.2.0"- },- "dependencies": {- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- }+ "strip-ansi": "^6.0.1",+ "wrap-ansi": "^7.0.0"}},"clone": {@@ -32017,6 +31804,12 @@"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==","dev": true},+ "is-fullwidth-code-point": {+ "version": "3.0.0",+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",+ "dev": true+ },"is-generator-fn": {"version": "2.1.0","resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",@@ -32449,6 +32242,17 @@"supports-color": "^7.1.0"}},+ "cliui": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "dev": true,+ "requires": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.0",+ "wrap-ansi": "^6.2.0"+ }+ },"color-convert": {"version": "2.0.1","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",@@ -32464,12 +32268,49 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},+ "find-up": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",+ "dev": true,+ "requires": {+ "locate-path": "^5.0.0",+ "path-exists": "^4.0.0"+ }+ },"has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz","integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true},+ "locate-path": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",+ "dev": true,+ "requires": {+ "p-locate": "^4.1.0"+ }+ },+ "p-limit": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",+ "dev": true,+ "requires": {+ "p-try": "^2.0.0"+ }+ },+ "p-locate": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",+ "dev": true,+ "requires": {+ "p-limit": "^2.2.0"+ }+ },"supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -32478,6 +32319,46 @@"requires": {"has-flag": "^4.0.0"}+ },+ "wrap-ansi": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "dev": true,+ "requires": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ }+ },+ "yargs": {+ "version": "15.4.1",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "dev": true,+ "requires": {+ "cliui": "^6.0.0",+ "decamelize": "^1.2.0",+ "find-up": "^4.1.0",+ "get-caller-file": "^2.0.1",+ "require-directory": "^2.1.1",+ "require-main-filename": "^2.0.0",+ "set-blocking": "^2.0.0",+ "string-width": "^4.2.0",+ "which-module": "^2.0.0",+ "y18n": "^4.0.0",+ "yargs-parser": "^18.1.2"+ }+ },+ "yargs-parser": {+ "version": "18.1.3",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",+ "dev": true,+ "requires": {+ "camelcase": "^5.0.0",+ "decamelize": "^1.2.0"+ }}}},@@ -33203,6 +33084,17 @@"supports-color": "^7.1.0"}},+ "cliui": {+ "version": "6.0.0",+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",+ "dev": true,+ "requires": {+ "string-width": "^4.2.0",+ "strip-ansi": "^6.0.0",+ "wrap-ansi": "^6.2.0"+ }+ },"color-convert": {"version": "2.0.1","resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",@@ -33218,12 +33110,49 @@"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true},+ "find-up": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",+ "dev": true,+ "requires": {+ "locate-path": "^5.0.0",+ "path-exists": "^4.0.0"+ }+ },"has-flag": {"version": "4.0.0","resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz","integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true},+ "locate-path": {+ "version": "5.0.0",+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",+ "dev": true,+ "requires": {+ "p-locate": "^4.1.0"+ }+ },+ "p-limit": {+ "version": "2.3.0",+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",+ "dev": true,+ "requires": {+ "p-try": "^2.0.0"+ }+ },+ "p-locate": {+ "version": "4.1.0",+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",+ "dev": true,+ "requires": {+ "p-limit": "^2.2.0"+ }+ },"supports-color": {"version": "7.2.0","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",@@ -33232,6 +33161,46 @@"requires": {"has-flag": "^4.0.0"}+ },+ "wrap-ansi": {+ "version": "6.2.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "dev": true,+ "requires": {+ "ansi-styles": "^4.0.0",+ "string-width": "^4.1.0",+ "strip-ansi": "^6.0.0"+ }+ },+ "yargs": {+ "version": "15.4.1",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "dev": true,+ "requires": {+ "cliui": "^6.0.0",+ "decamelize": "^1.2.0",+ "find-up": "^4.1.0",+ "get-caller-file": "^2.0.1",+ "require-directory": "^2.1.1",+ "require-main-filename": "^2.0.0",+ "set-blocking": "^2.0.0",+ "string-width": "^4.2.0",+ "which-module": "^2.0.0",+ "y18n": "^4.0.0",+ "yargs-parser": "^18.1.2"+ }+ },+ "yargs-parser": {+ "version": "18.1.3",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",+ "dev": true,+ "requires": {+ "camelcase": "^5.0.0",+ "decamelize": "^1.2.0"+ }}}},@@ -34575,15 +34544,6 @@"yargs-unparser": "2.0.0"},"dependencies": {- "ansi-styles": {- "version": "4.3.0",- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",- "dev": true,- "requires": {- "color-convert": "^2.0.1"- }- },"argparse": {"version": "2.0.1","resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",@@ -34601,21 +34561,6 @@"wrap-ansi": "^7.0.0"}},- "color-convert": {- "version": "2.0.1",- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",- "dev": true,- "requires": {- "color-name": "~1.1.4"- }- },- "color-name": {- "version": "1.1.4",- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",- "dev": true- },"debug": {"version": "4.3.3","resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",@@ -34633,12 +34578,6 @@}}},- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"escape-string-regexp": {"version": "4.0.0","resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",@@ -34676,12 +34615,6 @@"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==","dev": true},- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },"js-yaml": {"version": "4.1.0","resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",@@ -34712,17 +34645,6 @@"integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==","dev": true},- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- },"supports-color": {"version": "8.1.1","resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",@@ -34732,17 +34654,6 @@"has-flag": "^4.0.0"}},- "wrap-ansi": {- "version": "7.0.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",- "dev": true,- "requires": {- "ansi-styles": "^4.0.0",- "string-width": "^4.1.0",- "strip-ansi": "^6.0.0"- }- },"y18n": {"version": "5.0.8","resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",@@ -38681,12 +38592,6 @@"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz","integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true}}},@@ -39251,6 +39156,25 @@"strip-ansi": "^6.0.0"}},+ "string-width": {+ "version": "4.2.3",+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",+ "dev": true,+ "requires": {+ "emoji-regex": "^8.0.0",+ "is-fullwidth-code-point": "^3.0.0",+ "strip-ansi": "^6.0.1"+ },+ "dependencies": {+ "emoji-regex": {+ "version": "8.0.0",+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",+ "dev": true+ }+ }+ },"string.prototype.matchall": {"version": "4.0.7","resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz",@@ -39421,12 +39345,6 @@"integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==","dev": true},- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },"get-stdin": {"version": "8.0.0","resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz",@@ -39439,29 +39357,12 @@"integrity": "sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==","dev": true},- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },"resolve-from": {"version": "5.0.0","resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz","integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==","dev": true},- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- },"write-file-atomic": {"version": "4.0.1","resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz",@@ -39663,34 +39564,11 @@"uri-js": "^4.2.2"}},- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },"json-schema-traverse": {"version": "1.0.0","resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz","integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==","dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }}}},@@ -40989,31 +40867,6 @@"dev": true,"requires": {"string-width": "^4.0.0"- },- "dependencies": {- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- }}},"wildcard": {@@ -41040,9 +40893,9 @@"dev": true},"wrap-ansi": {- "version": "6.2.0",- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",+ "version": "7.0.0",+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==","dev": true,"requires": {"ansi-styles": "^4.0.0",@@ -41073,29 +40926,6 @@"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz","integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==","dev": true- },- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",- "dev": true- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }}}},@@ -41165,93 +40995,31 @@"integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="},"yargs": {- "version": "15.4.1",- "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",- "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",+ "version": "17.6.2",+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.6.2.tgz",+ "integrity": "sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==","dev": true,"requires": {- "cliui": "^6.0.0",- "decamelize": "^1.2.0",- "find-up": "^4.1.0",- "get-caller-file": "^2.0.1",+ "cliui": "^8.0.1",+ "escalade": "^3.1.1",+ "get-caller-file": "^2.0.5","require-directory": "^2.1.1",- "require-main-filename": "^2.0.0",- "set-blocking": "^2.0.0",- "string-width": "^4.2.0",- "which-module": "^2.0.0",- "y18n": "^4.0.0",- "yargs-parser": "^18.1.2"+ "string-width": "^4.2.3",+ "y18n": "^5.0.5",+ "yargs-parser": "^21.1.1"},"dependencies": {- "emoji-regex": {- "version": "8.0.0",- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",- "dev": true- },- "find-up": {- "version": "4.1.0",- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",- "dev": true,- "requires": {- "locate-path": "^5.0.0",- "path-exists": "^4.0.0"- }- },- "is-fullwidth-code-point": {- "version": "3.0.0",- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",+ "y18n": {+ "version": "5.0.8",+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==","dev": true},- "locate-path": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",- "dev": true,- "requires": {- "p-locate": "^4.1.0"- }- },- "p-limit": {- "version": "2.3.0",- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",- "dev": true,- "requires": {- "p-try": "^2.0.0"- }- },- "p-locate": {- "version": "4.1.0",- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",- "dev": true,- "requires": {- "p-limit": "^2.2.0"- }- },- "string-width": {- "version": "4.2.3",- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",- "dev": true,- "requires": {- "emoji-regex": "^8.0.0",- "is-fullwidth-code-point": "^3.0.0",- "strip-ansi": "^6.0.1"- }- },"yargs-parser": {- "version": "18.1.3",- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",- "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",- "dev": true,- "requires": {- "camelcase": "^5.0.0",- "decamelize": "^1.2.0"- }+ "version": "21.1.1",+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",+ "dev": true}}},diff --git a/package.json b/package.jsonindex f2a6a2365..85a30454f 100644--- a/package.json+++ b/package.json@@ -23,7 +23,7 @@"license": "NASA-1.3","repository": "nasa-gibs/worldview","engines": {- "node": "16.18.0"+ "node": ">= 16.18.0"},"husky": {"hooks": {@@ -33,15 +33,15 @@"scripts": {"analyze": "cross-env ANALYZE_MODE=true NODE_ENV=production webpack","browserstack": "node e2e/browserstack.js -c e2e/browserstack.conf.js -e browserstack ",- "build": "pipenv run run-s clean getcapabilities build:config build:dev",- "build:ci": "pipenv run run-s getcapabilities build:config build:prod",+ "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": "pipenv run run-s build:options && node ./tasks/config.js",+ "build:config": "run-s build:options && node ./tasks/config.js","build:dev": "cross-env NODE_ENV=development webpack","build:prod": "cross-env NODE_ENV=production webpack","clean": "node ./tasks/clean.js",- "dist": "pipenv run run-s clean getcapabilities build:config build:prod && node ./tasks/dist.js",- "dist:dev": "pipenv run run-s clean getcapabilities build:config build:dev && node ./tasks/dist.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","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 .",@@ -134,7 +134,7 @@"node-dir": "^0.1.17","node-fetch": "^2.6.7","node-ssh": "^13.0.0",- "npm-run-all": "^4.1.1",+ "npm-run-all": "^4.1.5","patch-package": "^6.4.7","postcss": "^8.4.16","postcss-loader": "^7.0.1",@@ -157,7 +157,7 @@"webpack-cli": "^4.10.0","webpack-dev-middleware": "^5.3.3","webpack-dev-server": "^4.11.1",- "yargs": "^15.3.0"+ "yargs": "^17.6.2"},"dependencies": {"@elastic/react-search-ui": "^1.5.1",diff --git a/tasks/buildOptions.sh b/tasks/buildOptions.shindex a98f56c4d..696afdd97 100755--- a/tasks/buildOptions.sh+++ b/tasks/buildOptions.sh@@ -8,6 +8,7 @@ OPT_DIR="$BASE/config/default"BUILD_DIR="$BASE/build/options-build"DEST_DIR="$BASE/build/options"PYTHON_SCRIPTS_DIR="$BASE/tasks/python3"+NODE_SCRIPTS_DIR="$BASE/tasks/node"# If there is an active directory, use instead of defaults@@ -51,7 +52,7 @@ mkdir -p "$BUILD_DIR/colormaps"if [ "$FETCH_GC" ] ; thenrm -rf "$OPT_DIR/$OPT_SUBDIR/gc/*"rm -rf "$OPT_DIR/$OPT_SUBDIR/colormaps/gc/*"- "$PYTHON_SCRIPTS_DIR/getCapabilities.py" "$OPT_DIR/$OPT_SUBDIR/config.json" "$OPT_DIR/$OPT_SUBDIR/gc"+ "$NODE_SCRIPTS_DIR/getCapabilities.js -c $OPT_DIR/$OPT_SUBDIR/config.json -gc $OPT_DIR/$OPT_SUBDIR/gc"# Get visualization metadata (if configured)rm -rf "$OPT_DIR/$OPT_SUBDIR/layer-metadata"@@ -61,84 +62,84 @@ if [ "$FETCH_GC" ] ; thenexit 0fi-"$PYTHON_SCRIPTS_DIR/validateConfigs.py" "$SRC_DIR/common/config/wv.json/layers" \- "$BASE/schemas/layer-config.json"--if [ -e "$BUILD_DIR/features.json" ] ; then- cp "$BUILD_DIR/features.json" "$BUILD_DIR/config/wv.json/_features.json"-fi--# Run extractConfigFromWMTS.py script with config.json-if [ -e "$BUILD_DIR/config.json" ] ; then- "$PYTHON_SCRIPTS_DIR/extractConfigFromWMTS.py" "$BUILD_DIR/config.json" "$BUILD_DIR/gc" \- "$BUILD_DIR/_wmts"-fi--# Run processVectorStyles.py and move vectorstyles where we want them-if [ -e "$BUILD_DIR/gc/vectorstyles" ] ; then- mkdir -p "$BUILD_DIR"/config/wv.json/vectorstyles- "$PYTHON_SCRIPTS_DIR/processVectorStyles.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \- "$BUILD_DIR/gc/vectorstyles" \- "$BUILD_DIR/config/wv.json/vectorstyles"-fi--# Run processVectorData.py and move vectordata where we want them-if [ -e "$BUILD_DIR/gc/vectordata" ] ; then- mkdir -p "$BUILD_DIR"/config/wv.json/vectordata- "$PYTHON_SCRIPTS_DIR/processVectorData.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \- "$BUILD_DIR/gc/vectordata" \- "$BUILD_DIR/config/wv.json/vectordata"-fi--# Run processColormap.py and move colormaps where we want them-if [ -e "$BUILD_DIR/colormaps" ] ; then- mkdir -p "$BUILD_DIR"/config/palettes- if [ -d "$BUILD_DIR"/gc/colormaps ] ; then- cp -r "$BUILD_DIR"/gc/colormaps "$BUILD_DIR"/colormaps/gc- fi- "$PYTHON_SCRIPTS_DIR/processColormap.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \- "$BUILD_DIR/colormaps" \- "$BUILD_DIR/config/palettes"-fi--# Throw error if no categoryGroupOrder.json file present-if [ ! -e "$BUILD_DIR/config/wv.json/categoryGroupOrder.json" ] ; then- echo "categoryGroupOrder.json not found. Generating..."- "$PYTHON_SCRIPTS_DIR/generateCategoryGroupOrder.py" "$SRC_DIR/common/config/wv.json/categories/" \- "$SRC_DIR/common/config/wv.json/"-fi--if [ -e "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" ] ; then- cp "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" "$BUILD_DIR/config/wv.json/layer-metadata.json"-fi--# Run mergeConfig.py on all directories in /config-configs=$(ls "$BUILD_DIR/config")-for config in $configs; do- case $config in- *.json)- "$PYTHON_SCRIPTS_DIR/mergeConfig.py" "$BUILD_DIR/config/$config" \- "$DEST_DIR/config/$config"- ;;- *)- cp -r "$BUILD_DIR/config/$config" "$DEST_DIR/config/$config"- ;;- esac-done--# Run mergeConfigWithWMTS.py to merge layer metadata from WMTS GC with worldview layer configs into wv.json-"$PYTHON_SCRIPTS_DIR/mergeConfigWithWMTS.py" "$BUILD_DIR/_wmts" \- "$DEST_DIR/config/wv.json"--# Copy brand files from build to dest-cp -r "$BUILD_DIR/brand" "$DEST_DIR"-cp "$BUILD_DIR/brand.json" "$DEST_DIR"--# Validate the options build-"$PYTHON_SCRIPTS_DIR/validateOptions.py" "$BUILD_DIR/config.json" "$DEST_DIR/config"--# Fetch preview images from WV Snapshots for any layers which they are missing-"$PYTHON_SCRIPTS_DIR/fetchPreviewSnapshots.py" "$DEST_DIR/config/wv.json" \- "$OPT_DIR/common/previewLayerOverrides.json" "$BUILD_DIR/features.json"+# "$PYTHON_SCRIPTS_DIR/validateConfigs.py" "$SRC_DIR/common/config/wv.json/layers" \+# "$BASE/schemas/layer-config.json"++# if [ -e "$BUILD_DIR/features.json" ] ; then+# cp "$BUILD_DIR/features.json" "$BUILD_DIR/config/wv.json/_features.json"+# fi++# # Run extractConfigFromWMTS.py script with config.json+# if [ -e "$BUILD_DIR/config.json" ] ; then+# "$PYTHON_SCRIPTS_DIR/extractConfigFromWMTS.py" "$BUILD_DIR/config.json" "$BUILD_DIR/gc" \+# "$BUILD_DIR/_wmts"+# fi++# # Run processVectorStyles.py and move vectorstyles where we want them+# if [ -e "$BUILD_DIR/gc/vectorstyles" ] ; then+# mkdir -p "$BUILD_DIR"/config/wv.json/vectorstyles+# "$PYTHON_SCRIPTS_DIR/processVectorStyles.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \+# "$BUILD_DIR/gc/vectorstyles" \+# "$BUILD_DIR/config/wv.json/vectorstyles"+# fi++# # Run processVectorData.py and move vectordata where we want them+# if [ -e "$BUILD_DIR/gc/vectordata" ] ; then+# mkdir -p "$BUILD_DIR"/config/wv.json/vectordata+# "$PYTHON_SCRIPTS_DIR/processVectorData.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \+# "$BUILD_DIR/gc/vectordata" \+# "$BUILD_DIR/config/wv.json/vectordata"+# fi++# # Run processColormap.py and move colormaps where we want them+# if [ -e "$BUILD_DIR/colormaps" ] ; then+# mkdir -p "$BUILD_DIR"/config/palettes+# if [ -d "$BUILD_DIR"/gc/colormaps ] ; then+# cp -r "$BUILD_DIR"/gc/colormaps "$BUILD_DIR"/colormaps/gc+# fi+# "$PYTHON_SCRIPTS_DIR/processColormap.py" "$OPT_DIR/$OPT_SUBDIR/config.json" \+# "$BUILD_DIR/colormaps" \+# "$BUILD_DIR/config/palettes"+# fi++# # Throw error if no categoryGroupOrder.json file present+# if [ ! -e "$BUILD_DIR/config/wv.json/categoryGroupOrder.json" ] ; then+# echo "categoryGroupOrder.json not found. Generating..."+# "$PYTHON_SCRIPTS_DIR/generateCategoryGroupOrder.py" "$SRC_DIR/common/config/wv.json/categories/" \+# "$SRC_DIR/common/config/wv.json/"+# fi++# if [ -e "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" ] ; then+# cp "$OPT_DIR/$OPT_SUBDIR/layer-metadata/all.json" "$BUILD_DIR/config/wv.json/layer-metadata.json"+# fi++# # Run mergeConfig.py on all directories in /config+# configs=$(ls "$BUILD_DIR/config")+# for config in $configs; do+# case $config in+# *.json)+# "$PYTHON_SCRIPTS_DIR/mergeConfig.py" "$BUILD_DIR/config/$config" \+# "$DEST_DIR/config/$config"+# ;;+# *)+# cp -r "$BUILD_DIR/config/$config" "$DEST_DIR/config/$config"+# ;;+# esac+# done++# # Run mergeConfigWithWMTS.py to merge layer metadata from WMTS GC with worldview layer configs into wv.json+# "$PYTHON_SCRIPTS_DIR/mergeConfigWithWMTS.py" "$BUILD_DIR/_wmts" \+# "$DEST_DIR/config/wv.json"++# # Copy brand files from build to dest+# cp -r "$BUILD_DIR/brand" "$DEST_DIR"+# cp "$BUILD_DIR/brand.json" "$DEST_DIR"++# # Validate the options build+# "$PYTHON_SCRIPTS_DIR/validateOptions.py" "$BUILD_DIR/config.json" "$DEST_DIR/config"++# # Fetch preview images from WV Snapshots for any layers which they are missing+# "$PYTHON_SCRIPTS_DIR/fetchPreviewSnapshots.py" "$DEST_DIR/config/wv.json" \+# "$OPT_DIR/common/previewLayerOverrides.json" "$BUILD_DIR/features.json"exit 0diff --git a/tasks/config.js b/tasks/config.jsindex 1b0735d52..e688b153f 100755--- a/tasks/config.js+++ b/tasks/config.js@@ -5,6 +5,7 @@ const fs = require('fs');const glob = require('glob');const showdown = require('showdown');const shell = require('shelljs');+const console = require('console');console.log('Converting markdown to html');const converter = new showdown.Converter({@@ -33,13 +34,3 @@ console.log('Copying options to web directory');shell.cp('-r', 'build/options/config', 'web');shell.cp('-r', 'build/options/brand', 'web');shell.cp('-r', 'build/options/brand.json', 'web/brand');--console.log('Adding .htaccess files to options');-const htaccess = `-ExpiresActive On-ExpiresDefault A0-Header set Cache-Control "no-cache, must-revalidate, public"-Header set Pragma "no-cache"-`;-fs.writeFileSync('web/brand/.htaccess', htaccess);-fs.writeFileSync('web/config/.htaccess', htaccess);diff --git a/tasks/node/getCapabilities.js b/tasks/node/getCapabilities.jsnew file mode 100755index 000000000..690eaf42d--- /dev/null+++ b/tasks/node/getCapabilities.js@@ -0,0 +1,45 @@+#!/usr/bin/env node++const yargs = require('yargs');+const console = require('console');++const options = yargs+ .usage('Usage: $0 [options]')+ .option('config', {+ alias: 'c',+ type: 'string',+ description: 'config file',+ })+ .option('getcapabilities', {+ alias: 'gc',+ type: 'string',+ description: 'getcapabilities file',+ });++// import config file from ./config/default/release/config.json++async function main() {+ console.log('testing');+ const { argv } = options;++ if (!argv.config) {+ console.log('error: config must be defined');+ process.exit(1);+ }++ argv.array.forEach((element) => {+ console.log(element);+ });++ // read config++ // get "wv-options-fetch" values++ // for each value++ // create an object of colormaps, vectorstyles, vectordata+}++main().catch((err) => {+ console.error(err.stack);+});diff --git a/web/service/debug/.htaccess b/web/service/debug/.htaccessdeleted file mode 100644index ceb239fe0..000000000--- a/web/service/debug/.htaccess+++ /dev/null@@ -1,7 +0,0 @@-Options +ExecCGI-AddHandler cgi-script .cgi--ExpiresDefault A0-Header set Cache-Control "no-cache, no-store, must-revalidate"-Header set Pragma "no-cache"-diff --git a/web/service/debug/debug_tile.cgi b/web/service/debug/debug_tile.cgideleted file mode 100755index 51fa494e4..000000000--- a/web/service/debug/debug_tile.cgi+++ /dev/null@@ -1,27 +0,0 @@-#!/usr/bin/python--import cgi--fields = cgi.FieldStorage()--size = int(fields["TILEMATRIXSET"].value)-z = fields["TILEMATRIX"].value-x = fields["TILEROW"].value-y = fields["TILECOL"].value--print "Content-type: image/svg+xml"-print """-<svg version="1.1"- baseProfile="full"- width="%d" height="%d"- xmlns="http://www.w3.org/2000/svg">-- <line x1="0" y1="0" x2="%d" y2="0" stroke="rgb(255, 0, 0)" stroke-width="5"/>- <line x1="0" y1="0" x2="0" y2="%d" stroke="rgb(255, 0, 0)" stroke-width="5"/>-- <rect width="128" height="30" fill="rgb(255, 0, 0)" />-- <text x="10" y="21" font-size="18" text-anchor="start" fill="white">%s / %s / %s</text>--</svg>-""" % (size, size, size, size, z, x, y)diff --git a/web/service/link/.htaccess b/web/service/link/.htaccessdeleted file mode 100644index 1695f503f..000000000--- a/web/service/link/.htaccess+++ /dev/null@@ -1,2 +0,0 @@-Options +ExecCGI-AddHandler cgi-script .cgidiff --git a/web/service/link/shorten.cgi b/web/service/link/shorten.cgideleted file mode 100755index ecaf3ba79..000000000--- a/web/service/link/shorten.cgi+++ /dev/null@@ -1,173 +0,0 @@-#!/usr/bin/python--import cgi-import json-from optparse import OptionParser-import os-import shutil-import sys-from urllib2 import Request, urlopen, HTTPError, unquote--endpoint = "https://api-ssl.bit.ly/v4/shorten"-key = ""-group = ""--class RequestError(Exception):- """- Exception raised when a missing or an invalid parameter is provided- """- pass---def handle_error(error_code, message, options, info=None):- """- Displays an error page to the client and exits the program with a return- code of one.-- Parameters:- - error_code: HTTP status code to set in the header- - message: Message reported to the user- - options: Execution options- - info: Additional information to display to the user if options.error- is True- """- print "Content-type: text/html"- print "Status: %s" % error_code- print ""- print "<h2>%s Error</h2>" % error_code- print message- if options.error and info:- print "<br/><br/>"- print str(info)-- # Print to standard out for the Apache error log- sys.stderr.write("worldview/shorten.cgi [%s]: %s" % (error_code, message))- if info:- sys.stderr.write(": %s" % info)- sys.stderr.write("\n")-- sys.exit(1)---def bad_request(options, info=None):- """- Displays the error page with a 400 error and a Bad Request message. Exits- the program with a return code of one.-- Parameters:- - options: Execution options- - info: Additional information to display to the user if options.error- is True- """- handle_error(400, "Bad request", options, info)---def internal_server_error(options, info=None):- """- Displays the error page with a 500 error and a Unexpected Error message.- Exits the program with a return code of one.-- Parameters:- - options: Execution options- - info: Additional information to display to the user if options.error- is True- """- handle_error(500, "Unexpected error", options, info)---def service_unavailable(options, info=None):- """- Displays the error page with a 503 error and a Service Unavailable message.- Exits the program with a return code of one.-- Parameters:- - options: Execution options- - info: Additional information to display to the user if options.error- is True- """- handle_error(503, "Service Unavailable", options, info)--def process_request(options):- fields = cgi.FieldStorage()-- if len(fields) == 0:- raise RequestError("No parameters")-- required_fields = ["url"]- for required_field in required_fields:- if required_field not in fields:- raise RequestError("Missing parameter: %s" % required_field)-- headers = {- "Authorization": "Bearer " + key,- "Content-Type": "application/json",- }- data = {- "group_guid": group,- "long_url": unquote(fields["url"].value),- }- request = Request(url=endpoint, headers=headers, data=json.dumps(data))-- fp = None- try:- fp = urlopen(request)- print "Content-type: application/json"- print ""- shutil.copyfileobj(fp, sys.stdout)- fp.close()- fp = None- finally:- if fp:- fp.close()--def parse_options():- """- Allow command line arguments for easy debugging at the command line.-- Returns:- Execution options- """- parser = OptionParser()- parser.add_option("-a", "--all", action="store_true",- help="Print all debugging information")- parser.add_option("-e", "--error", action="store_true",- help="Print detailed error information")- parser.add_option("-u", "--url" ,action="store_true",- help="Print URL used to access bit.ly")- (options, args) = parser.parse_args()-- if options.all:- options.error = True-- # Enable this to see error output- options.error = True-- return options--if __name__ == '__main__':- """- Entry point- """-- options = parse_options()- try:- key_path = os.path.join("..", "..", "..", "bitly.json")- with open(key_path) as fp:- config = json.load(fp)- key = config["key"]- group = config["group"]- process_request(options)- except HTTPError as he:- if options.error:- raise- service_unavailable(options, he)- except IOError as e:- sys.stderr.write("error: %s" % str(e))- options.error = True- service_unavailable(options, "No API key")- except RequestError as re:- bad_request(options, re)- except Exception as e:- if options.error:- raise- internal_server_error(options, e)\ No newline at end of filediff --git a/web/service/link/shorten.cgi-error b/web/service/link/shorten.cgi-errordeleted file mode 100644index 46637bd74..000000000--- a/web/service/link/shorten.cgi-error+++ /dev/null@@ -1 +0,0 @@-{"status_code": 500, "status_txt": "Limit exceeded"}