From cea35072f6e2bdd3f1c2fc4c03bdb060340ec8a6 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 14:43:16 +0800 Subject: [PATCH 001/126] Migrate to vite --- .eslintignore | 26 +- .eslintrc.js | 62 +- .gitignore | 3 - .prettierrc | 2 +- build/icon.icns | Bin 66054 -> 0 bytes build/icon.ico | Bin 106463 -> 0 bytes package.json | 74 +- src/{renderer => }/actions/databaseEditor.js | 0 src/{renderer => }/actions/homepage.js | 0 src/{renderer => }/actions/inputEditor.js | 0 src/{renderer => }/actions/jobs.js | 0 src/{renderer => }/actions/project.js | 0 src/{renderer => }/actions/tools.js | 0 src/{renderer => }/app.global.css | 5 - src/{renderer/static => assets}/cea-logo.png | Bin .../components/Dashboard/Dashboard.css | 0 .../components/Dashboard/Dashboard.js | 0 .../components/Dashboard/Layouts.js | 0 .../components/Dashboard/Modals.js | 2 - .../components/Dashboard/Plot.js | 1 - .../DatabaseEditor/ColumnGlossary.js | 0 .../components/DatabaseEditor/Database.js | 0 .../DatabaseEditor/DatabaseEditor.css | 0 .../DatabaseEditor/DatabaseEditor.js | 0 .../DatabaseEditor/DatabaseTopMenu.js | 0 .../DatabaseEditor/ExportDatabaseModal.js | 2 - .../DatabaseEditor/NewScheduleModal.js | 0 .../DatabaseEditor/SavingDatabaseModal.js | 0 .../components/DatabaseEditor/Table.js | 0 .../DatabaseEditor/UseTypesDatabase.js | 0 .../DatabaseEditor/ValidationErrors.js | 0 .../components/HomePage/CenterSpinner.js | 0 .../components/HomePage/Header.js | 0 .../components/HomePage/SearchBar.css | 0 .../components/HomePage/SearchBar.js | 1 - .../components/HomePage/SideNav.js | 6 +- .../components/HomePage/ToolsMenu.js | 0 .../InputEditor/EditSelectedModal.js | 0 .../components/InputEditor/InputEditor.js | 0 .../InputEditor/NavigationPrompt.js | 0 .../components/InputEditor/ScheduleEditor.css | 0 .../components/InputEditor/ScheduleEditor.js | 0 .../components/InputEditor/Table.js | 1 - .../components/InputEditor/inputEditor.css | 0 .../components/Landing/Landing.js | 10 +- .../components/Map/EditableMap.css | 0 .../components/Map/EditableMap.js | 0 src/{renderer => }/components/Map/Map.css | 0 src/{renderer => }/components/Map/Map.js | 0 .../components/Map/MapButtons.css | 0 .../components/Map/MapButtons.js | 0 .../Project/CreatingScenarioModal.js | 0 .../components/Project/NewProjectModal.js | 2 - .../components/Project/NewScenarioModal.js | 2 - .../components/Project/OpenProjectModal.js | 1 - .../components/Project/Project.css | 0 .../components/Project/Project.js | 0 .../components/Project/RenameScenarioModal.js | 2 - .../components/Project/ScenarioCard.js | 0 .../Project/ScenarioGenerateDataForm.js | 0 .../Project/ScenarioImportDataForm.js | 2 - .../components/Project/ToolModal.js | 0 .../components/Splash/Splash.js | 0 .../components/StatusBar/StatusBar.css | 0 .../components/StatusBar/StatusBar.js | 0 .../components/Titlebar/index.js | 1 - .../components/Tools/Parameter.js | 2 - src/{renderer => }/components/Tools/Tool.js | 0 src/{renderer => }/constants/colors.json | 0 .../constants/inputEndpoints.json | 0 src/{renderer => }/constants/mapStyles.json | 0 src/{renderer => }/constants/months.js | 0 src/{renderer => }/constants/routes.json | 0 src/{renderer => }/containers/App.js | 0 src/{renderer => }/containers/HomePage.js | 0 src/index.html | 15 + src/main.js | 47 - src/main.jsx | 13 + src/main/ceaProcess.js | 123 - src/main/index.js | 226 - src/main/menu.js | 100 - src/{renderer => }/reducers/databaseEditor.js | 0 src/{renderer => }/reducers/homepage.js | 0 src/{renderer => }/reducers/index.js | 0 src/{renderer => }/reducers/inputEditor.js | 0 src/{renderer => }/reducers/jobs.js | 0 src/{renderer => }/reducers/project.js | 0 src/{renderer => }/reducers/tools.js | 0 src/renderer/index.html | 13 - src/renderer/index.js | 19 - src/renderer/utils/menu.js | 517 -- .../store/configureStore.dev.js | 0 src/{renderer => }/store/configureStore.js | 0 .../store/configureStore.prod.js | 0 src/{renderer => }/store/httpMiddleware.js | 0 src/{renderer => }/utils/ErrorBoundary.js | 0 src/{renderer => }/utils/ModalManager.js | 0 src/{renderer => }/utils/hooks.js | 0 src/{renderer => }/utils/index.js | 1 - src/{renderer => }/utils/static.js | 0 vite.config.js | 7 + webpack.main.config.js | 11 - webpack.renderer.config.js | 27 - webpack.rules.js | 53 - yarn.lock | 6182 +++-------------- 105 files changed, 967 insertions(+), 6594 deletions(-) delete mode 100644 build/icon.icns delete mode 100644 build/icon.ico rename src/{renderer => }/actions/databaseEditor.js (100%) rename src/{renderer => }/actions/homepage.js (100%) rename src/{renderer => }/actions/inputEditor.js (100%) rename src/{renderer => }/actions/jobs.js (100%) rename src/{renderer => }/actions/project.js (100%) rename src/{renderer => }/actions/tools.js (100%) rename src/{renderer => }/app.global.css (94%) rename src/{renderer/static => assets}/cea-logo.png (100%) rename src/{renderer => }/components/Dashboard/Dashboard.css (100%) rename src/{renderer => }/components/Dashboard/Dashboard.js (100%) rename src/{renderer => }/components/Dashboard/Layouts.js (100%) rename src/{renderer => }/components/Dashboard/Modals.js (99%) rename src/{renderer => }/components/Dashboard/Plot.js (99%) rename src/{renderer => }/components/DatabaseEditor/ColumnGlossary.js (100%) rename src/{renderer => }/components/DatabaseEditor/Database.js (100%) rename src/{renderer => }/components/DatabaseEditor/DatabaseEditor.css (100%) rename src/{renderer => }/components/DatabaseEditor/DatabaseEditor.js (100%) rename src/{renderer => }/components/DatabaseEditor/DatabaseTopMenu.js (100%) rename src/{renderer => }/components/DatabaseEditor/ExportDatabaseModal.js (98%) rename src/{renderer => }/components/DatabaseEditor/NewScheduleModal.js (100%) rename src/{renderer => }/components/DatabaseEditor/SavingDatabaseModal.js (100%) rename src/{renderer => }/components/DatabaseEditor/Table.js (100%) rename src/{renderer => }/components/DatabaseEditor/UseTypesDatabase.js (100%) rename src/{renderer => }/components/DatabaseEditor/ValidationErrors.js (100%) rename src/{renderer => }/components/HomePage/CenterSpinner.js (100%) rename src/{renderer => }/components/HomePage/Header.js (100%) rename src/{renderer => }/components/HomePage/SearchBar.css (100%) rename src/{renderer => }/components/HomePage/SearchBar.js (99%) rename src/{renderer => }/components/HomePage/SideNav.js (96%) rename src/{renderer => }/components/HomePage/ToolsMenu.js (100%) rename src/{renderer => }/components/InputEditor/EditSelectedModal.js (100%) rename src/{renderer => }/components/InputEditor/InputEditor.js (100%) rename src/{renderer => }/components/InputEditor/NavigationPrompt.js (100%) rename src/{renderer => }/components/InputEditor/ScheduleEditor.css (100%) rename src/{renderer => }/components/InputEditor/ScheduleEditor.js (100%) rename src/{renderer => }/components/InputEditor/Table.js (99%) rename src/{renderer => }/components/InputEditor/inputEditor.css (100%) rename src/{renderer => }/components/Landing/Landing.js (91%) rename src/{renderer => }/components/Map/EditableMap.css (100%) rename src/{renderer => }/components/Map/EditableMap.js (100%) rename src/{renderer => }/components/Map/Map.css (100%) rename src/{renderer => }/components/Map/Map.js (100%) rename src/{renderer => }/components/Map/MapButtons.css (100%) rename src/{renderer => }/components/Map/MapButtons.js (100%) rename src/{renderer => }/components/Project/CreatingScenarioModal.js (100%) rename src/{renderer => }/components/Project/NewProjectModal.js (98%) rename src/{renderer => }/components/Project/NewScenarioModal.js (99%) rename src/{renderer => }/components/Project/OpenProjectModal.js (98%) rename src/{renderer => }/components/Project/Project.css (100%) rename src/{renderer => }/components/Project/Project.js (100%) rename src/{renderer => }/components/Project/RenameScenarioModal.js (98%) rename src/{renderer => }/components/Project/ScenarioCard.js (100%) rename src/{renderer => }/components/Project/ScenarioGenerateDataForm.js (100%) rename src/{renderer => }/components/Project/ScenarioImportDataForm.js (98%) rename src/{renderer => }/components/Project/ToolModal.js (100%) rename src/{renderer => }/components/Splash/Splash.js (100%) rename src/{renderer => }/components/StatusBar/StatusBar.css (100%) rename src/{renderer => }/components/StatusBar/StatusBar.js (100%) rename src/{renderer => }/components/Titlebar/index.js (97%) rename src/{renderer => }/components/Tools/Parameter.js (99%) rename src/{renderer => }/components/Tools/Tool.js (100%) rename src/{renderer => }/constants/colors.json (100%) rename src/{renderer => }/constants/inputEndpoints.json (100%) rename src/{renderer => }/constants/mapStyles.json (100%) rename src/{renderer => }/constants/months.js (100%) rename src/{renderer => }/constants/routes.json (100%) rename src/{renderer => }/containers/App.js (100%) rename src/{renderer => }/containers/HomePage.js (100%) create mode 100644 src/index.html delete mode 100644 src/main.js create mode 100644 src/main.jsx delete mode 100644 src/main/ceaProcess.js delete mode 100644 src/main/index.js delete mode 100644 src/main/menu.js rename src/{renderer => }/reducers/databaseEditor.js (100%) rename src/{renderer => }/reducers/homepage.js (100%) rename src/{renderer => }/reducers/index.js (100%) rename src/{renderer => }/reducers/inputEditor.js (100%) rename src/{renderer => }/reducers/jobs.js (100%) rename src/{renderer => }/reducers/project.js (100%) rename src/{renderer => }/reducers/tools.js (100%) delete mode 100644 src/renderer/index.html delete mode 100644 src/renderer/index.js delete mode 100644 src/renderer/utils/menu.js rename src/{renderer => }/store/configureStore.dev.js (100%) rename src/{renderer => }/store/configureStore.js (100%) rename src/{renderer => }/store/configureStore.prod.js (100%) rename src/{renderer => }/store/httpMiddleware.js (100%) rename src/{renderer => }/utils/ErrorBoundary.js (100%) rename src/{renderer => }/utils/ModalManager.js (100%) rename src/{renderer => }/utils/hooks.js (100%) rename src/{renderer => }/utils/index.js (98%) rename src/{renderer => }/utils/static.js (100%) create mode 100644 vite.config.js delete mode 100644 webpack.main.config.js delete mode 100644 webpack.renderer.config.js delete mode 100644 webpack.rules.js diff --git a/.eslintignore b/.eslintignore index f5189d4..0097980 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,26 +1,6 @@ -# Logs -logs -*.log - -# Compiled binary addons (http://nodejs.org/api/addons.html) -build/Release -.eslintcache - -# Dependency directory -# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git node_modules - -# OSX .DS_Store - -# App packaged -release dist - -.idea -npm-debug.log.* -__snapshots__ - -# Package.json -package.json -.travis.yml +dist-ssr +*.local +node_modules/* diff --git a/.eslintrc.js b/.eslintrc.js index b9dcf8f..3043356 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,41 +1,49 @@ module.exports = { - /* your base configuration of choice */ - extends: [ - 'eslint:recommended', - 'plugin:react/recommended', - 'plugin:react/jsx-runtime', - 'plugin:prettier/recommended', - ], - parser: '@babel/eslint-parser', + root: true, parserOptions: { + ecmaVersion: 2020, sourceType: 'module', - requireConfigFile: false, - babelOptions: { - presets: ['@babel/preset-react'], + ecmaFeatures: { + jsx: true, }, }, - env: { - browser: true, - node: true, - }, - globals: { - MAIN_WINDOW_WEBPACK_ENTRY: true, - MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: true, - }, settings: { react: { version: 'detect', }, + 'import/resolver': { + node: { + paths: ['src'], + extensions: ['.js', '.jsx', '.ts', '.tsx'], + }, + }, + }, + env: { + browser: true, + amd: true, + node: true, }, + extends: [ + 'eslint:recommended', + 'plugin:react/recommended', + 'plugin:jsx-a11y/recommended', + 'plugin:prettier/recommended', // Make sure this is always the last element in the array. + ], + plugins: ['simple-import-sort', 'prettier'], rules: { - // allow anonymous component functions - 'react/display-name': 0, - // disallow console and debugger in production mode - 'no-console': process.env.NODE_ENV === 'production' ? 2 : 0, - 'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0, - // allow spreading out properties from an object without warnings - // 'no-unused-vars': [1, { ignoreRestSiblings: true }], - 'no-unused-vars': 'off', + 'prettier/prettier': ['error', {}, { usePrettierrc: true }], + 'react/react-in-jsx-scope': 'off', + 'jsx-a11y/accessible-emoji': 'off', 'react/prop-types': 'off', + 'simple-import-sort/imports': 'error', + 'simple-import-sort/exports': 'error', + 'jsx-a11y/anchor-is-valid': [ + 'error', + { + components: ['Link'], + specialLink: ['hrefLeft', 'hrefRight'], + aspects: ['invalidHref', 'preferButton'], + }, + ], }, }; diff --git a/.gitignore b/.gitignore index 8e3a106..ab0d397 100644 --- a/.gitignore +++ b/.gitignore @@ -84,6 +84,3 @@ typings/ # Webpack .webpack/ - -# Electron-Forge -out/ diff --git a/.prettierrc b/.prettierrc index 04596f2..012e3ab 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,7 +1,7 @@ { "overrides": [ { - "files": [".prettierrc", ".babelrc"], + "files": [".prettierrc"], "options": { "parser": "json" } diff --git a/build/icon.icns b/build/icon.icns deleted file mode 100644 index 9823bb4e94c7b8c6fe2d23f7b4146d09414dfb1b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 66054 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 diff --git a/build/icon.ico b/build/icon.ico deleted file mode 100644 index 8427962f6b62344e15383fa78138f6686dbdb9eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 106463 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 ArT_o{ diff --git a/package.json b/package.json index 4ec1e68..951561c 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,13 @@ "description": "Official GUI of the City Energy Analyst tool", "homepage": "http://www.cityenergyanalyst.com", "repository": "github:architecture-building-systems/CityEnergyAnalyst-GUI", - "main": ".webpack/main", "scripts": { - "start": "electron-forge start", - "package": "electron-forge package", - "make": "electron-forge make", - "publish": "electron-forge publish", - "lint": "yarn eslint ." + "dev": "vite", + "build": "vite build", + "preview": "vite preview", + "lint:fix": "eslint ./src --ext .jsx,.js,.ts,.tsx --quiet --fix --ignore-path ./.gitignore", + "lint:format": "prettier --loglevel warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ", + "lint": "yarn lint:format && yarn lint:fix " }, "keywords": [], "author": { @@ -19,63 +19,21 @@ "email": "reyold@hotmail.com" }, "license": "MIT", - "config": { - "forge": { - "packagerConfig": { - "asar": true, - "icon": "build/icon" - }, - "makers": [ - { - "name": "@electron-forge/maker-zip" - } - ], - "plugins": [ - { - "name": "@electron-forge/plugin-webpack", - "config": { - "devContentSecurityPolicy": "default-src * self blob: data: gap:; style-src * self 'unsafe-inline' blob: data: gap:; script-src * 'self' 'unsafe-eval' 'unsafe-inline' blob: data: gap:; object-src * 'self' blob: data: gap:; img-src * self 'unsafe-inline' blob: data: gap:; connect-src self * 'unsafe-inline' blob: data: gap:; frame-src * self blob: data: gap:;", - "mainConfig": "./webpack.main.config.js", - "renderer": { - "nodeIntegration": true, - "contextIsolation": false, - "config": "./webpack.renderer.config.js", - "entryPoints": [ - { - "name": "main_window", - "html": "./src/renderer/index.html", - "js": "./src/renderer/index.js" - } - ] - } - } - } - ] - } - }, "devDependencies": { - "@babel/core": "^7.17.7", - "@babel/eslint-parser": "^7.17.0", - "@babel/preset-react": "^7.14.5", - "@electron-forge/cli": "^6.0.0-beta.63", - "@electron-forge/maker-deb": "^6.0.0-beta.61", - "@electron-forge/maker-rpm": "^6.0.0-beta.61", - "@electron-forge/maker-squirrel": "^6.0.0-beta.61", - "@electron-forge/maker-zip": "^6.0.0-beta.63", - "@electron-forge/plugin-webpack": "^6.0.0-beta.63", - "@vercel/webpack-asset-relocator-loader": "^1.7.0", - "babel-loader": "^8.2.2", - "copy-webpack-plugin": "^9.0.1", - "css-loader": "^6.0.0", - "electron": "^21.2.0", + "@types/react": "^18.0.26", + "@types/react-dom": "^18.0.9", + "@vitejs/plugin-react-swc": "^3.0.0", "eslint": "^8.11.0", "eslint-config-prettier": "^8.3.0", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-react": "^7.26.1", + "eslint-plugin-react": "^7.28.0", + "eslint-plugin-simple-import-sort": "^7.0.0", "node-loader": "^2.0.0", "prettier": "^2.4.1", "redux-logger": "^3.0.6", - "style-loader": "^3.0.0" + "vite": "^4.0.0" }, "dependencies": { "@ant-design/compatible": "^1.1.0", @@ -87,13 +45,9 @@ "color-interpolate": "^1.0.5", "connected-react-router": "^6.5.2", "deck.gl": "^7", - "electron-log": "^4.4.3", - "electron-squirrel-startup": "^1.0.0", - "frameless-titlebar": "^2.1.4", "handsontable": "^6", "history": "^4.9.0", "html-react-parser": "^3.0.4", - "ini": "^3.0.1", "nebula.gl": "^0.15.0", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/renderer/actions/databaseEditor.js b/src/actions/databaseEditor.js similarity index 100% rename from src/renderer/actions/databaseEditor.js rename to src/actions/databaseEditor.js diff --git a/src/renderer/actions/homepage.js b/src/actions/homepage.js similarity index 100% rename from src/renderer/actions/homepage.js rename to src/actions/homepage.js diff --git a/src/renderer/actions/inputEditor.js b/src/actions/inputEditor.js similarity index 100% rename from src/renderer/actions/inputEditor.js rename to src/actions/inputEditor.js diff --git a/src/renderer/actions/jobs.js b/src/actions/jobs.js similarity index 100% rename from src/renderer/actions/jobs.js rename to src/actions/jobs.js diff --git a/src/renderer/actions/project.js b/src/actions/project.js similarity index 100% rename from src/renderer/actions/project.js rename to src/actions/project.js diff --git a/src/renderer/actions/tools.js b/src/actions/tools.js similarity index 100% rename from src/renderer/actions/tools.js rename to src/actions/tools.js diff --git a/src/renderer/app.global.css b/src/app.global.css similarity index 94% rename from src/renderer/app.global.css rename to src/app.global.css index 33e0031..99ae789 100644 --- a/src/renderer/app.global.css +++ b/src/app.global.css @@ -5,11 +5,6 @@ overflow: hidden; } -#cea-title-bar { - position: relative; - z-index: 9999; -} - .trigger { font-size: 18px; line-height: 64px; diff --git a/src/renderer/static/cea-logo.png b/src/assets/cea-logo.png similarity index 100% rename from src/renderer/static/cea-logo.png rename to src/assets/cea-logo.png diff --git a/src/renderer/components/Dashboard/Dashboard.css b/src/components/Dashboard/Dashboard.css similarity index 100% rename from src/renderer/components/Dashboard/Dashboard.css rename to src/components/Dashboard/Dashboard.css diff --git a/src/renderer/components/Dashboard/Dashboard.js b/src/components/Dashboard/Dashboard.js similarity index 100% rename from src/renderer/components/Dashboard/Dashboard.js rename to src/components/Dashboard/Dashboard.js diff --git a/src/renderer/components/Dashboard/Layouts.js b/src/components/Dashboard/Layouts.js similarity index 100% rename from src/renderer/components/Dashboard/Layouts.js rename to src/components/Dashboard/Layouts.js diff --git a/src/renderer/components/Dashboard/Modals.js b/src/components/Dashboard/Modals.js similarity index 99% rename from src/renderer/components/Dashboard/Modals.js rename to src/components/Dashboard/Modals.js index a07621d..94f8c01 100644 --- a/src/renderer/components/Dashboard/Modals.js +++ b/src/components/Dashboard/Modals.js @@ -5,9 +5,7 @@ import '@ant-design/compatible/assets/index.css'; import { Modal, Select, Input, Radio, Button, Skeleton } from 'antd'; import axios from 'axios'; import { ModalContext } from '../../utils/ModalManager'; -import { shell } from 'electron'; import Parameter from '../Tools/Parameter'; -import path from 'path'; const { Option } = Select; diff --git a/src/renderer/components/Dashboard/Plot.js b/src/components/Dashboard/Plot.js similarity index 99% rename from src/renderer/components/Dashboard/Plot.js rename to src/components/Dashboard/Plot.js index 8c2f5b7..529278c 100644 --- a/src/renderer/components/Dashboard/Plot.js +++ b/src/components/Dashboard/Plot.js @@ -1,6 +1,5 @@ import { memo, useState, useEffect, useContext } from 'react'; import { Link } from 'react-router-dom'; -import { ipcRenderer } from 'electron'; import Icon, { EditTwoTone, FileTextTwoTone, diff --git a/src/renderer/components/DatabaseEditor/ColumnGlossary.js b/src/components/DatabaseEditor/ColumnGlossary.js similarity index 100% rename from src/renderer/components/DatabaseEditor/ColumnGlossary.js rename to src/components/DatabaseEditor/ColumnGlossary.js diff --git a/src/renderer/components/DatabaseEditor/Database.js b/src/components/DatabaseEditor/Database.js similarity index 100% rename from src/renderer/components/DatabaseEditor/Database.js rename to src/components/DatabaseEditor/Database.js diff --git a/src/renderer/components/DatabaseEditor/DatabaseEditor.css b/src/components/DatabaseEditor/DatabaseEditor.css similarity index 100% rename from src/renderer/components/DatabaseEditor/DatabaseEditor.css rename to src/components/DatabaseEditor/DatabaseEditor.css diff --git a/src/renderer/components/DatabaseEditor/DatabaseEditor.js b/src/components/DatabaseEditor/DatabaseEditor.js similarity index 100% rename from src/renderer/components/DatabaseEditor/DatabaseEditor.js rename to src/components/DatabaseEditor/DatabaseEditor.js diff --git a/src/renderer/components/DatabaseEditor/DatabaseTopMenu.js b/src/components/DatabaseEditor/DatabaseTopMenu.js similarity index 100% rename from src/renderer/components/DatabaseEditor/DatabaseTopMenu.js rename to src/components/DatabaseEditor/DatabaseTopMenu.js diff --git a/src/renderer/components/DatabaseEditor/ExportDatabaseModal.js b/src/components/DatabaseEditor/ExportDatabaseModal.js similarity index 98% rename from src/renderer/components/DatabaseEditor/ExportDatabaseModal.js rename to src/components/DatabaseEditor/ExportDatabaseModal.js index 7ff973a..79a89db 100644 --- a/src/renderer/components/DatabaseEditor/ExportDatabaseModal.js +++ b/src/components/DatabaseEditor/ExportDatabaseModal.js @@ -2,8 +2,6 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Modal, message, Alert } from 'antd'; -import fs from 'fs'; -import path from 'path'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useSelector } from 'react-redux'; diff --git a/src/renderer/components/DatabaseEditor/NewScheduleModal.js b/src/components/DatabaseEditor/NewScheduleModal.js similarity index 100% rename from src/renderer/components/DatabaseEditor/NewScheduleModal.js rename to src/components/DatabaseEditor/NewScheduleModal.js diff --git a/src/renderer/components/DatabaseEditor/SavingDatabaseModal.js b/src/components/DatabaseEditor/SavingDatabaseModal.js similarity index 100% rename from src/renderer/components/DatabaseEditor/SavingDatabaseModal.js rename to src/components/DatabaseEditor/SavingDatabaseModal.js diff --git a/src/renderer/components/DatabaseEditor/Table.js b/src/components/DatabaseEditor/Table.js similarity index 100% rename from src/renderer/components/DatabaseEditor/Table.js rename to src/components/DatabaseEditor/Table.js diff --git a/src/renderer/components/DatabaseEditor/UseTypesDatabase.js b/src/components/DatabaseEditor/UseTypesDatabase.js similarity index 100% rename from src/renderer/components/DatabaseEditor/UseTypesDatabase.js rename to src/components/DatabaseEditor/UseTypesDatabase.js diff --git a/src/renderer/components/DatabaseEditor/ValidationErrors.js b/src/components/DatabaseEditor/ValidationErrors.js similarity index 100% rename from src/renderer/components/DatabaseEditor/ValidationErrors.js rename to src/components/DatabaseEditor/ValidationErrors.js diff --git a/src/renderer/components/HomePage/CenterSpinner.js b/src/components/HomePage/CenterSpinner.js similarity index 100% rename from src/renderer/components/HomePage/CenterSpinner.js rename to src/components/HomePage/CenterSpinner.js diff --git a/src/renderer/components/HomePage/Header.js b/src/components/HomePage/Header.js similarity index 100% rename from src/renderer/components/HomePage/Header.js rename to src/components/HomePage/Header.js diff --git a/src/renderer/components/HomePage/SearchBar.css b/src/components/HomePage/SearchBar.css similarity index 100% rename from src/renderer/components/HomePage/SearchBar.css rename to src/components/HomePage/SearchBar.css diff --git a/src/renderer/components/HomePage/SearchBar.js b/src/components/HomePage/SearchBar.js similarity index 99% rename from src/renderer/components/HomePage/SearchBar.js rename to src/components/HomePage/SearchBar.js index 7be3157..ee6fd76 100644 --- a/src/renderer/components/HomePage/SearchBar.js +++ b/src/components/HomePage/SearchBar.js @@ -1,5 +1,4 @@ import { useState, useEffect, useRef } from 'react'; -import { shell } from 'electron'; import { SearchOutlined } from '@ant-design/icons'; import { Input } from 'antd'; import axios from 'axios'; diff --git a/src/renderer/components/HomePage/SideNav.js b/src/components/HomePage/SideNav.js similarity index 96% rename from src/renderer/components/HomePage/SideNav.js rename to src/components/HomePage/SideNav.js index 4ca6d51..ca58023 100644 --- a/src/renderer/components/HomePage/SideNav.js +++ b/src/components/HomePage/SideNav.js @@ -1,6 +1,5 @@ import { Children, cloneElement, useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import { shell } from 'electron'; import { Link } from 'react-router-dom'; import { BarChartOutlined, @@ -18,11 +17,10 @@ import { Layout, Menu } from 'antd'; import { setCollapsed } from '../../actions/homepage'; import ToolsMenu from './ToolsMenu'; import routes from '../../constants/routes'; -import getStatic from '../../utils/static'; +import ceaLogo from '../../assets/react.svg'; const { Sider } = Layout; const { SubMenu } = Menu; -const logo = getStatic('cea-logo.png'); const SideNav = () => { // TODO: Maybe use context instead of redux for this @@ -59,7 +57,7 @@ const SideNav = () => { // defaultCollapsed="true" >
- Logo + Logo

City Energy Analyst

diff --git a/src/renderer/components/HomePage/ToolsMenu.js b/src/components/HomePage/ToolsMenu.js similarity index 100% rename from src/renderer/components/HomePage/ToolsMenu.js rename to src/components/HomePage/ToolsMenu.js diff --git a/src/renderer/components/InputEditor/EditSelectedModal.js b/src/components/InputEditor/EditSelectedModal.js similarity index 100% rename from src/renderer/components/InputEditor/EditSelectedModal.js rename to src/components/InputEditor/EditSelectedModal.js diff --git a/src/renderer/components/InputEditor/InputEditor.js b/src/components/InputEditor/InputEditor.js similarity index 100% rename from src/renderer/components/InputEditor/InputEditor.js rename to src/components/InputEditor/InputEditor.js diff --git a/src/renderer/components/InputEditor/NavigationPrompt.js b/src/components/InputEditor/NavigationPrompt.js similarity index 100% rename from src/renderer/components/InputEditor/NavigationPrompt.js rename to src/components/InputEditor/NavigationPrompt.js diff --git a/src/renderer/components/InputEditor/ScheduleEditor.css b/src/components/InputEditor/ScheduleEditor.css similarity index 100% rename from src/renderer/components/InputEditor/ScheduleEditor.css rename to src/components/InputEditor/ScheduleEditor.css diff --git a/src/renderer/components/InputEditor/ScheduleEditor.js b/src/components/InputEditor/ScheduleEditor.js similarity index 100% rename from src/renderer/components/InputEditor/ScheduleEditor.js rename to src/components/InputEditor/ScheduleEditor.js diff --git a/src/renderer/components/InputEditor/Table.js b/src/components/InputEditor/Table.js similarity index 99% rename from src/renderer/components/InputEditor/Table.js rename to src/components/InputEditor/Table.js index e1ab39c..cca0a70 100644 --- a/src/renderer/components/InputEditor/Table.js +++ b/src/components/InputEditor/Table.js @@ -15,7 +15,6 @@ import routes from '../../constants/routes'; import Tabulator from 'tabulator-tables'; import 'tabulator-tables/dist/css/tabulator.min.css'; import ScheduleEditor from './ScheduleEditor'; -import { shell } from 'electron'; import { AsyncError } from '../../utils'; import { createRoot } from 'react-dom/client'; diff --git a/src/renderer/components/InputEditor/inputEditor.css b/src/components/InputEditor/inputEditor.css similarity index 100% rename from src/renderer/components/InputEditor/inputEditor.css rename to src/components/InputEditor/inputEditor.css diff --git a/src/renderer/components/Landing/Landing.js b/src/components/Landing/Landing.js similarity index 91% rename from src/renderer/components/Landing/Landing.js rename to src/components/Landing/Landing.js index 95811e9..2b02033 100644 --- a/src/renderer/components/Landing/Landing.js +++ b/src/components/Landing/Landing.js @@ -3,12 +3,10 @@ import { useDispatch } from 'react-redux'; import { push } from 'connected-react-router'; import { FolderOpenOutlined, PlusOutlined } from '@ant-design/icons'; import { Button } from 'antd'; -import getStatic from '../../utils/static'; import NewProjectModal from '../Project/NewProjectModal'; import OpenProjectModal from '../Project/OpenProjectModal'; import routes from '../../constants/routes'; - -const logo = getStatic('cea-logo.png'); +import ceaLogo from '../../assets/react.svg'; const Landing = () => { return ( @@ -19,7 +17,11 @@ const Landing = () => { alignItems: 'center', }} > - CEA Logo + CEA Logo

City Energy Analyst

diff --git a/src/renderer/components/Map/EditableMap.css b/src/components/Map/EditableMap.css similarity index 100% rename from src/renderer/components/Map/EditableMap.css rename to src/components/Map/EditableMap.css diff --git a/src/renderer/components/Map/EditableMap.js b/src/components/Map/EditableMap.js similarity index 100% rename from src/renderer/components/Map/EditableMap.js rename to src/components/Map/EditableMap.js diff --git a/src/renderer/components/Map/Map.css b/src/components/Map/Map.css similarity index 100% rename from src/renderer/components/Map/Map.css rename to src/components/Map/Map.css diff --git a/src/renderer/components/Map/Map.js b/src/components/Map/Map.js similarity index 100% rename from src/renderer/components/Map/Map.js rename to src/components/Map/Map.js diff --git a/src/renderer/components/Map/MapButtons.css b/src/components/Map/MapButtons.css similarity index 100% rename from src/renderer/components/Map/MapButtons.css rename to src/components/Map/MapButtons.css diff --git a/src/renderer/components/Map/MapButtons.js b/src/components/Map/MapButtons.js similarity index 100% rename from src/renderer/components/Map/MapButtons.js rename to src/components/Map/MapButtons.js diff --git a/src/renderer/components/Project/CreatingScenarioModal.js b/src/components/Project/CreatingScenarioModal.js similarity index 100% rename from src/renderer/components/Project/CreatingScenarioModal.js rename to src/components/Project/CreatingScenarioModal.js diff --git a/src/renderer/components/Project/NewProjectModal.js b/src/components/Project/NewProjectModal.js similarity index 98% rename from src/renderer/components/Project/NewProjectModal.js rename to src/components/Project/NewProjectModal.js index 238a9c3..fc4226b 100644 --- a/src/renderer/components/Project/NewProjectModal.js +++ b/src/components/Project/NewProjectModal.js @@ -2,8 +2,6 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; -import fs from 'fs'; -import path from 'path'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; diff --git a/src/renderer/components/Project/NewScenarioModal.js b/src/components/Project/NewScenarioModal.js similarity index 99% rename from src/renderer/components/Project/NewScenarioModal.js rename to src/components/Project/NewScenarioModal.js index a6f585f..da914e3 100644 --- a/src/renderer/components/Project/NewScenarioModal.js +++ b/src/components/Project/NewScenarioModal.js @@ -2,8 +2,6 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Modal, Radio, Input } from 'antd'; -import fs from 'fs'; -import path from 'path'; import axios from 'axios'; import { useOpenScenario } from './Project'; import CreatingScenarioModal from './CreatingScenarioModal'; diff --git a/src/renderer/components/Project/OpenProjectModal.js b/src/components/Project/OpenProjectModal.js similarity index 98% rename from src/renderer/components/Project/OpenProjectModal.js rename to src/components/Project/OpenProjectModal.js index ed5dba6..93f6380 100644 --- a/src/renderer/components/Project/OpenProjectModal.js +++ b/src/components/Project/OpenProjectModal.js @@ -2,7 +2,6 @@ import { useRef, useState, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; -import path from 'path'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; diff --git a/src/renderer/components/Project/Project.css b/src/components/Project/Project.css similarity index 100% rename from src/renderer/components/Project/Project.css rename to src/components/Project/Project.css diff --git a/src/renderer/components/Project/Project.js b/src/components/Project/Project.js similarity index 100% rename from src/renderer/components/Project/Project.js rename to src/components/Project/Project.js diff --git a/src/renderer/components/Project/RenameScenarioModal.js b/src/components/Project/RenameScenarioModal.js similarity index 98% rename from src/renderer/components/Project/RenameScenarioModal.js rename to src/components/Project/RenameScenarioModal.js index e2f96d2..26ff9b1 100644 --- a/src/renderer/components/Project/RenameScenarioModal.js +++ b/src/components/Project/RenameScenarioModal.js @@ -2,8 +2,6 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; -import fs from 'fs'; -import path from 'path'; import axios from 'axios'; import { FormItemWrapper } from '../Tools/Parameter'; import { useFetchProject } from './Project'; diff --git a/src/renderer/components/Project/ScenarioCard.js b/src/components/Project/ScenarioCard.js similarity index 100% rename from src/renderer/components/Project/ScenarioCard.js rename to src/components/Project/ScenarioCard.js diff --git a/src/renderer/components/Project/ScenarioGenerateDataForm.js b/src/components/Project/ScenarioGenerateDataForm.js similarity index 100% rename from src/renderer/components/Project/ScenarioGenerateDataForm.js rename to src/components/Project/ScenarioGenerateDataForm.js diff --git a/src/renderer/components/Project/ScenarioImportDataForm.js b/src/components/Project/ScenarioImportDataForm.js similarity index 98% rename from src/renderer/components/Project/ScenarioImportDataForm.js rename to src/components/Project/ScenarioImportDataForm.js index 70d2ba0..752861d 100644 --- a/src/renderer/components/Project/ScenarioImportDataForm.js +++ b/src/components/Project/ScenarioImportDataForm.js @@ -1,5 +1,3 @@ -import { ipcRenderer } from 'electron'; -import fs from 'fs'; import { DownOutlined, EllipsisOutlined, diff --git a/src/renderer/components/Project/ToolModal.js b/src/components/Project/ToolModal.js similarity index 100% rename from src/renderer/components/Project/ToolModal.js rename to src/components/Project/ToolModal.js diff --git a/src/renderer/components/Splash/Splash.js b/src/components/Splash/Splash.js similarity index 100% rename from src/renderer/components/Splash/Splash.js rename to src/components/Splash/Splash.js diff --git a/src/renderer/components/StatusBar/StatusBar.css b/src/components/StatusBar/StatusBar.css similarity index 100% rename from src/renderer/components/StatusBar/StatusBar.css rename to src/components/StatusBar/StatusBar.css diff --git a/src/renderer/components/StatusBar/StatusBar.js b/src/components/StatusBar/StatusBar.js similarity index 100% rename from src/renderer/components/StatusBar/StatusBar.js rename to src/components/StatusBar/StatusBar.js diff --git a/src/renderer/components/Titlebar/index.js b/src/components/Titlebar/index.js similarity index 97% rename from src/renderer/components/Titlebar/index.js rename to src/components/Titlebar/index.js index db18e9e..e79528a 100644 --- a/src/renderer/components/Titlebar/index.js +++ b/src/components/Titlebar/index.js @@ -1,5 +1,4 @@ import { useEffect, useState } from 'react'; -import { ipcRenderer } from 'electron'; import TitleBar from 'frameless-titlebar'; export default function Titlebar() { diff --git a/src/renderer/components/Tools/Parameter.js b/src/components/Tools/Parameter.js similarity index 99% rename from src/renderer/components/Tools/Parameter.js rename to src/components/Tools/Parameter.js index fae7ca8..20c0e51 100644 --- a/src/renderer/components/Tools/Parameter.js +++ b/src/components/Tools/Parameter.js @@ -1,6 +1,4 @@ import { forwardRef } from 'react'; -import { ipcRenderer } from 'electron'; -import fs from 'fs'; import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import '@ant-design/compatible/assets/index.css'; diff --git a/src/renderer/components/Tools/Tool.js b/src/components/Tools/Tool.js similarity index 100% rename from src/renderer/components/Tools/Tool.js rename to src/components/Tools/Tool.js diff --git a/src/renderer/constants/colors.json b/src/constants/colors.json similarity index 100% rename from src/renderer/constants/colors.json rename to src/constants/colors.json diff --git a/src/renderer/constants/inputEndpoints.json b/src/constants/inputEndpoints.json similarity index 100% rename from src/renderer/constants/inputEndpoints.json rename to src/constants/inputEndpoints.json diff --git a/src/renderer/constants/mapStyles.json b/src/constants/mapStyles.json similarity index 100% rename from src/renderer/constants/mapStyles.json rename to src/constants/mapStyles.json diff --git a/src/renderer/constants/months.js b/src/constants/months.js similarity index 100% rename from src/renderer/constants/months.js rename to src/constants/months.js diff --git a/src/renderer/constants/routes.json b/src/constants/routes.json similarity index 100% rename from src/renderer/constants/routes.json rename to src/constants/routes.json diff --git a/src/renderer/containers/App.js b/src/containers/App.js similarity index 100% rename from src/renderer/containers/App.js rename to src/containers/App.js diff --git a/src/renderer/containers/HomePage.js b/src/containers/HomePage.js similarity index 100% rename from src/renderer/containers/HomePage.js rename to src/containers/HomePage.js diff --git a/src/index.html b/src/index.html new file mode 100644 index 0000000..6083a40 --- /dev/null +++ b/src/index.html @@ -0,0 +1,15 @@ + + + + + + + CityEnergyAnalyst + + + +
+ + + + \ No newline at end of file diff --git a/src/main.js b/src/main.js deleted file mode 100644 index 81e6560..0000000 --- a/src/main.js +++ /dev/null @@ -1,47 +0,0 @@ -const { app, BrowserWindow } = require('electron'); -const path = require('path'); - -// Handle creating/removing shortcuts on Windows when installing/uninstalling. -if (require('electron-squirrel-startup')) { - // eslint-disable-line global-require - app.quit(); -} - -const createWindow = () => { - // Create the browser window. - const mainWindow = new BrowserWindow({ - width: 800, - height: 600, - }); - - // and load the index.html of the app. - mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY); - - // Open the DevTools. - mainWindow.webContents.openDevTools(); -}; - -// This method will be called when Electron has finished -// initialization and is ready to create browser windows. -// Some APIs can only be used after this event occurs. -app.on('ready', createWindow); - -// Quit when all windows are closed, except on macOS. There, it's common -// for applications and their menu bar to stay active until the user quits -// explicitly with Cmd + Q. -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit(); - } -}); - -app.on('activate', () => { - // On OS X it's common to re-create a window in the app when the - // dock icon is clicked and there are no other windows open. - if (BrowserWindow.getAllWindows().length === 0) { - createWindow(); - } -}); - -// In this file you can include the rest of your app's specific main process -// code. You can also put them in separate files and import them here. diff --git a/src/main.jsx b/src/main.jsx new file mode 100644 index 0000000..66c16e0 --- /dev/null +++ b/src/main.jsx @@ -0,0 +1,13 @@ +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import App from './containers/App'; +import { configureStore, history } from './store/configureStore'; +import './app.global.css'; + +const store = configureStore(); + +ReactDOM.createRoot(document.getElementById('root')).render( + + + +); diff --git a/src/main/ceaProcess.js b/src/main/ceaProcess.js deleted file mode 100644 index a3ee331..0000000 --- a/src/main/ceaProcess.js +++ /dev/null @@ -1,123 +0,0 @@ -import fs from 'fs'; -import path from 'path'; -import axios from 'axios'; -import { app, dialog } from 'electron'; - -let cea; -let timeout; -let interval; -let startupError = ''; - -export function createCEAProcess(url, BrowserWindow, callback) { - console.log(`createCEAProcess(${url})`); - // For windows - if (process.platform === 'win32') { - let scriptPath = path.join( - path.dirname(process.execPath), - '/../', - 'dashboard.bat' - ); - // Fallback to default install path - if (!fs.existsSync(scriptPath)) - scriptPath = path.join( - process.env.USERPROFILE, - 'Documents', - 'CityEnergyAnalyst', - 'dashboard.bat' - ); - console.log(scriptPath); - cea = require('child_process').spawn('cmd.exe', ['/c', scriptPath]); - } - - if (cea) { - // Attach cea output to console - cea.stdout.on('data', function (data) { - console.log(data.toString('utf8').trim()); - }); - - cea.stderr.on('data', function (data) { - console.error(data.toString('utf8').trim()); - }); - - // Show Error message box when CEA encounters any error on startup - cea.stderr.on('data', saveStartupError); - cea.on('exit', showStartupError); - } - - function saveStartupError(message) { - startupError += message.toString('utf8'); - } - - function showStartupError() { - dialog.showMessageBoxSync(BrowserWindow, { - type: 'error', - title: 'CEA Error', - message: 'CEA has encounted an error on startup', - detail: startupError, - buttons: ['Exit CEA'], - }); - app.exit(); - } - - checkCEAStarted(url, () => { - // Remove Error message box listener after successful startup - if (cea) { - cea.stderr.removeListener('data', saveStartupError); - cea.removeListener('exit', showStartupError); - } - callback(); - }); - - return cea; -} - -// Kill process and stop all timed events -export function killCEAProcess() { - if (cea) { - cea.removeAllListeners('exit'); - process.kill(cea.pid); - } - interval && clearInterval(interval); - timeout && clearTimeout(timeout); -} - -export async function isCEAAlive(url) { - console.debug(`isCEAAlive(${url})`); - try { - const resp = await axios.get(`${url}/server/alive`); - return resp.status == 200; - } catch (error) { - console.error(error.response || 'No Response'); - return false; - } -} - -function checkCEAStarted(url, callback) { - console.debug(`checkCEAStarted(${url})`); - const runCallbackOnce = (() => { - let executed = false; - return () => { - if (!executed) { - executed = true; - callback(); - } - }; - })(); - - // Check every 1 seconds - var bound_url = url; - console.debug(`checkCEAStarted(bound_url=${bound_url})`); - interval = setInterval(async () => { - const alive = await isCEAAlive(bound_url); - if (alive) { - clearInterval(interval); - timeout && clearTimeout(timeout); - runCallbackOnce(); - } - }, 1000); - - // Stop checking after 1 min - timeout = setTimeout(() => { - clearInterval(interval); - }, 60000); -} diff --git a/src/main/index.js b/src/main/index.js deleted file mode 100644 index 590116d..0000000 --- a/src/main/index.js +++ /dev/null @@ -1,226 +0,0 @@ -'use strict'; - -import { app, BrowserWindow, Menu, ipcMain, dialog } from 'electron'; -import path from 'path'; -import { createCEAProcess, isCEAAlive, killCEAProcess } from './ceaProcess'; -import menu from './menu'; -import axios from 'axios'; -import ini from 'ini'; -import os from 'os'; -import fs from 'fs'; -import log from 'electron-log'; - -// Setup logging -process.env.LOG_PATH = path.join(app.getPath('logs'), 'console.log'); -log.transports.file.resolvePath = () => { - return process.env.LOG_PATH; -}; -const mainLog = log.scope('main'); -console.log = mainLog.log; -console.debug = mainLog.debug; -console.error = mainLog.error; - -const isDevelopment = process.env.NODE_ENV !== 'production'; - -// global reference to mainWindow (necessary to prevent window from being garbage collected) -let mainWindow; -let splashWindow; - -// TEMP SOLUTION. Should check for errors (file doesn't exist) -const cea_config = ini.parse( - fs.readFileSync(path.join(os.homedir(), 'cea.config'), 'utf-8') -); -const CEA_URL = `${cea_config.server.protocol}://${cea_config.server.host}:${cea_config.server.port}`; -console.log(`CEA_URL: ${CEA_URL}`); -process.env.CEA_URL = CEA_URL; - -// Add Menu to application -Menu.setApplicationMenu(menu); - -function createMainWindow() { - const window = new BrowserWindow({ - minWidth: 600, - minHeight: 600, - show: false, // starts hidden until page is loaded - frame: false, - titleBarStyle: 'hidden', // or 'customButtonsOnHover', - webPreferences: { - preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY, - nodeIntegration: true, - contextIsolation: false, - }, - }); - - window.webContents.on('did-frame-finish-load', () => { - if (isDevelopment) { - window.webContents.openDevTools(); - } - }); - - window.once('ready-to-show', () => { - window.show(); - window.maximize(); - splashWindow && splashWindow.close(); - }); - - window.loadURL(`${MAIN_WINDOW_WEBPACK_ENTRY}`); - - window.on('closed', () => { - mainWindow = null; - app.quit(); - }); - - window.webContents.on('devtools-opened', () => { - window.focus(); - setImmediate(() => { - window.focus(); - }); - }); - - // Set window handlers - window.on('maximize', () => { - window.webContents.send('main-window-maximize'); - }); - window.on('unmaximize', () => { - window.webContents.send('main-window-unmaximize'); - }); - ipcMain.handle('main-window-close', () => { - window.close(); - }); - ipcMain.handle('main-window-minimize', () => { - window.minimize(); - }); - ipcMain.handle('main-window-restore', () => { - window.restore(); - }); - ipcMain.handle('main-window-maximize', () => { - window.maximize(); - }); - - ipcMain.handle('open-dialog', async (_, arg) => { - const { filePaths } = await dialog.showOpenDialog(window, arg); - return filePaths; - }); - - ipcMain.handle('open-plot-window', (_, arg) => { - const { index, dashIndex } = arg; - - let win = new BrowserWindow({ - title: 'City Energy Analyst | Loading Plot...', - width: 800, - height: 600, - }); - win.removeMenu(); - win.on('closed', () => { - win = null; - }); - - // Triggers savePage when 'Export to File' is clicked - win.webContents.on('did-navigate-in-page', () => { - dialog - .showSaveDialog(win, { - defaultPath: win.getTitle().split(' | ')[1], - filters: [ - { - name: 'HTML', - extensions: ['html'], - }, - ], - }) - .then(({ filePath }) => { - if (filePath) win.webContents.savePage(filePath, 'HTMLOnly'); - }) - .catch((error) => { - console.error(error); - }); - }); - - win.loadURL(`${process.env.CEA_URL}/plots/plot/${dashIndex}/${index}`); - }); - - return window; -} - -function createSplashWindow(url) { - const window = new BrowserWindow({ - height: 300, - width: 500, - resizable: false, - maximizable: false, - show: false, - frame: false, - backgroundColor: '#2e2c29', - titleBarStyle: 'hidden', - webPreferences: { - preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY, - nodeIntegration: true, - contextIsolation: false, - }, - }); - - window.once('ready-to-show', () => { - window.show(); - - // Check if CEA server is already running, only start if not - isCEAAlive(url).then((alive) => { - if (alive) { - console.log('cea dashboard already running...'); - mainWindow = createMainWindow(); - } else { - console.log('cea dashboard not running, starting...'); - createCEAProcess(url, window, () => { - console.log('cea dashboard process created...'); - mainWindow = createMainWindow(); - }); - } - }); - }); - - window.loadURL(`${MAIN_WINDOW_WEBPACK_ENTRY}#splash`); - - window.on('closed', () => { - !mainWindow && killCEAProcess(); - splashWindow = null; - }); - - return window; -} - -/** - * Add event listeners... - */ - -app.on('will-quit', (event) => { - event.preventDefault(); - const shutdown = async () => { - try { - const resp = await axios.post(`${CEA_URL}/server/shutdown`); - console.log(resp?.data); - } catch (error) { - console.error(error); - } - app.exit(); - }; - shutdown(); -}); - -// quit application when all windows are closed -app.on('window-all-closed', () => { - // on macOS it is common for applications to stay open until the user explicitly quits - if (process.platform !== 'darwin') { - app.quit(); - } -}); - -app.on('activate', () => { - // on macOS it is common to re-create a window even after all windows have been closed - if (mainWindow === null) { - mainWindow = createMainWindow(); - } -}); - -// create splash BrowserWindow when electron is ready -app.on('ready', () => { - console.log(`app.on('ready'): CEA_URL=${CEA_URL}`); - splashWindow = createSplashWindow(CEA_URL); -}); diff --git a/src/main/menu.js b/src/main/menu.js deleted file mode 100644 index d311aae..0000000 --- a/src/main/menu.js +++ /dev/null @@ -1,100 +0,0 @@ -import { app, Menu } from 'electron'; - -const isMac = process.platform === 'darwin'; -const template = [ - // { role: 'appMenu' } - ...(isMac - ? [ - { - label: app.getName(), - submenu: [ - { role: 'about' }, - { type: 'separator' }, - { role: 'services' }, - { type: 'separator' }, - { role: 'hide' }, - { role: 'hideothers' }, - { role: 'unhide' }, - { type: 'separator' }, - { role: 'quit' }, - ], - }, - ] - : []), - // { role: 'fileMenu' } - { - label: 'File', - submenu: [isMac ? { role: 'close' } : { role: 'quit' }], - }, - // { role: 'editMenu' } - { - label: 'Edit', - submenu: [ - { role: 'undo' }, - { role: 'redo' }, - { type: 'separator' }, - { role: 'cut' }, - { role: 'copy' }, - { role: 'paste' }, - ...(isMac - ? [ - { role: 'pasteAndMatchStyle' }, - { role: 'delete' }, - { role: 'selectAll' }, - { type: 'separator' }, - { - label: 'Speech', - submenu: [{ role: 'startspeaking' }, { role: 'stopspeaking' }], - }, - ] - : [{ role: 'delete' }, { type: 'separator' }, { role: 'selectAll' }]), - ], - }, - // { role: 'viewMenu' } - { - label: 'View', - submenu: [ - { role: 'reload' }, - { role: 'forcereload', accelerator: 'CmdOrCtrl+Shift+R' }, - { role: 'toggledevtools' }, - { type: 'separator' }, - { role: 'resetzoom' }, - { role: 'zoomin' }, - { role: 'zoomout' }, - { type: 'separator' }, - { role: 'togglefullscreen' }, - ], - }, - // { role: 'windowMenu' } - { - label: 'Window', - submenu: [ - { role: 'minimize' }, - { role: 'zoom' }, - ...(isMac - ? [ - { type: 'separator' }, - { role: 'front' }, - { type: 'separator' }, - { role: 'window' }, - ] - : [{ role: 'close' }]), - ], - }, - { - role: 'help', - submenu: [ - { - label: 'Learn More', - click: async () => { - const { shell } = require('electron'); - await shell.openExternal('https://electronjs.org'); - }, - }, - ], - }, -]; - -const menu = Menu.buildFromTemplate(template); - -export default menu; diff --git a/src/renderer/reducers/databaseEditor.js b/src/reducers/databaseEditor.js similarity index 100% rename from src/renderer/reducers/databaseEditor.js rename to src/reducers/databaseEditor.js diff --git a/src/renderer/reducers/homepage.js b/src/reducers/homepage.js similarity index 100% rename from src/renderer/reducers/homepage.js rename to src/reducers/homepage.js diff --git a/src/renderer/reducers/index.js b/src/reducers/index.js similarity index 100% rename from src/renderer/reducers/index.js rename to src/reducers/index.js diff --git a/src/renderer/reducers/inputEditor.js b/src/reducers/inputEditor.js similarity index 100% rename from src/renderer/reducers/inputEditor.js rename to src/reducers/inputEditor.js diff --git a/src/renderer/reducers/jobs.js b/src/reducers/jobs.js similarity index 100% rename from src/renderer/reducers/jobs.js rename to src/reducers/jobs.js diff --git a/src/renderer/reducers/project.js b/src/reducers/project.js similarity index 100% rename from src/renderer/reducers/project.js rename to src/reducers/project.js diff --git a/src/renderer/reducers/tools.js b/src/reducers/tools.js similarity index 100% rename from src/renderer/reducers/tools.js rename to src/reducers/tools.js diff --git a/src/renderer/index.html b/src/renderer/index.html deleted file mode 100644 index b4a8abb..0000000 --- a/src/renderer/index.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - CityEnergyAnalyst - - - -
- - - \ No newline at end of file diff --git a/src/renderer/index.js b/src/renderer/index.js deleted file mode 100644 index eacfb97..0000000 --- a/src/renderer/index.js +++ /dev/null @@ -1,19 +0,0 @@ -import { createRoot } from 'react-dom/client'; -import App from './containers/App'; -import { configureStore, history } from './store/configureStore'; -import './app.global.css'; -import log from 'electron-log'; -import path from 'path'; - -log.transports.file.resolvePath = (variables) => { - return path.join(variables.libraryDefaultDir, 'console.log'); -}; -const rendererLog = log.scope('renderer'); -console.log = rendererLog.log; -console.error = rendererLog.error; - -const store = configureStore(); - -const container = document.getElementById('app'); -const root = createRoot(container); -root.render(); diff --git a/src/renderer/utils/menu.js b/src/renderer/utils/menu.js deleted file mode 100644 index 01fcf19..0000000 --- a/src/renderer/utils/menu.js +++ /dev/null @@ -1,517 +0,0 @@ -import { shell } from 'electron'; - -const { openExternal } = shell; - -export const defaultTemplate = [ - { - id: '1', - label: 'App', - submenu: [ - { - id: 'hello', - label: 'Disabled', - enabled: true, - after: '2', - click: (item, win, e) => { - e.menuBar.setKeyById(item.id, 'enabled', !item.enabled); - }, - }, - { - id: '2', - label: 'Sub Menu', - icon: 'https://www.gstatic.com/images/branding/product/1x/keep_48dp.png', - submenu: [ - { - label: 'Color Submenu', - submenu: [ - { - label: 'Light', - type: 'radio', - checked: false, - click: (item, win, e) => { - document.querySelector('html').style.background = - 'rgb(240,240,240)'; - }, - }, - { - label: 'Dark', - type: 'radio', - checked: true, - click: (item, win, e) => { - document.querySelector('html').style.background = - 'rgb(64,64,64)'; - }, - }, - { - label: 'Black', - type: 'radio', - checked: false, - click: (item, win, e) => { - document.querySelector('html').style.background = - 'rgb(0,0,0)'; - }, - }, - ], - }, - { - label: 'Random 2', - }, - { - label: 'Random 3', - submenu: [ - { - label: 'Random 4', - submenu: [ - { - label: 'Random 7', - }, - { - label: 'Random 8', - }, - { - label: 'Random 9', - }, - { - label: 'Random 10', - }, - ], - }, - { - label: 'Random 5', - }, - { - label: 'Random 6', - }, - ], - }, - ], - }, - { - id: '4', - label: 'Not visible', - visible: false, - }, - { - id: '3', - label: 'Arguments', - click: (item, win, e) => { - console.log(item, win, e); - }, - }, - { - id: '5', - label: 'Really Long Menu Label that should be truncated', - }, - { type: 'separator' }, - { - label: 'Test Accelerator', - accelerator: 'CommandOrControl+Y', - click: (item, win, e) => { - console.log(item, win, e); - }, - }, - { - label: 'Open Dev Tools', - click: (item, win, e) => { - win.openDevTools(); - }, - }, - { - label: 'Resizable', - type: 'checkbox', - checked: true, - click: (item, win, e) => { - win.setResizable(item.checked); - }, - }, - { - label: 'Unchecked', - type: 'checkbox', - checked: false, - click: (item, win, e) => { - win.setResizable(item.checked); - }, - }, - { - label: 'Quit', - click: () => { - window.close(); - }, - }, - ], - }, - { - id: '2', - label: 'Color', - before: '1', - submenu: [ - { - label: 'Light', - type: 'radio', - checked: false, - click: (item, win, e) => { - document.querySelector('html').style.background = 'rgb(240,240,240)'; - }, - }, - { - label: 'Dark', - type: 'radio', - checked: true, - click: (item, win, e) => { - document.querySelector('html').style.background = 'rgb(64,64,64)'; - }, - }, - { - label: 'Black', - type: 'radio', - checked: false, - click: (item, win, e) => { - document.querySelector('html').style.background = 'rgb(0,0,0)'; - }, - }, - ], - }, - { - label: 'Disabled', - enabled: false, - submenu: [ - { - label: 'Light', - type: 'radio', - checked: false, - click: (item, win, e) => { - document.querySelector('html').style.background = 'rgb(240,240,240)'; - }, - }, - ], - }, - { - label: 'Help', - submenu: [ - { - label: 'Homepage', - click: () => { - openExternal('https://github.com/Cristian006/frameless-titlebar'); - }, - }, - ], - }, - { - label: 'Scrollable', - submenu: [ - { - label: 'Random 1', - }, - { - label: 'Random 2', - }, - { - label: 'Random 3', - }, - { - label: 'Random 4', - }, - { - label: 'Random 5', - }, - { - label: 'Random 6', - }, - { - label: 'Random 7', - }, - { - label: 'Random 8', - }, - { - label: 'Random 9', - }, - { - label: 'Random 10', - }, - { - label: 'Random 11', - }, - { - label: 'Random 12', - }, - { - label: 'Random 13', - }, - { - label: 'Random 14', - }, - { - label: 'Random 15', - }, - { - label: 'Random 16', - }, - { - label: 'Random 17', - }, - { - label: 'Random 18', - }, - { - label: 'Random 19', - }, - { - label: 'Random 20', - }, - ], - }, -]; - -const Edit = [ - { - label: 'Undo', - accelerator: 'Ctrl+Z', - }, - { - label: 'Redo', - accelerator: 'Ctrl+Y', - }, - { - type: 'separator', - }, - { - label: 'Cut', - accelerator: 'Ctrl+X', - }, - { - label: 'Copy', - accelerator: 'Ctrl+C', - }, - { - label: 'Paste', - accelerator: 'Ctrl+V', - }, - { - label: 'Paste and Match Style', - accelerator: 'Ctrl+Shift+V', - }, - { - label: 'Delete', - }, - { - label: 'Select all', - accelerator: 'Ctrl+A', - }, -]; - -export const githubTemplate = [ - { - label: 'File', - submenu: [ - { - label: 'New repository', - accelerator: 'Ctrl+N', - }, - { - type: 'separator', - }, - { - label: 'Add local repository', - accelerator: 'Ctrl+O', - }, - { - label: 'Clone repository', - accelerator: 'Ctrl+Shift+O', - }, - { - type: 'separator', - }, - { - label: 'Options', - accelerator: 'Ctrl+,', - }, - { - type: 'separator', - }, - { - label: 'Exit', - }, - ], - }, - { - label: 'Edit', - submenu: Edit, - }, - { - label: 'View', - submenu: [], - }, - { - label: 'Repository', - submenu: [], - }, - { - label: 'Branch', - submenu: [], - }, - { - label: 'Help', - submenu: [], - }, -]; - -export const signalTemplate = [ - { - label: 'File', - submenu: [ - { - label: 'Preferences...', - }, - { - type: 'separator', - }, - { - label: 'Exit', - }, - ], - }, - { - label: 'Edit', - submenu: Edit, - }, - { - label: 'View', - submenu: [ - { - label: 'Actual Size', - accelerator: 'Ctrl+0', - }, - { - label: 'Zoom In', - accelerator: 'Ctrl+Shift+=', - }, - { - label: 'Zoom Out', - accelerator: 'CtrlCtrl+-', - }, - { - type: 'separator', - }, - { - label: 'Toggle Full Screen', - accelerator: 'F11', - }, - { - type: 'separator', - }, - { - label: 'Debug Log', - }, - { - label: 'Toggle Developer Tools', - accelerator: 'Ctrl+Shift+I', - }, - ], - }, - { - label: 'Window', - submenu: [ - { - label: 'Minimize', - accelerator: 'Ctrl+M', - }, - ], - }, - { - label: 'Help', - submenu: [ - { - label: 'Go to Release Notes', - }, - { - type: 'separator', - }, - { - label: 'Go to Forums', - }, - { - label: 'Report An Issue', - }, - { - type: 'separator', - }, - { - label: 'About Signal Desktop', - }, - ], - }, -]; - -export const slackTemplate = [ - { - label: 'File', - accelerator: 'Ctrl+F', - submenu: [ - { - label: 'Preferences', - accelerator: 'Ctrl+,', - }, - { - label: 'Close', - accelerator: 'Ctrl+W', - }, - { - label: 'Quit Slack', - accelerator: 'Ctrl+Q', - }, - ], - }, - { - label: 'Edit', - submenu: [ - { - label: 'Undo', - accelerator: 'Ctrl+Z', - }, - { - label: 'Redo', - accelerator: 'Ctrl+Y', - }, - { - type: 'separator', - }, - { - label: 'Cut', - accelerator: 'Ctrl+X', - }, - { - label: 'Copy', - accelerator: 'Ctrl+C', - }, - { - label: 'Paste', - accelerator: 'Ctrl+V', - }, - { - label: 'Paste and Match Style', - accelerator: 'Ctrl+Shift+V', - }, - { - label: 'Delete', - }, - { - label: 'Select all', - accelerator: 'Ctrl+A', - }, - ], - }, - { - label: 'View', - }, - { - label: 'History', - }, - { - label: 'Window', - }, - { - label: 'Help', - accelerator: 'Ctrl+H', - }, -]; diff --git a/src/renderer/store/configureStore.dev.js b/src/store/configureStore.dev.js similarity index 100% rename from src/renderer/store/configureStore.dev.js rename to src/store/configureStore.dev.js diff --git a/src/renderer/store/configureStore.js b/src/store/configureStore.js similarity index 100% rename from src/renderer/store/configureStore.js rename to src/store/configureStore.js diff --git a/src/renderer/store/configureStore.prod.js b/src/store/configureStore.prod.js similarity index 100% rename from src/renderer/store/configureStore.prod.js rename to src/store/configureStore.prod.js diff --git a/src/renderer/store/httpMiddleware.js b/src/store/httpMiddleware.js similarity index 100% rename from src/renderer/store/httpMiddleware.js rename to src/store/httpMiddleware.js diff --git a/src/renderer/utils/ErrorBoundary.js b/src/utils/ErrorBoundary.js similarity index 100% rename from src/renderer/utils/ErrorBoundary.js rename to src/utils/ErrorBoundary.js diff --git a/src/renderer/utils/ModalManager.js b/src/utils/ModalManager.js similarity index 100% rename from src/renderer/utils/ModalManager.js rename to src/utils/ModalManager.js diff --git a/src/renderer/utils/hooks.js b/src/utils/hooks.js similarity index 100% rename from src/renderer/utils/hooks.js rename to src/utils/hooks.js diff --git a/src/renderer/utils/index.js b/src/utils/index.js similarity index 98% rename from src/renderer/utils/index.js rename to src/utils/index.js index b548ff3..64db972 100644 --- a/src/renderer/utils/index.js +++ b/src/utils/index.js @@ -1,6 +1,5 @@ import { FileTextOutlined } from '@ant-design/icons'; import { Button, Result } from 'antd'; -import { shell } from 'electron'; export function createNestedProp(obj, prop, ...rest) { if (typeof obj[prop] == 'undefined') { diff --git a/src/renderer/utils/static.js b/src/utils/static.js similarity index 100% rename from src/renderer/utils/static.js rename to src/utils/static.js diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 0000000..861b04b --- /dev/null +++ b/vite.config.js @@ -0,0 +1,7 @@ +import { defineConfig } from 'vite' +import react from '@vitejs/plugin-react-swc' + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [react()], +}) diff --git a/webpack.main.config.js b/webpack.main.config.js deleted file mode 100644 index ee13726..0000000 --- a/webpack.main.config.js +++ /dev/null @@ -1,11 +0,0 @@ -module.exports = { - /** - * This is the main entry point for your application, it's the first file - * that runs in the main process. - */ - entry: './src/main/index.js', - // Put your normal webpack config below here - module: { - rules: require('./webpack.rules'), - }, -}; diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js deleted file mode 100644 index 8156e2f..0000000 --- a/webpack.renderer.config.js +++ /dev/null @@ -1,27 +0,0 @@ -const rules = require('./webpack.rules'); -const path = require('path'); -const CopyWebpackPlugin = require('copy-webpack-plugin'); - -rules.push({ - test: /\.css$/, - use: [{ loader: 'style-loader' }, { loader: 'css-loader' }], -}); - -const assets = ['static']; -const copyPlugins = new CopyWebpackPlugin({ - patterns: assets.map((asset) => ({ - from: path.resolve(__dirname, 'src', 'renderer', asset), - to: path.resolve(__dirname, '.webpack/renderer', asset), - })), -}); - -module.exports = { - // Put your normal webpack config below here - module: { - rules, - }, - plugins: [copyPlugins], - cache: { - type: 'filesystem', - }, -}; diff --git a/webpack.rules.js b/webpack.rules.js deleted file mode 100644 index d162529..0000000 --- a/webpack.rules.js +++ /dev/null @@ -1,53 +0,0 @@ -module.exports = [ - // Add support for native node modules - { - // We're specifying native_modules in the test because the asset relocator loader generates a - // "fake" .node file which is really a cjs file. - test: /native_modules\/.+\.node$/, - use: 'node-loader', - }, - { - test: /\.(m?js|node)$/, - parser: { amd: false }, - use: { - loader: '@vercel/webpack-asset-relocator-loader', - options: { - outputAssetBase: 'native_modules', - }, - }, - }, - { - test: /\.jsx?$/, - use: { - loader: 'babel-loader', - options: { - exclude: /node_modules/, - presets: [ - [ - '@babel/preset-react', - { - runtime: 'automatic', - }, - ], - ], - }, - }, - }, - - // Put your webpack loader rules in this array. This is where you would put - // your ts-loader configuration for instance: - /** - * Typescript Example: - * - * { - * test: /\.tsx?$/, - * exclude: /(node_modules|.webpack)/, - * loaders: [{ - * loader: 'ts-loader', - * options: { - * transpileOnly: true - * } - * }] - * } - */ -]; diff --git a/yarn.lock b/yarn.lock index cab3adf..8dff607 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,14 +2,6 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.1.0": - version "2.2.0" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== - dependencies: - "@jridgewell/gen-mapping" "^0.1.0" - "@jridgewell/trace-mapping" "^0.3.9" - "@ant-design/colors@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" @@ -38,9 +30,9 @@ integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== "@ant-design/icons@^4.0.0", "@ant-design/icons@^4.7.0": - version "4.7.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.7.0.tgz#8c3cbe0a556ba92af5dc7d1e70c0b25b5179af0f" - integrity sha512-aoB4Z7JA431rt6d4u+8xcNPPCrdufSRMUOpxa1ab6mz1JCQZOEVolj2WVs/tDFmN62zzK30mNelEsprLYsSF3g== + version "4.8.0" + resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.8.0.tgz#3084e2bb494cac3dad6c0392f77c1efc90ee1fa4" + integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons-svg" "^4.2.1" @@ -59,269 +51,25 @@ lodash "^4.17.21" resize-observer-polyfill "^1.5.1" -"@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== - dependencies: - "@babel/highlight" "^7.18.6" - -"@babel/compat-data@^7.19.3": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.19.4.tgz#95c86de137bf0317f3a570e1b6e996b427299747" - integrity sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw== - -"@babel/core@^7.17.7": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.19.6.tgz#7122ae4f5c5a37c0946c066149abd8e75f81540f" - integrity sha512-D2Ue4KHpc6Ys2+AxpIx1BZ8+UegLLLE2p3KJEuJRKmokHOtl49jQ5ny1773KsGLZs8MQvBidAF6yWUJxRqtKtg== - dependencies: - "@ampproject/remapping" "^2.1.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.6" - "@babel/helper-compilation-targets" "^7.19.3" - "@babel/helper-module-transforms" "^7.19.6" - "@babel/helpers" "^7.19.4" - "@babel/parser" "^7.19.6" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.6" - "@babel/types" "^7.19.4" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.1" - semver "^6.3.0" - -"@babel/eslint-parser@^7.17.0": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.19.1.tgz#4f68f6b0825489e00a24b41b6a1ae35414ecd2f4" - integrity sha512-AqNf2QWt1rtu2/1rLswy6CDP7H9Oh3mMhk177Y67Rg8d7RD9WfOLLv8CGn6tisFvS2htm86yIe1yLF6I1UDaGQ== - dependencies: - "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1" - eslint-visitor-keys "^2.1.0" - semver "^6.3.0" - -"@babel/generator@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.19.6.tgz#9e481a3fe9ca6261c972645ae3904ec0f9b34a1d" - integrity sha512-oHGRUQeoX1QrKeJIKVe0hwjGqNnVYsM5Nep5zo0uE0m42sLH+Fsd2pStJ5sRM1bNyTUUoz0pe2lTeMJrb/taTA== +"@babel/runtime-corejs3@^7.10.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz#a1e5ea3d758ba6beb715210142912e3f29981d84" + integrity sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg== dependencies: - "@babel/types" "^7.19.4" - "@jridgewell/gen-mapping" "^0.3.2" - jsesc "^2.5.1" + core-js-pure "^3.25.1" + regenerator-runtime "^0.13.11" -"@babel/helper-annotate-as-pure@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb" - integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" + integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-compilation-targets@^7.19.3": - version "7.19.3" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.19.3.tgz#a10a04588125675d7c7ae299af86fa1b2ee038ca" - integrity sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg== - dependencies: - "@babel/compat-data" "^7.19.3" - "@babel/helper-validator-option" "^7.18.6" - browserslist "^4.21.3" - semver "^6.3.0" - -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-function-name@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" - integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== - dependencies: - "@babel/template" "^7.18.10" - "@babel/types" "^7.19.0" - -"@babel/helper-hoist-variables@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" - integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-module-transforms@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.19.6.tgz#6c52cc3ac63b70952d33ee987cbee1c9368b533f" - integrity sha512-fCmcfQo/KYr/VXXDIyd3CBGZ6AFhPFy1TfSEJ+PilGVlQT6jcbqtHAM4C1EciRqMza7/TpOUZliuSH+U6HAhJw== - dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.19.4" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/helper-validator-identifier" "^7.19.1" - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.6" - "@babel/types" "^7.19.4" - -"@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.19.0": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.19.0.tgz#4796bb14961521f0f8715990bee2fb6e51ce21bf" - integrity sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw== - -"@babel/helper-simple-access@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.19.4.tgz#be553f4951ac6352df2567f7daa19a0ee15668e7" - integrity sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg== - dependencies: - "@babel/types" "^7.19.4" - -"@babel/helper-split-export-declaration@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" - integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== - dependencies: - "@babel/types" "^7.18.6" - -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== - -"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": - version "7.19.1" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" - integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== - -"@babel/helper-validator-option@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" - integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== - -"@babel/helpers@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.19.4.tgz#42154945f87b8148df7203a25c31ba9a73be46c5" - integrity sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw== - dependencies: - "@babel/template" "^7.18.10" - "@babel/traverse" "^7.19.4" - "@babel/types" "^7.19.4" - -"@babel/highlight@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" - integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== - dependencies: - "@babel/helper-validator-identifier" "^7.18.6" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.18.10", "@babel/parser@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.19.6.tgz#b923430cb94f58a7eae8facbffa9efd19130e7f8" - integrity sha512-h1IUp81s2JYJ3mRkdxJgs4UvmSsRvDrx5ICSJbPvtWYv5i1nTBGcBpnog+89rAFMwvvru6E5NUHdBe01UeSzYA== - -"@babel/plugin-syntax-jsx@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-react-display-name@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.18.6.tgz#8b1125f919ef36ebdfff061d664e266c666b9415" - integrity sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/plugin-transform-react-jsx-development@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.18.6.tgz#dbe5c972811e49c7405b630e4d0d2e1380c0ddc5" - integrity sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA== - dependencies: - "@babel/plugin-transform-react-jsx" "^7.18.6" - -"@babel/plugin-transform-react-jsx@^7.18.6": - version "7.19.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.19.0.tgz#b3cbb7c3a00b92ec8ae1027910e331ba5c500eb9" - integrity sha512-UVEvX3tXie3Szm3emi1+G63jyw1w5IcMY0FSKM+CRnKRI5Mr1YbCNgsSTwoTwKphQEG9P+QqmuRFneJPZuHNhg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.19.0" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.19.0" - -"@babel/plugin-transform-react-pure-annotations@^7.18.6": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.18.6.tgz#561af267f19f3e5d59291f9950fd7b9663d0d844" - integrity sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ== - dependencies: - "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-plugin-utils" "^7.18.6" - -"@babel/preset-react@^7.14.5": - version "7.18.6" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.18.6.tgz#979f76d6277048dc19094c217b507f3ad517dd2d" - integrity sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg== - dependencies: - "@babel/helper-plugin-utils" "^7.18.6" - "@babel/helper-validator-option" "^7.18.6" - "@babel/plugin-transform-react-display-name" "^7.18.6" - "@babel/plugin-transform-react-jsx" "^7.18.6" - "@babel/plugin-transform-react-jsx-development" "^7.18.6" - "@babel/plugin-transform-react-pure-annotations" "^7.18.6" - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.19.4.tgz#a42f814502ee467d55b38dd1c256f53a7b885c78" - integrity sha512-EXpLCrk55f+cYqmHsSR+yD/0gAIMxxA9QK9lnQWzhMCvt+YmoBN7Zx94s++Kv0+unHk39vxNO8t+CMA2WSS3wA== - dependencies: - regenerator-runtime "^0.13.4" - -"@babel/template@^7.18.10": - version "7.18.10" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" - integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/parser" "^7.18.10" - "@babel/types" "^7.18.10" - -"@babel/traverse@^7.19.4", "@babel/traverse@^7.19.6": - version "7.19.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.19.6.tgz#7b4c865611df6d99cb131eec2e8ac71656a490dc" - integrity sha512-6l5HrUCzFM04mfbG09AagtYyR2P0B71B1wN7PfSPiksDPz2k5H9CBC1tcZpz2M8OxbKTPccByoOJ22rUKbpmQQ== - dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.19.6" - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-function-name" "^7.19.0" - "@babel/helper-hoist-variables" "^7.18.6" - "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.19.6" - "@babel/types" "^7.19.4" - debug "^4.1.0" - globals "^11.1.0" - -"@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.19.4": - version "7.19.4" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.19.4.tgz#0dd5c91c573a202d600490a35b33246fed8a41c7" - integrity sha512-M5LK7nAeS6+9j7hAq+b3fQs+pNfUtTGq+yFFfHnauFA8zQtLRfmuipmsKDKKLuyG+wC8ABW43A153YNawNTEtw== - dependencies: - "@babel/helper-string-parser" "^7.19.4" - "@babel/helper-validator-identifier" "^7.19.1" - to-fast-properties "^2.0.0" + regenerator-runtime "^0.13.11" "@ctrl/tinycolor@^3.4.0": - version "3.4.1" - resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.4.1.tgz#75b4c27948c81e88ccd3a8902047bcd797f38d32" - integrity sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw== + version "3.5.0" + resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz#6e52b3d1c38d13130101771821e09cdd414a16bc" + integrity sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg== "@deck.gl/aggregation-layers@7.3.15": version "7.3.15" @@ -406,305 +154,144 @@ dependencies: prop-types "^15.6.0" -"@electron-forge/async-ora@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/async-ora/-/async-ora-6.0.0-beta.68.tgz#0b02f784e6deb23acb8b9697090a28943465c3eb" - integrity sha512-OnQEsYhxGWSzNL/TkjKH0ye0n7P2ekcoA5AbkVjMBh1IXkynTg/GGl9RqWDhDnUqOEFNlzW0v/+KC67xjfIBjg== - dependencies: - chalk "^4.0.0" - debug "^4.3.1" - log-symbols "^4.0.0" - ora "^5.0.0" - pretty-ms "^7.0.0" - -"@electron-forge/cli@^6.0.0-beta.63": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/cli/-/cli-6.0.0-beta.68.tgz#ac911cd4793cd25cdee39b919ab5d33be5f2f423" - integrity sha512-UUhXyzx3WL22UXAe7ZXluKgECOJttfpnvfy10gW/IzyxZjBR943X1hRANE2ms43jWtzFJYQj6YA0ekkFYwYIzg== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/core" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@electron/get" "^2.0.0" - chalk "^4.0.0" - commander "^4.1.1" - debug "^4.3.1" - fs-extra "^10.0.0" - inquirer "^8.0.0" - semver "^7.2.1" - -"@electron-forge/core@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/core/-/core-6.0.0-beta.68.tgz#5af58f3d9ff410786a2c2322ea9cd6f1e8ec497a" - integrity sha512-X5QDlz3nrKYiJAI4K6Ntkn4VbzN9hQ1mJthebw0sCxJ6Sh5A8yOQL8t6oneHwvjxsFpuPJlonA2A0GiOtZdtqg== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/maker-base" "6.0.0-beta.68" - "@electron-forge/plugin-base" "6.0.0-beta.68" - "@electron-forge/publisher-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@electron-forge/template-base" "6.0.0-beta.68" - "@electron-forge/template-typescript-webpack" "6.0.0-beta.68" - "@electron-forge/template-webpack" "6.0.0-beta.68" - "@electron/get" "^2.0.0" - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.3.1" - electron-packager "^17.0.0" - electron-rebuild "^3.2.6" - fast-glob "^3.2.7" - filenamify "^4.1.0" - find-up "^5.0.0" - fs-extra "^10.0.0" - got "^11.8.5" - lodash "^4.17.20" - log-symbols "^4.0.0" - node-fetch "^2.6.7" - progress "^2.0.3" - resolve-package "^1.0.1" - semver "^7.2.1" - source-map-support "^0.5.13" - sudo-prompt "^9.1.1" - username "^5.1.0" - yarn-or-npm "^3.0.1" - -"@electron-forge/maker-base@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-base/-/maker-base-6.0.0-beta.68.tgz#c111462f17486e9ed27987ba08ac8e4b2eb45f54" - integrity sha512-j1ijODZMJXXXo4OnuFapcDjlcliygmcDQAa0tFwj1ce676T/ffTQzUZ8427/DXRjmis9JpDzVzDamCq4GRyrFg== - dependencies: - "@electron-forge/shared-types" "6.0.0-beta.68" - fs-extra "^10.0.0" - which "^2.0.2" - -"@electron-forge/maker-deb@^6.0.0-beta.61": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.68.tgz#54040bd65290e1e27a336109d4c10f4d1ee82410" - integrity sha512-6xtTTFfgT8eMMsd2LweCwVvOO/xdVbhahxWMeEcp/dYe6OkHw7kIxdVquyxKrp17DDHCEiju0sjS1J9/wJeBbg== - dependencies: - "@electron-forge/maker-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - optionalDependencies: - electron-installer-debian "^3.0.0" - -"@electron-forge/maker-rpm@^6.0.0-beta.61": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-rpm/-/maker-rpm-6.0.0-beta.68.tgz#079e0dee6d49c19b92e6714b1b4c9fee6c3b8d4e" - integrity sha512-CNZieq51jUCR440a3W0f4YwcML5RPIgx/jGtIEnzAyg0kY7UXvZ/n0/CYdFV/pt67D3jRxOLMKFrcd8sauCVVg== - dependencies: - "@electron-forge/maker-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - optionalDependencies: - electron-installer-redhat "^3.2.0" - -"@electron-forge/maker-squirrel@^6.0.0-beta.61": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.68.tgz#4c2d7cde21a8f417056bae161a122603f0c790eb" - integrity sha512-lOMw2r9sK3AXgnRLHduJ7Q6d7Ili3Wes5TgKXcHOXaQHi2NVHVpWSCzdA+Rq4YoaGSqhqMS5z2UaU6TSuzBqHg== - dependencies: - "@electron-forge/maker-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - fs-extra "^10.0.0" - optionalDependencies: - electron-winstaller "^5.0.0" - -"@electron-forge/maker-zip@^6.0.0-beta.63": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-zip/-/maker-zip-6.0.0-beta.68.tgz#60d8a6215d7d4b449cef5b41e4bc25dd5ff07435" - integrity sha512-IXlWjn6+51Ba47ZarVRNzy4hSYtEYUFeA/fkN8PTh5g295yAmDiGOCuEW9zptR4tiW9H49JOmeWm9ihQRsd7uw== - dependencies: - "@electron-forge/maker-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - cross-zip "^4.0.0" - fs-extra "^10.0.0" - -"@electron-forge/plugin-base@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.68.tgz#3e90a137a4c2c2c880c1f26a9c7868b5c1fc35a2" - integrity sha512-LXJDDHSennreotyJI4TJ94W01BoWuHCrtCIU/5dzNWd1E4VgeAK8N/tiWombz3CcqraOxAvjnV4Qk8LtA6+0Ew== - dependencies: - "@electron-forge/shared-types" "6.0.0-beta.68" - -"@electron-forge/plugin-webpack@^6.0.0-beta.63": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/plugin-webpack/-/plugin-webpack-6.0.0-beta.68.tgz#6377728e53913c913d4209314204b2a51f46f305" - integrity sha512-azhBjtIoT5UFWyfRmUlvtMnoNJvKAqlKlAGTy8J4zAh8JD20o8IgSXu0VVq6d662JHRamWdBKXv/wqPihlcm2w== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/core" "6.0.0-beta.68" - "@electron-forge/plugin-base" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@electron-forge/web-multi-logger" "6.0.0-beta.68" - chalk "^4.0.0" - debug "^4.3.1" - fs-extra "^10.0.0" - global "^4.3.2" - html-webpack-plugin "^5.3.1" - webpack "^5.69.1" - webpack-dev-server "^4.0.0" - webpack-merge "^5.7.3" - -"@electron-forge/publisher-base@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.68.tgz#4a6025319d510eee0cecbe2ba15965aaf04af9ef" - integrity sha512-sjMeLtdHPdeB0IaB877AWqZ52XGxFK+YlXLwMzH3ym2X4yQxhuuL7LGyLmWtyXbH8KwJap4qU/5LmnABqq/mAA== - dependencies: - "@electron-forge/shared-types" "6.0.0-beta.68" - -"@electron-forge/shared-types@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.0.0-beta.68.tgz#e8e96ca2c8f8e0c9ee71bcee23b2ca982ec78c19" - integrity sha512-ORLvHNQ7i6R51qHxdqUrRGVJCKF6IF9Wb+qR5RNdM0Q0PI8gEwyiY9J+reAIpNFi0o1EFcY0yVCLks+Pdvra9A== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - electron-packager "^17.0.0" - electron-rebuild "^3.2.6" - ora "^5.0.0" - -"@electron-forge/template-base@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/template-base/-/template-base-6.0.0-beta.68.tgz#8b050210d026005da3083fa3e0cefa10034e4eef" - integrity sha512-EmIfCRxHKWJQbhFSS3uCpU9gBH2iBrhkD9Qjq1crscN0SN9tnYNHW/4FAM/+2dICQ8VYry01fN2UgvdizJ3MfQ== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@malept/cross-spawn-promise" "^2.0.0" - debug "^4.3.1" - fs-extra "^10.0.0" - username "^5.1.0" - -"@electron-forge/template-typescript-webpack@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/template-typescript-webpack/-/template-typescript-webpack-6.0.0-beta.68.tgz#0742bae7e3419b37c43b50f5fbcefda44d8e5c05" - integrity sha512-s5qNjGZ99YZeBMMxlscKQf7PcJ3t+mAkv5KZ9kPQ880V+kQMt/y/4HpQBbK9TBlwOZOIDrh4EpSFvpe0LCsPpg== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@electron-forge/template-base" "6.0.0-beta.68" - fs-extra "^10.0.0" - -"@electron-forge/template-webpack@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/template-webpack/-/template-webpack-6.0.0-beta.68.tgz#35ebd7c09f9e8f6c209bc020537ea424c17c538f" - integrity sha512-mJxp0c23r9OPeV6uBnWj0b3Ww6LxDCw5BwddfqAXl1RbYaYUhjU/fdmWP7nHzsFePOdlazlROEEQSReSSm432Q== - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.68" - "@electron-forge/shared-types" "6.0.0-beta.68" - "@electron-forge/template-base" "6.0.0-beta.68" - fs-extra "^10.0.0" - -"@electron-forge/web-multi-logger@6.0.0-beta.68": - version "6.0.0-beta.68" - resolved "https://registry.yarnpkg.com/@electron-forge/web-multi-logger/-/web-multi-logger-6.0.0-beta.68.tgz#7d814c24bcf5ae46d21d924f12a25ee2ba1ea130" - integrity sha512-o5MZ3SCj6sgmpJBwpg1349CmVrFYSz1yFrsgU71+HD3fM+pSbFmGQUP+HN2w8JaPvkaOe5A1uePWEUoFUN55Xg== - dependencies: - express "^4.17.1" - express-ws "^5.0.2" - xterm "^4.9.0" - xterm-addon-fit "^0.5.0" - xterm-addon-search "^0.8.0" - -"@electron/asar@^3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.1.tgz#c4143896f3dd43b59a80a9c9068d76f77efb62ea" - integrity sha512-hE2cQMZ5+4o7+6T2lUaVbxIzrOjZZfX7dB02xuapyYFJZEAiWTelq6J3mMoxzd0iONDvYLPVKecB5tyjIoVDVA== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" - -"@electron/get@^1.14.1": - version "1.14.1" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.14.1.tgz#16ba75f02dffb74c23965e72d617adc721d27f40" - integrity sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^9.6.0" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - global-tunnel-ng "^2.7.1" - -"@electron/get@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.2.tgz#ae2a967b22075e9c25aaf00d5941cd79c21efd7e" - integrity sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g== - dependencies: - debug "^4.1.1" - env-paths "^2.2.0" - fs-extra "^8.1.0" - got "^11.8.5" - progress "^2.0.3" - semver "^6.2.0" - sumchecker "^3.0.1" - optionalDependencies: - global-agent "^3.0.0" - -"@electron/osx-sign@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.1.tgz#ab4fceded7fed9f2f18c25650f46c1e3a6f17054" - integrity sha512-WkUcva+qkt809bI6uxxEG/uOWfl8HAw0m8aPijpKmGMIpZ1CWWB808YG6aY3wckUO86xZdmiOsUJTM4keLhY8A== - dependencies: - compare-version "^0.1.2" - debug "^4.3.4" - fs-extra "^10.0.0" - isbinaryfile "^4.0.8" - minimist "^1.2.6" - plist "^3.0.5" - -"@electron/universal@^1.3.2": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.3.3.tgz#f22088dce7f2e808130fd1bbcd43925246adfa59" - integrity sha512-79yc61D5QWaQpia+sLQbIIi5iVoV4y9HtgOTlE0fYT0xoyg+ChwndBl4a0Q7yJfDsqq+/nLEPE655F0bTpDiCg== - dependencies: - "@electron/asar" "^3.2.1" - "@malept/cross-spawn-promise" "^1.1.0" - debug "^4.3.1" - dir-compare "^2.4.0" - fs-extra "^9.0.1" - minimatch "^3.0.4" - plist "^3.0.4" - -"@eslint/eslintrc@^1.3.3": - version "1.3.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.3.3.tgz#2b044ab39fdfa75b4688184f9e573ce3c5b0ff95" - integrity sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg== +"@esbuild/android-arm64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.12.tgz#86c4fdd7c0d65fe9dcbe138fbe72720658ec3b88" + integrity sha512-0LacmiIW+X0/LOLMZqYtZ7d4uY9fxYABAYhSSOu+OGQVBqH4N5eIYgkT7bBFnR4Nm3qo6qS3RpHKVrDASqj/uQ== + +"@esbuild/android-arm@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.12.tgz#15e33bb1c8c2f560fbb27cda227c0fa22d83d0ef" + integrity sha512-CTWgMJtpCyCltrvipZrrcjjRu+rzm6pf9V8muCsJqtKujR3kPmU4ffbckvugNNaRmhxAF1ZI3J+0FUIFLFg8KA== + +"@esbuild/android-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.12.tgz#3b0ddaf59fdf94e8e9fcb2aa6537cbab93d5fe22" + integrity sha512-sS5CR3XBKQXYpSGMM28VuiUnbX83Z+aWPZzClW+OB2JquKqxoiwdqucJ5qvXS8pM6Up3RtJfDnRQZkz3en2z5g== + +"@esbuild/darwin-arm64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.12.tgz#ac6c5d85cabf20de5047b55eab7f3c252d9aae71" + integrity sha512-Dpe5hOAQiQRH20YkFAg+wOpcd4PEuXud+aGgKBQa/VriPJA8zuVlgCOSTwna1CgYl05lf6o5els4dtuyk1qJxQ== + +"@esbuild/darwin-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.12.tgz#3433e6432dd474994302bcfe35c5420fae46a206" + integrity sha512-ApGRA6X5txIcxV0095X4e4KKv87HAEXfuDRcGTniDWUUN+qPia8sl/BqG/0IomytQWajnUn4C7TOwHduk/FXBQ== + +"@esbuild/freebsd-arm64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.12.tgz#b150587dc54dc2369cb826e6ee9f94fc5ec14635" + integrity sha512-AMdK2gA9EU83ccXCWS1B/KcWYZCj4P3vDofZZkl/F/sBv/fphi2oUqUTox/g5GMcIxk8CF1CVYTC82+iBSyiUg== + +"@esbuild/freebsd-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.12.tgz#e682a61cde8d6332aaeb4c2b28fce0d833928903" + integrity sha512-KUKB9w8G/xaAbD39t6gnRBuhQ8vIYYlxGT2I+mT6UGRnCGRr1+ePFIGBQmf5V16nxylgUuuWVW1zU2ktKkf6WQ== + +"@esbuild/linux-arm64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.12.tgz#d0d75e10796d4f1414ecaf16a8071ce05446cb9f" + integrity sha512-29HXMLpLklDfmw7T2buGqq3HImSUaZ1ArmrPOMaNiZZQptOSZs32SQtOHEl8xWX5vfdwZqrBfNf8Te4nArVzKQ== + +"@esbuild/linux-arm@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.12.tgz#945ebcd99205fadea5ee22bff624189bd95c0484" + integrity sha512-vhDdIv6z4eL0FJyNVfdr3C/vdd/Wc6h1683GJsFoJzfKb92dU/v88FhWdigg0i6+3TsbSDeWbsPUXb4dif2abg== + +"@esbuild/linux-ia32@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.12.tgz#132e61b2124eee6033bf7f0d5b312c02524d39db" + integrity sha512-JFDuNDTTfgD1LJg7wHA42o2uAO/9VzHYK0leAVnCQE/FdMB599YMH73ux+nS0xGr79pv/BK+hrmdRin3iLgQjg== + +"@esbuild/linux-loong64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.12.tgz#d27dc1e203c0d0516c1daadb7988f88b643f8ea2" + integrity sha512-xTGzVPqm6WKfCC0iuj1fryIWr1NWEM8DMhAIo+4rFgUtwy/lfHl+Obvus4oddzRDbBetLLmojfVZGmt/g/g+Rw== + +"@esbuild/linux-mips64el@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.12.tgz#9616c378ca76f12d06ffaf242da68a58be966a18" + integrity sha512-zI1cNgHa3Gol+vPYjIYHzKhU6qMyOQrvZ82REr5Fv7rlh5PG6SkkuCoH7IryPqR+BK2c/7oISGsvPJPGnO2bHQ== + +"@esbuild/linux-ppc64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.12.tgz#b033a248212249c05c162b64124744345a041f92" + integrity sha512-/C8OFXExoMmvTDIOAM54AhtmmuDHKoedUd0Otpfw3+AuuVGemA1nQK99oN909uZbLEU6Bi+7JheFMG3xGfZluQ== + +"@esbuild/linux-riscv64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.12.tgz#b6476abff413b5b472e6cf093086b9d5be4553a8" + integrity sha512-qeouyyc8kAGV6Ni6Isz8hUsKMr00EHgVwUKWNp1r4l88fHEoNTDB8mmestvykW6MrstoGI7g2EAsgr0nxmuGYg== + +"@esbuild/linux-s390x@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.12.tgz#981a639f8c2a2e0646f47eba0fae7c2c270b208b" + integrity sha512-s9AyI/5vz1U4NNqnacEGFElqwnHusWa81pskAf8JNDM2eb6b2E6PpBmT8RzeZv6/TxE6/TADn2g9bb0jOUmXwQ== + +"@esbuild/linux-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.12.tgz#01b777229d8baf068eeeb7cd7c396aea4d1ebd36" + integrity sha512-e8YA7GQGLWhvakBecLptUiKxOk4E/EPtSckS1i0MGYctW8ouvNUoh7xnU15PGO2jz7BYl8q1R6g0gE5HFtzpqQ== + +"@esbuild/netbsd-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.12.tgz#6d4b9de7dc3ac99bf04653fe640b3be63c57b1aa" + integrity sha512-z2+kUxmOqBS+6SRVd57iOLIHE8oGOoEnGVAmwjm2aENSP35HPS+5cK+FL1l+rhrsJOFIPrNHqDUNechpuG96Sg== + +"@esbuild/openbsd-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.12.tgz#2a28010b1848466586d5e2189e9f1b8334b65708" + integrity sha512-PAonw4LqIybwn2/vJujhbg1N9W2W8lw9RtXIvvZoyzoA/4rA4CpiuahVbASmQohiytRsixbNoIOUSjRygKXpyA== + +"@esbuild/sunos-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.12.tgz#3ee120008cc759d604825dd25501152071ef30f0" + integrity sha512-+wr1tkt1RERi+Zi/iQtkzmMH4nS8+7UIRxjcyRz7lur84wCkAITT50Olq/HiT4JN2X2bjtlOV6vt7ptW5Gw60Q== + +"@esbuild/win32-arm64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.12.tgz#8c599a91f1c55b3df304c450ac0613855c10502e" + integrity sha512-XEjeUSHmjsAOJk8+pXJu9pFY2O5KKQbHXZWQylJzQuIBeiGrpMeq9sTVrHefHxMOyxUgoKQTcaTS+VK/K5SviA== + +"@esbuild/win32-ia32@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.12.tgz#102b5a44b514f8849a10cc4cc618c60c70a4c536" + integrity sha512-eRKPM7e0IecUAUYr2alW7JGDejrFJXmpjt4MlfonmQ5Rz9HWpKFGCjuuIRgKO7W9C/CWVFXdJ2GjddsBXqQI4A== + +"@esbuild/win32-x64@0.16.12": + version "0.16.12" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.12.tgz#31197bb509049b63c059c4808ac58e66fdff7479" + integrity sha512-iPYKN78t3op2+erv2frW568j1q0RpqX6JOLZ7oPPaAV1VaF7dDstOrNw37PVOYoTWE11pV4A1XUitpdEFNIsPg== + +"@eslint/eslintrc@^1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" + integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== dependencies: ajv "^6.12.4" debug "^4.3.2" espree "^9.4.0" - globals "^13.15.0" + globals "^13.19.0" ignore "^5.2.0" import-fresh "^3.2.1" js-yaml "^4.1.0" minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@gar/promisify@^1.1.3": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6" - integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw== - "@handsontable/react@^3.1.2": version "3.1.3" resolved "https://registry.yarnpkg.com/@handsontable/react/-/react-3.1.3.tgz#382ff655c17469bd587010e50281f0f47c3c0e79" integrity sha512-XuLP0rmpkXAi55kmw1YtK1Icn2gtkHe0xT99inNgLiGGFMnv3ll1Y8NCfwHqSp0EMnpwpbO6wbN+ZBE/huwPwA== -"@humanwhocodes/config-array@^0.11.6": - version "0.11.6" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.6.tgz#6a51d603a3aaf8d4cf45b42b3f2ac9318a4adc4b" - integrity sha512-jJr+hPTJYKyDILJfhNSHsjiwXYf26Flsz8DvNndOsHs5pwSnpGUEy8yzF0JYhCEvTDdV2vuOK5tt8BVhwO5/hg== +"@humanwhocodes/config-array@^0.11.8": + version "0.11.8" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" debug "^4.1.1" - minimatch "^3.0.4" + minimatch "^3.0.5" "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" @@ -716,59 +303,6 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" - integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== - dependencies: - "@jridgewell/set-array" "^1.0.0" - "@jridgewell/sourcemap-codec" "^1.4.10" - -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" - integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== - -"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": - version "1.4.14" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" - integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== - -"@jridgewell/trace-mapping@^0.3.14", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.17" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== - dependencies: - "@jridgewell/resolve-uri" "3.1.0" - "@jridgewell/sourcemap-codec" "1.4.14" - -"@leichtgewicht/ip-codec@^2.0.1": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b" - integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A== - "@loaders.gl/3d-tiles@^1.3.4": version "1.3.7" resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-1.3.7.tgz#c8d2ff8a01890641e7a4e2360cb5aee8a93cfa0a" @@ -884,20 +418,6 @@ "@luma.gl/webgl2-polyfill" "7.3.2" probe.gl "^3.1.1" -"@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" - integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== - dependencies: - cross-spawn "^7.0.1" - -"@malept/cross-spawn-promise@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz#d0772de1aa680a0bfb9ba2f32b4c828c7857cb9d" - integrity sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg== - dependencies: - cross-spawn "^7.0.1" - "@mapbox/geojson-rewind@^0.5.0": version "0.5.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" @@ -1050,13 +570,6 @@ global ">=4.3.0" viewport-mercator-project ">=6.0.0" -"@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1": - version "5.1.1-v1" - resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129" - integrity sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg== - dependencies: - eslint-scope "5.1.1" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1065,12 +578,12 @@ "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": +"@nodelib/fs.stat@2.0.5": version "2.0.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8": +"@nodelib/fs.walk@^1.2.8": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== @@ -1078,163 +591,193 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@npmcli/fs@^2.1.0": - version "2.1.2" - resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865" - integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ== - dependencies: - "@gar/promisify" "^1.1.3" - semver "^7.3.5" - -"@npmcli/move-file@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4" - integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ== +"@probe.gl/env@3.5.4": + version "3.5.4" + resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-3.5.4.tgz#faddd1232f607b634fa9f00502b40706e143426d" + integrity sha512-MtMINUpcPzAp8upQNbm5U1Hp+/EQ8yw0tXccg5Aiz7cl92LsMopDPtgXnCRv2whzcayioHAdg4YIhNPY5fFxMQ== dependencies: - mkdirp "^1.0.4" - rimraf "^3.0.2" + "@babel/runtime" "^7.0.0" -"@probe.gl/env@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-3.5.2.tgz#f5639d5686235afb165f353675efea26766f8555" - integrity sha512-JlNvJ2p6+ObWX7es6n3TycGPTv5CfVrCS8vblI1eHhrFCcZ6RxIo727ffRVwldpp0YTzdgjx3/4fB/1dnVYElw== +"@probe.gl/log@3.5.4": + version "3.5.4" + resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-3.5.4.tgz#106c863032242ba1232d7a1afc4acd9905305305" + integrity sha512-jnyr6aAdW4PbS55izskE8crpb52hJ/bQwqeJeQywK6sm7Jhh9im2RFbPrjs8CIEVDBqrcwJ1Rm1hEvTKNhKSmA== dependencies: "@babel/runtime" "^7.0.0" + "@probe.gl/env" "3.5.4" -"@probe.gl/log@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-3.5.2.tgz#e33103f6151c30431c4bfe63f1341bc0d9febe94" - integrity sha512-5yo8Dg8LrSltuPBdGlLh/WOvt4LdU7DDHu75GMeiS0fKM+J4IACRpGV8SOrktCj1MWZ6JVHcNQkJnoyZ6G7p/w== +"@probe.gl/stats@3.5.4": + version "3.5.4" + resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-3.5.4.tgz#822979f602fa920ce6d5432f8f3b0e6c3c0606ae" + integrity sha512-jtXpv1bphtXTjq7uvTC30zKEIma9j2pMFrqB47zp/LGrZdymF/mfdKzFzo9f1NUyWGaoJL4Yn8ZS+9/BtkoETg== dependencies: "@babel/runtime" "^7.0.0" - "@probe.gl/env" "3.5.2" -"@probe.gl/stats@3.5.2": - version "3.5.2" - resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-3.5.2.tgz#8ee41f73199182fddb8e40221da967414eaea619" - integrity sha512-YKaYXiHF//fgy1OkX38JD70Lc8qxg2Viw8Q2CTNMwGPDJe12wda7kEmMKPJNw2oYLyFUfTzv00KJMA5h18z02w== +"@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.2": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.1.0.tgz#6b94450d2c2b00d50b141bd7a0be23bd96503dbe" + integrity sha512-tbXM9SB1r5FOuZjRCljERFByFiEUcMmCWMXLog/NmgCzlAzreXyf23Vei3ZpSMxSMavzPnhCovfZjZdmxS3d1w== dependencies: - "@babel/runtime" "^7.0.0" + "@babel/runtime" "^7.18.0" + classnames "^2.3.2" + rc-util "^5.24.4" -"@react-spring/animated@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.5.5.tgz#d3bfd0f62ed13a337463a55d2c93bb23c15bbf3e" - integrity sha512-glzViz7syQ3CE6BQOwAyr75cgh0qsihm5lkaf24I0DfU63cMm/3+br299UEYkuaHNmfDfM414uktiPlZCNJbQA== - dependencies: - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/core@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.5.5.tgz#1d8a4c64630ee26b2295361e1eedfd716a85b4ae" - integrity sha512-shaJYb3iX18Au6gkk8ahaF0qx0LpS0Yd+ajb4asBaAQf6WPGuEdJsbsNSgei1/O13JyEATsJl20lkjeslJPMYA== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/rafz" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/konva@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.5.5.tgz#ddbb30cfa268219d69552aa71188832ca8ab4905" - integrity sha512-0CNh+1vCIjNUklTFwMvxg+H83Jo2OWykBrdEA28ccmnpZgkQ8Kq5xyvaPFLzcDKV67OXHnaWiCYKpRbhLy2wng== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/core" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/native@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.5.5.tgz#4ecc420c7b4c3fefeebd55d852640d36c29ec9c8" - integrity sha512-kauqmyJ8u7aVy2bBs22vl1SdB2i5uYIL4rP53k1KDWrFSqJh4j3efWkbTt9uzR5cMXuNVbkNo9OYVFUcQBz50A== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/core" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/rafz@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.5.5.tgz#62a49c5e294104b79db2a8afdf4f3a274c7f44ca" - integrity sha512-F/CLwB0d10jL6My5vgzRQxCNY2RNyDJZedRBK7FsngdCmzoq3V4OqqNc/9voJb9qRC2wd55oGXUeXv2eIaFmsw== - -"@react-spring/shared@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.5.5.tgz#9be0b391d546e3e184a24ecbaf40acbaeab7fc73" - integrity sha512-YwW70Pa/YXPOwTutExHZmMQSHcNC90kJOnNR4G4mCDNV99hE98jWkIPDOsgqbYx3amIglcFPiYKMaQuGdr8dyQ== - dependencies: - "@react-spring/rafz" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/three@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.5.5.tgz#c6fbee977007d1980406db20a28ac3f5dc2ce153" - integrity sha512-9kTIaSceqFIl5EIrdwM7Z53o5I+9BGNVzbp4oZZYMao+GMAWOosnlQdDG5GeqNsIqfW9fZCEquGqagfKAxftcA== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/core" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/types@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.5.5.tgz#c8e94f1b9232ca7cb9d860ea67762ec401b1de14" - integrity sha512-7I/qY8H7Enwasxr4jU6WmtNK+RZ4Z/XvSlDvjXFVe7ii1x0MoSlkw6pD7xuac8qrHQRm9BTcbZNyeeKApYsvCg== - -"@react-spring/web@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.5.5.tgz#d416abc591aaed930401f0c98a991a8c5b90c382" - integrity sha512-+moT8aDX/ho/XAhU+HRY9m0LVV9y9CK6NjSRaI+30Re150pB3iEip6QfnF4qnhSCQ5drpMF0XRXHgOTY/xbtFw== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/core" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@react-spring/zdog@~9.5.5": - version "9.5.5" - resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.5.5.tgz#916dba337637d1151c3c2bc829b5105d15adacb5" - integrity sha512-LZgjo2kLlGmUqfE2fdVnvLXz+4eYyQARRvB9KQ4PTEynaETTG89Xgn9YxLrh1p57DzH7gEmTGDZ5hEw3pWqu8g== - dependencies: - "@react-spring/animated" "~9.5.5" - "@react-spring/core" "~9.5.5" - "@react-spring/shared" "~9.5.5" - "@react-spring/types" "~9.5.5" - -"@sindresorhus/is@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea" - integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== - -"@sindresorhus/is@^4.0.0": - version "4.6.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" - integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== +"@react-spring/animated@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.6.1.tgz#ccc626d847cbe346f5f8815d0928183c647eb425" + integrity sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ== + dependencies: + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/core@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.6.1.tgz#ebe07c20682b360b06af116ea24e2b609e778c10" + integrity sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/rafz" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/konva@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.6.1.tgz#66e63da0e9681e42395e995402a7e73ba6892461" + integrity sha512-MevnU+tnG1LPsmMRpfJfevfLtI0ObIvrwYc+Xg+kmYJe00vwMRSdulQOztKANKalFXBewwk72XrQCeRLXFaUIg== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/core" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/native@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.6.1.tgz#b66e237f2faaa4f88569d5a03b6fb0136bcdf2b9" + integrity sha512-ZIfSytxFGLw4gYOb8gsmwG0+JZYxuM/Y1XPCXCkhuoMn+RmOYrr0kQ4gLczbmf+TRxth7OT1c8vBYz0+SCGcIQ== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/core" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/rafz@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.6.1.tgz#d71aafb92b78b24e4ff84639f52745afc285c38d" + integrity sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ== + +"@react-spring/shared@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.6.1.tgz#4e2e4296910656c02bd9fd54c559702bc836ac4e" + integrity sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw== + dependencies: + "@react-spring/rafz" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/three@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.6.1.tgz#095fcd1dc6509127c33c14486d88289b89baeb9d" + integrity sha512-Tyw2YhZPKJAX3t2FcqvpLRb71CyTe1GvT3V+i+xJzfALgpk10uPGdGaQQ5Xrzmok1340DAeg2pR/MCfaW7b8AA== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/core" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/types@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.6.1.tgz#913d3a68c5cbc1124fdb18eff919432f7b6abdde" + integrity sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q== + +"@react-spring/web@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.6.1.tgz#3e4c03b724d2b545dc2fa2649eb6109318ab9178" + integrity sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/core" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" + +"@react-spring/zdog@~9.6.1": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.6.1.tgz#5292c374e23e3846db3eb9d7557ed5a7bb40dada" + integrity sha512-0jSGm2OFW/+/+4dkRp46KzEkcLVfzV2k6DO1om0dLDtQ4q6FpX4dmDTlRc7Apzin6VtfQONMFIGITtbqoS28MQ== + dependencies: + "@react-spring/animated" "~9.6.1" + "@react-spring/core" "~9.6.1" + "@react-spring/shared" "~9.6.1" + "@react-spring/types" "~9.6.1" "@socket.io/component-emitter@~3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@szmarczak/http-timer@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421" - integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== - dependencies: - defer-to-connect "^1.0.1" - -"@szmarczak/http-timer@^4.0.5": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" - integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== - dependencies: - defer-to-connect "^2.0.0" - -"@tootallnate/once@2": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" - integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== +"@swc/core-darwin-arm64@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.3.24.tgz#d41fc574cb5049def9001903680fdd924f065052" + integrity sha512-rR+9UpWm+fGXcipsjCst2hIL1GYIbo0YTLhJZWdIpQD6KRHHJMFXiydMgQQkDj2Ml7HpqUVgxj6m4ZWYL8b0OA== + +"@swc/core-darwin-x64@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.3.24.tgz#0f7a3960b91cbd7f95f25542b29d0e08bde4f59d" + integrity sha512-px+5vkGtgPH0m3FkkTBHynlRdS5rRz+lK+wiXIuBZFJSySWFl6RkKbvwkD+sf0MpazQlqwlv/rTOGJBw6oDffg== + +"@swc/core-linux-arm-gnueabihf@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.3.24.tgz#a0fdd97b8341806b57290217830a5d1ab7d0b193" + integrity sha512-jLs8ZOdTV4UW4J12E143QJ4mOMONQtqgAnuhBbRuWFzQ3ny1dfoC3P1jNWAJ2Xi59XdxAIXn0PggPNH4Kh34kw== + +"@swc/core-linux-arm64-gnu@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.3.24.tgz#0536d03e12dd471ebafc180599488404aebb65cf" + integrity sha512-A/v0h70BekrwGpp1DlzIFGcHQ3QQ2PexXcnnuIBZeMc9gNmHlcZmg3EcwAnaUDiokhNuSUFA/wV94yk1OqmSkw== + +"@swc/core-linux-arm64-musl@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.3.24.tgz#54f46ffea1bf6ffcbe7c62037efaefdfb5115214" + integrity sha512-pbc9eArWPTiMrbpS/pJo0IiQNAKAQBcBIDjWBGP1tcw2iDXYLw4bruwz9kI/VjakbshWb8MoE4T5ClkeuULvSw== + +"@swc/core-linux-x64-gnu@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.3.24.tgz#c2b5cef83f8afd2a57d0eafbac083562d50cd0e6" + integrity sha512-pP5pOLlY1xd352qo7rTlpVPUI9/9VhOd4b3Lk+LzfZDq9bTL2NDlGfyrPiwa5DGHMSzrugH56K2J68eutkxYVA== + +"@swc/core-linux-x64-musl@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.3.24.tgz#3459d01f9bf745568a4196c1993987f3d4a98303" + integrity sha512-phNbP7zGp+Wcyxq1Qxlpe5KkxO7WLT2kVQUC7aDFGlVdCr+xdXsfH1MzheHtnr0kqTVQX1aiM8XXXHfFxR0oNA== + +"@swc/core-win32-arm64-msvc@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.3.24.tgz#85a18c844c00d66bf46db99d9c98e9550b4d28f5" + integrity sha512-qhbiJTWAOqyR+K9xnGmCkOWSz2EmWpDBstEJCEOTc6FZiEdbiTscDmqTcMbCKaTHGu8t+6erVA4t65/Eg6uWPA== + +"@swc/core-win32-ia32-msvc@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.3.24.tgz#18318199ba06cab4ead8f6122b9f30b3f452b1e7" + integrity sha512-JfghIlscE4Rz+Lc08lSoDh+R0cWxrISed5biogFfE6vZqhaDnw3E5Qshqw7O3pIaiq8L2u1nmzuyP581ZmpbRA== + +"@swc/core-win32-x64-msvc@1.3.24": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.24.tgz#b53746787e5af021787134d393fd67b0431f90d9" + integrity sha512-3AmJRr0hwciwDBbzUNqaftvppzS8v9X/iv/Wl7YaVLBVpPfQvaZzfqLycvNMGLZb5vIKXR/u58txg3dRBGsJtw== + +"@swc/core@^1.3.22": + version "1.3.24" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.24.tgz#ef6b30267c1bbd48af62cbc91370fe9b3f5d6a23" + integrity sha512-QMOTd0AgiUT3K1crxLRqd3gw0f3FC8hhH1vvlIlryvYqU4c+FJ/T2G4ZhMKLxQlZ/jX6Rhk0gKINZRBxy2GFyQ== + optionalDependencies: + "@swc/core-darwin-arm64" "1.3.24" + "@swc/core-darwin-x64" "1.3.24" + "@swc/core-linux-arm-gnueabihf" "1.3.24" + "@swc/core-linux-arm64-gnu" "1.3.24" + "@swc/core-linux-arm64-musl" "1.3.24" + "@swc/core-linux-x64-gnu" "1.3.24" + "@swc/core-linux-x64-musl" "1.3.24" + "@swc/core-win32-arm64-msvc" "1.3.24" + "@swc/core-win32-ia32-msvc" "1.3.24" + "@swc/core-win32-x64-msvc" "1.3.24" "@turf/along@^6.5.0": version "6.5.0" @@ -2373,98 +1916,6 @@ "@turf/invariant" "^6.5.0" d3-voronoi "1.1.2" -"@types/body-parser@*": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0" - integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g== - dependencies: - "@types/connect" "*" - "@types/node" "*" - -"@types/bonjour@^3.5.9": - version "3.5.10" - resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275" - integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw== - dependencies: - "@types/node" "*" - -"@types/cacheable-request@^6.0.1": - version "6.0.2" - resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" - integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA== - dependencies: - "@types/http-cache-semantics" "*" - "@types/keyv" "*" - "@types/node" "*" - "@types/responselike" "*" - -"@types/connect-history-api-fallback@^1.3.5": - version "1.3.5" - resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae" - integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw== - dependencies: - "@types/express-serve-static-core" "*" - "@types/node" "*" - -"@types/connect@*": - version "3.4.35" - resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1" - integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ== - dependencies: - "@types/node" "*" - -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.4.8" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.8.tgz#720dd6a32b8219b9aba1a07b13e9d03b622695fd" - integrity sha512-zUCKQI1bUCTi+0kQs5ZQzQ/XILWRLIlh15FXWNykJ+NG3TMKMVvwwC6GP3DR1Ylga15fB7iAExSzc4PNlR5i3w== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" - integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== - -"@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== - -"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18": - version "4.17.31" - resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.31.tgz#a1139efeab4e7323834bb0226e62ac019f474b2f" - integrity sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q== - dependencies: - "@types/node" "*" - "@types/qs" "*" - "@types/range-parser" "*" - -"@types/express@*", "@types/express@^4.17.13": - version "4.17.14" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.14.tgz#143ea0557249bc1b3b54f15db4c81c3d4eb3569c" - integrity sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - -"@types/fs-extra@^9.0.1": - version "9.0.13" - resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" - integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== - dependencies: - "@types/node" "*" - "@types/geojson@*", "@types/geojson@^7946.0.7": version "7946.0.10" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" @@ -2475,14 +1926,6 @@ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== -"@types/glob@^7.1.1": - version "7.2.0" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" - integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/hammerjs@^2.0.41": version "2.0.41" resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.41.tgz#f6ecf57d1b12d2befcce00e928a6a097c22980aa" @@ -2496,306 +1939,62 @@ "@types/react" "*" hoist-non-react-statics "^3.3.0" -"@types/html-minifier-terser@^6.0.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" - integrity sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg== - -"@types/http-cache-semantics@*": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" - integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== - -"@types/http-proxy@^1.17.8": - version "1.17.9" - resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a" - integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw== - dependencies: - "@types/node" "*" - -"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": - version "7.0.11" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" - integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== - -"@types/keyv@*": - version "4.2.0" - resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-4.2.0.tgz#65b97868ab757906f2dbb653590d7167ad023fa0" - integrity sha512-xoBtGl5R9jeKUhc8ZqeYaRDx04qqJ10yhhXYGmJ4Jr8qKpvMsDQQrNUvF/wUJ4klOtmJeJM+p2Xo3zp9uaC3tw== - dependencies: - keyv "*" +"@types/json5@^0.0.29": + version "0.0.29" + resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== "@types/mapbox-gl@^2.0.3": - version "2.7.6" - resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.6.tgz#87edd38d9ac4b72be5e293472488a2e21910ad58" - integrity sha512-EPIfNO7WApXaFM7DuJBj+kpXmqffqJHMJ3Q9gbV/nNL23XHR0PC5CCDYbAFa4tKErm0xJd9C5kPLF6KvA/cRcA== + version "2.7.10" + resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz#a3a32a366bad8966c0a40b78209ed430ba018ce1" + integrity sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw== dependencies: "@types/geojson" "*" -"@types/mime@*": - version "3.0.1" - resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" - integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA== - -"@types/minimatch@*": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-5.1.2.tgz#07508b45797cb81ec3f273011b054cd0755eddca" - integrity sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA== - -"@types/node@*": - version "18.11.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.7.tgz#8ccef136f240770c1379d50100796a6952f01f94" - integrity sha512-LhFTglglr63mNXUSRYD8A+ZAIu5sFqNJ4Y2fPuY7UlrySJH87rRRlhtVmMHplmfk5WkoJGmDjE9oiTfyX94CpQ== - -"@types/node@^16.11.26": - version "16.18.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.2.tgz#77878acc68c5f6241454008beedd39513bd8e851" - integrity sha512-KIGQJyya+opDCFvDSZMNNS899ov5jlNdtN7PypgHWeb8e+5vWISdwTRo/ClsNVlmDihzOGqFyNBDamUs7TQQCA== - "@types/prop-types@*": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/qs@*": - version "6.9.7" - resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" - integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw== - -"@types/range-parser@*": - version "1.2.4" - resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc" - integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw== +"@types/react-dom@^18.0.9": + version "18.0.10" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.10.tgz#3b66dec56aa0f16a6cc26da9e9ca96c35c0b4352" + integrity sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg== + dependencies: + "@types/react" "*" -"@types/react@*": - version "18.0.23" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.23.tgz#4190ecd58b99fa79fe2e67832bdcb287e5f893e4" - integrity sha512-R1wTULtCiJkudAN2DJGoYYySbGtOdzZyUWAACYinKdiQC8auxso4kLDUhQ7AJ2kh3F6A6z4v69U6tNY39hihVQ== +"@types/react@*", "@types/react@^18.0.26": + version "18.0.26" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917" + integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" -"@types/responselike@*", "@types/responselike@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" - integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== - dependencies: - "@types/node" "*" - -"@types/retry@0.12.0": - version "0.12.0" - resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" - integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== - "@types/scheduler@*": version "0.16.2" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/serve-index@^1.9.1": - version "1.9.1" - resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278" - integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg== - dependencies: - "@types/express" "*" - -"@types/serve-static@*", "@types/serve-static@^1.13.10": - version "1.15.0" - resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155" - integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg== - dependencies: - "@types/mime" "*" - "@types/node" "*" - -"@types/sockjs@^0.3.33": - version "0.3.33" - resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f" - integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw== - dependencies: - "@types/node" "*" - "@types/use-sync-external-store@^0.0.3": version "0.0.3" resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== -"@types/ws@^8.5.1": - version "8.5.3" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d" - integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w== - dependencies: - "@types/node" "*" - -"@types/yauzl@^2.9.1": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" - integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== - dependencies: - "@types/node" "*" - -"@vercel/webpack-asset-relocator-loader@^1.7.0": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@vercel/webpack-asset-relocator-loader/-/webpack-asset-relocator-loader-1.7.3.tgz#e65ca1fd9feb045039788f9b4710e5acc84b01b0" - integrity sha512-vizrI18v8Lcb1PmNNUBz7yxPxxXoOeuaVEjTG9MjvDrphjiSxFZrRJ5tIghk+qdLFRCXI5HBCshgobftbmrC5g== - dependencies: - resolve "^1.10.0" - -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== - dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== - -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== - -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== - -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== - dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@xtuc/long" "4.2.2" - -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== - -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== - dependencies: - "@xtuc/ieee754" "^1.2.0" - -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== - dependencies: - "@xtuc/long" "4.2.2" - -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@xtuc/long" "4.2.2" - -"@xtuc/ieee754@^1.2.0": - version "1.2.0" - resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" - integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== - -"@xtuc/long@4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d" - integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ== - -abbrev@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" - integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q== - -accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8: - version "1.3.8" - resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e" - integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw== +"@vitejs/plugin-react-swc@^3.0.0": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-react-swc/-/plugin-react-swc-3.0.1.tgz#7c904f889967f2240e04ac13582399a061468990" + integrity sha512-3GQ2oruZO9j8dSHcI0MUeOZQBhjYyDQsF/pKY4Px+CJxn0M16OhgFeEzUjeuwci4zhhjoNIDE9aFNaV5GMQ09g== dependencies: - mime-types "~2.1.34" - negotiator "0.6.3" - -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== + "@swc/core" "^1.3.22" acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.8.0: version "8.8.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== @@ -2807,50 +2006,7 @@ add-dom-event-listener@^1.1.0: dependencies: object-assign "4.x" -agent-base@6, agent-base@^6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" - integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== - dependencies: - debug "4" - -agentkeepalive@^4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717" - integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA== - dependencies: - debug "^4.1.0" - depd "^1.1.2" - humanize-ms "^1.2.1" - -aggregate-error@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" - integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== - dependencies: - clean-stack "^2.0.0" - indent-string "^4.0.0" - -ajv-formats@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" - integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== - dependencies: - ajv "^8.0.0" - -ajv-keywords@^3.5.2: - version "3.5.2" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" - integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== - -ajv-keywords@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" - integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== - dependencies: - fast-deep-equal "^3.1.3" - -ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2860,46 +2016,17 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^8.0.0, ajv@^8.8.0: - version "8.11.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" - integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== - dependencies: - fast-deep-equal "^3.1.1" - json-schema-traverse "^1.0.0" - require-from-string "^2.0.2" - uri-js "^4.2.2" - almost-equal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/almost-equal/-/almost-equal-1.1.0.tgz#f851c631138757994276aa2efbe8dfa3066cccdd" integrity sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A== -ansi-escapes@^4.2.1: - version "4.3.2" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" - integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== - dependencies: - type-fest "^0.21.3" - -ansi-html-community@^0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" - integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw== - ansi-regex@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: +ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== @@ -2907,9 +2034,9 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: color-convert "^2.0.1" antd@^4.19.2: - version "4.23.6" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.23.6.tgz#e21523c401f0e8fdff47bec48bd6535247492b27" - integrity sha512-AYH57cWBDe1ChtbnvG8i9dpKG4WnjE3AG0zIKpXByFNnxsr4saV6/19ihE8/ImSGpohN4E2zTXmo7R5/MyVRKQ== + version "4.24.6" + resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.6.tgz#ca1bd1deccbede9325c75c127790ba8d78c95da6" + integrity sha512-x4tTXI3aOJukcG/MWQ7PdWHIqGEFInkKPhSHJpSiDvZI5BAvgLicW57WWhnBpJ6m9H9e9FRohC5FRJf0NIwsWQ== dependencies: "@ant-design/colors" "^6.0.0" "@ant-design/icons" "^4.7.0" @@ -2919,34 +2046,33 @@ antd@^4.19.2: classnames "^2.2.6" copy-to-clipboard "^3.2.0" lodash "^4.17.21" - memoize-one "^6.0.0" moment "^2.29.2" rc-cascader "~3.7.0" rc-checkbox "~2.3.0" - rc-collapse "~3.3.0" - rc-dialog "~8.9.0" - rc-drawer "~5.1.0" + rc-collapse "~3.4.2" + rc-dialog "~9.0.2" + rc-drawer "~6.1.0" rc-dropdown "~4.0.0" rc-field-form "~1.27.0" - rc-image "~5.7.0" - rc-input "~0.1.2" + rc-image "~5.13.0" + rc-input "~0.1.4" rc-input-number "~7.3.9" - rc-mentions "~1.10.0" - rc-menu "~9.6.3" + rc-mentions "~1.13.1" + rc-menu "~9.8.0" rc-motion "^2.6.1" rc-notification "~4.6.0" - rc-pagination "~3.1.17" - rc-picker "~2.6.11" - rc-progress "~3.3.2" + rc-pagination "~3.2.0" + rc-picker "~2.7.0" + rc-progress "~3.4.1" rc-rate "~2.9.0" rc-resize-observer "^1.2.0" rc-segmented "~2.1.0" rc-select "~14.1.13" rc-slider "~10.0.0" - rc-steps "~4.1.0" + rc-steps "~5.0.0-alpha.2" rc-switch "~3.2.0" rc-table "~7.26.0" - rc-tabs "~12.2.0" + rc-tabs "~12.4.1" rc-textarea "~0.4.5" rc-tooltip "~5.2.0" rc-tree "~5.7.0" @@ -2956,51 +2082,28 @@ antd@^4.19.2: rc-util "^5.22.5" scroll-into-view-if-needed "^2.2.25" -anymatch@~3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" - integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -"aproba@^1.0.3 || ^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc" - integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ== - -are-we-there-yet@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz#679df222b278c64f2cdba1175cdc00b0d96164bd" - integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg== - dependencies: - delegates "^1.0.0" - readable-stream "^3.6.0" - argparse@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -array-flatten@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== - -array-flatten@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" - integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== +aria-query@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== + dependencies: + "@babel/runtime" "^7.10.2" + "@babel/runtime-corejs3" "^7.10.2" -array-includes@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" - integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== +array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" + integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" - get-intrinsic "^1.1.1" + es-abstract "^1.20.4" + get-intrinsic "^1.1.3" is-string "^1.0.7" array-tree-filter@^2.1.0: @@ -3008,37 +2111,46 @@ array-tree-filter@^2.1.0: resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190" integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw== -array-union@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== +array.prototype.flat@^1.2.5: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" + integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.0.tgz#a7e8ed4225f4788a70cd910abcf0791e76a5534f" - integrity sha512-PZC9/8TKAIxcWKdyeb77EzULHPrIX/tIZebLJUQOMR1OwYosT8yggdfWScfTBCDj5utONvOuPQQumYsU2ULbkg== +array.prototype.flatmap@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" + integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + es-shim-unscopables "^1.0.0" + +array.prototype.tosorted@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" + integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" + get-intrinsic "^1.1.3" asap@~2.0.3: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== -asar@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/asar/-/asar-3.2.0.tgz#e6edb5edd6f627ebef04db62f771c61bea9c1221" - integrity sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg== - dependencies: - chromium-pickle-js "^0.2.0" - commander "^5.0.0" - glob "^7.1.6" - minimatch "^3.0.4" - optionalDependencies: - "@types/glob" "^7.1.1" +ast-types-flow@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" + integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag== async-validator@^4.1.0: version "4.2.5" @@ -3055,34 +2167,24 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== -at-least-node@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" - integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== - -author-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/author-regex/-/author-regex-1.0.0.tgz#d08885be6b9bbf9439fe087c76287245f0a81450" - integrity sha512-KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g== +axe-core@^4.4.3: + version "4.6.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.1.tgz#79cccdee3e3ab61a8f42c458d4123a6768e6fbce" + integrity sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w== axios@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.1.3.tgz#8274250dada2edf53814ed7db644b9c2866c1e35" - integrity sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA== + version "1.2.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" + integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" proxy-from-env "^1.1.0" -babel-loader@^8.2.2: - version "8.2.5" - resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e" - integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ== - dependencies: - find-cache-dir "^3.3.1" - loader-utils "^2.0.0" - make-dir "^3.1.0" - schema-utils "^2.6.5" +axobject-query@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" + integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: version "6.26.0" @@ -3097,16 +2199,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base64-js@^1.3.1, base64-js@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" - integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== - -batch@0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" - integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -3117,63 +2209,6 @@ bignumber.js@^8.1.1: resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.1.1.tgz#4b072ae5aea9c20f6730e4e5d529df1271c4d885" integrity sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ== -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -bl@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a" - integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w== - dependencies: - buffer "^5.5.0" - inherits "^2.0.4" - readable-stream "^3.4.0" - -bluebird@^3.1.1: - version "3.7.2" - resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" - integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== - -body-parser@1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668" - integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw== - dependencies: - bytes "3.1.2" - content-type "~1.0.4" - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - http-errors "2.0.0" - iconv-lite "0.4.24" - on-finished "2.4.1" - qs "6.11.0" - raw-body "2.5.1" - type-is "~1.6.18" - unpipe "1.0.0" - -bonjour-service@^1.0.11: - version "1.0.14" - resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.14.tgz#c346f5bc84e87802d08f8d5a60b93f758e514ee7" - integrity sha512-HIMbgLnk1Vqvs6B4Wq5ep7mxvj9sGz5d1JJyDNSGNIdA/w2MCz6GTjWTdjqOJV1bEPj+6IkxDvWNFKEBxNt4kQ== - dependencies: - array-flatten "^2.1.2" - dns-equal "^1.0.0" - fast-deep-equal "^3.1.3" - multicast-dns "^7.2.5" - -boolbase@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== - -boolean@^3.0.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" - integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== - brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3182,159 +2217,20 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -brace-expansion@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" - integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: - balanced-match "^1.0.0" + function-bind "^1.1.1" + get-intrinsic "^1.0.2" -braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== - dependencies: - fill-range "^7.0.1" +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -browserslist@^4.14.5, browserslist@^4.21.3: - version "4.21.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" - integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== - dependencies: - caniuse-lite "^1.0.30001400" - electron-to-chromium "^1.4.251" - node-releases "^2.0.6" - update-browserslist-db "^1.0.9" - -buffer-crc32@~0.2.3: - version "0.2.13" - resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" - integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== - -buffer-equal@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe" - integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ== - -buffer-from@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" - integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== - -buffer@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" - integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== - dependencies: - base64-js "^1.3.1" - ieee754 "^1.1.13" - -bytes@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048" - integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw== - -bytes@3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5" - integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg== - -cacache@^16.1.0: - version "16.1.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e" - integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ== - dependencies: - "@npmcli/fs" "^2.1.0" - "@npmcli/move-file" "^2.0.0" - chownr "^2.0.0" - fs-minipass "^2.1.0" - glob "^8.0.1" - infer-owner "^1.0.4" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - mkdirp "^1.0.4" - p-map "^4.0.0" - promise-inflight "^1.0.1" - rimraf "^3.0.2" - ssri "^9.0.0" - tar "^6.1.11" - unique-filename "^2.0.0" - -cacheable-lookup@^5.0.3: - version "5.0.4" - resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" - integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== - -cacheable-request@^6.0.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" - integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^3.0.0" - lowercase-keys "^2.0.0" - normalize-url "^4.1.0" - responselike "^1.0.2" - -cacheable-request@^7.0.2: - version "7.0.2" - resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27" - integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew== - dependencies: - clone-response "^1.0.2" - get-stream "^5.1.0" - http-cache-semantics "^4.0.0" - keyv "^4.0.0" - lowercase-keys "^2.0.0" - normalize-url "^6.0.1" - responselike "^2.0.0" - -call-bind@^1.0.0, call-bind@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" - integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== - dependencies: - function-bind "^1.1.1" - get-intrinsic "^1.0.2" - -callsites@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== - -camel-case@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" - integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== - dependencies: - pascal-case "^3.1.2" - tslib "^2.0.3" - -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -caniuse-lite@^1.0.30001400: - version "1.0.30001426" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001426.tgz#58da20446ccd0cb1dfebd11d2350c907ee7c2eaa" - integrity sha512-n7cosrHLl8AWt0wwZw/PJZgUg3lV0gk9LMI7ikGJwhyhgsd2Nb65vKvmSexCqq/J7rbH3mFG6yZZiPR5dLPW5A== - -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3342,135 +2238,16 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" -chardet@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA== - -chokidar@^3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" - integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw== - dependencies: - anymatch "~3.1.2" - braces "~3.0.2" - glob-parent "~5.1.2" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.6.0" - optionalDependencies: - fsevents "~2.3.2" - -chownr@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" - integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== - -chrome-trace-event@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" - integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== - -chromium-pickle-js@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" - integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== - clamp@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634" integrity sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA== -classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: +classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== -clean-css@^5.2.2: - version "5.3.1" - resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-5.3.1.tgz#d0610b0b90d125196a2894d35366f734e5d7aa32" - integrity sha512-lCr8OHhiWCTw4v8POJovCoh4T7I9U11yVsPjMWWnnMmp9ZowCxyad1Pathle/9HjaDp+fdQKjO9fQydE6RHTZg== - dependencies: - source-map "~0.6.0" - -clean-stack@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" - integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw== - dependencies: - restore-cursor "^3.1.0" - -cli-spinners@^2.5.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.7.0.tgz#f815fd30b5f9eaac02db604c7a231ed7cb2f797a" - integrity sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw== - -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - -cliui@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" - integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^6.2.0" - -cliui@^7.0.2: - version "7.0.4" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f" - integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^7.0.0" - -cliui@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" - integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.1" - wrap-ansi "^7.0.0" - -clone-deep@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" - integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ== - dependencies: - is-plain-object "^2.0.4" - kind-of "^6.0.2" - shallow-clone "^3.0.0" - -clone-response@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" - integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== - dependencies: - mimic-response "^1.0.0" - -clone@^1.0.2: - version "1.0.4" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" - integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== - dependencies: - color-name "1.1.3" - color-convert@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" @@ -3488,11 +2265,6 @@ color-interpolate@^1.0.5: color-space "^1.14.3" lerp "^1.0.3" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -3513,21 +2285,6 @@ color-space@^1.14.3: hsluv "^0.0.3" mumath "^3.3.4" -color-support@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" - integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== - -colorette@^2.0.10: - version "2.0.19" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== - -colors@1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== - combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" @@ -3535,43 +2292,11 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@2, commander@^2.20.0: +commander@2: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@2.9.0: - version "2.9.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4" - integrity sha512-bmkUukX8wAOjHdN26xj5c4ctEV22TQ7dQYhSmuckKhToXrkUn0iIaolHdIxYYqD55nhpSPA9zPQ1yP57GdXP2A== - dependencies: - graceful-readlink ">= 1.0.0" - -commander@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -commander@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" - integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== - -commander@^8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" - integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== - -commondir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" - integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg== - -compare-version@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" - integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== - component-classes@^1.2.5: version "1.2.6" resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691" @@ -3584,30 +2309,10 @@ component-indexof@0.0.3: resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24" integrity sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw== -compressible@~2.0.16: - version "2.0.18" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba" - integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg== - dependencies: - mime-db ">= 1.43.0 < 2" - -compression@^1.7.4: - version "1.7.4" - resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f" - integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ== - dependencies: - accepts "~1.3.5" - bytes "3.0.0" - compressible "~2.0.16" - debug "2.6.9" - on-headers "~1.0.2" - safe-buffer "5.1.2" - vary "~1.1.2" - -compute-scroll-into-view@^1.0.17: - version "1.0.17" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz#6a88f18acd9d42e9cf4baa6bec7e0522607ab7ab" - integrity sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg== +compute-scroll-into-view@^1.0.20: + version "1.0.20" + resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43" + integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg== concat-map@0.0.1: version "0.0.1" @@ -3624,19 +2329,6 @@ concaveman@*: robust-predicates "^2.0.4" tinyqueue "^2.0.3" -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - -connect-history-api-fallback@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" - integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== - connected-react-router@^6.5.2: version "6.9.3" resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972" @@ -3648,56 +2340,17 @@ connected-react-router@^6.5.2: immutable "^3.8.1 || ^4.0.0" seamless-immutable "^7.1.3" -console-control-strings@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== - -content-disposition@0.5.4: - version "0.5.4" - resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe" - integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ== - dependencies: - safe-buffer "5.2.1" - -content-type@~1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== - -convert-source-map@^1.7.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" - integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== - -cookie-signature@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== - -cookie@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b" - integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw== - copy-to-clipboard@^3.2.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.2.tgz#5b263ec2366224b100181dded7ce0579b340c107" - integrity sha512-Vme1Z6RUDzrb6xAI7EZlVZ5uvOk2F//GaxKUxajDqm9LhOVM1inxNAD2vy+UZDYsd0uyA9s7b3/FVZPSxqrCfg== + version "3.3.3" + resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" + integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA== dependencies: toggle-selection "^1.0.6" -copy-webpack-plugin@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.1.0.tgz#2d2c460c4c4695ec0a58afb2801a1205256c4e6b" - integrity sha512-rxnR7PaGigJzhqETHGmAcxKnLZSR5u1Y3/bcIv/1FnqXedcL/E2ewK7ZCNrArJKCiSv8yVXhTqetJh8inDvfsA== - dependencies: - fast-glob "^3.2.7" - glob-parent "^6.0.1" - globby "^11.0.3" - normalize-path "^3.0.0" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" +core-js-pure@^3.25.1: + version "3.27.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.27.0.tgz#091dce4799a5aad4cfde930ea747b0a1962388c5" + integrity sha512-fJml7FM6v1HI3Gkg5/Ifc/7Y2qXcJxaDwSROeZGAZfNykSTvUk94WT55TYzJ2lFHK0voSr/d4nOVChLuNCWNpA== core-js@^1.0.0: version "1.2.7" @@ -3709,11 +2362,6 @@ core-js@^2.4.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== -core-util-is@~1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" - integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== - create-react-class@^15.5.3: version "15.7.0" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e" @@ -3722,27 +2370,7 @@ create-react-class@^15.5.3: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-spawn-windows-exe@^1.1.0, cross-spawn-windows-exe@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/cross-spawn-windows-exe/-/cross-spawn-windows-exe-1.2.0.tgz#46253b0f497676e766faf4a7061004618b5ac5ec" - integrity sha512-mkLtJJcYbDCxEG7Js6eUnUNndWjyUZwJ3H7bErmmtOYU/Zb99DyUkpamuIZE0b3bhmJyZ7D90uS6f+CGxRRjOw== - dependencies: - "@malept/cross-spawn-promise" "^1.1.0" - is-wsl "^2.2.0" - which "^2.0.2" - -cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -3751,11 +2379,6 @@ cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: shebang-command "^2.0.0" which "^2.0.1" -cross-zip@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/cross-zip/-/cross-zip-4.0.0.tgz#c29bfb2c001659a6d480ae9596f3bee83b48a230" - integrity sha512-MEzGfZo0rqE10O/B+AEcCSJLZsrWuRUvmqJTqHNqBtALhaJc3E3ixLGLJNTRzEA2K34wbmOHC4fwYs9sVsdcCA== - css-animation@^1.3.2: version "1.6.1" resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e" @@ -3764,46 +2387,11 @@ css-animation@^1.3.2: babel-runtime "6.x" component-classes "^1.2.5" -css-loader@^6.0.0: - version "6.7.1" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e" - integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw== - dependencies: - icss-utils "^5.1.0" - postcss "^8.4.7" - postcss-modules-extract-imports "^3.0.0" - postcss-modules-local-by-default "^4.0.0" - postcss-modules-scope "^3.0.0" - postcss-modules-values "^4.0.0" - postcss-value-parser "^4.2.0" - semver "^7.3.5" - -css-select@^4.1.3: - version "4.3.0" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" - integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== - dependencies: - boolbase "^1.0.0" - css-what "^6.0.1" - domhandler "^4.3.1" - domutils "^2.8.0" - nth-check "^2.0.1" - -css-what@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" - integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== - csscolorparser@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b" integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w== -cssesc@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" - integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== - csstype@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" @@ -3845,41 +2433,41 @@ d3-voronoi@1.1.2: resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c" integrity sha512-RhGS1u2vavcO7ay7ZNAPo4xeDh/VYeGof3x5ZLJBQgYhLegxr3s5IykvWmJ94FTU6mcbtp4sloqZ54mP6R4Utw== +damerau-levenshtein@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== + date-fns@2.x: version "2.29.3" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== dayjs@1.x: - version "1.11.6" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.6.tgz#2e79a226314ec3ec904e3ee1dd5a4f5e5b1c7afb" - integrity sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ== + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== -debug@2.6.9, debug@^2.2.0: +debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - -debug@^3.1.0: +debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -decamelize@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA== +debug@^4.1.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" deck.gl@^7: version "7.3.15" @@ -3897,20 +2485,6 @@ deck.gl@^7: "@deck.gl/mesh-layers" "7.3.15" "@deck.gl/react" "7.3.15" -decompress-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== - dependencies: - mimic-response "^1.0.0" - -decompress-response@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" - integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== - dependencies: - mimic-response "^3.1.0" - deep-diff@^0.3.5: version "0.3.8" resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" @@ -3933,40 +2507,6 @@ deep-is@^0.1.3: resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== - -default-gateway@^6.0.3: - version "6.0.3" - resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" - integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg== - dependencies: - execa "^5.0.0" - -defaults@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.4.tgz#b0b02062c1e2aa62ff5d9528f0f98baa90978d7a" - integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A== - dependencies: - clone "^1.0.2" - -defer-to-connect@^1.0.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591" - integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ== - -defer-to-connect@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" - integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== - -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" @@ -3980,70 +2520,11 @@ delayed-stream@~1.0.0: resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== -delegates@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== - density-clustering@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/density-clustering/-/density-clustering-1.3.0.tgz#dc9f59c8f0ab97e1624ac64930fd3194817dcac5" integrity sha512-icpmBubVTwLnsaor9qH/4tG5+7+f61VcqMN3V3pm9sxxSCt2Jcs0zWOgwZW9ARJYaKD3FumIgHiMOcIMRRAzFQ== -depd@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df" - integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== - -depd@^1.1.2, depd@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== - -destroy@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" - integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== - -detect-libc@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd" - integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w== - -detect-node@^2.0.4: - version "2.1.0" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" - integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== - -dir-compare@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-2.4.0.tgz#785c41dc5f645b34343a4eafc50b79bac7f11631" - integrity sha512-l9hmu8x/rjVC9Z2zmGzkhOEowZvW7pmYws5CWHutg8u1JgvsKWMx7Q/UODeu4djLZ4FgW5besw5yvMQnBHzuCA== - dependencies: - buffer-equal "1.0.0" - colors "1.0.3" - commander "2.9.0" - minimatch "3.0.4" - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== - dependencies: - path-type "^4.0.0" - -dns-equal@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" - integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg== - -dns-packet@^5.2.2: - version "5.4.0" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b" - integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g== - dependencies: - "@leichtgewicht/ip-codec" "^2.0.1" - doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -4059,31 +2540,15 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-align@^1.7.0: - version "1.12.3" - resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.3.tgz#a36d02531dae0eefa2abb0c4db6595250526f103" - integrity sha512-Gj9hZN3a07cbR6zviMUBOMPdWxYhbMI+x+WS0NAIu2zFZmbK8ys9R79g+iG9qLnlCwpFoaB+fKy8Pdv470GsPA== - -dom-converter@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" - integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== - dependencies: - utila "~0.4" + version "1.12.4" + resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.4.tgz#3503992eb2a7cfcb2ed3b2a6d21e0b9c00d54511" + integrity sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw== dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0: version "1.2.1" resolved "https://registry.yarnpkg.com/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e" integrity sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ== -dom-serializer@^1.0.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30" - integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.2.0" - entities "^2.0.0" - dom-serializer@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" @@ -4098,7 +2563,7 @@ dom-walk@^0.1.0: resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84" integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w== -domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0: +domelementtype@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== @@ -4110,22 +2575,6 @@ domhandler@5.0.3, domhandler@^5.0.1, domhandler@^5.0.2: dependencies: domelementtype "^2.3.0" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" - integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== - dependencies: - domelementtype "^2.2.0" - -domutils@^2.5.2, domutils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" - integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A== - dependencies: - dom-serializer "^1.0.1" - domelementtype "^2.2.0" - domhandler "^4.2.0" - domutils@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" @@ -4135,14 +2584,6 @@ domutils@^3.0.1: domelementtype "^2.3.0" domhandler "^5.0.1" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - draft-js@^0.10.0, draft-js@~0.10.0: version "0.10.5" resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742" @@ -4152,184 +2593,28 @@ draft-js@^0.10.0, draft-js@~0.10.0: immutable "~3.7.4" object-assign "^4.1.0" -duplexer3@^0.1.4: - version "0.1.5" - resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" - integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA== - earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.2: version "2.2.4" resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== -ee-first@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== - -electron-installer-common@^0.10.2: - version "0.10.3" - resolved "https://registry.yarnpkg.com/electron-installer-common/-/electron-installer-common-0.10.3.tgz#40f9db644ca60eb28673d545b67ee0113aef4444" - integrity sha512-mYbP+6i+nHMIm0WZHXgGdmmXMe+KXncl6jZYQNcCF9C1WsNA9C5SZ2VP4TLQMSIoFO+X4ugkMEA5uld1bmyEvA== - dependencies: - "@malept/cross-spawn-promise" "^1.0.0" - asar "^3.0.0" - debug "^4.1.1" - fs-extra "^9.0.0" - glob "^7.1.4" - lodash "^4.17.15" - parse-author "^2.0.0" - semver "^7.1.1" - tmp-promise "^3.0.2" - optionalDependencies: - "@types/fs-extra" "^9.0.1" - -electron-installer-debian@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/electron-installer-debian/-/electron-installer-debian-3.1.0.tgz#2f6107f559f6564c44e3832fb2942dd8de4d40cc" - integrity sha512-k6KChvx0Fw8XTlCqwwbBfh19yGQaKjGdbugokmr1IpzINOm4QFyACKMTHAYFHW5LCBUZQShZD96hwxUZ+8Kx+w== - dependencies: - "@malept/cross-spawn-promise" "^1.0.0" - debug "^4.1.1" - electron-installer-common "^0.10.2" - fs-extra "^9.0.0" - get-folder-size "^2.0.1" - lodash "^4.17.4" - word-wrap "^1.2.3" - yargs "^15.0.1" - -electron-installer-redhat@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/electron-installer-redhat/-/electron-installer-redhat-3.3.0.tgz#acdb59d13d738c55debc5214114d36096eda1aed" - integrity sha512-hXIXB3uQXmXZy/v3MpbwWN4Of28ALpPt9ZyUDNEoSe0w7QZceL9IqI2K6Q6imiBJCLRC0hmT94WhlKj1RyGOWg== - dependencies: - "@malept/cross-spawn-promise" "^1.0.0" - debug "^4.1.1" - electron-installer-common "^0.10.2" - fs-extra "^9.0.0" - lodash "^4.17.15" - word-wrap "^1.2.3" - yargs "^16.0.2" - -electron-log@^4.4.3: - version "4.4.8" - resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-4.4.8.tgz#fcb9f714dbcaefb6ac7984c4683912c74730248a" - integrity sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA== - -electron-notarize@^1.1.1: - version "1.2.2" - resolved "https://registry.yarnpkg.com/electron-notarize/-/electron-notarize-1.2.2.tgz#ebf2b258e8e08c1c9f8ff61dc53d5b16b439daf4" - integrity sha512-ZStVWYcWI7g87/PgjPJSIIhwQXOaw4/XeXU+pWqMMktSLHaGMLHdyPPN7Cmao7+Cr7fYufA16npdtMndYciHNw== - dependencies: - debug "^4.1.1" - fs-extra "^9.0.1" - -electron-packager@^17.0.0: - version "17.0.0" - resolved "https://registry.yarnpkg.com/electron-packager/-/electron-packager-17.0.0.tgz#09e86734da51049de08b14cee8fc6b2d424efeec" - integrity sha512-dDy/gMR7Zl9t5AOFNIDjX+7T0d6GEifh1o/ciDUUf/fnHpVVNjDG92HsWgToGN/H9CZi5NEdlHWUQ49Wj7TN5g== - dependencies: - "@electron/asar" "^3.2.1" - "@electron/get" "^2.0.0" - "@electron/osx-sign" "^1.0.1" - "@electron/universal" "^1.3.2" - cross-spawn-windows-exe "^1.2.0" - debug "^4.0.1" - electron-notarize "^1.1.1" - extract-zip "^2.0.0" - filenamify "^4.1.0" - fs-extra "^10.1.0" - galactus "^0.2.1" - get-package-info "^1.0.0" - junk "^3.1.0" - parse-author "^2.0.0" - plist "^3.0.0" - rcedit "^3.0.1" - resolve "^1.1.6" - semver "^7.1.3" - yargs-parser "^21.1.1" - -electron-rebuild@^3.2.6: - version "3.2.9" - resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-3.2.9.tgz#ea372be15f591f8d6d978ee9bca6526dadbcf20f" - integrity sha512-FkEZNFViUem3P0RLYbZkUjC8LUFIK+wKq09GHoOITSJjfDAVQv964hwaNseTTWt58sITQX3/5fHNYcTefqaCWw== - dependencies: - "@malept/cross-spawn-promise" "^2.0.0" - chalk "^4.0.0" - debug "^4.1.1" - detect-libc "^2.0.1" - fs-extra "^10.0.0" - got "^11.7.0" - lzma-native "^8.0.5" - node-abi "^3.0.0" - node-api-version "^0.1.4" - node-gyp "^9.0.0" - ora "^5.1.0" - semver "^7.3.5" - tar "^6.0.5" - yargs "^17.0.1" - -electron-squirrel-startup@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/electron-squirrel-startup/-/electron-squirrel-startup-1.0.0.tgz#19b4e55933fa0ef8f556784b9c660f772546a0b8" - integrity sha512-Oce8mvgGdFmwr+DsAcXBmFK8jFfN6yaFAP9IvyhTfupM3nFkBku/7VS/mdtJteWumImkC6P+BKGsxScoDDkv9Q== - dependencies: - debug "^2.2.0" - -electron-to-chromium@^1.4.251: - version "1.4.284" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" - integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== - -electron-winstaller@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/electron-winstaller/-/electron-winstaller-5.1.0.tgz#528ed08a65858dd678d9178e8ae24f82a4e12271" - integrity sha512-4wlZzkUm5cJNiOtp5wL804+QpygdKTKkrZJXA3sSDEI2XnCVPv0kxmxUvVw4KHBwbNS+Yox89agEr+VkR7kxww== - dependencies: - "@electron/asar" "^3.2.1" - debug "^4.1.1" - fs-extra "^7.0.1" - lodash.template "^4.2.2" - temp "^0.9.0" - -electron@^21.2.0: - version "21.2.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-21.2.0.tgz#8eb65d69b36aa8dac0ee7330eab70181df211c8b" - integrity sha512-oKV4fo8l6jlOZ1cYZ4RpZz02ZxLuBo3SO7DH+FrJ8uDyCirP+eVJ/qlzu23odtNe0P7S/mYAZbC6abZHWoqtLg== - dependencies: - "@electron/get" "^1.14.1" - "@types/node" "^16.11.26" - extract-zip "^2.0.1" - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== +emoji-regex@^9.2.2: + version "9.2.2" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== -encodeurl@^1.0.2, encodeurl@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== - -encoding@^0.1.11, encoding@^0.1.13: +encoding@^0.1.11: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: iconv-lite "^0.6.2" -end-of-stream@^1.1.0: - version "1.4.4" - resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" - integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== - dependencies: - once "^1.4.0" - engine.io-client@~6.2.3: version "6.2.3" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" @@ -4346,45 +2631,15 @@ engine.io-parser@~5.0.3: resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== -enhanced-resolve@^5.10.0: - version "5.10.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6" - integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - -entities@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" - integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== - entities@^4.2.0, entities@^4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== -env-paths@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" - integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== - -err-code@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" - integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== - -error-ex@^1.2.0: - version "1.3.2" - resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g== - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19.5: - version "1.20.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.4.tgz#1d103f9f8d78d4cf0713edcd6d0ed1a46eed5861" - integrity sha512-0UtvRN79eMe2L+UNEF1BwRe364sj/DXhQ/k5FmivgoSdpM90b8Jc0mDzKMGo7QS0BVbOP/bTwBKNnDc9rNzaPA== +es-abstract@^1.19.0, es-abstract@^1.20.4: + version "1.20.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2" + integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4392,6 +2647,7 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19 function.prototype.name "^1.1.5" get-intrinsic "^1.1.3" get-symbol-description "^1.0.0" + gopd "^1.0.1" has "^1.0.3" has-property-descriptors "^1.0.0" has-symbols "^1.0.3" @@ -4407,15 +2663,10 @@ es-abstract@^1.19.0, es-abstract@^1.19.1, es-abstract@^1.19.2, es-abstract@^1.19 object.assign "^4.1.4" regexp.prototype.flags "^1.4.3" safe-regex-test "^1.0.0" - string.prototype.trimend "^1.0.5" - string.prototype.trimstart "^1.0.5" + string.prototype.trimend "^1.0.6" + string.prototype.trimstart "^1.0.6" unbox-primitive "^1.0.2" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== - es-shim-unscopables@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" @@ -4432,25 +2683,33 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es6-error@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" - integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== - -escalade@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" - integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== - -escape-html@~1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== - -escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== +esbuild@^0.16.3: + version "0.16.12" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.12.tgz#60850b9ad2f103f1c4316be42c34d5023f27378d" + integrity sha512-eq5KcuXajf2OmivCl4e89AD3j8fbV+UTE9vczEzq5haA07U9oOTzBWlh3+6ZdjJR7Rz2QfWZ2uxZyhZxBgJ4+g== + optionalDependencies: + "@esbuild/android-arm" "0.16.12" + "@esbuild/android-arm64" "0.16.12" + "@esbuild/android-x64" "0.16.12" + "@esbuild/darwin-arm64" "0.16.12" + "@esbuild/darwin-x64" "0.16.12" + "@esbuild/freebsd-arm64" "0.16.12" + "@esbuild/freebsd-x64" "0.16.12" + "@esbuild/linux-arm" "0.16.12" + "@esbuild/linux-arm64" "0.16.12" + "@esbuild/linux-ia32" "0.16.12" + "@esbuild/linux-loong64" "0.16.12" + "@esbuild/linux-mips64el" "0.16.12" + "@esbuild/linux-ppc64" "0.16.12" + "@esbuild/linux-riscv64" "0.16.12" + "@esbuild/linux-s390x" "0.16.12" + "@esbuild/linux-x64" "0.16.12" + "@esbuild/netbsd-x64" "0.16.12" + "@esbuild/openbsd-x64" "0.16.12" + "@esbuild/sunos-x64" "0.16.12" + "@esbuild/win32-arm64" "0.16.12" + "@esbuild/win32-ia32" "0.16.12" + "@esbuild/win32-x64" "0.16.12" escape-string-regexp@^4.0.0: version "4.0.0" @@ -4462,40 +2721,91 @@ eslint-config-prettier@^8.3.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== -eslint-plugin-prettier@^4.0.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" +eslint-import-resolver-node@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== + dependencies: + debug "^3.2.7" + resolve "^1.20.0" + +eslint-module-utils@^2.7.3: + version "2.7.4" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" + integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== + dependencies: + debug "^3.2.7" + +eslint-plugin-import@^2.25.4: + version "2.26.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" + integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== + dependencies: + array-includes "^3.1.4" + array.prototype.flat "^1.2.5" + debug "^2.6.9" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.6" + eslint-module-utils "^2.7.3" + has "^1.0.3" + is-core-module "^2.8.1" + is-glob "^4.0.3" + minimatch "^3.1.2" + object.values "^1.1.5" + resolve "^1.22.0" + tsconfig-paths "^3.14.1" + +eslint-plugin-jsx-a11y@^6.5.1: + version "6.6.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff" + integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q== + dependencies: + "@babel/runtime" "^7.18.9" + aria-query "^4.2.2" + array-includes "^3.1.5" + ast-types-flow "^0.0.7" + axe-core "^4.4.3" + axobject-query "^2.2.0" + damerau-levenshtein "^1.0.8" + emoji-regex "^9.2.2" + has "^1.0.3" + jsx-ast-utils "^3.3.2" + language-tags "^1.0.5" + minimatch "^3.1.2" + semver "^6.3.0" + +eslint-plugin-prettier@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== dependencies: prettier-linter-helpers "^1.0.0" -eslint-plugin-react@^7.26.1: - version "7.31.10" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.10.tgz#6782c2c7fe91c09e715d536067644bbb9491419a" - integrity sha512-e4N/nc6AAlg4UKW/mXeYWd3R++qUano5/o+t+wnWxIf+bLsOaH3a4q74kX3nDjYym3VBN4HyO9nEn1GcAqgQOA== +eslint-plugin-react@^7.28.0: + version "7.31.11" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8" + integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw== dependencies: - array-includes "^3.1.5" - array.prototype.flatmap "^1.3.0" + array-includes "^3.1.6" + array.prototype.flatmap "^1.3.1" + array.prototype.tosorted "^1.1.1" doctrine "^2.1.0" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" - object.entries "^1.1.5" - object.fromentries "^2.0.5" - object.hasown "^1.1.1" - object.values "^1.1.5" + object.entries "^1.1.6" + object.fromentries "^2.0.6" + object.hasown "^1.1.2" + object.values "^1.1.6" prop-types "^15.8.1" resolve "^2.0.0-next.3" semver "^6.3.0" - string.prototype.matchall "^4.0.7" + string.prototype.matchall "^4.0.8" -eslint-scope@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" +eslint-plugin-simple-import-sort@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz#a1dad262f46d2184a90095a60c66fef74727f0f8" + integrity sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw== eslint-scope@^7.1.1: version "7.1.1" @@ -4512,7 +2822,7 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0: +eslint-visitor-keys@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== @@ -4523,12 +2833,12 @@ eslint-visitor-keys@^3.3.0: integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.11.0: - version "8.26.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.26.0.tgz#2bcc8836e6c424c4ac26a5674a70d44d84f2181d" - integrity sha512-kzJkpaw1Bfwheq4VXUezFriD1GxszX6dUekM7Z3aC2o4hju+tsR/XyTC3RcoSD7jmy9VkPU3+N6YjVU2e96Oyg== + version "8.30.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50" + integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ== dependencies: - "@eslint/eslintrc" "^1.3.3" - "@humanwhocodes/config-array" "^0.11.6" + "@eslint/eslintrc" "^1.4.0" + "@humanwhocodes/config-array" "^0.11.8" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" ajv "^6.10.0" @@ -4547,7 +2857,7 @@ eslint@^8.11.0: file-entry-cache "^6.0.1" find-up "^5.0.0" glob-parent "^6.0.2" - globals "^13.15.0" + globals "^13.19.0" grapheme-splitter "^1.0.4" ignore "^5.2.0" import-fresh "^3.0.0" @@ -4568,9 +2878,9 @@ eslint@^8.11.0: text-table "^0.2.0" espree@^9.4.0: - version "9.4.0" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.0.tgz#cd4bc3d6e9336c433265fc0aa016fc1aaf182f8a" - integrity sha512-DQmnRpLj7f6TgN/NYb0MTzJXL+vJF9h3pHy4JhCIs3zwcgez8xmGg3sXHcEO97BrmO2OSvCwMdfdlyl+E9KjOw== + version "9.4.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" @@ -4590,11 +2900,6 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -4605,100 +2910,6 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -etag@~1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== - -eventemitter3@^4.0.0: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" - integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== - -events@^3.2.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" - integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== - -execa@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA== - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" - integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== - dependencies: - cross-spawn "^7.0.3" - get-stream "^6.0.0" - human-signals "^2.1.0" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.1" - onetime "^5.1.2" - signal-exit "^3.0.3" - strip-final-newline "^2.0.0" - -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw== - dependencies: - homedir-polyfill "^1.0.1" - -express-ws@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/express-ws/-/express-ws-5.0.2.tgz#5b02d41b937d05199c6c266d7cc931c823bda8eb" - integrity sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ== - dependencies: - ws "^7.4.6" - -express@^4.17.1, express@^4.17.3: - version "4.18.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" - integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== - dependencies: - accepts "~1.3.8" - array-flatten "1.1.1" - body-parser "1.20.1" - content-disposition "0.5.4" - content-type "~1.0.4" - cookie "0.5.0" - cookie-signature "1.0.6" - debug "2.6.9" - depd "2.0.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - finalhandler "1.2.0" - fresh "0.5.2" - http-errors "2.0.0" - merge-descriptors "1.0.1" - methods "~1.1.2" - on-finished "2.4.1" - parseurl "~1.3.3" - path-to-regexp "0.1.7" - proxy-addr "~2.0.7" - qs "6.11.0" - range-parser "~1.2.1" - safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" - setprototypeof "1.2.0" - statuses "2.0.1" - type-is "~1.6.18" - utils-merge "1.0.1" - vary "~1.1.2" - expression-eval@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/expression-eval/-/expression-eval-2.1.0.tgz#422915caa46140a7c5b5f248650dea8bf8236e62" @@ -4706,26 +2917,6 @@ expression-eval@^2.0.0: dependencies: jsep "^0.3.0" -external-editor@^3.0.3: - version "3.1.0" - resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew== - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extract-zip@^2.0.0, extract-zip@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" - integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== - dependencies: - debug "^4.1.1" - get-stream "^5.1.0" - yauzl "^2.10.0" - optionalDependencies: - "@types/yauzl" "^2.9.1" - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -4736,17 +2927,6 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^3.2.7, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== - dependencies: - "@nodelib/fs.stat" "^2.0.2" - "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.2" - merge2 "^1.3.0" - micromatch "^4.0.4" - fast-json-stable-stringify@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -4758,19 +2938,12 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: - version "1.13.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c" - integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw== + version "1.14.0" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" + integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== dependencies: reusify "^1.0.4" -faye-websocket@^0.11.3: - version "0.11.4" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" - integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== - dependencies: - websocket-driver ">=0.5.1" - fbjs@^0.8.15: version "0.8.18" resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a" @@ -4784,20 +2957,6 @@ fbjs@^0.8.15: setimmediate "^1.0.5" ua-parser-js "^0.7.30" -fd-slicer@~1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" - integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== - dependencies: - pend "~1.2.0" - -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -4805,64 +2964,6 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" -filename-reserved-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229" - integrity sha512-lc1bnsSr4L4Bdif8Xb/qrtokGbq5zlsms/CYH8PP+WtCkGNF65DPiQY8vG3SakEdRn8Dlnm+gW/qWKKjS5sZzQ== - -filenamify@^4.1.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-4.3.0.tgz#62391cb58f02b09971c9d4f9d63b3cf9aba03106" - integrity sha512-hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg== - dependencies: - filename-reserved-regex "^2.0.0" - strip-outer "^1.0.1" - trim-repeated "^1.0.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== - dependencies: - to-regex-range "^5.0.1" - -finalhandler@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32" - integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg== - dependencies: - debug "2.6.9" - encodeurl "~1.0.2" - escape-html "~1.0.3" - on-finished "2.4.1" - parseurl "~1.3.3" - statuses "2.0.1" - unpipe "~1.0.0" - -find-cache-dir@^3.3.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b" - integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig== - dependencies: - commondir "^1.0.1" - make-dir "^3.0.2" - pkg-dir "^4.1.0" - -find-up@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha512-NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ== - dependencies: - locate-path "^2.0.0" - -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw== - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -4884,15 +2985,7 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -flora-colossus@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/flora-colossus/-/flora-colossus-1.0.1.tgz#aba198425a8185341e64f9d2a6a96fd9a3cbdb93" - integrity sha512-d+9na7t9FyH8gBJoNDSi28mE4NgQVGGvxQ4aHtFRetjyh5SXjuus+V5EZaxFmFdXVemSOrx0lsgEl/ZMjnOWJA== - dependencies: - debug "^4.1.1" - fs-extra "^7.0.0" - -follow-redirects@^1.0.0, follow-redirects@^1.15.0: +follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -4906,82 +2999,6 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -forwarded@0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" - integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== - -frameless-titlebar@^2.1.4: - version "2.1.4" - resolved "https://registry.yarnpkg.com/frameless-titlebar/-/frameless-titlebar-2.1.4.tgz#d769cbd1a0293e0bf65bcb68f5bf597e61f8974e" - integrity sha512-Wz7ZPOLpZNIQg5YxxI2lP6JVrGAolxKN/X85lTOFNpSEe5iJWAKMpYUviuFtc24/Ei8/rBRGkItgdhIFwer7lQ== - dependencies: - classnames "^2.2.6" - deepmerge "^4.2.2" - -fresh@0.5.2: - version "0.5.2" - resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== - -fs-extra@^10.0.0, fs-extra@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" - integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" - integrity sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^7.0.0, fs-extra@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" - integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== - dependencies: - graceful-fs "^4.2.0" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^9.0.0, fs-extra@^9.0.1: - version "9.1.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-minipass@^2.0.0, fs-minipass@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" - integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== - dependencies: - minipass "^3.0.0" - -fs-monkey@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3" - integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q== - fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -5012,39 +3029,6 @@ functions-have-names@^1.2.2: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -galactus@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/galactus/-/galactus-0.2.1.tgz#cbed2d20a40c1f5679a35908e2b9415733e78db9" - integrity sha512-mDc8EQJKtxjp9PMYS3PbpjjbX3oXhBTxoGaPahw620XZBIHJ4+nvw5KN/tRtmmSDR9dypstGNvqQ3C29QGoGHQ== - dependencies: - debug "^3.1.0" - flora-colossus "^1.0.0" - fs-extra "^4.0.0" - -gar@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/gar/-/gar-1.0.4.tgz#f777bc7db425c0572fdeb52676172ca1ae9888b8" - integrity sha512-w4n9cPWyP7aHxKxYHFQMegj7WIAsL/YX/C4Bs5Rr8s1H9M1rNtRWRsw+ovYMkXDQ5S4ZbYHsHAPmevPjPgw44w== - -gauge@^4.0.3: - version "4.0.4" - resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.4.tgz#52ff0652f2bbf607a989793d53b751bef2328dce" - integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg== - dependencies: - aproba "^1.0.3 || ^2.0.0" - color-support "^1.1.3" - console-control-strings "^1.1.0" - has-unicode "^2.0.1" - signal-exit "^3.0.7" - string-width "^4.2.3" - strip-ansi "^6.0.1" - wide-align "^1.1.5" - -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - geojson-equality@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72" @@ -5073,27 +3057,7 @@ geojson-vt@^3.2.1: resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7" integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg== -get-caller-file@^2.0.1, get-caller-file@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== - -get-folder-size@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/get-folder-size/-/get-folder-size-2.0.1.tgz#3fe0524dd3bad05257ef1311331417bcd020a497" - integrity sha512-+CEb+GDCM7tkOS2wdMKTn9vU7DgnKUTuDlehkNJKNSovdCOVxs14OfKCk4cvSaR3za4gj+OBdl9opPN9xrJ0zA== - dependencies: - gar "^1.0.4" - tiny-each-async "2.0.3" - -get-installed-path@^2.0.3: - version "2.1.1" - resolved "https://registry.yarnpkg.com/get-installed-path/-/get-installed-path-2.1.1.tgz#a1f33dc6b8af542c9331084e8edbe37fe2634152" - integrity sha512-Qkn9eq6tW5/q9BDVdMpB8tOHljX9OSP0jRC5TRNVA4qRc839t4g8KQaR8t0Uv0EFVL0MlyG7m/ofjEgAROtYsA== - dependencies: - global-modules "1.0.0" - -get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== @@ -5102,31 +3066,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1, get-intrinsic@ has "^1.0.3" has-symbols "^1.0.3" -get-package-info@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/get-package-info/-/get-package-info-1.0.0.tgz#6432796563e28113cd9474dbbd00052985a4999c" - integrity sha512-SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw== - dependencies: - bluebird "^3.1.1" - debug "^2.2.0" - lodash.get "^4.0.0" - read-pkg-up "^2.0.0" - -get-stream@^4.0.0, get-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w== - dependencies: - pump "^3.0.0" - -get-stream@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" - integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== - dependencies: - pump "^3.0.0" - -get-stream@^6.0.0, get-stream@^6.0.1: +get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== @@ -5144,26 +3084,14 @@ gl-matrix@^3.0.0, gl-matrix@^3.2.1, gl-matrix@^3.4.0: resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== -glob-parent@^5.1.2, glob-parent@~5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" - integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== - dependencies: - is-glob "^4.0.1" - -glob-parent@^6.0.1, glob-parent@^6.0.2: +glob-parent@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: is-glob "^4.0.3" -glob-to-regexp@^0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" - integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== - -glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.1.3: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -5175,60 +3103,7 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.1: - version "8.0.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e" - integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^5.0.1" - once "^1.3.0" - -global-agent@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" - integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== - dependencies: - boolean "^3.0.1" - es6-error "^4.1.1" - matcher "^3.0.0" - roarr "^2.15.3" - semver "^7.3.2" - serialize-error "^7.0.1" - -global-modules@1.0.0, global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg== - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -global-tunnel-ng@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" - integrity sha512-4s+DyciWBV0eK148wqXxcmVAbFVPqtc3sEtUE/GTQfuU80rySLcMhUmHKSHI7/LDj8q0gDYI1lIhRRB7ieRAqg== - dependencies: - encodeurl "^1.0.2" - lodash "^4.17.10" - npm-conf "^1.1.3" - tunnel "^0.0.6" - -global@>=4.3.0, global@^4.3.2: +global@>=4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" integrity sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w== @@ -5236,80 +3111,19 @@ global@>=4.3.0, global@^4.3.2: min-document "^2.19.0" process "^0.11.10" -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - -globals@^13.15.0: - version "13.17.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4" - integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw== +globals@^13.19.0: + version "13.19.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" + integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== dependencies: type-fest "^0.20.2" -globalthis@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" - integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== - dependencies: - define-properties "^1.1.3" - -globby@^11.0.3: - version "11.1.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" - integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== - dependencies: - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.2.9" - ignore "^5.2.0" - merge2 "^1.4.1" - slash "^3.0.0" - -got@^11.7.0, got@^11.8.5: - version "11.8.5" - resolved "https://registry.yarnpkg.com/got/-/got-11.8.5.tgz#ce77d045136de56e8f024bebb82ea349bc730046" - integrity sha512-o0Je4NvQObAuZPHLFoRSkdG2lTgtcynqymzg2Vupdx6PorhaT5MCbIyXG6d4D94kk8ZG57QeosgdiqfJWhEhlQ== - dependencies: - "@sindresorhus/is" "^4.0.0" - "@szmarczak/http-timer" "^4.0.5" - "@types/cacheable-request" "^6.0.1" - "@types/responselike" "^1.0.0" - cacheable-lookup "^5.0.3" - cacheable-request "^7.0.2" - decompress-response "^6.0.0" - http2-wrapper "^1.0.0-beta.5.2" - lowercase-keys "^2.0.0" - p-cancelable "^2.0.0" - responselike "^2.0.0" - -got@^9.6.0: - version "9.6.0" - resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85" - integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q== - dependencies: - "@sindresorhus/is" "^0.14.0" - "@szmarczak/http-timer" "^1.1.2" - cacheable-request "^6.0.0" - decompress-response "^3.3.0" - duplexer3 "^0.1.4" - get-stream "^4.1.0" - lowercase-keys "^1.0.1" - mimic-response "^1.0.1" - p-cancelable "^1.0.0" - to-readable-stream "^1.0.0" - url-parse-lax "^3.0.0" - -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: - version "4.2.10" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== - -"graceful-readlink@>= 1.0.0": +gopd@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725" - integrity sha512-8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w== + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" grapheme-splitter@^1.0.4: version "1.0.4" @@ -5331,11 +3145,6 @@ hammerjs@^2.0.8: resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" integrity sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ== -handle-thing@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" - integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== - handsontable@^6: version "6.2.2" resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-6.2.2.tgz#f1250f3f374abdf7d4a0080950482d3edeea8f07" @@ -5350,11 +3159,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -5379,11 +3183,6 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" -has-unicode@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== - has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" @@ -5391,11 +3190,6 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -he@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" - integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== - history@^4.9.0: version "4.10.1" resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" @@ -5415,28 +3209,6 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react- dependencies: react-is "^16.7.0" -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== - dependencies: - parse-passwd "^1.0.0" - -hosted-git-info@^2.1.4: - version "2.8.9" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" - integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== - -hpack.js@^2.1.6: - version "2.1.6" - resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2" - integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ== - dependencies: - inherits "^2.0.1" - obuf "^1.0.0" - readable-stream "^2.0.1" - wbuf "^1.1.0" - hsluv@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hsluv/-/hsluv-0.0.3.tgz#829107dafb4a9f8b52a1809ed02e091eade6754c" @@ -5450,44 +3222,15 @@ html-dom-parser@3.1.2: domhandler "5.0.3" htmlparser2 "8.0.1" -html-entities@^2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46" - integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA== - -html-minifier-terser@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#bfc818934cc07918f6b3669f5774ecdfd48f32ab" - integrity sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw== - dependencies: - camel-case "^4.1.2" - clean-css "^5.2.2" - commander "^8.3.0" - he "^1.2.0" - param-case "^3.0.4" - relateurl "^0.2.7" - terser "^5.10.0" - html-react-parser@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-3.0.4.tgz#6a6a115a011dfdadd901ca9d2ed80fa5390647e5" - integrity sha512-va68PSmC7uA6PbOEc9yuw5Mu3OHPXmFKUpkLGvUPdTuNrZ0CJZk1s/8X/FaHjswK/6uZghu2U02tJjussT8+uw== + version "3.0.6" + resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-3.0.6.tgz#356b861e6ad48e3221337d5a5929c5e452f8dfdd" + integrity sha512-kFh/qJkz4KJudCcILfI1hQKXTheRyMREXuL/WbWYUAsMsu0EOwV4nO5jA3ecu1LUNpCcebkNcBECxqpswBDlLw== dependencies: domhandler "5.0.3" html-dom-parser "3.1.2" react-property "2.0.0" - style-to-js "1.1.1" - -html-webpack-plugin@^5.3.1: - version "5.5.0" - resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" - integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw== - dependencies: - "@types/html-minifier-terser" "^6.0.0" - html-minifier-terser "^6.0.2" - lodash "^4.17.21" - pretty-error "^4.0.0" - tapable "^2.0.0" + style-to-js "1.1.2" htmlparser2@8.0.1: version "8.0.1" @@ -5499,110 +3242,7 @@ htmlparser2@8.0.1: domutils "^3.0.1" entities "^4.3.0" -htmlparser2@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" - integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== - dependencies: - domelementtype "^2.0.1" - domhandler "^4.0.0" - domutils "^2.5.2" - entities "^2.0.0" - -http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" - integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== - -http-deceiver@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" - integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw== - -http-errors@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3" - integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ== - dependencies: - depd "2.0.0" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses "2.0.1" - toidentifier "1.0.1" - -http-errors@~1.6.2: - version "1.6.3" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" - integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A== - dependencies: - depd "~1.1.2" - inherits "2.0.3" - setprototypeof "1.1.0" - statuses ">= 1.4.0 < 2" - -http-parser-js@>=0.5.1: - version "0.5.8" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3" - integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q== - -http-proxy-agent@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" - integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== - dependencies: - "@tootallnate/once" "2" - agent-base "6" - debug "4" - -http-proxy-middleware@^2.0.3: - version "2.0.6" - resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f" - integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw== - dependencies: - "@types/http-proxy" "^1.17.8" - http-proxy "^1.18.1" - is-glob "^4.0.1" - is-plain-obj "^3.0.0" - micromatch "^4.0.2" - -http-proxy@^1.18.1: - version "1.18.1" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" - integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== - dependencies: - eventemitter3 "^4.0.0" - follow-redirects "^1.0.0" - requires-port "^1.0.0" - -http2-wrapper@^1.0.0-beta.5.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" - integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== - dependencies: - quick-lru "^5.1.1" - resolve-alpn "^1.0.0" - -https-proxy-agent@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" - integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== - dependencies: - agent-base "6" - debug "4" - -human-signals@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" - integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== - -humanize-ms@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== - dependencies: - ms "^2.0.0" - -iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24: +iconv-lite@0.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -5616,20 +3256,15 @@ iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-utils@^5.0.0, icss-utils@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" - integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA== - -ieee754@^1.1.12, ieee754@^1.1.13: +ieee754@^1.1.12: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== + version "5.2.4" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== immutable@^3.7.4: version "3.8.2" @@ -5637,9 +3272,9 @@ immutable@^3.7.4: integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== "immutable@^3.8.1 || ^4.0.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef" - integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ== + version "4.2.1" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.1.tgz#8a4025691018c560a40c67e43d698f816edc44d4" + integrity sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ== immutable@~3.7.4: version "3.7.6" @@ -5659,16 +3294,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - -infer-owner@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" - integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A== - inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" @@ -5677,76 +3302,25 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3: +inherits@2: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== -inherits@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== - -ini@^1.3.4: - version "1.3.8" - resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" - integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== - -ini@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/ini/-/ini-3.0.1.tgz#c76ec81007875bc44d544ff7a11a55d12294102d" - integrity sha512-it4HyVAUTKBc6m8e1iXWvXSTdndF7HbdN713+kvLrymxTaU4AUBWrJ4vEooP+V7fexnVD3LKcBshjGGPefSMUQ== - inline-style-parser@0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== -inquirer@^8.0.0: - version "8.2.5" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" - integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== - dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.1" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.21" - mute-stream "0.0.8" - ora "^5.4.1" - run-async "^2.4.0" - rxjs "^7.5.5" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - wrap-ansi "^7.0.0" - internal-slot@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" - integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== dependencies: - get-intrinsic "^1.1.0" + get-intrinsic "^1.1.3" has "^1.0.3" side-channel "^1.0.4" -ip@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" - integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== - -ipaddr.js@1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" - integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== - -ipaddr.js@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0" - integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng== - is-arguments@^1.0.4: version "1.1.1" resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" @@ -5755,11 +3329,6 @@ is-arguments@^1.0.4: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== - is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -5767,13 +3336,6 @@ is-bigint@^1.0.1: dependencies: has-bigints "^1.0.1" -is-binary-path@~2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09" - integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw== - dependencies: - binary-extensions "^2.0.0" - is-boolean-object@^1.1.0: version "1.1.2" resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" @@ -5787,7 +3349,7 @@ is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.9.0: +is-core-module@^2.8.1, is-core-module@^2.9.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== @@ -5801,38 +3363,18 @@ is-date-object@^1.0.1: dependencies: has-tostringtag "^1.0.0" -is-docker@^2.0.0, is-docker@^2.1.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" - integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== - is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== - -is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: +is-glob@^4.0.0, is-glob@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" -is-interactive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e" - integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w== - -is-lambda@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== - is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" @@ -5845,28 +3387,11 @@ is-number-object@^1.0.4: dependencies: has-tostringtag "^1.0.0" -is-number@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng== - is-path-inside@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== -is-plain-obj@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7" - integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA== - -is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og== - dependencies: - isobject "^3.0.1" - is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -5882,16 +3407,11 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" -is-stream@^1.0.1, is-stream@^1.1.0: +is-stream@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== -is-stream@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" - integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== - is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" @@ -5906,11 +3426,6 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-unicode-supported@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" - integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== - is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -5918,43 +3433,16 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" -is-windows@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== - -is-wsl@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" - integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww== - dependencies: - is-docker "^2.0.0" - isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== -isarray@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== - -isbinaryfile@^4.0.8: - version "4.0.10" - resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" - integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== - isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isobject@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== - isomorphic-fetch@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" @@ -5963,21 +3451,12 @@ isomorphic-fetch@^2.1.1: node-fetch "^1.0.1" whatwg-fetch ">=0.10.0" -jest-worker@^27.4.5: - version "27.5.1" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0" - integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg== - dependencies: - "@types/node" "*" - merge-stream "^2.0.0" - supports-color "^8.0.0" - js-sdsl@^4.1.4: - version "4.1.5" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a" - integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q== + version "4.2.0" + resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" + integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +"js-tokens@^3.0.0 || ^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -5994,46 +3473,16 @@ jsep@^0.3.0: resolved "https://registry.yarnpkg.com/jsep/-/jsep-0.3.5.tgz#3fd79ebd92f6f434e4857d5272aaeef7d948264d" integrity sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA== -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - -json-buffer@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== - -json-buffer@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" - integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== - -json-parse-even-better-errors@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" - integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== - json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== -json-schema-traverse@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" - integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== -json-stringify-safe@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== - json2mq@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" @@ -6041,28 +3490,19 @@ json2mq@^0.2.0: dependencies: string-convert "^0.2.0" -json5@^2.1.2, json5@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" - integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== - -jsonfile@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" - integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== - optionalDependencies: - graceful-fs "^4.1.6" - -jsonfile@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" - integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== +json5@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: - universalify "^2.0.0" - optionalDependencies: - graceful-fs "^4.1.6" + minimist "^1.2.0" + +json5@^2.1.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== -"jsx-ast-utils@^2.4.1 || ^3.0.0": +"jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw== @@ -6070,34 +3510,22 @@ jsonfile@^6.0.1: array-includes "^3.1.5" object.assign "^4.1.3" -junk@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/junk/-/junk-3.1.0.tgz#31499098d902b7e98c5d9b9c80f43457a88abfa1" - integrity sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ== - kdbush@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== -keyv@*, keyv@^4.0.0: - version "4.5.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.0.tgz#dbce9ade79610b6e641a9a65f2f6499ba06b9bc6" - integrity sha512-2YvuMsA+jnFGtBareKqgANOEKe1mk3HKiXu2fRmAfyxG0MJAywNhi5ttWA3PMjl4NmpyjZNbFifR2vNjW1znfA== - dependencies: - json-buffer "3.0.1" +language-subtag-registry@^0.3.20: + version "0.3.22" + resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d" + integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w== -keyv@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9" - integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA== +language-tags@^1.0.5: + version "1.0.7" + resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.7.tgz#41cc248730f3f12a452c2e2efe32bc0bbce67967" + integrity sha512-bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw== dependencies: - json-buffer "3.0.0" - -kind-of@^6.0.2: - version "6.0.3" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" - integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + language-subtag-registry "^0.3.20" lerp@^1.0.3: version "1.0.3" @@ -6112,45 +3540,15 @@ levn@^0.4.1: prelude-ls "^1.2.1" type-check "~0.4.0" -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha512-3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ== - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -loader-runner@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" - integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg== - loader-utils@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.3.tgz#d4b15b8504c63d1fc3f2ade52d41bc8459d6ede1" - integrity sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A== + version "2.0.4" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" + integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== dependencies: big.js "^5.2.2" emojis-list "^3.0.0" json5 "^2.1.2" -locate-path@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha512-NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA== - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g== - dependencies: - p-locate "^4.1.0" - locate-path@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" @@ -6158,21 +3556,11 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" -lodash._reinterpolate@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" - integrity sha512-xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA== - lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== -lodash.get@^4.0.0: - version "4.4.2" - resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== - lodash.isequalwith@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0" @@ -6183,39 +3571,16 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.template@^4.2.2: - version "4.5.0" - resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" - integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.templatesettings "^4.0.0" - -lodash.templatesettings@^4.0.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33" - integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ== - dependencies: - lodash._reinterpolate "^3.0.0" - lodash.upperfirst@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.16.5, lodash@^4.17.10, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4: +lodash@^4.16.5, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@^4.0.0, log-symbols@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" - integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== - dependencies: - chalk "^4.1.0" - is-unicode-supported "^0.1.0" - long@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" @@ -6228,80 +3593,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 dependencies: js-tokens "^3.0.0 || ^4.0.0" -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" - -lowercase-keys@^1.0.0, lowercase-keys@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" - integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA== - -lowercase-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" - integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== - -lru-cache@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" - integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== - dependencies: - yallist "^4.0.0" - -lru-cache@^7.7.1: - version "7.14.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.14.0.tgz#21be64954a4680e303a09e9468f880b98a0b3c7f" - integrity sha512-EIRtP1GrSJny0dqb50QXRUNBxHJhcpxHC++M5tD7RYbvLLn5KVWKsbyswSSqDuU15UFi3bgTQIY8nhDMeF6aDQ== - -lzma-native@^8.0.5: - version "8.0.6" - resolved "https://registry.yarnpkg.com/lzma-native/-/lzma-native-8.0.6.tgz#3ea456209d643bafd9b5d911781bdf0b396b2665" - integrity sha512-09xfg67mkL2Lz20PrrDeNYZxzeW7ADtpYFbwSQh9U8+76RIzx5QsJBMy8qikv3hbUPfpy6hqwxt6FcGK81g9AA== - dependencies: - node-addon-api "^3.1.0" - node-gyp-build "^4.2.1" - readable-stream "^3.6.0" - -make-dir@^3.0.2, make-dir@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" - integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== - dependencies: - semver "^6.0.0" - -make-fetch-happen@^10.0.3: - version "10.2.1" - resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz#f5e3835c5e9817b617f2770870d9492d28678164" - integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w== - dependencies: - agentkeepalive "^4.2.1" - cacache "^16.1.0" - http-cache-semantics "^4.1.0" - http-proxy-agent "^5.0.0" - https-proxy-agent "^5.0.0" - is-lambda "^1.0.1" - lru-cache "^7.7.1" - minipass "^3.1.6" - minipass-collect "^1.0.2" - minipass-fetch "^2.0.3" - minipass-flush "^1.0.5" - minipass-pipeline "^1.2.4" - negotiator "^0.6.3" - promise-retry "^2.0.1" - socks-proxy-agent "^7.0.0" - ssri "^9.0.0" - -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - mapbox-gl@^1.0.0: version "1.13.2" resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.2.tgz#76639c44f141f8dff71b7d8f1504f2aed11f7517" @@ -6331,13 +3622,6 @@ mapbox-gl@^1.0.0: tinyqueue "^2.0.3" vt-pbf "^3.1.1" -matcher@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" - integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== - dependencies: - escape-string-regexp "^4.0.0" - math.gl@^3.0.0, math.gl@^3.0.0-beta.3: version "3.6.3" resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.6.3.tgz#f87e0d24cb33c1a215185ae3a4e16839f1ce6db2" @@ -6345,92 +3629,18 @@ math.gl@^3.0.0, math.gl@^3.0.0-beta.3: dependencies: "@math.gl/core" "3.6.3" -media-typer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== - -mem@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - -memfs@^3.4.3: - version "3.4.7" - resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a" - integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw== - dependencies: - fs-monkey "^1.0.3" - -memoize-one@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" - integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== - -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== - -merge2@^1.3.0, merge2@^1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" - integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== - -methods@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== - -micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.5" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" - integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== - dependencies: - braces "^3.0.2" - picomatch "^2.3.1" - -mime-db@1.52.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.52.0: version "1.52.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" -mime@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== - -mimic-fn@^2.0.0, mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== - -mimic-response@^1.0.0, mimic-response@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" - integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== - -mimic-response@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" - integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== - min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -6438,91 +3648,18 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -minimalistic-assert@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" - integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== - -minimatch@3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA== - dependencies: - brace-expansion "^1.1.7" - -minimatch@^3.0.4, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" -minimatch@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7" - integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg== - dependencies: - brace-expansion "^2.0.1" - -minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: version "1.2.7" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -minipass-collect@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617" - integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA== - dependencies: - minipass "^3.0.0" - -minipass-fetch@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add" - integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA== - dependencies: - minipass "^3.1.6" - minipass-sized "^1.0.3" - minizlib "^2.1.2" - optionalDependencies: - encoding "^0.1.13" - -minipass-flush@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373" - integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw== - dependencies: - minipass "^3.0.0" - -minipass-pipeline@^1.2.4: - version "1.2.4" - resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c" - integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A== - dependencies: - minipass "^3.0.0" - -minipass-sized@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70" - integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g== - dependencies: - minipass "^3.0.0" - -minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6: - version "3.3.4" - resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.4.tgz#ca99f95dd77c43c7a76bf51e6d200025eee0ffae" - integrity sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw== - dependencies: - yallist "^4.0.0" - -minizlib@^2.1.1, minizlib@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" - integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== - dependencies: - minipass "^3.0.0" - yallist "^4.0.0" - mjolnir.js@^2.1.2, mjolnir.js@^2.5.0: version "2.7.1" resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.7.1.tgz#4e12590fe168b377c9c669b9c31aa5a62f8b8460" @@ -6531,18 +3668,6 @@ mjolnir.js@^2.1.2, mjolnir.js@^2.5.0: "@types/hammerjs" "^2.0.41" hammerjs "^2.0.8" -mkdirp@^0.5.1: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - -mkdirp@^1.0.3, mkdirp@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== - moment@2.20.1: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" @@ -6563,19 +3688,11 @@ ms@2.1.2: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== -ms@2.1.3, ms@^2.0.0, ms@^2.1.1: +ms@^2.1.1: version "2.1.3" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -multicast-dns@^7.2.5: - version "7.2.5" - resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced" - integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg== - dependencies: - dns-packet "^5.2.2" - thunky "^1.0.2" - mumath@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/mumath/-/mumath-3.3.4.tgz#48d4a0f0fd8cad4e7b32096ee89b161a63d30bbf" @@ -6588,11 +3705,6 @@ murmurhash-js@^1.0.0: resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51" integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw== -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - nanoid@^3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" @@ -6637,48 +3749,6 @@ nebula.gl@^0.15.0: global ">=4.3.0" viewport-mercator-project ">=6.0.0" -negotiator@0.6.3, negotiator@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" - integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== - -neo-async@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" - integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" - -node-abi@^3.0.0: - version "3.28.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.28.0.tgz#b0df8b317e1c4f2f323756c5fc8ffccc5bca4718" - integrity sha512-fRlDb4I0eLcQeUvGq7IY3xHrSb0c9ummdvDSYWfT9+LKP+3jCKw/tKoqaM7r1BAoiAC6GtwyjaGnOz6B3OtF+A== - dependencies: - semver "^7.3.5" - -node-addon-api@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161" - integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A== - -node-api-version@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/node-api-version/-/node-api-version-0.1.4.tgz#1ed46a485e462d55d66b5aa1fe2821720dedf080" - integrity sha512-KGXihXdUChwJAOHO53bv9/vXcLmdUsZ6jIptbvYvkpKfth+r7jw44JkVxQFA3kX5nQjzjmGu1uAu/xNNLNlI5g== - dependencies: - semver "^7.3.5" - node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -6687,39 +3757,6 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.6.7: - version "2.6.7" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" - integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== - dependencies: - whatwg-url "^5.0.0" - -node-forge@^1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" - integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA== - -node-gyp-build@^4.2.1: - version "4.5.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.5.0.tgz#7a64eefa0b21112f89f58379da128ac177f20e40" - integrity sha512-2iGbaQBV+ITgCz76ZEjmhUKAKVf7xfY1sRl4UiKQspfZMH2h06SyhNsnSVy50cwkFQDGLyif6m/6uFXHkOZ6rg== - -node-gyp@^9.0.0: - version "9.3.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.0.tgz#f8eefe77f0ad8edb3b3b898409b53e697642b319" - integrity sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.6" - make-fetch-happen "^10.0.3" - nopt "^6.0.0" - npmlog "^6.0.0" - rimraf "^3.0.2" - semver "^7.3.5" - tar "^6.1.2" - which "^2.0.2" - node-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" @@ -6727,82 +3764,6 @@ node-loader@^2.0.0: dependencies: loader-utils "^2.0.0" -node-releases@^2.0.6: - version "2.0.6" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503" - integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg== - -nopt@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" - integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g== - dependencies: - abbrev "^1.0.0" - -normalize-package-data@^2.3.2: - version "2.5.0" - resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA== - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^3.0.0, normalize-path@~3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== - -normalize-url@^4.1.0: - version "4.5.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a" - integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA== - -normalize-url@^6.0.1: - version "6.1.0" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" - integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== - -npm-conf@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9" - integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw== - dependencies: - config-chain "^1.1.11" - pify "^3.0.0" - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw== - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== - dependencies: - path-key "^3.0.0" - -npmlog@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.2.tgz#c8166017a42f2dea92d6453168dd865186a70830" - integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg== - dependencies: - are-we-there-yet "^3.0.0" - console-control-strings "^1.1.0" - gauge "^4.0.3" - set-blocking "^2.0.0" - -nth-check@^2.0.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d" - integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w== - dependencies: - boolbase "^1.0.0" - numbro@^2.0.6: version "2.3.6" resolved "https://registry.yarnpkg.com/numbro/-/numbro-2.3.6.tgz#4bd622ebe59ccbc49dad365c5b9eed200781fa21" @@ -6843,45 +3804,40 @@ object.assign@^4.1.3, object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.5.tgz#e1acdd17c4de2cd96d5a08487cfb9db84d881861" - integrity sha512-TyxmjUoZggd4OrrU1W66FMDG6CuqJxsFvymeyXI51+vQLN67zYfZseptRge703kKQdo4uccgAKebXFcRCzk4+g== +object.entries@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23" + integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" -object.fromentries@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.5.tgz#7b37b205109c21e741e605727fe8b0ad5fa08251" - integrity sha512-CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw== +object.fromentries@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73" + integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" -object.hasown@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.1.tgz#ad1eecc60d03f49460600430d97f23882cf592a3" - integrity sha512-LYLe4tivNQzq4JdaWW6WO3HMZZJWzkkH8fnI6EebWl0VZth2wL2Lovm74ep2/gZzlaTdV62JZHEqHQ2yVn8Q/A== +object.hasown@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92" + integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw== dependencies: define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" -object.values@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" - integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== +object.values@^1.1.5, object.values@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" + integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - -obuf@^1.0.0, obuf@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" - integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg== + define-properties "^1.1.4" + es-abstract "^1.20.4" omit.js@^1.0.2: version "1.0.2" @@ -6890,41 +3846,13 @@ omit.js@^1.0.2: dependencies: babel-runtime "^6.23.0" -on-finished@2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f" - integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg== - dependencies: - ee-first "1.1.1" - -on-headers@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f" - integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA== - -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" -onetime@^5.1.0, onetime@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" - integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== - dependencies: - mimic-fn "^2.1.0" - -open@^8.0.9: - version "8.4.0" - resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8" - integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - optionator@^0.9.1: version "0.9.1" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" @@ -6937,65 +3865,6 @@ optionator@^0.9.1: type-check "^0.4.0" word-wrap "^1.2.3" -ora@^5.0.0, ora@^5.1.0, ora@^5.4.1: - version "5.4.1" - resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18" - integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ== - dependencies: - bl "^4.1.0" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-spinners "^2.5.0" - is-interactive "^1.0.0" - is-unicode-supported "^0.1.0" - log-symbols "^4.1.0" - strip-ansi "^6.0.0" - wcwidth "^1.0.1" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g== - -p-cancelable@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc" - integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw== - -p-cancelable@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" - integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== - -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw== - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== - -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - -p-limit@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q== - dependencies: - p-try "^1.0.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== - dependencies: - p-try "^2.0.0" - p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -7003,20 +3872,6 @@ p-limit@^3.0.2: dependencies: yocto-queue "^0.1.0" -p-locate@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha512-nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg== - dependencies: - p-limit "^1.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A== - dependencies: - p-limit "^2.2.0" - p-locate@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" @@ -7024,39 +3879,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -p-map@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" - integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== - dependencies: - aggregate-error "^3.0.0" - -p-retry@^4.5.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16" - integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ== - dependencies: - "@types/retry" "0.12.0" - retry "^0.13.1" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== - -p-try@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== - -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -7064,48 +3886,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-author@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/parse-author/-/parse-author-2.0.0.tgz#d3460bf1ddd0dfaeed42da754242e65fb684a81f" - integrity sha512-yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw== - dependencies: - author-regex "^1.0.0" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ== - dependencies: - error-ex "^1.2.0" - -parse-ms@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-2.1.0.tgz#348565a753d4391fa524029956b172cb7753097d" - integrity sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA== - -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q== - -parseurl@~1.3.2, parseurl@~1.3.3: - version "1.3.3" - resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" - integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== - path-exists@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" @@ -7116,12 +3896,7 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw== - -path-key@^3.0.0, path-key@^3.1.0: +path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== @@ -7131,11 +3906,6 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== - path-to-regexp@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" @@ -7143,18 +3913,6 @@ path-to-regexp@^1.7.0: dependencies: isarray "0.0.1" -path-type@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha512-dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ== - dependencies: - pify "^2.0.0" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== - pbf@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a" @@ -7163,11 +3921,6 @@ pbf@^3.2.1: ieee754 "^1.1.12" resolve-protobuf-schema "^2.1.0" -pend@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" - integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -7178,21 +3931,6 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" - integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== - -pify@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== - -pify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg== - pikaday@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3" @@ -7200,21 +3938,6 @@ pikaday@1.5.1: optionalDependencies: moment "2.x" -pkg-dir@^4.1.0, pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ== - dependencies: - find-up "^4.0.0" - -plist@^3.0.0, plist@^3.0.4, plist@^3.0.5: - version "3.0.6" - resolved "https://registry.yarnpkg.com/plist/-/plist-3.0.6.tgz#7cfb68a856a7834bca6dbfe3218eb9c7740145d3" - integrity sha512-WiIVYyrp8TD4w8yCvyeIr+lkmrGRd5u0VbRnU+tP/aRLxP/YadJUYOMZJ/6hIa3oUyVCsycXvtNRgd5XBJIbiA== - dependencies: - base64-js "^1.5.1" - xmlbuilder "^15.1.1" - point-in-polygon@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz#b0af2616c01bdee341cbf2894df643387ca03357" @@ -7227,51 +3950,10 @@ polygon-clipping@^0.15.3: dependencies: splaytree "^3.1.0" -postcss-modules-extract-imports@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" - integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== - -postcss-modules-local-by-default@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" - integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ== - dependencies: - icss-utils "^5.0.0" - postcss-selector-parser "^6.0.2" - postcss-value-parser "^4.1.0" - -postcss-modules-scope@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" - integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg== - dependencies: - postcss-selector-parser "^6.0.4" - -postcss-modules-values@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" - integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ== - dependencies: - icss-utils "^5.0.0" - -postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: - version "6.0.10" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" - integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== - dependencies: - cssesc "^3.0.0" - util-deprecate "^1.0.2" - -postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" - integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== - -postcss@^8.4.7: - version "8.4.18" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.18.tgz#6d50046ea7d3d66a85e0e782074e7203bc7fbca2" - integrity sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA== +postcss@^8.4.20: + version "8.4.20" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56" + integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g== dependencies: nanoid "^3.3.4" picocolors "^1.0.0" @@ -7287,11 +3969,6 @@ prelude-ls@^1.2.1: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prepend-http@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== - prettier-linter-helpers@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" @@ -7300,63 +3977,25 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.4.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== - -pretty-error@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" - integrity sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw== - dependencies: - lodash "^4.17.20" - renderkid "^3.0.0" - -pretty-ms@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8" - integrity sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q== - dependencies: - parse-ms "^2.1.0" + version "2.8.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" + integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== probe.gl@^3.1.0-beta.3, probe.gl@^3.1.1: - version "3.5.2" - resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.5.2.tgz#d24f84a24678bd7ce005826d4cf2d7221b9c7db8" - integrity sha512-8lFQVmi7pMQZkqfj8+VjX4GU9HTkyxgRm5/h/xxA/4/IvZPv3qtP996L+awPwZsrPRKEw99t12SvqEHqSls/sA== + version "3.5.4" + resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.5.4.tgz#9647581b18d7f6928540f77e0c98465d341e6f83" + integrity sha512-zCHp8behCySEiH+V32gX12OSBLV5qop8RQ0ahrt0golVpNNLRPTKBOwHULqgUtnOhC5RllDcP5hHABBI7hTnZw== dependencies: "@babel/runtime" "^7.0.0" - "@probe.gl/env" "3.5.2" - "@probe.gl/log" "3.5.2" - "@probe.gl/stats" "3.5.2" - -process-nextick-args@~2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" - integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + "@probe.gl/env" "3.5.4" + "@probe.gl/log" "3.5.4" + "@probe.gl/stats" "3.5.4" process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -progress@^2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== - -promise-inflight@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== - -promise-retry@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" - integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== - dependencies: - err-code "^2.0.2" - retry "^0.12.0" - promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -7373,59 +4012,26 @@ prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, pr object-assign "^4.1.1" react-is "^16.13.1" -proto-list@~1.2.1: - version "1.2.4" - resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849" - integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA== - protocol-buffers-schema@^3.3.1: version "3.6.0" resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw== -proxy-addr@~2.0.7: - version "2.0.7" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" - integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== - dependencies: - forwarded "0.2.0" - ipaddr.js "1.9.1" - proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== -pump@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== -qs@6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a" - integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q== - dependencies: - side-channel "^1.0.4" - queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== -quick-lru@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" - integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== - quickselect@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2" @@ -7443,28 +4049,6 @@ raf@^3.4.0: dependencies: performance-now "^2.1.0" -randombytes@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a" - integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ== - dependencies: - safe-buffer "^5.1.0" - -range-parser@^1.2.1, range-parser@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" - integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== - -raw-body@2.5.1: - version "2.5.1" - resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857" - integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig== - dependencies: - bytes "3.1.2" - http-errors "2.0.0" - iconv-lite "0.4.24" - unpipe "1.0.0" - rbush@2.x, rbush@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/rbush/-/rbush-2.0.2.tgz#bb6005c2731b7ba1d5a9a035772927d16a614605" @@ -7480,15 +4064,14 @@ rbush@^3.0.1: quickselect "^2.0.0" rc-align@^4.0.0: - version "4.0.12" - resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.12.tgz#065b5c68a1cc92a00800c9239320d9fdf5f16207" - integrity sha512-3DuwSJp8iC/dgHzwreOQl52soj40LchlfUHtgACOUtwGuoFIOVh6n/sCpfqCU8kO5+iz6qR0YKvjgB8iPdE3aQ== + version "4.0.15" + resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.15.tgz#2bbd665cf85dfd0b0244c5a752b07565e9098577" + integrity sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" dom-align "^1.7.0" - lodash "^4.17.21" - rc-util "^5.3.0" + rc-util "^5.26.0" resize-observer-polyfill "^1.5.1" rc-animate@^2.10.2, rc-animate@^2.3.0: @@ -7524,10 +4107,10 @@ rc-checkbox@~2.3.0: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-collapse@~3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.3.1.tgz#fc66d4c9cfeaf41e932b2de6da2d454874aee55a" - integrity sha512-cOJfcSe3R8vocrF8T+PgaHDrgeA1tX+lwfhwSj60NX9QVRidsILIbRNDLD6nAzmcvVC5PWiIRiR4S1OobxdhCg== +rc-collapse@~3.4.2: + version "3.4.2" + resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.4.2.tgz#1310be7ad4cd0dcfc622c45f6c3b5ffdee403ad7" + integrity sha512-jpTwLgJzkhAgp2Wpi3xmbTbbYExg6fkptL67Uu5LCRVEj6wqmy0DHTjjeynsjOLsppHGHu41t1ELntZ0lEvS/Q== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -7535,22 +4118,24 @@ rc-collapse@~3.3.0: rc-util "^5.2.1" shallowequal "^1.1.0" -rc-dialog@~8.9.0: - version "8.9.0" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-8.9.0.tgz#04dc39522f0321ed2e06018d4a7e02a4c32bd3ea" - integrity sha512-Cp0tbJnrvPchJfnwIvOMWmJ4yjX3HWFatO6oBFD1jx8QkgsQCR0p8nUWAKdd3seLJhEC39/v56kZaEjwp9muoQ== +rc-dialog@~9.0.0, rc-dialog@~9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-9.0.2.tgz#aadfebdeba145f256c1fac9b9f509f893cdbb5b8" + integrity sha512-s3U+24xWUuB6Bn2Lk/Qt6rufy+uT+QvWkiFhNBcO9APLxcFFczWamaq7x9h8SCuhfc1nHcW4y8NbMsnAjNnWyg== dependencies: "@babel/runtime" "^7.10.1" + "@rc-component/portal" "^1.0.0-8" classnames "^2.2.6" rc-motion "^2.3.0" rc-util "^5.21.0" -rc-drawer@~5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-5.1.0.tgz#c1b8a46e5c064ba46a16233fbcfb1ccec6a73c10" - integrity sha512-pU3Tsn99pxGdYowXehzZbdDVE+4lDXSGb7p8vA9mSmr569oc2Izh4Zw5vLKSe/Xxn2p5MSNbLVqD4tz+pK6SOw== +rc-drawer@~6.1.0: + version "6.1.2" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.2.tgz#032918a21bfa8a7d9e52ada1e7b8ed08c0ae6346" + integrity sha512-mYsTVT8Amy0LRrpVEv7gI1hOjtfMSO/qHAaCDzFx9QBLnms3cAQLJkaxRWM+Eq99oyLhU/JkgoqTg13bc4ogOQ== dependencies: "@babel/runtime" "^7.10.1" + "@rc-component/portal" "^1.0.0-6" classnames "^2.2.6" rc-motion "^2.6.1" rc-util "^5.21.2" @@ -7616,55 +4201,57 @@ rc-form@^2.4.10: react-is "^16.13.1" warning "^4.0.3" -rc-image@~5.7.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.7.1.tgz#678dc014845954c30237808c00c7b12e5f2a0b07" - integrity sha512-QyMfdhoUfb5W14plqXSisaYwpdstcLYnB0MjX5ccIK2rydQM9sDPuekQWu500DDGR2dBaIF5vx9XbWkNFK17Fg== +rc-image@~5.13.0: + version "5.13.0" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.13.0.tgz#1ed9b852a40b5eff34786ba7d2f0e9d26eeab874" + integrity sha512-iZTOmw5eWo2+gcrJMMcnd7SsxVHl3w5xlyCgsULUdJhJbnuI8i/AL0tVOsE7aLn9VfOh1qgDT3mC2G75/c7mqg== dependencies: "@babel/runtime" "^7.11.2" + "@rc-component/portal" "^1.0.2" classnames "^2.2.6" - rc-dialog "~8.9.0" + rc-dialog "~9.0.0" + rc-motion "^2.6.2" rc-util "^5.0.6" rc-input-number@~7.3.9: - version "7.3.9" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.9.tgz#bc6560376ea595e3bf8fbd3137711cbc158800b5" - integrity sha512-u0+miS+SATdb6DtssYei2JJ1WuZME+nXaG6XGtR8maNyW5uGDytfDu60OTWLQEb0Anv/AcCzehldV8CKmKyQfA== + version "7.3.11" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.11.tgz#c7089705a220e1a59ba974fabf89693e00dd2442" + integrity sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" rc-util "^5.23.0" -rc-input@~0.1.2: - version "0.1.3" - resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.1.3.tgz#5ef4cb60d6ec3548af58bf94034c220ef76b7c23" - integrity sha512-FgW80AtNA3qTc++BPWXoBPVCGL7oSVbWxcEnBN51pBWpOqiJ6ta79EqtD/WI7k/N1SNqh+ie3GRfPmZhKOj6VQ== +rc-input@~0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.1.4.tgz#45cb4ba209ae6cc835a2acb8629d4f8f0cb347e0" + integrity sha512-FqDdNz+fV2dKNgfXzcSLKvC+jEs1709t7nD+WdfjrdSaOcefpgc7BUJYadc3usaING+b7ediMTfKxuJBsEFbXA== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" rc-util "^5.18.1" -rc-mentions@~1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.10.0.tgz#f2e4055b535d042d408e94b853b709dbd966f546" - integrity sha512-oMlYWnwXSxP2NQVlgxOTzuG/u9BUc3ySY78K3/t7MNhJWpZzXTao+/Bic6tyZLuNCO89//hVQJBdaR2rnFQl6Q== +rc-mentions@~1.13.1: + version "1.13.1" + resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.13.1.tgz#c884b70e1505a197f1b32a7c6b39090db6992a72" + integrity sha512-FCkaWw6JQygtOz0+Vxz/M/NWqrWHB9LwqlY2RtcuFqWJNFK9njijOOzTSsBGANliGufVUzx/xuPHmZPBV0+Hgw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" - rc-menu "~9.6.0" + rc-menu "~9.8.0" rc-textarea "^0.4.0" rc-trigger "^5.0.4" rc-util "^5.22.5" -rc-menu@~9.6.0, rc-menu@~9.6.3: - version "9.6.4" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.6.4.tgz#033e7b8848c17a09a81b68b8d4c3fa457605f4f6" - integrity sha512-6DiNAjxjVIPLZXHffXxxcyE15d4isRL7iQ1ru4MqYDH2Cqc5bW96wZOdMydFtGLyDdnmEQ9jVvdCE9yliGvzkw== +rc-menu@~9.8.0: + version "9.8.1" + resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.8.1.tgz#988cd807f78d2f92eab686f6813f50b165f78405" + integrity sha512-179weouypfjWJSRvvoo/vPy+StojsMzK2XC5jRNhL1ryt/N/8wAFESte8K6jZJkNp9DHDLFTe+dCGmikKpiFuA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.4.3" - rc-overflow "^1.2.0" + rc-overflow "^1.2.8" rc-trigger "^5.1.2" rc-util "^5.12.0" shallowequal "^1.1.0" @@ -7679,16 +4266,16 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motio rc-util "^5.21.0" rc-notification@~4.6.0: - version "4.6.0" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.0.tgz#4e76fc2d0568f03cc93ac18c9e20763ebe29fa46" - integrity sha512-xF3MKgIoynzjQAO4lqsoraiFo3UXNYlBfpHs0VWvwF+4pimen9/H1DYLN2mfRWhHovW6gRpla73m2nmyIqAMZQ== + version "4.6.1" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.1.tgz#068e8674f4bd7926a447eca512915d4b41b15c91" + integrity sha512-NSmFYwrrdY3+un1GvDAJQw62Xi9LNMSsoQyo95tuaYrcad5Bn9gJUL8AREufRxSQAQnr64u3LtP3EUyLYT6bhw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" rc-motion "^2.2.0" rc-util "^5.20.1" -rc-overflow@^1.0.0, rc-overflow@^1.2.0: +rc-overflow@^1.0.0, rc-overflow@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.8.tgz#40f140fabc244118543e627cdd1ef750d9481a88" integrity sha512-QJ0UItckWPQ37ZL1dMEBAdY1dhfTXFL9k6oTTcyydVwoUNMnMqCGqnRNA98axSr/OeDKqR6DVFyi8eA5RQI/uQ== @@ -7698,18 +4285,18 @@ rc-overflow@^1.0.0, rc-overflow@^1.2.0: rc-resize-observer "^1.0.0" rc-util "^5.19.2" -rc-pagination@~3.1.17: - version "3.1.17" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.1.17.tgz#91e690aa894806e344cea88ea4a16d244194a1bd" - integrity sha512-/BQ5UxcBnW28vFAcP2hfh+Xg15W0QZn8TWYwdCApchMH1H0CxiaUUcULP8uXcFM1TygcdKWdt3JqsL9cTAfdkQ== +rc-pagination@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.2.0.tgz#4f2fdba9fdac0f48e5c9fb1141973818138af7e1" + integrity sha512-5tIXjB670WwwcAJzAqp2J+cOBS9W3cH/WU1EiYwXljuZ4vtZXKlY2Idq8FZrnYBz8KhN3vwPo9CoV/SJS6SL1w== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-picker@~2.6.11: - version "2.6.11" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.6.11.tgz#d4a55e46480517cd1bfea5f5acd28b1d6be232d2" - integrity sha512-INJ7ULu+Kj4UgqbcqE8Q+QpMw55xFf9kkyLBHJFk0ihjJpAV4glialRfqHE7k4KX2BWYPQfpILwhwR14x2EiRQ== +rc-picker@~2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.7.0.tgz#3c19881da27a0c5ee4c7e7504e21b552bd43a94c" + integrity sha512-oZH6FZ3j4iuBxHB4NvQ6ABRsS2If/Kpty1YFFsji7/aej6ruGmfM7WnJWQ88AoPfpJ++ya5z+nVEA8yCRYGKyw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" @@ -7720,10 +4307,10 @@ rc-picker@~2.6.11: rc-util "^5.4.0" shallowequal "^1.1.0" -rc-progress@~3.3.2: - version "3.3.3" - resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.3.3.tgz#eb9bffbacab1534f2542f9f6861ce772254362b1" - integrity sha512-MDVNVHzGanYtRy2KKraEaWeZLri2ZHWIRyaE1a9MQ2MuJ09m+Wxj5cfcaoaR6z5iRpHpA59YeUxAlpML8N4PJw== +rc-progress@~3.4.1: + version "3.4.1" + resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.4.1.tgz#a9ffe099e88a4fc03afb09d8603162bf0760d743" + integrity sha512-eAFDHXlk8aWpoXl0llrenPMt9qKHQXphxcVsnKs0FHC6eCSk1ebJtyaVjJUzKe0233ogiLDeEFK1Uihz3s67hw== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.6" @@ -7739,13 +4326,13 @@ rc-rate@~2.9.0: rc-util "^5.0.1" rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.0.tgz#9f46052f81cdf03498be35144cb7c53fd282c4c7" - integrity sha512-6W+UzT3PyDM0wVCEHfoW3qTHPTvbdSgiA43buiy8PzmeMnfgnDeb9NjdimMXMl3/TcrvvWl5RRVdp+NqcR47pQ== + version "1.2.1" + resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.1.tgz#7f9715b5d1afe126ade3c107aafd2cebf8a57a99" + integrity sha512-g53PnWLeVOmt4XWkt2x+QlIdf/PhJSd7JqHhtMrUY370e7wJ+kxbgXicYqvENUcgFiiOiMCd07YsC2GNsoSbnA== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.20.7" classnames "^2.2.1" - rc-util "^5.15.0" + rc-util "^5.27.0" resize-observer-polyfill "^1.5.1" rc-segmented@~2.1.0: @@ -7759,9 +4346,9 @@ rc-segmented@~2.1.0: rc-util "^5.17.0" rc-select@~14.1.0, rc-select@~14.1.13: - version "14.1.13" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.13.tgz#7eb53d00be82fb8e5050de3094e72edcf27ce6f6" - integrity sha512-WMEsC3gTwA1dbzWOdVIXDmWyidYNLq68AwvvUlRROw790uGUly0/vmqDozXrIr0QvN/A3CEULx12o+WtLCAefg== + version "14.1.16" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.16.tgz#0cc4b5a1fc551a2db7c96bc1ece0896317ecdd47" + integrity sha512-71XLHleuZmufpdV2vis5oituRkhg2WNvLpVMJBGWRar6WGAVOHXaY9DR5HvwWry3EGTn19BqnL6Xbybje6f8YA== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -7781,14 +4368,14 @@ rc-slider@~10.0.0: rc-util "^5.18.1" shallowequal "^1.1.0" -rc-steps@~4.1.0: - version "4.1.4" - resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-4.1.4.tgz#0ba82db202d59ca52d0693dc9880dd145b19dc23" - integrity sha512-qoCqKZWSpkh/b03ASGx1WhpKnuZcRWmvuW+ZUu4mvMdfvFzVxblTwUM+9aBd0mlEUFmt6GW8FXhMpHkK3Uzp3w== +rc-steps@~5.0.0-alpha.2: + version "5.0.0" + resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-5.0.0.tgz#2e2403f2dd69eb3966d65f461f7e3a8ee1ef69fe" + integrity sha512-9TgRvnVYirdhbV0C3syJFj9EhCRqoJAsxt4i1rED5o8/ZcSv5TLIYyo4H8MCjLPvbe2R+oBAm/IYBEtC+OS1Rw== dependencies: - "@babel/runtime" "^7.10.2" + "@babel/runtime" "^7.16.7" classnames "^2.2.3" - rc-util "^5.0.1" + rc-util "^5.16.1" rc-switch@~3.2.0: version "3.2.2" @@ -7810,23 +4397,23 @@ rc-table@~7.26.0: rc-util "^5.22.5" shallowequal "^1.1.0" -rc-tabs@~12.2.0: - version "12.2.1" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.2.1.tgz#1dd9b2a61f57a06780ac1929686a2840d4da0e82" - integrity sha512-09pVv4kN8VFqp6THceEmxOW8PAShQC08hrroeVYP4Y8YBFaP1PIWdyFL01czcbyz5YZFj9flZ7aljMaAl0jLVg== +rc-tabs@~12.4.1: + version "12.4.2" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.4.2.tgz#487a1b3f8d8cf0bfc121224013dab00d4a8e0532" + integrity sha512-FFlGwuTjQUznWzJtyhmHc6KAp5lRQFxKUv9Aj1UtsOYe2e7WGmuzcrd+/LQchuPe0VjhaZPdGkmFGcqGqNO6ow== dependencies: "@babel/runtime" "^7.11.2" classnames "2.x" rc-dropdown "~4.0.0" - rc-menu "~9.6.0" + rc-menu "~9.8.0" rc-motion "^2.6.2" rc-resize-observer "^1.0.0" - rc-util "^5.5.0" + rc-util "^5.16.0" rc-textarea@^0.4.0, rc-textarea@~0.4.5: - version "0.4.6" - resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.4.6.tgz#65a46c9bb45da65c2acb9b071551eb420f6568e4" - integrity sha512-HEKCu8nouXXayqYelQnhQm8fdH7v92pAQvfVCz+jhIPv2PHTyBxVrmoZJMn3B8cU+wdyuvRGkshngO3/TzBn4w== + version "0.4.7" + resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.4.7.tgz#627f662d46f99e0059d1c1ebc8db40c65339fe90" + integrity sha512-IQPd1CDI3mnMlkFyzt2O4gQ2lxUsnBAeJEoZGJnkkXgORNqyM9qovdrCj9NzcRfpHgLdzaEbU3AmobNFGUznwQ== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" @@ -7844,9 +4431,9 @@ rc-tooltip@~5.2.0: rc-trigger "^5.0.0" rc-tree-select@~5.5.0: - version "5.5.3" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.5.3.tgz#9c19f74b55a00f17e31a81cf04c834e63e6bee27" - integrity sha512-gv8KyC6J7f9e50OkGk1ibF7v8vL+iaBnA8Ep/EVlMma2/tGdBQXO9xIvPjX8eQrZL5PjoeTUndNPM3cY3721ng== + version "5.5.5" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.5.5.tgz#d28b3b45da1e820cd21762ba0ee93c19429bb369" + integrity sha512-k2av7jF6tW9bIO4mQhaVdV4kJ1c54oxV3/hHVU+oD251Gb5JN+m1RbJFTMf1o0rAFqkvto33rxMdpafaGKQRJw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -7855,9 +4442,9 @@ rc-tree-select@~5.5.0: rc-util "^5.16.1" rc-tree@~5.7.0: - version "5.7.0" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.7.0.tgz#d0e316eeeac2ba4a1c36b2b2201d84884f1c76a1" - integrity sha512-F+Ewkv/UcutshnVBMISP+lPdHDlcsL+YH/MQDVWbk+QdkfID7vXiwrHMEZn31+2Rbbm21z/HPceGS8PXGMmnQg== + version "5.7.2" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.7.2.tgz#270ea7d9e1b2e5e81cd3659eba2fbd022a4831f6" + integrity sha512-nmnL6qLnfwVckO5zoqKL2I9UhwDqzyCtjITQCkwhimyz1zfuFkG5ZPIXpzD/Guzso94qQA/QrMsvzic5W6QDjg== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -7866,9 +4453,9 @@ rc-tree@~5.7.0: rc-virtual-list "^3.4.8" rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc-trigger@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.3.3.tgz#166013df79e6a4ce64515391bd6d4f8386839761" - integrity sha512-IC4nuTSAME7RJSgwvHCNDQrIzhvGMKf6NDu5veX+zk1MG7i1UnwTWWthcP9WHw3+FZfP3oZGvkrHFPu/EGkFKw== + version "5.3.4" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.3.4.tgz#6b4b26e32825677c837d1eb4d7085035eecf9a61" + integrity sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw== dependencies: "@babel/runtime" "^7.18.3" classnames "^2.2.6" @@ -7896,31 +4483,24 @@ rc-util@^4.10.0, rc-util@^4.15.3: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.3.0, rc-util@^5.4.0, rc-util@^5.5.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: - version "5.24.4" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.24.4.tgz#a4126f01358c86f17c1bf380a1d83d6c9155ae65" - integrity sha512-2a4RQnycV9eV7lVZPEJ7QwJRPlZNc06J7CwcwZo4vIHr3PfUqtYgl1EkUV9ETAc6VRRi8XZOMFhYG63whlIC9Q== +rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: + version "5.27.1" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.27.1.tgz#d12f02b9577b04299c0f1a235c8acbcf56e2824b" + integrity sha512-PsjHA+f+KBCz+YTZxrl3ukJU5RoNKoe3KSNMh0xGiISbR67NaM9E9BiMjCwxa3AcCUOg/rZ+V0ZKLSimAA+e3w== dependencies: "@babel/runtime" "^7.18.3" react-is "^16.12.0" - shallowequal "^1.1.0" rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: - version "3.4.10" - resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.10.tgz#80a7c47c91388334657e6948dbfd70c170dc7372" - integrity sha512-Jv0cgJxJ+8F/YViW8WGs/jQF2rmT8RUcJ5uDJs5MOFLTYLAvCpM/xU+Zu6EpCun50fmovhXiItQctcfE2UY3Aw== + version "3.4.13" + resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz#20acc934b263abcf7b7c161f50ef82281b2f7e8d" + integrity sha512-cPOVDmcNM7rH6ANotanMDilW/55XnFPw0Jh/GQYtrzZSy3AmWvCnqVNyNC/pgg3lfVmX2994dlzAhuUrd4jG7w== dependencies: + "@babel/runtime" "^7.20.0" classnames "^2.2.6" rc-resize-observer "^1.0.0" rc-util "^5.15.0" -rcedit@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/rcedit/-/rcedit-3.0.1.tgz#ae21b43e49c075f4d84df1929832a12c302f3c90" - integrity sha512-XM0Jv40/y4hVAqj/MO70o/IWs4uOsaSoo2mLyk3klFDW+SStLnCtzuQu+1OBTIMGlM8CvaK9ftlYCp6DJ+cMsw== - dependencies: - cross-spawn-windows-exe "^1.1.0" - react-dom@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" @@ -7945,9 +4525,9 @@ react-lifecycles-compat@^3.0.4: integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== react-map-gl@^5: - version "5.3.19" - resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.19.tgz#8c012eb7328c64dc2a4bb65eeceacd4a66734f72" - integrity sha512-Ia8OlbFJIjC9x7XMaUCNtm179NKiD/bjQOt1R/SbBcaz35pSFPUyI0SwOnIUQ98/mR4xopL6phgIfs0B3yZhtQ== + version "5.3.21" + resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.21.tgz#7d28cdfe382d599d4ac8cccf7d794a3a0f06b65b" + integrity sha512-hNVYiPBjgfVIcDV70OU9QnzvNCI1NhLm5OHjyY1rKPOKqzV4m9jjuXEKUaWC72vqIHk1Dzb+gG78xWOpqVi6uw== dependencies: "@babel/runtime" "^7.0.0" "@types/geojson" "^7946.0.7" @@ -7964,9 +4544,9 @@ react-property@2.0.0: integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== react-redux@^8.0.4: - version "8.0.4" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.4.tgz#80c31dffa8af9526967c4267022ae1525ff0e36a" - integrity sha512-yMfQ7mX6bWuicz2fids6cR1YT59VTuT8MKyyE310wJQlINKENCeT1UcPdEiX6znI5tF8zXyJ/VYvDgeGuaaNwQ== + version "8.0.5" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.5.tgz#e5fb8331993a019b8aaf2e167a93d10af469c7bd" + integrity sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw== dependencies: "@babel/runtime" "^7.12.1" "@types/hoist-non-react-statics" "^3.3.1" @@ -8004,16 +4584,16 @@ react-router@5.3.4, react-router@^5.0.1: tiny-warning "^1.0.0" react-spring@^9.2.5: - version "9.5.5" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.5.5.tgz#314009a65efc04d0ef157d3d60590dbb9de65f3c" - integrity sha512-vMGVd2yjgxWcRCzoLn9AD1d24+WpunHBRg5DoehcRdiBocaOH6qgle0xN9C5LPplXfv4yIpS5QWGN5MKrWxSZg== + version "9.6.1" + resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.6.1.tgz#e715b2fa523c1a3acfdcf1aaa93e081620b8cc8e" + integrity sha512-BeP80R4SLb1bZHW/Q62nECoScHw/fH+jzGkD7dc892HNGa+lbGIJXURc6U7N8JfZ8peEO46nPxR57aUMuYzquQ== dependencies: - "@react-spring/core" "~9.5.5" - "@react-spring/konva" "~9.5.5" - "@react-spring/native" "~9.5.5" - "@react-spring/three" "~9.5.5" - "@react-spring/web" "~9.5.5" - "@react-spring/zdog" "~9.5.5" + "@react-spring/core" "~9.6.1" + "@react-spring/konva" "~9.6.1" + "@react-spring/native" "~9.6.1" + "@react-spring/three" "~9.6.1" + "@react-spring/web" "~9.6.1" + "@react-spring/zdog" "~9.6.1" react@^18.2.0: version "18.2.0" @@ -8022,52 +4602,6 @@ react@^18.2.0: dependencies: loose-envify "^1.1.0" -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha512-1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w== - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha512-eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA== - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -readable-stream@^2.0.1: - version "2.3.7" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" - integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -readdirp@~3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" - integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== - dependencies: - picomatch "^2.2.1" - redux-logger@^3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" @@ -8076,9 +4610,9 @@ redux-logger@^3.0.6: deep-diff "^0.3.5" redux-thunk@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714" - integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q== + version "2.4.2" + resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" + integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== redux@^4.1.2: version "4.2.0" @@ -8092,12 +4626,12 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.4: - version "0.13.10" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" - integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== +regenerator-runtime@^0.13.11: + version "0.13.11" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1, regexp.prototype.flags@^1.4.3: +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== @@ -8111,72 +4645,16 @@ regexpp@^3.2.0: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== -relateurl@^0.2.7: - version "0.2.7" - resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" - integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog== - -renderkid@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-3.0.0.tgz#5fd823e4d6951d37358ecc9a58b1f06836b6268a" - integrity sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg== - dependencies: - css-select "^4.1.3" - dom-converter "^0.2.0" - htmlparser2 "^6.1.0" - lodash "^4.17.21" - strip-ansi "^6.0.1" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== - -require-from-string@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" - integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== - -requires-port@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" - integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ== - -resize-observer-polyfill@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" - integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== - -resolve-alpn@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" - integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== - -resolve-dir@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg== - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" +resize-observer-polyfill@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve-package@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-package/-/resolve-package-1.0.1.tgz#686f70b188bd7d675f5bbc4282ccda060abb9d27" - integrity sha512-rzB7NnQpOkPHBWFPP3prUMqOP6yg3HkRGgcvR+lDyvyHoY3fZLFLYDkPXh78SPVBAE6VTCk/V+j8we4djg6o4g== - dependencies: - get-installed-path "^2.0.3" - resolve-pathname@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" @@ -8189,7 +4667,7 @@ resolve-protobuf-schema@^2.1.0: dependencies: protocol-buffers-schema "^3.3.1" -resolve@^1.1.6, resolve@^1.10.0: +resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -8207,78 +4685,29 @@ resolve@^2.0.0-next.3: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -responselike@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== - dependencies: - lowercase-keys "^1.0.0" - -responselike@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" - integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== - dependencies: - lowercase-keys "^2.0.0" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA== - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -retry@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== - -retry@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658" - integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg== - reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" -rimraf@~2.6.2: - version "2.6.3" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA== - dependencies: - glob "^7.1.3" - -roarr@^2.15.3: - version "2.15.4" - resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" - integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== - dependencies: - boolean "^3.0.1" - detect-node "^2.0.4" - globalthis "^1.0.1" - json-stringify-safe "^5.0.1" - semver-compare "^1.0.0" - sprintf-js "^1.1.2" - robust-predicates@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-2.0.4.tgz#0a2367a93abd99676d075981707f29cfb402248b" integrity sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg== -run-async@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" - integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== +rollup@^3.7.0: + version "3.8.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.8.1.tgz#d4af8aca7c60d5b8c0281be79ea2fab6b41d458f" + integrity sha512-4yh9eMW7byOroYcN8DlF9P/2jCpu6txVIHjEqquQVSx7DI0RgyCCN3tjrcy4ra6yVtV336aLBB3v2AarYAxePQ== + optionalDependencies: + fsevents "~2.3.2" run-parallel@^1.1.9: version "1.2.0" @@ -8292,13 +4721,6 @@ rw@1, rw@^1.3.3: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rxjs@^7.5.5: - version "7.5.7" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39" - integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA== - dependencies: - tslib "^2.1.0" - s2-geometry@^1.2.10: version "1.2.10" resolved "https://registry.yarnpkg.com/s2-geometry/-/s2-geometry-1.2.10.tgz#c6ff22f3eccafd0eea491b60b44c141b9887acab" @@ -8306,16 +4728,6 @@ s2-geometry@^1.2.10: dependencies: long "^3.2.0" -safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@~5.2.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" - integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== - safe-regex-test@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" @@ -8337,40 +4749,12 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" -schema-utils@^2.6.5: - version "2.7.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" - integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== - dependencies: - "@types/json-schema" "^7.0.5" - ajv "^6.12.4" - ajv-keywords "^3.5.2" - -schema-utils@^3.1.0, schema-utils@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" - integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== - dependencies: - "@types/json-schema" "^7.0.8" - ajv "^6.12.5" - ajv-keywords "^3.5.2" - -schema-utils@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" - integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== - dependencies: - "@types/json-schema" "^7.0.9" - ajv "^8.8.0" - ajv-formats "^2.1.1" - ajv-keywords "^5.0.0" - scroll-into-view-if-needed@^2.2.25: - version "2.2.29" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz#551791a84b7e2287706511f8c68161e4990ab885" - integrity sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg== + version "2.2.31" + resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz#d3c482959dc483e37962d1521254e3295d0d1587" + integrity sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA== dependencies: - compute-scroll-into-view "^1.0.17" + compute-scroll-into-view "^1.0.20" seamless-immutable@^7.1.3: version "7.1.4" @@ -8382,135 +4766,21 @@ seer@^0.2.4: resolved "https://registry.yarnpkg.com/seer/-/seer-0.2.5.tgz#f0975153741f4d1c3916a144eef4738458bcb05a" integrity sha512-//0Zwt0x97KQhIWrp4oq9AVNvGA2ctCx4dmFddpkORjRr6bW+hyC8eOhWBVIhiU3uHv1XLU1dekfFKOi28RGHA== -select-hose@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" - integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg== - -selfsigned@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61" - integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ== - dependencies: - node-forge "^1" - -semver-compare@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" - integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== - -"semver@2 || 3 || 4 || 5", semver@^5.5.0: - version "5.7.1" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0, semver@^6.2.0, semver@^6.3.0: +semver@^6.3.0: version "6.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: - version "7.3.8" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== - dependencies: - lru-cache "^6.0.0" - -send@0.18.0: - version "0.18.0" - resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be" - integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg== - dependencies: - debug "2.6.9" - depd "2.0.0" - destroy "1.2.0" - encodeurl "~1.0.2" - escape-html "~1.0.3" - etag "~1.8.1" - fresh "0.5.2" - http-errors "2.0.0" - mime "1.6.0" - ms "2.1.3" - on-finished "2.4.1" - range-parser "~1.2.1" - statuses "2.0.1" - -serialize-error@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" - integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== - dependencies: - type-fest "^0.13.1" - -serialize-javascript@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8" - integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag== - dependencies: - randombytes "^2.1.0" - -serve-index@^1.9.1: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239" - integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw== - dependencies: - accepts "~1.3.4" - batch "0.6.1" - debug "2.6.9" - escape-html "~1.0.3" - http-errors "~1.6.2" - mime-types "~2.1.17" - parseurl "~1.3.2" - -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== - dependencies: - encodeurl "~1.0.2" - escape-html "~1.0.3" - parseurl "~1.3.3" - send "0.18.0" - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== - setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== -setprototypeof@1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" - integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ== - -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - -shallow-clone@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3" - integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA== - dependencies: - kind-of "^6.0.2" - shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg== - dependencies: - shebang-regex "^1.0.0" - shebang-command@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" @@ -8518,11 +4788,6 @@ shebang-command@^2.0.0: dependencies: shebang-regex "^3.0.0" -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ== - shebang-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" @@ -8537,37 +4802,22 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: - version "3.0.7" - resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - skmeans@0.9.7: version "0.9.7" resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d" integrity sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg== -slash@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== - -smart-buffer@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" - integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== - socket.io-client@^4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.3.tgz#bed69209d001465b2fea650d2e95c1e82768ab5e" - integrity sha512-I/hqDYpQ6JKwtJOf5ikM+Qz+YujZPMEl6qBLhxiP0nX+TfXKhW4KZZG8lamrD6Y5ngjmYHreESVasVCgi5Kl3A== + version "4.5.4" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" + integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== dependencies: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.2" engine.io-client "~6.2.3" - socket.io-parser "~4.2.0" + socket.io-parser "~4.2.1" -socket.io-parser@~4.2.0: +socket.io-parser@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== @@ -8575,187 +4825,54 @@ socket.io-parser@~4.2.0: "@socket.io/component-emitter" "~3.1.0" debug "~4.3.1" -sockjs@^0.3.24: - version "0.3.24" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce" - integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ== - dependencies: - faye-websocket "^0.11.3" - uuid "^8.3.2" - websocket-driver "^0.7.4" - -socks-proxy-agent@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6" - integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww== - dependencies: - agent-base "^6.0.2" - debug "^4.3.3" - socks "^2.6.2" - -socks@^2.6.2: - version "2.7.1" - resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" - integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== - dependencies: - ip "^2.0.0" - smart-buffer "^4.2.0" - source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-support@^0.5.13, source-map-support@~0.5.20: - version "0.5.21" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" - integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0, source-map@~0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -spdx-correct@^3.0.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" - integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" - integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== - -spdx-expression-parse@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" - integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.12" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.12.tgz#69077835abe2710b65f03969898b6637b505a779" - integrity sha512-rr+VVSXtRhO4OHbXUiAF7xW3Bo9DuuF6C5jH+q/x15j2jniycgKbxU09Hr0WqlSLUs4i4ltHGXqTe7VHclYWyA== - -spdy-transport@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31" - integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw== - dependencies: - debug "^4.1.0" - detect-node "^2.0.4" - hpack.js "^2.1.6" - obuf "^1.1.2" - readable-stream "^3.0.6" - wbuf "^1.7.3" - -spdy@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b" - integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA== - dependencies: - debug "^4.1.0" - handle-thing "^2.0.0" - http-deceiver "^1.2.7" - select-hose "^2.0.0" - spdy-transport "^3.0.0" - splaytree@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/splaytree/-/splaytree-3.1.1.tgz#e1bc8e68e64ef5a9d5f09d36e6d9f3621795a438" integrity sha512-9FaQ18FF0+sZc/ieEeXHt+Jw2eSpUgUtTLDYB/HXKWvhYVyOc7h1hzkn5MMO3GPib9MmXG1go8+OsBBzs/NMww== -sprintf-js@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" - integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== - -ssri@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" - integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q== - dependencies: - minipass "^3.1.1" - -statuses@2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" - integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ== - -"statuses@>= 1.4.0 < 2": - version "1.5.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== - string-convert@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== -"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string.prototype.matchall@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" - integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== +string.prototype.matchall@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3" + integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - get-intrinsic "^1.1.1" + define-properties "^1.1.4" + es-abstract "^1.20.4" + get-intrinsic "^1.1.3" has-symbols "^1.0.3" internal-slot "^1.0.3" - regexp.prototype.flags "^1.4.1" + regexp.prototype.flags "^1.4.3" side-channel "^1.0.4" -string.prototype.trimend@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0" - integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog== +string.prototype.trimend@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" + es-abstract "^1.20.4" -string.prototype.trimstart@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef" - integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg== +string.prototype.trimstart@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" + integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== dependencies: call-bind "^1.0.2" define-properties "^1.1.4" - es-abstract "^1.19.5" - -string_decoder@^1.1.1: - version "1.3.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" - integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA== - dependencies: - safe-buffer "~5.2.0" + es-abstract "^1.20.4" -string_decoder@~1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" - integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^6.0.0, strip-ansi@^6.0.1: +strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8767,59 +4884,25 @@ strip-bom@^3.0.0: resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== - strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== -strip-outer@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" - integrity sha512-k55yxKHwaXnpYGsOzg4Vl8+tDrWylxDEpknGjhTiZB8dFRU5rTo9CAzeycivxV3s+zlTKwrs6WxMxR95n26kwg== - dependencies: - escape-string-regexp "^1.0.2" - -style-loader@^3.0.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575" - integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ== - -style-to-js@1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.1.tgz#417786986cda61d4525c80aed9d1123a6a7af9b8" - integrity sha512-RJ18Z9t2B02sYhZtfWKQq5uplVctgvjTfLWT7+Eb1zjUjIrWzX5SdlkwLGQozrqarTmEzJJ/YmdNJCUNI47elg== +style-to-js@1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.2.tgz#6821c53b86a236571236d9d15688389e81a2a893" + integrity sha512-aMG8jJpEF0SCGbQFY8W8CT+EjQ9ubp35FOZG3prWkNjxW/a1bEeSod0tkWiP+6iiOCDIIrQykUDkPY5LbNF87g== dependencies: - style-to-object "0.3.0" + style-to-object "0.4.0" -style-to-object@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.3.0.tgz#b1b790d205991cc783801967214979ee19a76e46" - integrity sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA== +style-to-object@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.0.tgz#fdcee2ba7f195f96023a44a124683f70d463dd24" + integrity sha512-dAjq2m87tPn/TcYTeqMhXJRhu96WYWcxMFQxs3Y9jfYpq2jG+38u4tj0Lst6DOiYXmDuNxVJ2b1Z2uPC6wTEeg== dependencies: inline-style-parser "0.1.1" -sudo-prompt@^9.1.1: - version "9.2.1" - resolved "https://registry.yarnpkg.com/sudo-prompt/-/sudo-prompt-9.2.1.tgz#77efb84309c9ca489527a4e749f287e6bdd52afd" - integrity sha512-Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw== - -sumchecker@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" - integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== - dependencies: - debug "^4.1.0" - supercluster@^7.1.0: version "7.1.5" resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" @@ -8827,13 +4910,6 @@ supercluster@^7.1.0: dependencies: kdbush "^3.0.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -8841,13 +4917,6 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -8858,72 +4927,11 @@ tabulator-tables@^4.4.1: resolved "https://registry.yarnpkg.com/tabulator-tables/-/tabulator-tables-4.9.3.tgz#89ea8f9bffc11ba9a789369b5165ac82da26f4f0" integrity sha512-iwwQqAEGGxlgrBpcmJJvMJrfjGLcCXOB3AOb/DGkXqBy1YKoYA36hIl7qXGp6Jo8dSkzFAlDT6pKLZgyhs9OnQ== -tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: - version "2.2.1" - resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" - integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== - -tar@^6.0.5, tar@^6.1.11, tar@^6.1.2: - version "6.1.11" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" - integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - -temp@^0.9.0: - version "0.9.4" - resolved "https://registry.yarnpkg.com/temp/-/temp-0.9.4.tgz#cd20a8580cb63635d0e4e9d4bd989d44286e7620" - integrity sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA== - dependencies: - mkdirp "^0.5.1" - rimraf "~2.6.2" - -terser-webpack-plugin@^5.1.3: - version "5.3.6" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.6.tgz#5590aec31aa3c6f771ce1b1acca60639eab3195c" - integrity sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ== - dependencies: - "@jridgewell/trace-mapping" "^0.3.14" - jest-worker "^27.4.5" - schema-utils "^3.1.1" - serialize-javascript "^6.0.0" - terser "^5.14.1" - -terser@^5.10.0, terser@^5.14.1: - version "5.15.1" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.15.1.tgz#8561af6e0fd6d839669c73b92bdd5777d870ed6c" - integrity sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw== - dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" - commander "^2.20.0" - source-map-support "~0.5.20" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== -through@^2.3.6: - version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg== - -thunky@^1.0.2: - version "1.1.0" - resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d" - integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA== - -tiny-each-async@2.0.3: - version "2.0.3" - resolved "https://registry.yarnpkg.com/tiny-each-async/-/tiny-each-async-2.0.3.tgz#8ebbbfd6d6295f1370003fbb37162afe5a0a51d1" - integrity sha512-5ROII7nElnAirvFn8g7H7MtpfV1daMcyfTGQwsn/x2VtyV+VPiO5CjReCJtWLvoKTDEDmZocf3cNPraiMnBXLA== - tiny-invariant@^1.0.2: version "1.3.1" resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" @@ -8939,54 +4947,11 @@ tinyqueue@^2.0.3: resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA== -tmp-promise@^3.0.2: - version "3.0.3" - resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" - integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== - dependencies: - tmp "^0.2.0" - -tmp@^0.0.33: - version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== - dependencies: - os-tmpdir "~1.0.2" - -tmp@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== - -to-readable-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" - integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== - dependencies: - is-number "^7.0.0" - toggle-selection@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== -toidentifier@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" - integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== - topojson-client@3.x: version "3.1.0" resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99" @@ -9001,27 +4966,15 @@ topojson-server@3.x: dependencies: commander "2" -tr46@~0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" - integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== - -trim-repeated@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/trim-repeated/-/trim-repeated-1.0.0.tgz#e3646a2ea4e891312bf7eace6cfb05380bc01c21" - integrity sha512-pkonvlKk8/ZuR0D5tLW8ljt5I8kmxp2XKymhepUeOdCEfKpZaktSArkLHZt76OB1ZvO9bssUsDty4SWhLvZpLg== +tsconfig-paths@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: - escape-string-regexp "^1.0.2" - -tslib@^2.0.3, tslib@^2.1.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - -tunnel@^0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" - integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== + "@types/json5" "^0.0.29" + json5 "^1.0.1" + minimist "^1.2.6" + strip-bom "^3.0.0" turf-jsts@*: version "1.2.3" @@ -9035,29 +4988,11 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" -type-fest@^0.13.1: - version "0.13.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" - integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== - type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -type-fest@^0.21.3: - version "0.21.3" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" - integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== - -type-is@~1.6.18: - version "1.6.18" - resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" - integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== - dependencies: - media-typer "0.3.0" - mime-types "~2.1.24" - ua-parser-js@^0.7.30: version "0.7.32" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" @@ -9073,43 +5008,6 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unique-filename@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2" - integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A== - dependencies: - unique-slug "^3.0.0" - -unique-slug@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9" - integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w== - dependencies: - imurmurhash "^0.1.4" - -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== - -unpipe@1.0.0, unpipe@~1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== - -update-browserslist-db@^1.0.9: - version "1.0.10" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" - uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -9117,64 +5015,16 @@ uri-js@^4.2.2: dependencies: punycode "^2.1.0" -url-parse-lax@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== - dependencies: - prepend-http "^2.0.0" - use-sync-external-store@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== -username@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/username/-/username-5.1.0.tgz#a7f9325adce2d0166448cdd55d4985b1360f2508" - integrity sha512-PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg== - dependencies: - execa "^1.0.0" - mem "^4.3.0" - -util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== - -utila@~0.4: - version "0.4.0" - resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" - integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== - -utils-merge@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== - -uuid@^8.3.2: - version "8.3.2" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" - integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - value-equal@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== -vary@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== - viewport-mercator-project@>=6.0.0, viewport-mercator-project@^7.0.4: version "7.0.4" resolved "https://registry.yarnpkg.com/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz#67feec04135484bf424dd4890d630e82116b31e6" @@ -9190,6 +5040,18 @@ viewport-mercator-project@^6.2.3: "@babel/runtime" "^7.0.0" gl-matrix "^3.0.0" +vite@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.3.tgz#de27ad3f263a03ae9419cdc8bc07721eadcba8b9" + integrity sha512-HvuNv1RdE7deIfQb8mPk51UKjqptO/4RXZ5yXSAvurd5xOckwS/gg8h9Tky3uSbnjYTgUm0hVCet1cyhKd73ZA== + dependencies: + esbuild "^0.16.3" + postcss "^8.4.20" + resolve "^1.22.1" + rollup "^3.7.0" + optionalDependencies: + fsevents "~2.3.2" + vt-pbf@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" @@ -9206,149 +5068,11 @@ warning@^4.0.3: dependencies: loose-envify "^1.0.0" -watchpack@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" - integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - -wbuf@^1.1.0, wbuf@^1.7.3: - version "1.7.3" - resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" - integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA== - dependencies: - minimalistic-assert "^1.0.0" - -wcwidth@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" - integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg== - dependencies: - defaults "^1.0.3" - -webidl-conversions@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" - integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== - -webpack-dev-middleware@^5.3.1: - version "5.3.3" - resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f" - integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA== - dependencies: - colorette "^2.0.10" - memfs "^3.4.3" - mime-types "^2.1.31" - range-parser "^1.2.1" - schema-utils "^4.0.0" - -webpack-dev-server@^4.0.0: - version "4.11.1" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz#ae07f0d71ca0438cf88446f09029b92ce81380b5" - integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw== - dependencies: - "@types/bonjour" "^3.5.9" - "@types/connect-history-api-fallback" "^1.3.5" - "@types/express" "^4.17.13" - "@types/serve-index" "^1.9.1" - "@types/serve-static" "^1.13.10" - "@types/sockjs" "^0.3.33" - "@types/ws" "^8.5.1" - ansi-html-community "^0.0.8" - bonjour-service "^1.0.11" - chokidar "^3.5.3" - colorette "^2.0.10" - compression "^1.7.4" - connect-history-api-fallback "^2.0.0" - default-gateway "^6.0.3" - express "^4.17.3" - graceful-fs "^4.2.6" - html-entities "^2.3.2" - http-proxy-middleware "^2.0.3" - ipaddr.js "^2.0.1" - open "^8.0.9" - p-retry "^4.5.0" - rimraf "^3.0.2" - schema-utils "^4.0.0" - selfsigned "^2.1.1" - serve-index "^1.9.1" - sockjs "^0.3.24" - spdy "^4.0.2" - webpack-dev-middleware "^5.3.1" - ws "^8.4.2" - -webpack-merge@^5.7.3: - version "5.8.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" - integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== - dependencies: - clone-deep "^4.0.1" - wildcard "^2.0.0" - -webpack-sources@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" - integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== - -webpack@^5.69.1: - version "5.74.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980" - integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.7.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-even-better-errors "^2.3.1" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.4.0" - webpack-sources "^3.2.3" - -websocket-driver@>=0.5.1, websocket-driver@^0.7.4: - version "0.7.4" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" - integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== - dependencies: - http-parser-js ">=0.5.1" - safe-buffer ">=5.1.0" - websocket-extensions ">=0.1.1" - -websocket-extensions@>=0.1.1: - version "0.1.4" - resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" - integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== - whatwg-fetch@>=0.10.0: version "3.6.2" resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== -whatwg-url@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" - integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== - dependencies: - tr46 "~0.0.3" - webidl-conversions "^3.0.0" - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -9360,197 +5084,33 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" -which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== - -which@^1.2.14, which@^1.2.9: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" -wide-align@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3" - integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg== - dependencies: - string-width "^1.0.2 || 2 || 3 || 4" - -wildcard@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" - integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== - word-wrap@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== -ws@^7.4.6: - version "7.5.9" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - -ws@^8.4.2: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.10.0.tgz#00a28c09dfb76eae4eb45c3b565f771d6951aa51" - integrity sha512-+s49uSmZpvtAsd2h37vIPy1RBusaLawVe8of+GyEPsaJTCMpj/2v8NpeK1SHXjBlQ95lQTmQofOJnFiLoaN3yw== - ws@~8.2.3: version "8.2.3" resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== -xmlbuilder@^15.1.1: - version "15.1.1" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" - integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== - xmlhttprequest-ssl@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== -xterm-addon-fit@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" - integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== - -xterm-addon-search@^0.8.0: - version "0.8.2" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.2.tgz#be7aa74d5ff12c901707c6ff674229f214318032" - integrity sha512-I1863mjn8P6uVrqm/X+btalVsqjAKLhnhpbP7SavAOpEkI1jJhbHU2UTp7NjeRtcKTks6UWk/ycgds5snDSejg== - -xterm@^4.9.0: - version "4.19.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.19.0.tgz#c0f9d09cd61de1d658f43ca75f992197add9ef6d" - integrity sha512-c3Cp4eOVsYY5Q839dR5IejghRPpxciGmLWWaP9g+ppfMeBChMeLa1DCA+pmX/jyDZ+zxFOmlJL/82qVdayVoGQ== - -y18n@^4.0.0: - version "4.0.3" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" - integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== - -y18n@^5.0.5: - version "5.0.8" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" - integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== - -yallist@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" - integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== - -yargs-parser@^18.1.2: - version "18.1.3" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^20.2.2: - version "20.2.9" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee" - integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w== - -yargs-parser@^21.0.0, yargs-parser@^21.1.1: - version "21.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" - integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== - -yargs@^15.0.1: - version "15.4.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" - integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== - 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" - -yargs@^16.0.2: - version "16.2.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" - integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw== - dependencies: - cliui "^7.0.2" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.0" - y18n "^5.0.5" - yargs-parser "^20.2.2" - -yargs@^17.0.1: - version "17.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.0.tgz#e134900fc1f218bc230192bdec06a0a5f973e46c" - integrity sha512-8H/wTDqlSwoSnScvV2N/JHfLWOKuh5MVla9hqLjK3nsfyy6Y4kDSYSvkU5YCUEPOSnRXfIyx3Sq+B/IWudTo4g== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.0.0" - -yarn-or-npm@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/yarn-or-npm/-/yarn-or-npm-3.0.1.tgz#6336eea4dff7e23e226acc98c1a8ada17a1b8666" - integrity sha512-fTiQP6WbDAh5QZAVdbMQkecZoahnbOjClTQhzv74WX5h2Uaidj1isf9FDes11TKtsZ0/ZVfZsqZ+O3x6aLERHQ== - dependencies: - cross-spawn "^6.0.5" - pkg-dir "^4.2.0" - -yauzl@^2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" - integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== - dependencies: - buffer-crc32 "~0.2.3" - fd-slicer "~1.1.0" - yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" From 4a364517fba3d55647b56b42247ebce83cdba0b3 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 15:46:39 +0800 Subject: [PATCH 002/126] Rename .js to .jsx --- .../Dashboard/{Dashboard.js => Dashboard.jsx} | 0 .../Dashboard/{Layouts.js => Layouts.jsx} | 0 .../Dashboard/{Modals.js => Modals.jsx} | 0 .../Dashboard/{Plot.js => Plot.jsx} | 0 .../{ColumnGlossary.js => ColumnGlossary.jsx} | 0 .../{Database.js => Database.jsx} | 0 .../{DatabaseEditor.js => DatabaseEditor.jsx} | 0 ...DatabaseTopMenu.js => DatabaseTopMenu.jsx} | 0 ...tabaseModal.js => ExportDatabaseModal.jsx} | 0 ...wScheduleModal.js => NewScheduleModal.jsx} | 0 ...tabaseModal.js => SavingDatabaseModal.jsx} | 0 .../DatabaseEditor/{Table.js => Table.jsx} | 0 ...eTypesDatabase.js => UseTypesDatabase.jsx} | 0 ...lidationErrors.js => ValidationErrors.jsx} | 0 .../{CenterSpinner.js => CenterSpinner.jsx} | 0 .../HomePage/{Header.js => Header.jsx} | 0 .../HomePage/{SearchBar.js => SearchBar.jsx} | 0 .../HomePage/{SideNav.js => SideNav.jsx} | 0 .../HomePage/{ToolsMenu.js => ToolsMenu.jsx} | 0 ...SelectedModal.js => EditSelectedModal.jsx} | 0 .../{InputEditor.js => InputEditor.jsx} | 0 ...vigationPrompt.js => NavigationPrompt.jsx} | 0 .../{ScheduleEditor.js => ScheduleEditor.jsx} | 0 .../InputEditor/{Table.js => Table.jsx} | 0 .../Landing/{Landing.js => Landing.jsx} | 0 .../Map/{EditableMap.js => EditableMap.jsx} | 0 src/components/Map/{Map.js => Map.jsx} | 0 .../Map/{MapButtons.js => MapButtons.jsx} | 0 ...arioModal.js => CreatingScenarioModal.jsx} | 0 ...NewProjectModal.js => NewProjectModal.jsx} | 0 ...wScenarioModal.js => NewScenarioModal.jsx} | 0 ...enProjectModal.js => OpenProjectModal.jsx} | 0 .../Project/{Project.js => Project.jsx} | 0 ...enarioModal.js => RenameScenarioModal.jsx} | 0 .../{ScenarioCard.js => ScenarioCard.jsx} | 0 ...taForm.js => ScenarioGenerateDataForm.jsx} | 0 ...DataForm.js => ScenarioImportDataForm.jsx} | 0 .../Project/{ToolModal.js => ToolModal.jsx} | 0 .../Splash/{Splash.js => Splash.jsx} | 6 +-- .../StatusBar/{StatusBar.js => StatusBar.jsx} | 0 src/components/Titlebar/index.js | 50 ------------------- .../Tools/{Parameter.js => Parameter.jsx} | 0 src/components/Tools/{Tool.js => Tool.jsx} | 0 src/containers/{App.js => App.jsx} | 4 -- src/containers/{HomePage.js => HomePage.jsx} | 0 .../{ErrorBoundary.js => ErrorBoundary.jsx} | 0 .../{ModalManager.js => ModalManager.jsx} | 0 src/utils/{hooks.js => hooks.jsx} | 0 src/utils/{index.js => index.jsx} | 0 src/utils/static.js | 4 -- 50 files changed, 2 insertions(+), 62 deletions(-) rename src/components/Dashboard/{Dashboard.js => Dashboard.jsx} (100%) rename src/components/Dashboard/{Layouts.js => Layouts.jsx} (100%) rename src/components/Dashboard/{Modals.js => Modals.jsx} (100%) rename src/components/Dashboard/{Plot.js => Plot.jsx} (100%) rename src/components/DatabaseEditor/{ColumnGlossary.js => ColumnGlossary.jsx} (100%) rename src/components/DatabaseEditor/{Database.js => Database.jsx} (100%) rename src/components/DatabaseEditor/{DatabaseEditor.js => DatabaseEditor.jsx} (100%) rename src/components/DatabaseEditor/{DatabaseTopMenu.js => DatabaseTopMenu.jsx} (100%) rename src/components/DatabaseEditor/{ExportDatabaseModal.js => ExportDatabaseModal.jsx} (100%) rename src/components/DatabaseEditor/{NewScheduleModal.js => NewScheduleModal.jsx} (100%) rename src/components/DatabaseEditor/{SavingDatabaseModal.js => SavingDatabaseModal.jsx} (100%) rename src/components/DatabaseEditor/{Table.js => Table.jsx} (100%) rename src/components/DatabaseEditor/{UseTypesDatabase.js => UseTypesDatabase.jsx} (100%) rename src/components/DatabaseEditor/{ValidationErrors.js => ValidationErrors.jsx} (100%) rename src/components/HomePage/{CenterSpinner.js => CenterSpinner.jsx} (100%) rename src/components/HomePage/{Header.js => Header.jsx} (100%) rename src/components/HomePage/{SearchBar.js => SearchBar.jsx} (100%) rename src/components/HomePage/{SideNav.js => SideNav.jsx} (100%) rename src/components/HomePage/{ToolsMenu.js => ToolsMenu.jsx} (100%) rename src/components/InputEditor/{EditSelectedModal.js => EditSelectedModal.jsx} (100%) rename src/components/InputEditor/{InputEditor.js => InputEditor.jsx} (100%) rename src/components/InputEditor/{NavigationPrompt.js => NavigationPrompt.jsx} (100%) rename src/components/InputEditor/{ScheduleEditor.js => ScheduleEditor.jsx} (100%) rename src/components/InputEditor/{Table.js => Table.jsx} (100%) rename src/components/Landing/{Landing.js => Landing.jsx} (100%) rename src/components/Map/{EditableMap.js => EditableMap.jsx} (100%) rename src/components/Map/{Map.js => Map.jsx} (100%) rename src/components/Map/{MapButtons.js => MapButtons.jsx} (100%) rename src/components/Project/{CreatingScenarioModal.js => CreatingScenarioModal.jsx} (100%) rename src/components/Project/{NewProjectModal.js => NewProjectModal.jsx} (100%) rename src/components/Project/{NewScenarioModal.js => NewScenarioModal.jsx} (100%) rename src/components/Project/{OpenProjectModal.js => OpenProjectModal.jsx} (100%) rename src/components/Project/{Project.js => Project.jsx} (100%) rename src/components/Project/{RenameScenarioModal.js => RenameScenarioModal.jsx} (100%) rename src/components/Project/{ScenarioCard.js => ScenarioCard.jsx} (100%) rename src/components/Project/{ScenarioGenerateDataForm.js => ScenarioGenerateDataForm.jsx} (100%) rename src/components/Project/{ScenarioImportDataForm.js => ScenarioImportDataForm.jsx} (100%) rename src/components/Project/{ToolModal.js => ToolModal.jsx} (100%) rename src/components/Splash/{Splash.js => Splash.jsx} (92%) rename src/components/StatusBar/{StatusBar.js => StatusBar.jsx} (100%) delete mode 100644 src/components/Titlebar/index.js rename src/components/Tools/{Parameter.js => Parameter.jsx} (100%) rename src/components/Tools/{Tool.js => Tool.jsx} (100%) rename src/containers/{App.js => App.jsx} (84%) rename src/containers/{HomePage.js => HomePage.jsx} (100%) rename src/utils/{ErrorBoundary.js => ErrorBoundary.jsx} (100%) rename src/utils/{ModalManager.js => ModalManager.jsx} (100%) rename src/utils/{hooks.js => hooks.jsx} (100%) rename src/utils/{index.js => index.jsx} (100%) delete mode 100644 src/utils/static.js diff --git a/src/components/Dashboard/Dashboard.js b/src/components/Dashboard/Dashboard.jsx similarity index 100% rename from src/components/Dashboard/Dashboard.js rename to src/components/Dashboard/Dashboard.jsx diff --git a/src/components/Dashboard/Layouts.js b/src/components/Dashboard/Layouts.jsx similarity index 100% rename from src/components/Dashboard/Layouts.js rename to src/components/Dashboard/Layouts.jsx diff --git a/src/components/Dashboard/Modals.js b/src/components/Dashboard/Modals.jsx similarity index 100% rename from src/components/Dashboard/Modals.js rename to src/components/Dashboard/Modals.jsx diff --git a/src/components/Dashboard/Plot.js b/src/components/Dashboard/Plot.jsx similarity index 100% rename from src/components/Dashboard/Plot.js rename to src/components/Dashboard/Plot.jsx diff --git a/src/components/DatabaseEditor/ColumnGlossary.js b/src/components/DatabaseEditor/ColumnGlossary.jsx similarity index 100% rename from src/components/DatabaseEditor/ColumnGlossary.js rename to src/components/DatabaseEditor/ColumnGlossary.jsx diff --git a/src/components/DatabaseEditor/Database.js b/src/components/DatabaseEditor/Database.jsx similarity index 100% rename from src/components/DatabaseEditor/Database.js rename to src/components/DatabaseEditor/Database.jsx diff --git a/src/components/DatabaseEditor/DatabaseEditor.js b/src/components/DatabaseEditor/DatabaseEditor.jsx similarity index 100% rename from src/components/DatabaseEditor/DatabaseEditor.js rename to src/components/DatabaseEditor/DatabaseEditor.jsx diff --git a/src/components/DatabaseEditor/DatabaseTopMenu.js b/src/components/DatabaseEditor/DatabaseTopMenu.jsx similarity index 100% rename from src/components/DatabaseEditor/DatabaseTopMenu.js rename to src/components/DatabaseEditor/DatabaseTopMenu.jsx diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.js b/src/components/DatabaseEditor/ExportDatabaseModal.jsx similarity index 100% rename from src/components/DatabaseEditor/ExportDatabaseModal.js rename to src/components/DatabaseEditor/ExportDatabaseModal.jsx diff --git a/src/components/DatabaseEditor/NewScheduleModal.js b/src/components/DatabaseEditor/NewScheduleModal.jsx similarity index 100% rename from src/components/DatabaseEditor/NewScheduleModal.js rename to src/components/DatabaseEditor/NewScheduleModal.jsx diff --git a/src/components/DatabaseEditor/SavingDatabaseModal.js b/src/components/DatabaseEditor/SavingDatabaseModal.jsx similarity index 100% rename from src/components/DatabaseEditor/SavingDatabaseModal.js rename to src/components/DatabaseEditor/SavingDatabaseModal.jsx diff --git a/src/components/DatabaseEditor/Table.js b/src/components/DatabaseEditor/Table.jsx similarity index 100% rename from src/components/DatabaseEditor/Table.js rename to src/components/DatabaseEditor/Table.jsx diff --git a/src/components/DatabaseEditor/UseTypesDatabase.js b/src/components/DatabaseEditor/UseTypesDatabase.jsx similarity index 100% rename from src/components/DatabaseEditor/UseTypesDatabase.js rename to src/components/DatabaseEditor/UseTypesDatabase.jsx diff --git a/src/components/DatabaseEditor/ValidationErrors.js b/src/components/DatabaseEditor/ValidationErrors.jsx similarity index 100% rename from src/components/DatabaseEditor/ValidationErrors.js rename to src/components/DatabaseEditor/ValidationErrors.jsx diff --git a/src/components/HomePage/CenterSpinner.js b/src/components/HomePage/CenterSpinner.jsx similarity index 100% rename from src/components/HomePage/CenterSpinner.js rename to src/components/HomePage/CenterSpinner.jsx diff --git a/src/components/HomePage/Header.js b/src/components/HomePage/Header.jsx similarity index 100% rename from src/components/HomePage/Header.js rename to src/components/HomePage/Header.jsx diff --git a/src/components/HomePage/SearchBar.js b/src/components/HomePage/SearchBar.jsx similarity index 100% rename from src/components/HomePage/SearchBar.js rename to src/components/HomePage/SearchBar.jsx diff --git a/src/components/HomePage/SideNav.js b/src/components/HomePage/SideNav.jsx similarity index 100% rename from src/components/HomePage/SideNav.js rename to src/components/HomePage/SideNav.jsx diff --git a/src/components/HomePage/ToolsMenu.js b/src/components/HomePage/ToolsMenu.jsx similarity index 100% rename from src/components/HomePage/ToolsMenu.js rename to src/components/HomePage/ToolsMenu.jsx diff --git a/src/components/InputEditor/EditSelectedModal.js b/src/components/InputEditor/EditSelectedModal.jsx similarity index 100% rename from src/components/InputEditor/EditSelectedModal.js rename to src/components/InputEditor/EditSelectedModal.jsx diff --git a/src/components/InputEditor/InputEditor.js b/src/components/InputEditor/InputEditor.jsx similarity index 100% rename from src/components/InputEditor/InputEditor.js rename to src/components/InputEditor/InputEditor.jsx diff --git a/src/components/InputEditor/NavigationPrompt.js b/src/components/InputEditor/NavigationPrompt.jsx similarity index 100% rename from src/components/InputEditor/NavigationPrompt.js rename to src/components/InputEditor/NavigationPrompt.jsx diff --git a/src/components/InputEditor/ScheduleEditor.js b/src/components/InputEditor/ScheduleEditor.jsx similarity index 100% rename from src/components/InputEditor/ScheduleEditor.js rename to src/components/InputEditor/ScheduleEditor.jsx diff --git a/src/components/InputEditor/Table.js b/src/components/InputEditor/Table.jsx similarity index 100% rename from src/components/InputEditor/Table.js rename to src/components/InputEditor/Table.jsx diff --git a/src/components/Landing/Landing.js b/src/components/Landing/Landing.jsx similarity index 100% rename from src/components/Landing/Landing.js rename to src/components/Landing/Landing.jsx diff --git a/src/components/Map/EditableMap.js b/src/components/Map/EditableMap.jsx similarity index 100% rename from src/components/Map/EditableMap.js rename to src/components/Map/EditableMap.jsx diff --git a/src/components/Map/Map.js b/src/components/Map/Map.jsx similarity index 100% rename from src/components/Map/Map.js rename to src/components/Map/Map.jsx diff --git a/src/components/Map/MapButtons.js b/src/components/Map/MapButtons.jsx similarity index 100% rename from src/components/Map/MapButtons.js rename to src/components/Map/MapButtons.jsx diff --git a/src/components/Project/CreatingScenarioModal.js b/src/components/Project/CreatingScenarioModal.jsx similarity index 100% rename from src/components/Project/CreatingScenarioModal.js rename to src/components/Project/CreatingScenarioModal.jsx diff --git a/src/components/Project/NewProjectModal.js b/src/components/Project/NewProjectModal.jsx similarity index 100% rename from src/components/Project/NewProjectModal.js rename to src/components/Project/NewProjectModal.jsx diff --git a/src/components/Project/NewScenarioModal.js b/src/components/Project/NewScenarioModal.jsx similarity index 100% rename from src/components/Project/NewScenarioModal.js rename to src/components/Project/NewScenarioModal.jsx diff --git a/src/components/Project/OpenProjectModal.js b/src/components/Project/OpenProjectModal.jsx similarity index 100% rename from src/components/Project/OpenProjectModal.js rename to src/components/Project/OpenProjectModal.jsx diff --git a/src/components/Project/Project.js b/src/components/Project/Project.jsx similarity index 100% rename from src/components/Project/Project.js rename to src/components/Project/Project.jsx diff --git a/src/components/Project/RenameScenarioModal.js b/src/components/Project/RenameScenarioModal.jsx similarity index 100% rename from src/components/Project/RenameScenarioModal.js rename to src/components/Project/RenameScenarioModal.jsx diff --git a/src/components/Project/ScenarioCard.js b/src/components/Project/ScenarioCard.jsx similarity index 100% rename from src/components/Project/ScenarioCard.js rename to src/components/Project/ScenarioCard.jsx diff --git a/src/components/Project/ScenarioGenerateDataForm.js b/src/components/Project/ScenarioGenerateDataForm.jsx similarity index 100% rename from src/components/Project/ScenarioGenerateDataForm.js rename to src/components/Project/ScenarioGenerateDataForm.jsx diff --git a/src/components/Project/ScenarioImportDataForm.js b/src/components/Project/ScenarioImportDataForm.jsx similarity index 100% rename from src/components/Project/ScenarioImportDataForm.js rename to src/components/Project/ScenarioImportDataForm.jsx diff --git a/src/components/Project/ToolModal.js b/src/components/Project/ToolModal.jsx similarity index 100% rename from src/components/Project/ToolModal.js rename to src/components/Project/ToolModal.jsx diff --git a/src/components/Splash/Splash.js b/src/components/Splash/Splash.jsx similarity index 92% rename from src/components/Splash/Splash.js rename to src/components/Splash/Splash.jsx index d61f640..2e80e7a 100644 --- a/src/components/Splash/Splash.js +++ b/src/components/Splash/Splash.jsx @@ -1,8 +1,6 @@ import { useEffect, useState } from 'react'; import { useSpring, animated } from 'react-spring'; -import getStatic from '../../utils/static'; - -const logo = getStatic('cea-logo.png'); +import ceaLogo from '../../assets/react.svg'; const useLoadingMessages = () => { const [message, setMessage] = useState(''); @@ -46,7 +44,7 @@ const Splash = () => { }} > CEA Logo { - ipcRenderer.invoke('main-window-close'); - }; - const handleMinimize = () => { - ipcRenderer.invoke('main-window-minimize'); - }; - const handleMaximize = () => { - if (maximized) { - ipcRenderer.invoke('main-window-restore'); - } else { - ipcRenderer.invoke('main-window-maximize'); - } - }; - - useEffect(() => { - const onMaximized = () => setMaximized(true); - const onRestore = () => setMaximized(false); - ipcRenderer.on('main-window-maximize', onMaximized); - ipcRenderer.on('main-window-unmaximize', onRestore); - return () => {}; - }, []); - - return ( -
- -
- ); -} diff --git a/src/components/Tools/Parameter.js b/src/components/Tools/Parameter.jsx similarity index 100% rename from src/components/Tools/Parameter.js rename to src/components/Tools/Parameter.jsx diff --git a/src/components/Tools/Tool.js b/src/components/Tools/Tool.jsx similarity index 100% rename from src/components/Tools/Tool.js rename to src/components/Tools/Tool.jsx diff --git a/src/containers/App.js b/src/containers/App.jsx similarity index 84% rename from src/containers/App.js rename to src/containers/App.jsx index 563e314..85cb32a 100644 --- a/src/containers/App.js +++ b/src/containers/App.jsx @@ -6,7 +6,6 @@ import { ConnectedRouter } from 'connected-react-router'; import routes from '../constants/routes'; import HomePage from './HomePage'; import Splash from '../components/Splash/Splash'; -import Titlebar from '../components/Titlebar'; class App extends Component { render() { @@ -17,9 +16,6 @@ class App extends Component { -
- -
diff --git a/src/containers/HomePage.js b/src/containers/HomePage.jsx similarity index 100% rename from src/containers/HomePage.js rename to src/containers/HomePage.jsx diff --git a/src/utils/ErrorBoundary.js b/src/utils/ErrorBoundary.jsx similarity index 100% rename from src/utils/ErrorBoundary.js rename to src/utils/ErrorBoundary.jsx diff --git a/src/utils/ModalManager.js b/src/utils/ModalManager.jsx similarity index 100% rename from src/utils/ModalManager.js rename to src/utils/ModalManager.jsx diff --git a/src/utils/hooks.js b/src/utils/hooks.jsx similarity index 100% rename from src/utils/hooks.js rename to src/utils/hooks.jsx diff --git a/src/utils/index.js b/src/utils/index.jsx similarity index 100% rename from src/utils/index.js rename to src/utils/index.jsx diff --git a/src/utils/static.js b/src/utils/static.js deleted file mode 100644 index 617c48f..0000000 --- a/src/utils/static.js +++ /dev/null @@ -1,4 +0,0 @@ -export default function getStatic(val) { - const isDevelopment = process.env.NODE_ENV !== 'production'; - return isDevelopment ? `/static/${val}` : `../static/${val}`; -} From d27d11619f057de8e84487663dfae7dec53dddc3 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 15:46:57 +0800 Subject: [PATCH 003/126] Move index.html to correct location --- src/index.html => index.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/index.html => index.html (100%) diff --git a/src/index.html b/index.html similarity index 100% rename from src/index.html rename to index.html From d2ddc5030865e7d8982d34087479d35e22b1b931 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 15:54:52 +0800 Subject: [PATCH 004/126] Fix logo path --- src/components/HomePage/SideNav.jsx | 2 +- src/components/Landing/Landing.jsx | 2 +- src/components/Splash/Splash.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index ca58023..098bb6d 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -17,7 +17,7 @@ import { Layout, Menu } from 'antd'; import { setCollapsed } from '../../actions/homepage'; import ToolsMenu from './ToolsMenu'; import routes from '../../constants/routes'; -import ceaLogo from '../../assets/react.svg'; +import ceaLogo from '../../assets/cea-logo.png'; const { Sider } = Layout; const { SubMenu } = Menu; diff --git a/src/components/Landing/Landing.jsx b/src/components/Landing/Landing.jsx index 2b02033..11fc3f4 100644 --- a/src/components/Landing/Landing.jsx +++ b/src/components/Landing/Landing.jsx @@ -6,7 +6,7 @@ import { Button } from 'antd'; import NewProjectModal from '../Project/NewProjectModal'; import OpenProjectModal from '../Project/OpenProjectModal'; import routes from '../../constants/routes'; -import ceaLogo from '../../assets/react.svg'; +import ceaLogo from '../../assets/cea-logo.png'; const Landing = () => { return ( diff --git a/src/components/Splash/Splash.jsx b/src/components/Splash/Splash.jsx index 2e80e7a..ee3ec58 100644 --- a/src/components/Splash/Splash.jsx +++ b/src/components/Splash/Splash.jsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { useSpring, animated } from 'react-spring'; -import ceaLogo from '../../assets/react.svg'; +import ceaLogo from '../../assets/cea-logo.png'; const useLoadingMessages = () => { const [message, setMessage] = useState(''); From aeca5999b546191fb953a46b69e188bde21db00d Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 17:22:20 +0800 Subject: [PATCH 005/126] Update .gitignore --- .gitignore | 90 +++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index ab0d397..a547bf3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,83 +4,21 @@ logs npm-debug.log* yarn-debug.log* yarn-error.log* +pnpm-debug.log* lerna-debug.log* -# Diagnostic reports (https://nodejs.org/api/report.html) -report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json +node_modules +dist +dist-ssr +*.local -# Runtime data -pids -*.pid -*.seed -*.pid.lock +# Editor directories and files +.vscode/* +!.vscode/extensions.json +.idea .DS_Store - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage -*.lcov - -# nyc test coverage -.nyc_output - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# TypeScript cache -*.tsbuildinfo - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env -.env.test - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless/ - -# FuseBox cache -.fusebox/ - -# DynamoDB Local files -.dynamodb/ - -# Webpack -.webpack/ +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? From ad6080203a78718cf287cd0a25a88251c24ccc2a Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 17:48:28 +0800 Subject: [PATCH 006/126] Add favicon --- index.html | 1 + public/cea.ico | Bin 0 -> 106463 bytes 2 files changed, 1 insertion(+) create mode 100644 public/cea.ico diff --git a/index.html b/index.html index 6083a40..dd52980 100644 --- a/index.html +++ b/index.html @@ -3,6 +3,7 @@ + CityEnergyAnalyst diff --git a/public/cea.ico b/public/cea.ico new file mode 100644 index 0000000000000000000000000000000000000000..8427962f6b62344e15383fa78138f6686dbdb9eb GIT binary patch literal 106463 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 ArT_o{ literal 0 HcmV?d00001 From 058e869c98f2ec251b2714e66667ac2f2c4a2538 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 17:50:04 +0800 Subject: [PATCH 007/126] Add environment variables --- .env | 1 + .env.development | 1 + src/actions/databaseEditor.js | 8 ++- src/actions/inputEditor.js | 10 +++- src/actions/jobs.js | 8 ++- src/actions/project.js | 2 +- src/actions/tools.js | 7 ++- src/components/Dashboard/Dashboard.jsx | 6 +- src/components/Dashboard/Modals.jsx | 55 ++++++++++++------- src/components/Dashboard/Plot.jsx | 2 +- .../DatabaseEditor/DatabaseEditor.jsx | 4 +- .../DatabaseEditor/ExportDatabaseModal.jsx | 2 +- src/components/HomePage/SearchBar.jsx | 4 +- src/components/Map/Map.jsx | 2 +- src/components/Project/NewProjectModal.jsx | 2 +- src/components/Project/NewScenarioModal.jsx | 4 +- src/components/Project/Project.jsx | 22 +++++--- .../Project/RenameScenarioModal.jsx | 4 +- src/components/Project/ScenarioCard.jsx | 4 +- src/components/StatusBar/StatusBar.jsx | 6 +- src/store/httpMiddleware.js | 2 +- 21 files changed, 101 insertions(+), 55 deletions(-) create mode 100644 .env create mode 100644 .env.development diff --git a/.env b/.env new file mode 100644 index 0000000..39e94d3 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +VITE_CEA_URL="http://localhost:5050" \ No newline at end of file diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..39e94d3 --- /dev/null +++ b/.env.development @@ -0,0 +1 @@ +VITE_CEA_URL="http://localhost:5050" \ No newline at end of file diff --git a/src/actions/databaseEditor.js b/src/actions/databaseEditor.js index bd76771..43c8eef 100644 --- a/src/actions/databaseEditor.js +++ b/src/actions/databaseEditor.js @@ -23,7 +23,7 @@ export const fetchDatabaseData = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_DATA }); const { data } = await axios.get( - `${process.env.CEA_URL}/api/inputs/databases` + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases` ); return dispatch({ type: FETCH_DATABASE_DATA_SUCCESS, @@ -44,7 +44,7 @@ export const fetchDatabaseSchema = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_SCHEMA }); const { data } = await axios.get( - `${process.env.CEA_URL}/api/databases/schema` + `${import.meta.env.VITE_CEA_URL}/api/databases/schema` ); return dispatch({ type: FETCH_DATABASE_SCHEMA_SUCCESS, @@ -66,7 +66,9 @@ export const FETCH_DATABASE_GLOSSARY_FAILURE = export const fetchDatabaseGlossary = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_GLOSSARY }); - const { data } = await axios.get(`${process.env.CEA_URL}/api/glossary`); + const { data } = await axios.get( + `${import.meta.env.VITE_CEA_URL}/api/glossary` + ); return dispatch({ type: FETCH_DATABASE_GLOSSARY_SUCCESS, payload: data, diff --git a/src/actions/inputEditor.js b/src/actions/inputEditor.js index 4b65ee8..d7abd9e 100644 --- a/src/actions/inputEditor.js +++ b/src/actions/inputEditor.js @@ -42,7 +42,7 @@ export const saveChanges = () => async (dispatch, getState) => { const { tables, geojsons, crs, schedules } = getState().inputData; return axios - .put(`${process.env.CEA_URL}/api/inputs/all-inputs`, { + .put(`${import.meta.env.VITE_CEA_URL}/api/inputs/all-inputs`, { tables, geojsons, crs, @@ -70,7 +70,11 @@ export const fetchBuildingSchedule = (buildings) => (dispatch) => { let errors = {}; const promises = buildings.map((building) => axios - .get(`${process.env.CEA_URL}/api/inputs/building-schedule/${building}`) + .get( + `${ + import.meta.env.VITE_CEA_URL + }/api/inputs/building-schedule/${building}` + ) .then((resp) => { return { [building]: resp.data }; }) @@ -156,7 +160,7 @@ export const fetchMapData = () => { let promises = layerList.map((type) => axios - .get(`${process.env.CEA_URL}${inputEndpoints[type]}`) + .get(`${import.meta.env.VITE_CEA_URL}${inputEndpoints[type]}`) .catch((error) => { console.error(error.response.data); }) diff --git a/src/actions/jobs.js b/src/actions/jobs.js index c0bcb2e..63504ef 100644 --- a/src/actions/jobs.js +++ b/src/actions/jobs.js @@ -8,7 +8,9 @@ export const fetchJobs = () => { return async (dispatch) => { dispatch({ type: FETCH_JOBS }); try { - const jobs = await axios.get(`${process.env.CEA_URL}/server/jobs/list`); + const jobs = await axios.get( + `${import.meta.env.VITE_CEA_URL}/server/jobs/list` + ); dispatch({ type: FETCH_JOBS_SUCCESS, payload: jobs.data }); } catch (error) { dispatch({ type: FETCH_JOBS_FAILED, payload: error }); @@ -25,7 +27,7 @@ export const createJob = (script, parameters) => { dispatch({ type: CREATE_JOB }); try { const job_info = await axios.post( - `${process.env.CEA_URL}/server/jobs/new`, + `${import.meta.env.VITE_CEA_URL}/server/jobs/new`, { script, parameters } ); dispatch({ type: CREATE_JOB_SUCCESS, payload: job_info.data }); @@ -45,7 +47,7 @@ export const startJob = (jobID) => { dispatch({ type: START_JOB }); try { const job = await axios.post( - `${process.env.CEA_URL}/server/jobs/start/${jobID}` + `${import.meta.env.VITE_CEA_URL}/server/jobs/start/${jobID}` ); dispatch({ type: START_JOB_SUCCESS, payload: job.data }); } catch (error) { diff --git a/src/actions/project.js b/src/actions/project.js index 78e63b4..5b62039 100644 --- a/src/actions/project.js +++ b/src/actions/project.js @@ -12,7 +12,7 @@ export const getProject = (project = null) => { }); const config = project ? { params: { project } } : {}; return axios - .get(`${process.env.CEA_URL}/api/project`, config) + .get(`${import.meta.env.VITE_CEA_URL}/api/project`, config) .then((response) => { dispatch({ type: GET_PROJECT_SUCCESS, diff --git a/src/actions/tools.js b/src/actions/tools.js index aa795cd..2255b55 100644 --- a/src/actions/tools.js +++ b/src/actions/tools.js @@ -39,7 +39,10 @@ export const saveToolParams = (tool, params) => { payload: { isSaving: true, error: null }, }); return axios - .post(`${process.env.CEA_URL}/api/tools/${tool}/save-config`, params) + .post( + `${import.meta.env.VITE_CEA_URL}/api/tools/${tool}/save-config`, + params + ) .then((response) => { dispatch({ type: SAVING_TOOLPARAMS, @@ -66,7 +69,7 @@ export const setDefaultToolParams = (tool) => { payload: { isSaving: true, error: null }, }); return axios - .post(`${process.env.CEA_URL}/api/tools/${tool}/default`) + .post(`${import.meta.env.VITE_CEA_URL}/api/tools/${tool}/default`) .then((response) => { dispatch({ type: SAVING_TOOLPARAMS, diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index c5314c1..b52fe6c 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -191,7 +191,9 @@ const useDashboardData = () => { const fetchDashboards = async () => { try { - const resp = await axios.get(`${process.env.CEA_URL}/api/dashboards/`); + const resp = await axios.get( + `${import.meta.env.VITE_CEA_URL}/api/dashboards/` + ); setDashboards(resp.data); } catch (error) { console.error(error); @@ -200,7 +202,7 @@ const useDashboardData = () => { const fetchCategories = async () => { try { const resp = await axios.get( - `${process.env.CEA_URL}/api/dashboards/plot-categories` + `${import.meta.env.VITE_CEA_URL}/api/dashboards/plot-categories` ); setCategories(resp.data); } catch (error) { diff --git a/src/components/Dashboard/Modals.jsx b/src/components/Dashboard/Modals.jsx index 94f8c01..2dd9821 100644 --- a/src/components/Dashboard/Modals.jsx +++ b/src/components/Dashboard/Modals.jsx @@ -25,7 +25,7 @@ export const ModalNewDashboard = ({ setConfirmLoading(true); console.log('Received values of form: ', values); axios - .post(`${process.env.CEA_URL}/api/dashboards/`, values) + .post(`${import.meta.env.VITE_CEA_URL}/api/dashboards/`, values) .then((response) => { if (response) { console.log(response.data); @@ -134,7 +134,7 @@ export const ModalDuplicateDashboard = ({ setConfirmLoading(true); console.log('Received values of form: ', values); axios - .post(`${process.env.CEA_URL}/api/dashboards/duplicate`, { + .post(`${import.meta.env.VITE_CEA_URL}/api/dashboards/duplicate`, { ...values, dashboard_index: dashIndex, }) @@ -218,7 +218,10 @@ export const ModalSetScenario = ({ fetchDashboards, dashIndex }) => { setConfirmLoading(true); console.log('Received values of form: ', values); axios - .patch(`${process.env.CEA_URL}/api/dashboards/${dashIndex}`, values) + .patch( + `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}`, + values + ) .then((response) => { if (response) { console.log(response.data); @@ -241,16 +244,18 @@ export const ModalSetScenario = ({ fetchDashboards, dashIndex }) => { useEffect(() => { if (visible.setScenario) { - axios.get(`${process.env.CEA_URL}/api/project/`).then((response) => { - const { scenario, scenarios } = response.data; - setScenarios({ - type: 'ScenarioNameParameter', - name: 'scenario', - value: scenario, - help: 'Change the scenario parameter of all plots in this dashboard', - choices: scenarios, + axios + .get(`${import.meta.env.VITE_CEA_URL}/api/project/`) + .then((response) => { + const { scenario, scenarios } = response.data; + setScenarios({ + type: 'ScenarioNameParameter', + name: 'scenario', + value: scenario, + help: 'Change the scenario parameter of all plots in this dashboard', + choices: scenarios, + }); }); - }); } else setScenarios(null); }, [visible.setScenario]); @@ -290,7 +295,7 @@ export const ModalDeleteDashboard = ({ const handleOk = (e) => { setConfirmLoading(true); axios - .delete(`${process.env.CEA_URL}/api/dashboards/${dashIndex}`) + .delete(`${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}`) .then((response) => { if (response) { console.log(response.data); @@ -348,7 +353,9 @@ const ModalAddPlotTemplate = ({ const getParameters = async (scenario) => { try { const params = await axios.get( - `${process.env.CEA_URL}/api/dashboards/plot-categories/${category.category}/plots/${category.plot_id}/parameters`, + `${import.meta.env.VITE_CEA_URL}/api/dashboards/plot-categories/${ + category.category + }/plots/${category.plot_id}/parameters`, scenario ? { params: { scenario } } : {} ); console.log(params.data); @@ -365,7 +372,9 @@ const ModalAddPlotTemplate = ({ console.log('Received values of form: ', values); axios .put( - `${process.env.CEA_URL}/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, + `${ + import.meta.env.VITE_CEA_URL + }/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, { ...category, parameters: values } ) .then((response) => { @@ -543,7 +552,9 @@ export const ModalEditParameters = ({ const getParameters = async (scenario) => { try { const params = await axios.get( - `${process.env.CEA_URL}/api/dashboards/${dashIndex}/plots/${activePlotRef.current}/parameters`, + `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ + activePlotRef.current + }/parameters`, scenario ? { params: { scenario } } : {} ); console.log(params.data); @@ -560,7 +571,9 @@ export const ModalEditParameters = ({ console.log('Received values of form: ', values); axios .put( - `${process.env.CEA_URL}/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, + `${ + import.meta.env.VITE_CEA_URL + }/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, { parameters: values } ) .then((response) => { @@ -647,7 +660,9 @@ export const ModalDeletePlot = ({ setConfirmLoading(true); axios .delete( - `${process.env.CEA_URL}/api/dashboards/${dashIndex}/plots/${activePlotRef.current}` + `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ + activePlotRef.current + }` ) .then((response) => { if (response) { @@ -764,7 +779,9 @@ export const ModalPlotFiles = ({ dashIndex, activePlotRef }) => { try { setLoading(true); const { data } = await axios.get( - `${process.env.CEA_URL}/api/dashboards/${dashIndex}/plots/${activePlotRef.current}/input-files` + `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ + activePlotRef.current + }/input-files` ); setFileLocations({ inputs: groupFilesOnParent(data.inputs), diff --git a/src/components/Dashboard/Plot.jsx b/src/components/Dashboard/Plot.jsx index 529278c..430b096 100644 --- a/src/components/Dashboard/Plot.jsx +++ b/src/components/Dashboard/Plot.jsx @@ -29,7 +29,7 @@ const useFetchPlotDiv = (dashIndex, index, hash) => { const fetch = async () => { try { const response = await axios.get( - `${process.env.CEA_URL}/plots/div/${dashIndex}/${index}`, + `${import.meta.env.VITE_CEA_URL}/plots/div/${dashIndex}/${index}`, { cancelToken: source.token, } diff --git a/src/components/DatabaseEditor/DatabaseEditor.jsx b/src/components/DatabaseEditor/DatabaseEditor.jsx index 04bf16a..cc43530 100644 --- a/src/components/DatabaseEditor/DatabaseEditor.jsx +++ b/src/components/DatabaseEditor/DatabaseEditor.jsx @@ -34,7 +34,7 @@ const useValidateDatabasePath = () => { setValid(null); setError(null); const resp = await axios.get( - `${process.env.CEA_URL}/api/inputs/databases/check` + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/check` ); setValid(true); } catch (err) { @@ -181,7 +181,7 @@ const SaveDatabaseButton = () => { try { console.log(databasesData); const resp = await axios.put( - `${process.env.CEA_URL}/api/inputs/databases`, + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases`, databasesData ); setSuccess(true); diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index 79a89db..1810cad 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -18,7 +18,7 @@ const ExportDatabaseModal = ({ visible, setVisible }) => { console.log('Received values of form: ', values); try { const resp = axios.put( - `${process.env.CEA_URL}/api/inputs/databases/copy`, + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/copy`, values ); setConfirmLoading(false); diff --git a/src/components/HomePage/SearchBar.jsx b/src/components/HomePage/SearchBar.jsx index ee6fd76..8d7d441 100644 --- a/src/components/HomePage/SearchBar.jsx +++ b/src/components/HomePage/SearchBar.jsx @@ -12,7 +12,9 @@ const useGlossaryData = () => { useEffect(() => { const getSearchResults = async () => { try { - const result = await axios.get(`${process.env.CEA_URL}/api/glossary`); + const result = await axios.get( + `${import.meta.env.VITE_CEA_URL}/api/glossary` + ); setData(result.data); } catch (error) { console.error(error); diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index 0878517..cfba846 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -480,7 +480,7 @@ export const useGeoJsons = (layerList) => { useEffect(() => { let promises = layerList.map((type) => { return axios - .get(`${process.env.CEA_URL}${inputEndpoints[type]}`) + .get(`${import.meta.env.VITE_CEA_URL}${inputEndpoints[type]}`) .catch((error) => { return console.error(error.response.data); }); diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index fc4226b..f3f740e 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -26,7 +26,7 @@ const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { setConfirmLoading(true); try { const resp = await axios.post( - `${process.env.CEA_URL}/api/project/`, + `${import.meta.env.VITE_CEA_URL}/api/project/`, values ); const { project } = resp.data; diff --git a/src/components/Project/NewScenarioModal.jsx b/src/components/Project/NewScenarioModal.jsx index da914e3..866b642 100644 --- a/src/components/Project/NewScenarioModal.jsx +++ b/src/components/Project/NewScenarioModal.jsx @@ -29,7 +29,7 @@ const NewScenarioModal = ({ visible, setVisible, project }) => { console.log('Received values of form: ', values); try { const resp = await axios.post( - `${process.env.CEA_URL}/api/project/scenario/`, + `${import.meta.env.VITE_CEA_URL}/api/project/scenario/`, { project, ...values } ); console.log(resp.data); @@ -139,7 +139,7 @@ const useFetchDatabasePathParameter = () => { const fetchParameter = async () => { try { const resp = await axios.get( - `${process.env.CEA_URL}/api/tools/data-initializer` + `${import.meta.env.VITE_CEA_URL}/api/tools/data-initializer` ); const dbPathParam = resp.data.parameters[ diff --git a/src/components/Project/Project.jsx b/src/components/Project/Project.jsx index 7193d50..ce198f2 100644 --- a/src/components/Project/Project.jsx +++ b/src/components/Project/Project.jsx @@ -166,10 +166,13 @@ const NewScenarioButton = ({ project }) => { const updateConfigProjectInfo = async (project, scenarioName) => { try { - const resp = await axios.put(`${process.env.CEA_URL}/api/project/`, { - project, - scenario_name: scenarioName, - }); + const resp = await axios.put( + `${import.meta.env.VITE_CEA_URL}/api/project/`, + { + project, + scenario_name: scenarioName, + } + ); console.log(resp.data); return resp.data; } catch (err) { @@ -185,7 +188,7 @@ export const deleteScenario = async ( try { console.log(`About to delete scenario ${scenario}`); const resp = await axios.delete( - `${process.env.CEA_URL}/api/project/scenario/${scenario}`, + `${import.meta.env.VITE_CEA_URL}/api/project/scenario/${scenario}`, { // apparently we can send a payload here: https://stackoverflow.com/a/58234086/2260 data: { project: project }, @@ -237,10 +240,15 @@ export const useFetchProject = () => { }; const fetchProjectDetails = async (project = null) => { - console.log(`fetchProjectDetails: ${project} - url: ${process.env.CEA_URL}`); + console.log( + `fetchProjectDetails: ${project} - url: ${import.meta.env.VITE_CEA_URL}` + ); const config = project ? { params: { project } } : {}; try { - const resp = await axios.get(`${process.env.CEA_URL}/api/project/`, config); + const resp = await axios.get( + `${import.meta.env.VITE_CEA_URL}/api/project/`, + config + ); console.log(`fetchProjectDetails: resp.data=${resp.data}`); return resp.data; } catch (err) { diff --git a/src/components/Project/RenameScenarioModal.jsx b/src/components/Project/RenameScenarioModal.jsx index 26ff9b1..1220f14 100644 --- a/src/components/Project/RenameScenarioModal.jsx +++ b/src/components/Project/RenameScenarioModal.jsx @@ -23,7 +23,9 @@ const RenameScenarioModal = ({ console.log('Received values of form: ', values); try { const resp = await axios.put( - `${process.env.CEA_URL}/api/project/scenario/${scenarioName}`, + `${ + import.meta.env.VITE_CEA_URL + }/api/project/scenario/${scenarioName}`, values ); console.log(resp.data); diff --git a/src/components/Project/ScenarioCard.jsx b/src/components/Project/ScenarioCard.jsx index b246284..72cbcc4 100644 --- a/src/components/Project/ScenarioCard.jsx +++ b/src/components/Project/ScenarioCard.jsx @@ -81,7 +81,9 @@ const useGenerateScenarioImage = (project, scenarioName) => { const fetch = async () => { try { const resp = await axios.get( - `${process.env.CEA_URL}/api/project/scenario/${scenarioName}/image`, + `${ + import.meta.env.VITE_CEA_URL + }/api/project/scenario/${scenarioName}/image`, { params: { project } } ); setData(resp.data); diff --git a/src/components/StatusBar/StatusBar.jsx b/src/components/StatusBar/StatusBar.jsx index 4b4e149..6fa7235 100644 --- a/src/components/StatusBar/StatusBar.jsx +++ b/src/components/StatusBar/StatusBar.jsx @@ -17,7 +17,7 @@ import axios from 'axios'; import { fetchJobs, updateJob, dismissJob } from '../../actions/jobs'; import './StatusBar.css'; -const socket = io(`${process.env.CEA_URL}`); +const socket = io(`${import.meta.env.VITE_CEA_URL}`); const StatusBar = () => { return ( @@ -293,7 +293,7 @@ const JobOutputModal = ({ job, visible, setVisible }) => { const getJobOutput = async () => { try { const resp = await axios.get( - `${process.env.CEA_URL}/server/streams/read/${job.id}`, + `${import.meta.env.VITE_CEA_URL}/server/streams/read/${job.id}`, null, { responseType: 'text' } ); @@ -342,7 +342,7 @@ const JobOutputModal = ({ job, visible, setVisible }) => { }; const cancelCeaJob = (job) => { - axios.post(`${process.env.CEA_URL}/server/jobs/cancel/${job.id}`); + axios.post(`${import.meta.env.VITE_CEA_URL}/server/jobs/cancel/${job.id}`); }; export default StatusBar; diff --git a/src/store/httpMiddleware.js b/src/store/httpMiddleware.js index 386a1ec..3b9d22c 100644 --- a/src/store/httpMiddleware.js +++ b/src/store/httpMiddleware.js @@ -2,7 +2,7 @@ import axios from 'axios'; export const httpAction = ({ type = '', - baseURL = `${process.env.CEA_URL}/api`, + baseURL = `${import.meta.env.VITE_CEA_URL}/api`, url = '', method = 'GET', data = null, From 65a4fb288fc36c7e787c3bb0f036efe3d149cda7 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 18:19:54 +0800 Subject: [PATCH 008/126] Fix antd css not found --- package.json | 4 +++- src/app.global.css | 2 -- vite.config.js | 29 +++++++++++++++++++++++++---- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 951561c..021f782 100644 --- a/package.json +++ b/package.json @@ -30,10 +30,12 @@ "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.28.0", "eslint-plugin-simple-import-sort": "^7.0.0", + "less": "^4.1.3", "node-loader": "^2.0.0", "prettier": "^2.4.1", "redux-logger": "^3.0.6", - "vite": "^4.0.0" + "vite": "^4.0.0", + "vite-plugin-imp": "^2.3.1" }, "dependencies": { "@ant-design/compatible": "^1.1.0", diff --git a/src/app.global.css b/src/app.global.css index 99ae789..0c0d3f3 100644 --- a/src/app.global.css +++ b/src/app.global.css @@ -1,5 +1,3 @@ -@import '~antd/dist/antd.css'; - #app { height: 100vh; overflow: hidden; diff --git a/vite.config.js b/vite.config.js index 861b04b..9af47d4 100644 --- a/vite.config.js +++ b/vite.config.js @@ -1,7 +1,28 @@ -import { defineConfig } from 'vite' -import react from '@vitejs/plugin-react-swc' +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react-swc'; +import vitePluginImp from 'vite-plugin-imp'; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [react()], -}) + css: { + preprocessorOptions: { + less: { + javascriptEnabled: true, + }, + }, + }, + plugins: [ + react(), + vitePluginImp({ + libList: [ + { + libName: 'antd', + style: (name) => `antd/es/${name}/style`, + }, + ], + }), + ], + define: { + global: 'window', + }, +}); From b3c00f461070008ecc9a50e69f4909acac8828eb Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 19:36:35 +0800 Subject: [PATCH 009/126] Fix `global` not defined --- vite.config.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/vite.config.js b/vite.config.js index 9af47d4..ffd7cc6 100644 --- a/vite.config.js +++ b/vite.config.js @@ -11,6 +11,14 @@ export default defineConfig({ }, }, }, + optimizeDeps: { + esbuildOptions: { + // Node.js global to browser globalThis + define: { + global: 'globalThis', + }, + }, + }, plugins: [ react(), vitePluginImp({ @@ -22,7 +30,4 @@ export default defineConfig({ ], }), ], - define: { - global: 'window', - }, }); From d1776b3f2b056fd38b47df4b3d1e19deb564b27a Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 20:52:55 +0800 Subject: [PATCH 010/126] Fit height to window --- src/containers/HomePage.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/containers/HomePage.jsx b/src/containers/HomePage.jsx index df5f05e..b95f742 100644 --- a/src/containers/HomePage.jsx +++ b/src/containers/HomePage.jsx @@ -22,7 +22,7 @@ const HomePage = () => {
From 179219ba9a48409f9e06606604c50925aa515a40 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Wed, 28 Dec 2022 21:29:02 +0800 Subject: [PATCH 011/126] Fix dependencies --- package.json | 6 +- yarn.lock | 2584 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 1752 insertions(+), 838 deletions(-) diff --git a/package.json b/package.json index 021f782..f220c06 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,6 @@ "eslint-plugin-react": "^7.28.0", "eslint-plugin-simple-import-sort": "^7.0.0", "less": "^4.1.3", - "node-loader": "^2.0.0", "prettier": "^2.4.1", "redux-logger": "^3.0.6", "vite": "^4.0.0", @@ -40,17 +39,18 @@ "dependencies": { "@ant-design/compatible": "^1.1.0", "@ant-design/icons": "^4.7.0", + "@babel/polyfill": "^7.12.1", "@handsontable/react": "^3.1.2", + "@nebula.gl/layers": "^1.0.4", "@turf/turf": "^6.5.0", "antd": "^4.19.2", "axios": "^1.1.3", "color-interpolate": "^1.0.5", "connected-react-router": "^6.5.2", - "deck.gl": "^7", + "deck.gl": "^8.8.20", "handsontable": "^6", "history": "^4.9.0", "html-react-parser": "^3.0.4", - "nebula.gl": "^0.15.0", "react": "^18.2.0", "react-dom": "^18.2.0", "react-map-gl": "^5", diff --git a/yarn.lock b/yarn.lock index 8dff607..0b590a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,16 +2,24 @@ # yarn lockfile v1 +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + dependencies: + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" + "@ant-design/colors@^6.0.0": version "6.0.0" - resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" + resolved "https://registry.npmjs.org/@ant-design/colors/-/colors-6.0.0.tgz" integrity sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ== dependencies: "@ctrl/tinycolor" "^3.4.0" "@ant-design/compatible@^1.1.0": version "1.1.2" - resolved "https://registry.yarnpkg.com/@ant-design/compatible/-/compatible-1.1.2.tgz#61a4f82627065c7135ae3695b78ec63342182fb6" + resolved "https://registry.npmjs.org/@ant-design/compatible/-/compatible-1.1.2.tgz" integrity sha512-Qsx5Qw97eiSgcxyQDlY45QSbvGn0gUdpX8XFImPvzZpKwabqQ2HnXXuUlb8RbrkURswaPIoyLEGKDPeogIaURA== dependencies: "@ant-design/icons" "^4.0.0" @@ -26,12 +34,12 @@ "@ant-design/icons-svg@^4.2.1": version "4.2.1" - resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz#8630da8eb4471a4aabdaed7d1ff6a97dcb2cf05a" + resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz" integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== "@ant-design/icons@^4.0.0", "@ant-design/icons@^4.7.0": version "4.8.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.8.0.tgz#3084e2bb494cac3dad6c0392f77c1efc90ee1fa4" + resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.0.tgz" integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== dependencies: "@ant-design/colors" "^6.0.0" @@ -42,7 +50,7 @@ "@ant-design/react-slick@~0.29.1": version "0.29.2" - resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-0.29.2.tgz#53e6a7920ea3562eebb304c15a7fc2d7e619d29c" + resolved "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-0.29.2.tgz" integrity sha512-kgjtKmkGHa19FW21lHnAfyyH9AAoh35pBdcJ53rHmQ3O+cfFHGHnUbj/HFrRNJ5vIts09FKJVAD8RpaC+RaWfA== dependencies: "@babel/runtime" "^7.10.4" @@ -51,9 +59,163 @@ lodash "^4.17.21" resize-observer-polyfill "^1.5.1" +"@babel/code-frame@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" + integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== + dependencies: + "@babel/highlight" "^7.18.6" + +"@babel/compat-data@^7.20.5": + version "7.20.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.10.tgz#9d92fa81b87542fff50e848ed585b4212c1d34ec" + integrity sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg== + +"@babel/core@^7.12.10": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.7.tgz#37072f951bd4d28315445f66e0ec9f6ae0c8c35f" + integrity sha512-t1ZjCluspe5DW24bn2Rr1CDb2v9rn/hROtg9a2tmd0+QYf4bsloYfLQzjG4qHPNMhWtKdGC33R5AxGR2Af2cBw== + dependencies: + "@ampproject/remapping" "^2.1.0" + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-compilation-targets" "^7.20.7" + "@babel/helper-module-transforms" "^7.20.7" + "@babel/helpers" "^7.20.7" + "@babel/parser" "^7.20.7" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" + convert-source-map "^1.7.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.1" + semver "^6.3.0" + +"@babel/generator@^7.12.11", "@babel/generator@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.7.tgz#f8ef57c8242665c5929fe2e8d82ba75460187b4a" + integrity sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw== + dependencies: + "@babel/types" "^7.20.7" + "@jridgewell/gen-mapping" "^0.3.2" + jsesc "^2.5.1" + +"@babel/helper-compilation-targets@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" + integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== + dependencies: + "@babel/compat-data" "^7.20.5" + "@babel/helper-validator-option" "^7.18.6" + browserslist "^4.21.3" + lru-cache "^5.1.1" + semver "^6.3.0" + +"@babel/helper-environment-visitor@^7.18.9": + version "7.18.9" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" + integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== + +"@babel/helper-function-name@^7.19.0": + version "7.19.0" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.19.0.tgz#941574ed5390682e872e52d3f38ce9d1bef4648c" + integrity sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w== + dependencies: + "@babel/template" "^7.18.10" + "@babel/types" "^7.19.0" + +"@babel/helper-hoist-variables@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678" + integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-imports@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" + integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-module-transforms@^7.20.7": + version "7.20.11" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.11.tgz#df4c7af713c557938c50ea3ad0117a7944b2f1b0" + integrity sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg== + dependencies: + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-module-imports" "^7.18.6" + "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/helper-validator-identifier" "^7.19.1" + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.10" + "@babel/types" "^7.20.7" + +"@babel/helper-simple-access@^7.20.2": + version "7.20.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" + integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== + dependencies: + "@babel/types" "^7.20.2" + +"@babel/helper-split-export-declaration@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075" + integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA== + dependencies: + "@babel/types" "^7.18.6" + +"@babel/helper-string-parser@^7.19.4": + version "7.19.4" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" + integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== + +"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": + version "7.19.1" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2" + integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w== + +"@babel/helper-validator-option@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8" + integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw== + +"@babel/helpers@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.7.tgz#04502ff0feecc9f20ecfaad120a18f011a8e6dce" + integrity sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA== + dependencies: + "@babel/template" "^7.20.7" + "@babel/traverse" "^7.20.7" + "@babel/types" "^7.20.7" + +"@babel/highlight@^7.18.6": + version "7.18.6" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf" + integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g== + dependencies: + "@babel/helper-validator-identifier" "^7.18.6" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@babel/parser@^7.12.11", "@babel/parser@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b" + integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg== + +"@babel/polyfill@^7.12.1": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96" + integrity sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g== + dependencies: + core-js "^2.6.5" + regenerator-runtime "^0.13.4" + "@babel/runtime-corejs3@^7.10.2": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz#a1e5ea3d758ba6beb715210142912e3f29981d84" + resolved "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.20.7.tgz" integrity sha512-jr9lCZ4RbRQmCR28Q8U8Fu49zvFqLxTY9AMOUz+iyMohMoAgpEcVxY+wJNay99oXOpOcCTODkk70NDN2aaJEeg== dependencies: core-js-pure "^3.25.1" @@ -61,98 +223,185 @@ "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2": version "7.20.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.7.tgz#fcb41a5a70550e04a7b708037c7c32f7f356d8fd" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.7.tgz" integrity sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ== dependencies: regenerator-runtime "^0.13.11" +"@babel/template@^7.18.10", "@babel/template@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8" + integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + +"@babel/traverse@^7.12.12", "@babel/traverse@^7.20.10", "@babel/traverse@^7.20.7": + version "7.20.10" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.10.tgz#2bf98239597fcec12f842756f186a9dde6d09230" + integrity sha512-oSf1juCgymrSez8NI4A2sr4+uB/mFd9MXplYGPEBnfAuWmmyeVcHa6xLPiaRBcXkcb/28bgxmQLTVwFKE1yfsg== + dependencies: + "@babel/code-frame" "^7.18.6" + "@babel/generator" "^7.20.7" + "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-function-name" "^7.19.0" + "@babel/helper-hoist-variables" "^7.18.6" + "@babel/helper-split-export-declaration" "^7.18.6" + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + debug "^4.1.0" + globals "^11.1.0" + +"@babel/types@^7.18.6", "@babel/types@^7.19.0", "@babel/types@^7.20.2", "@babel/types@^7.20.7": + version "7.20.7" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.7.tgz#54ec75e252318423fc07fb644dc6a58a64c09b7f" + integrity sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg== + dependencies: + "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-validator-identifier" "^7.19.1" + to-fast-properties "^2.0.0" + "@ctrl/tinycolor@^3.4.0": version "3.5.0" - resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz#6e52b3d1c38d13130101771821e09cdd414a16bc" + resolved "https://registry.npmjs.org/@ctrl/tinycolor/-/tinycolor-3.5.0.tgz" integrity sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg== -"@deck.gl/aggregation-layers@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-7.3.15.tgz#5413789e0dd7b96649147e848c7ed2a1a2057957" - integrity sha512-6ur1Nqa/X1Fpq1zrpP03MnaqPEjMs0+K3XMs0W0p6//E3tonSHQOJnFY45AVCI9TrwV/0yY2y+/hVoUDLEuyXA== +"@danmarshall/deckgl-typings@4.9.12": + version "4.9.12" + resolved "https://registry.yarnpkg.com/@danmarshall/deckgl-typings/-/deckgl-typings-4.9.12.tgz#81ed316353550996cf5a139f40d8c01384264a93" + integrity sha512-hRXXDepfieobs+YFcjhoSXS97boSqgMAlWKREGwxBbqO/mE2seNJgQHPedsR+DeGJiK3hJsQmykt8TO51shJ4g== dependencies: - d3-hexbin "^0.2.1" + "@types/hammerjs" "^2.0.36" + "@types/react" "*" + indefinitely-typed "^1.1.0" -"@deck.gl/core@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-7.3.15.tgz#b2ef42be8d6a26ca1449d648fc5d069131755953" - integrity sha512-ZxnFXH/V28s45uXI3OYrq2NyjqCI03N5vcwEWrQc888NH3oSivXzpSyAsonGNdGFadK+oici6Nd3jns64L7rPA== +"@deck.gl/aggregation-layers@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.8.20.tgz#7241e012d4d090d26c60467308ebac5c6e98ffca" + integrity sha512-TQ4xbvEOVxt86GXH4OqWxzW3JycrTs1CdcwGcbwnraefpUmY2MaujTfmCH/re2PnOIOpAY4/x7RaWME+kNJSPw== dependencies: - "@loaders.gl/core" "^1.3.4" - "@loaders.gl/images" "^1.3.4" - "@luma.gl/addons" "^7.3.2" - "@luma.gl/core" "^7.3.2" + "@luma.gl/constants" "^8.5.16" + "@luma.gl/shadertools" "^8.5.16" + "@math.gl/web-mercator" "^3.6.2" + d3-hexbin "^0.2.1" + +"@deck.gl/carto@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.8.20.tgz#d397e44cc2bb6c0819ff37f57257498d09cc10b4" + integrity sha512-53J3k7hIJk2Nl474SKQawrwbN2QGrW1Niv5Op/SRoGxwtXhftr2Vl/cBpLqMdrQT76doyMNBOfIj9HAjznD4jw== + dependencies: + "@loaders.gl/gis" "^3.2.10" + "@loaders.gl/loader-utils" "^3.2.10" + "@loaders.gl/mvt" "^3.2.10" + "@loaders.gl/tiles" "^3.2.10" + "@luma.gl/constants" "^8.5.16" + "@math.gl/web-mercator" "^3.6.2" + cartocolor "^4.0.2" + d3-array "^3.2.0" + d3-color "^3.1.0" + d3-format "^3.1.0" + d3-scale "^4.0.0" + h3-js "^3.7.0" + moment-timezone "^0.5.33" + pbf "^3.2.1" + quadbin "^0.1.2" + +"@deck.gl/core@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.8.20.tgz#7f9375e70df8c5307ace352ba4fe599db94b3a43" + integrity sha512-lEvK55OLyNwrrKJ5oMDb2yCbMPhmpEkh77tIi5Ip9ZO4ptqKPbN/SFvHowHHat1HlaO1wL37JB6rEFgJfooezg== + dependencies: + "@loaders.gl/core" "^3.2.10" + "@loaders.gl/images" "^3.2.10" + "@luma.gl/constants" "^8.5.16" + "@luma.gl/core" "^8.5.16" + "@math.gl/core" "^3.6.2" + "@math.gl/sun" "^3.6.2" + "@math.gl/web-mercator" "^3.6.2" + "@probe.gl/env" "^3.5.0" + "@probe.gl/log" "^3.5.0" + "@probe.gl/stats" "^3.5.0" gl-matrix "^3.0.0" - math.gl "^3.0.0" - mjolnir.js "^2.1.2" - probe.gl "^3.1.1" - seer "^0.2.4" - viewport-mercator-project "^6.2.3" - -"@deck.gl/extensions@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-7.3.15.tgz#0bd59027737821f929e328136c9c4ed5b9a6ce86" - integrity sha512-fjWhgHnqbaPQZbxohLzRB3/AJT/h3afZAKf3kvE9JTGF5bzXuHB2OG9/PBLmnBNICMIrgUbXVIeIwTY/AtsFRw== - -"@deck.gl/geo-layers@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-7.3.15.tgz#9b199d4b35438959e37358b3f41115dd44c3d518" - integrity sha512-UeGp2iAf/TMoJ5+XnCxsnyjfZD3SH+sJecwt/5hrQ10VTJ39wbBF1z5YdQ1mA7C/7T5ibxiiKw+lsX5oTbudZw== - dependencies: - "@loaders.gl/3d-tiles" "^1.3.4" - "@loaders.gl/core" "^1.3.4" - "@loaders.gl/gltf" "^1.3.4" - "@math.gl/culling" "^3.0.0" - "@math.gl/geospatial" "^3.0.0" - h3-js "^3.4.3" + math.gl "^3.6.2" + mjolnir.js "^2.7.0" + +"@deck.gl/extensions@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.8.20.tgz#d24a16ac96ea561a1a7b4b45f5cbb07e79cd3008" + integrity sha512-/VPEqM6L+2d+47fJmiuX8TiPzkWzeOdnSvzCfuz/12/EEEBHEwJ980ixhxPkDLCGEIKwaWGBEfJFKCEiy/ZPvw== + dependencies: + "@luma.gl/shadertools" "^8.5.16" + +"@deck.gl/geo-layers@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.8.20.tgz#3b1b47d2e5d40d5bfaa3643d6cdf200467083616" + integrity sha512-a0E1CjhfgFGvYgdpPkWOJQ8/6MKjDFfaM1IyQDYkDEWJoJ1EVQJoKvFbUIseXra4lAeQXVeZciSGJKCPoUxzFw== + dependencies: + "@loaders.gl/3d-tiles" "^3.2.10" + "@loaders.gl/gis" "^3.2.10" + "@loaders.gl/loader-utils" "^3.2.10" + "@loaders.gl/mvt" "^3.2.10" + "@loaders.gl/schema" "^3.2.10" + "@loaders.gl/terrain" "^3.2.10" + "@loaders.gl/tiles" "^3.2.10" + "@luma.gl/constants" "^8.5.16" + "@luma.gl/experimental" "^8.5.16" + "@math.gl/core" "^3.6.2" + "@math.gl/culling" "^3.6.2" + "@math.gl/web-mercator" "^3.6.2" + "@types/geojson" "^7946.0.8" + h3-js "^3.7.0" long "^3.2.0" - s2-geometry "^1.2.10" -"@deck.gl/google-maps@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-7.3.15.tgz#abc6f2cf915d9e75506ef0078340c0c5cf82660f" - integrity sha512-DJ1UDrHkg6gQKjj94vrCme7FYJQOHDmWrlqNuhsSNPlJcj9eAy6j299gsrousfMGcd9lSWX6/GCHs21VdC8Z6w== +"@deck.gl/google-maps@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.8.20.tgz#8ba95e694eeaf24b565e9cfbdfca92aa3dc3a666" + integrity sha512-LceXZ9kqkQqlklgW9qEE0PvMEFLJScU2xSvmnzgBEmgufhs45Rgmw4UTSlP7L2iB9hXwjCHkvJS5k1+ntImC/g== -"@deck.gl/json@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/json/-/json-7.3.15.tgz#5f1657ba2edb6d60aba15713147a19951e67d89d" - integrity sha512-qBjYTlzvq3m7iRkkHkg2dfC3Pg8DwDRUCKxWykMh4+Y4q98IGAmrhMKlUbh3x4EYlqkmY4NVCvSlLreYMLfMRQ== +"@deck.gl/json@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/json/-/json-8.8.20.tgz#a094f41e5c83083b4db05ce754ddf6bf9dc1ef9f" + integrity sha512-0w6BPMFOkUYcRWOjEXClHbtiDubENTkfSEk08VDOkf/qSKja/pSvJhaEzMANW2yxE8zXd0g970rb+PsVjlwF9Q== dependencies: d3-dsv "^1.0.8" expression-eval "^2.0.0" -"@deck.gl/layers@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-7.3.15.tgz#952aa682e9c79ca4e4d5e6251ff1b57316b493ca" - integrity sha512-KtFnq5RBUKPIFwZgsp6soLgVufYFGmZxhfDClychsSeL5kVCYoF5oxx61l6/gB4MLy8+8mdsIe8GDGTioqn+Vg== +"@deck.gl/layers@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.8.20.tgz#6c6c5725157accd4dbb6884023410f24b7c68713" + integrity sha512-4RNDTKhJsh8lrPXuaq58goweUPHoSuih7wEau2wk/hX4DrdmW9KtwwPpXYDkNPFalvS1uS1JW4QuH8tZFRrzXw== dependencies: - "@loaders.gl/images" "^1.3.4" + "@loaders.gl/images" "^3.2.10" + "@loaders.gl/schema" "^3.2.10" + "@luma.gl/constants" "^8.5.16" "@mapbox/tiny-sdf" "^1.1.0" + "@math.gl/core" "^3.6.2" + "@math.gl/polygon" "^3.6.2" + "@math.gl/web-mercator" "^3.6.2" earcut "^2.0.6" -"@deck.gl/mapbox@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/mapbox/-/mapbox-7.3.15.tgz#738bd47d30407efdf13e49c271144b0c6636b71b" - integrity sha512-j/XHYd5OJgO9LSpiYWZN0K0VZfYKgGD3C4rRQ82zgOOgYfEtw6Znt++/kwTkLwXbIShO2Y6d1mYti7uQxyF9kA== - -"@deck.gl/mesh-layers@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-7.3.15.tgz#f59c7f35c8db2c40183da8910c8e9108a47aed26" - integrity sha512-YkQB23RlO9kKxcBZR99+DHd7BZVJz6XFqfjcMVgETxXyI5/Nt1AeFd4BleiYNAR28RFP8tsSp2BU+nWelZxd6A== +"@deck.gl/mapbox@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/mapbox/-/mapbox-8.8.20.tgz#a96c46a9536ada576b442319929dff1abed0bfa7" + integrity sha512-Q1pZIr+zpQ/PhaBP/EMH6iS/nZ1zdEIDgkfRO5d9Q6P4E/8kYgyJZqK6xssyvS3Rwt6iB6A4UYkWCt7iDEjTrQ== dependencies: - "@luma.gl/addons" "^7.3.2" + "@types/mapbox-gl" "^2.6.3" -"@deck.gl/react@7.3.15": - version "7.3.15" - resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-7.3.15.tgz#7fa410bb040c2871569024b5d0a24d0b9d97ba14" - integrity sha512-c/m3RzBJNGm8upT1DP0APfngmH+FXn8PjDO5QCIMV0BFrtgS8aDP0fIDDtgpjpHeUcEYHnKbynsi1q9LXB2ZqQ== +"@deck.gl/mesh-layers@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.8.20.tgz#c5a27dc1ca0f8831e741dfae0661ed847c70201d" + integrity sha512-gipojfWbsfx/h+0GyRkfmkhTSLPG+cd6kVthAjSUuQ+V2yzO47LoAN7XnwWnQE4QtbYgTytmFbLr6GdEQtJw+A== dependencies: - prop-types "^15.6.0" + "@loaders.gl/gltf" "^3.2.10" + "@luma.gl/constants" "^8.5.16" + "@luma.gl/experimental" "^8.5.16" + "@luma.gl/shadertools" "^8.5.16" + +"@deck.gl/react@8.8.20": + version "8.8.20" + resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.8.20.tgz#56b9f0ec46b97a2ee09636191830482d04a3b6dd" + integrity sha512-Pk23yFR00WPC0lHkTzRduZytWqHcgftqSWDZicyZZ5qjoafcxOYEPvyMPEknoEcjrb/sE/bWMd3RyxPRQRB+sw== "@esbuild/android-arm64@0.16.12": version "0.16.12" @@ -261,12 +510,12 @@ "@esbuild/win32-x64@0.16.12": version "0.16.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.12.tgz#31197bb509049b63c059c4808ac58e66fdff7479" + resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.16.12.tgz" integrity sha512-iPYKN78t3op2+erv2frW568j1q0RpqX6JOLZ7oPPaAV1VaF7dDstOrNw37PVOYoTWE11pV4A1XUitpdEFNIsPg== "@eslint/eslintrc@^1.4.0": version "1.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.4.0.tgz#8ec64e0df3e7a1971ee1ff5158da87389f167a63" + resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.4.0.tgz" integrity sha512-7yfvXy6MWLgWSFsLhz5yH3iQ52St8cdUY6FoGieKkRDVxuxmrNuUetIuu6cmjNWwniUHiWXjxCr5tTXDrbYS5A== dependencies: ajv "^6.12.4" @@ -281,12 +530,12 @@ "@handsontable/react@^3.1.2": version "3.1.3" - resolved "https://registry.yarnpkg.com/@handsontable/react/-/react-3.1.3.tgz#382ff655c17469bd587010e50281f0f47c3c0e79" + resolved "https://registry.npmjs.org/@handsontable/react/-/react-3.1.3.tgz" integrity sha512-XuLP0rmpkXAi55kmw1YtK1Icn2gtkHe0xT99inNgLiGGFMnv3ll1Y8NCfwHqSp0EMnpwpbO6wbN+ZBE/huwPwA== "@humanwhocodes/config-array@^0.11.8": version "0.11.8" - resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.8.tgz#03595ac2075a4dc0f191cc2131de14fbd7d410b9" + resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz" integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g== dependencies: "@humanwhocodes/object-schema" "^1.2.1" @@ -295,132 +544,270 @@ "@humanwhocodes/module-importer@^1.0.1": version "1.0.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c" + resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz" integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA== "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" - resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" + resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@loaders.gl/3d-tiles@^1.3.4": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-1.3.7.tgz#c8d2ff8a01890641e7a4e2360cb5aee8a93cfa0a" - integrity sha512-Z8GJnTR9nl8DM8nMfYYAfU5Q94WUK1yKcCABnLtYhei3tqGgs+UjjDyjs1gKLNmdSqO07R9aa14+wNe1aFnwmg== - dependencies: - "@loaders.gl/core" "1.3.7" - "@loaders.gl/gltf" "1.3.7" - "@loaders.gl/loader-utils" "1.3.7" - "@loaders.gl/math" "1.3.7" - "@math.gl/culling" "^3.0.0-beta.3" - "@math.gl/geospatial" "^3.0.0-beta.3" - math.gl "^3.0.0-beta.3" - probe.gl "^3.1.0-beta.3" - -"@loaders.gl/core@1.3.7", "@loaders.gl/core@^1.3.4": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-1.3.7.tgz#86ae42b7f16b67035a7a561affa393c4fd98076a" - integrity sha512-dFZkJQc+i2PoqlBMz/aO8Gnn0y6ICafQp8u6cTpCm96h/HHulE8qDBodQlHGHn9EMJDSgVl/zjni+QhqIK31dg== +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.2": + version "0.3.2" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" + integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== + dependencies: + "@jridgewell/set-array" "^1.0.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + +"@jridgewell/resolve-uri@3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78" + integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w== + +"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" + integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== + +"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.14" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" + integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.17" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" + integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + dependencies: + "@jridgewell/resolve-uri" "3.1.0" + "@jridgewell/sourcemap-codec" "1.4.14" + +"@loaders.gl/3d-tiles@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-3.2.12.tgz#a9e55526d15231f5365ff1b6960855147640ccb1" + integrity sha512-fhJAW4KiMZ14isp/TaZe7GVptAtB7eT0MqM1nDoqWR7SlsxOrtW4S/hC+g58isf1FQ10DutpL8zs0ORVhSaweQ== + dependencies: + "@loaders.gl/draco" "3.2.12" + "@loaders.gl/gltf" "3.2.12" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/math" "3.2.12" + "@loaders.gl/tiles" "3.2.12" + "@math.gl/core" "^3.5.1" + "@math.gl/geospatial" "^3.5.1" + +"@loaders.gl/core@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-3.2.12.tgz#55a58b71d1aa64aa404d0369d190392fd2d4faca" + integrity sha512-kRQZGZ2+bvd++spjfp00aq2e3RrawAlaCwFxVyyQT6kYyQIzexr/obKd3X+yxYcrr4kUsav2iGqhLVObINlStQ== + dependencies: + "@babel/runtime" "^7.3.1" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/worker-utils" "3.2.12" + "@probe.gl/log" "^3.5.0" + probe.gl "^3.4.0" + +"@loaders.gl/draco@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-3.2.12.tgz#e561431a2c6b4971abcf39e7704aa1f36a1f5f30" + integrity sha512-QoDlnL3ouwW3OSMRbyE4DyY41oxqadtaQ7wU3K6us4CF0XgvOToZZTG6QnCfF8FauFZ8JMebn6NT1LtobTNVYQ== dependencies: "@babel/runtime" "^7.3.1" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/schema" "3.2.12" + "@loaders.gl/worker-utils" "3.2.12" + draco3d "1.4.1" + +"@loaders.gl/gis@3.2.12", "@loaders.gl/gis@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/gis/-/gis-3.2.12.tgz#d47ae587a7e5bef796fc74ccbe0c699e5a54d0a2" + integrity sha512-mm7YtDY2bnf+gWTKHRYK2T0itWilidyvsmZ6AcP5IiIwWoSaKBvBGq+mpzVWTKhgPvul7dP8+u2u7iuromxTGQ== + dependencies: + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/schema" "3.2.12" + "@mapbox/vector-tile" "^1.3.1" + "@math.gl/polygon" "^3.5.1" + pbf "^3.2.1" -"@loaders.gl/gltf@1.3.7", "@loaders.gl/gltf@^1.3.0", "@loaders.gl/gltf@^1.3.4": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-1.3.7.tgz#7f83c6f216934de280a8fdc54c5a1228e731e9f8" - integrity sha512-GHhnuF1AINHwTxoZWppgxFW6V8UCkZ1sB6dFZs0rVPraAOcoonNZEECHxSdPxcj9mPy8i7mhzq/UZ4MvPYV48w== +"@loaders.gl/gltf@3.2.12", "@loaders.gl/gltf@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-3.2.12.tgz#3b602986b2e215ffc48c2b110e4be381be0326f5" + integrity sha512-vdLdWruh4nqmDm/9T0HWX30fJ+UVtB35uQk9dhN/couvrXXtdpkvtb7aFdX0nlCLcrbRlcCYbuCfKctt1CF2mg== dependencies: - "@loaders.gl/core" "1.3.7" - "@loaders.gl/images" "1.3.7" - "@loaders.gl/loader-utils" "1.3.7" + "@loaders.gl/draco" "3.2.12" + "@loaders.gl/images" "3.2.12" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/textures" "3.2.12" -"@loaders.gl/images@1.3.7", "@loaders.gl/images@^1.3.0", "@loaders.gl/images@^1.3.4": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-1.3.7.tgz#fa0975e76cba12379c423df50de1940b32f3df00" - integrity sha512-TKqW94vjvWc4RIChhr0Yx6HaVTe8K6h6GFeXcahsKeCxq9/k2qpcigRkXfmb6/37dkp2Qy5COHp73ECgN/q+NA== +"@loaders.gl/images@3.2.12", "@loaders.gl/images@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-3.2.12.tgz#9ab2bab72892f72ecb4450f1343f6d12fcc56ffd" + integrity sha512-acPKRg9EwgrPyItF97x8LM9p4b8GR03JY+wFJwzBlVdOZXx1dmz1t4rVynRDwgAUgybGKLoPfJtwTIKARnICYQ== + dependencies: + "@loaders.gl/loader-utils" "3.2.12" -"@loaders.gl/loader-utils@1.3.7": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-1.3.7.tgz#9266ba276dd4191f362c0e6bec5670fe79f2426c" - integrity sha512-fNOuSVDwAOy5ovvkzbRVBcRwk8KTOuzMXxAzBZ2r6bmL4rFb+LOS8eIuODD3WgIDvHtaV56MMOlQE2kyYX52+A== +"@loaders.gl/loader-utils@3.2.12", "@loaders.gl/loader-utils@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-3.2.12.tgz#dfa9093d52a806128ff758e06f4b90cfc46d46db" + integrity sha512-OXu7vqBvYj2HD0Tcle8RwRAktJ5BsBTZc6ADPNia7FOGI9sA2ZDECPa0g8gBtKpbhzluLZzPj5N4OPdL6hNiQg== dependencies: "@babel/runtime" "^7.3.1" + "@loaders.gl/worker-utils" "3.2.12" + "@probe.gl/stats" "^3.5.0" + +"@loaders.gl/math@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-3.2.12.tgz#148853e5708ed9c59b2f7c093bc3e1309579a92e" + integrity sha512-+34kJ6v//33xJq7mFd5ndNe0BU5bgy4afQ5ciy4VVhQns/Keml9hl/i8eOY2lFt/SUs1T2CSe1+X5065L0CWCA== + dependencies: + "@loaders.gl/images" "3.2.12" + "@loaders.gl/loader-utils" "3.2.12" + "@math.gl/core" "^3.5.1" + +"@loaders.gl/mvt@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/mvt/-/mvt-3.2.12.tgz#ff399c252738597a608687d801eb47a1f4be5f5a" + integrity sha512-gr81UErVuZ2JMGwnrz/Bg4SGe3i6T3VQ9Z8bjGU50pwpFMgn+fKmQe5CyoC+XvYQ8nDML76QCgo5sLX+9ePhHA== + dependencies: + "@loaders.gl/gis" "3.2.12" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/schema" "3.2.12" + "@math.gl/polygon" "^3.5.1" + pbf "^3.2.1" -"@loaders.gl/math@1.3.7": - version "1.3.7" - resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-1.3.7.tgz#c8637f85ad2eb317ac8f39c35349a16e572dd301" - integrity sha512-9LfovsC+Es6pwvnsWZrZRLEn+l75kqdYqZrLTEgDaJ4eMqNtEM4oVYbSZMlVU4ZzC3GMO9A25iYx8ZBhh9o1+Q== +"@loaders.gl/schema@3.2.12", "@loaders.gl/schema@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-3.2.12.tgz#312911131d7fc90e05b771e95696dfddacb7c738" + integrity sha512-IP/fniG3PsMvhU+kkryULAoszgNEUSmfCvKZujDtU65xgIHScNQP87+wgqfZFScftEX0iBSahr7QYdQCEsv83w== dependencies: - "@loaders.gl/images" "1.3.7" - math.gl "^3.0.0-beta.3" + "@types/geojson" "^7946.0.7" + apache-arrow "^4.0.0" -"@luma.gl/addons@^7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/addons/-/addons-7.3.2.tgz#ace9d6a81121d7edd5776b2c9cb846b6defbf477" - integrity sha512-ul/iQnrqnhnmVuYo20zrW1FWokKkcnNlqxpRwPolkxFtMsyg5Z+hpxB0dM8buYpCSE0c5ypIsH2AatwXjIMTJA== +"@loaders.gl/terrain@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/terrain/-/terrain-3.2.12.tgz#742916b7091b1a076420ae9e5186899d211b7b8c" + integrity sha512-Vluf7PrVl/0eId4Qqbjrla97XnNuVpmrE4sZHyY3gjdpxn/liMwYmIzts8ZWkB7pXrH5CmN+fUBOyPbNh9vuLw== + dependencies: + "@babel/runtime" "^7.3.1" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/schema" "3.2.12" + "@mapbox/martini" "^0.2.0" + +"@loaders.gl/textures@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-3.2.12.tgz#75cda15b13761ba48f56e5751e2f7eb219105b83" + integrity sha512-xludkKPnzdQAHC19J0depqEvUH8x61cjsMId9Q1Et/emwI5TyEiDK78vl7tsIzuOh/IvrPHykRxfXp4uayW+Nw== + dependencies: + "@loaders.gl/images" "3.2.12" + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/schema" "3.2.12" + "@loaders.gl/worker-utils" "3.2.12" + ktx-parse "^0.0.4" + texture-compressor "^1.0.2" + +"@loaders.gl/tiles@3.2.12", "@loaders.gl/tiles@^3.2.10": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-3.2.12.tgz#27dd8907c1399c27753b7bb95bbb0f872fb239b5" + integrity sha512-4CGPi7UpL/uqO1/RS48rh1YmOYBG5fcHcX0bZMhDXvOKd6wm0bL3xIP5Q9/+5DBfcdWEe8fqQiFRfkGKWUnKLg== + dependencies: + "@loaders.gl/loader-utils" "3.2.12" + "@loaders.gl/math" "3.2.12" + "@math.gl/core" "^3.5.1" + "@math.gl/culling" "^3.5.1" + "@math.gl/geospatial" "^3.5.1" + "@math.gl/web-mercator" "^3.5.1" + "@probe.gl/stats" "^3.5.0" + +"@loaders.gl/worker-utils@3.2.12": + version "3.2.12" + resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-3.2.12.tgz#c47a6ddc2eae2845f7e9be14cf33f672da164fb0" + integrity sha512-MRgk8ln4Ur2RAnalD6OWstSuIAlf0l/26KTHtJiVD+HtmLJDoxSoQOHsnrEsdE18m+8NpAQgTD+rDzZtEpsnlw== dependencies: - "@loaders.gl/gltf" "^1.3.0" - "@loaders.gl/images" "^1.3.0" - "@luma.gl/constants" "7.3.2" - math.gl "^3.0.0" + "@babel/runtime" "^7.3.1" -"@luma.gl/constants@7.3.2", "@luma.gl/constants@^7.0.0": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-7.3.2.tgz#99c5d665f9e6d21192525038e47ec4acfbbbe0a6" - integrity sha512-hr6JOOwsGPjjoHnil4sQ6AWsc8P6XXYtRL10TwNYfFTcNxrhSrjQvutYoCzXHH5U0vfHBfPMMUyLASK9FqiHOA== +"@luma.gl/constants@8.5.18", "@luma.gl/constants@^8.5.16": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.5.18.tgz#f18886dfb1407225cd18cb792e490219f91eb3d2" + integrity sha512-lQLGAlroQaeJkAUwrb1fRiHlMBP9/ukyjnZ1QlYgXYyeC7/9XhLx4rqBlOzQ2sxcTHHwi73nHD0P2XmVuAccBg== -"@luma.gl/core@^7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-7.3.2.tgz#1d006da99ead3f1a7d6323e5c39e1dd6086f1ecf" - integrity sha512-XyQPSUJRkZcc//gVX0AgjLLNTkCOO68NRnm7RkIhikRBEUdovb4IOcpmWMCB1/Gyj4hzg/Z1FOAVT4pG1E+agw== +"@luma.gl/core@^8.5.16": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/core/-/core-8.5.18.tgz#622a71746df23ed262e52dca613de07146e68513" + integrity sha512-XvxE2WE9jFEweJftczQ4QPd8FD23H8mWJoQej7llnyta0Xqb18Cx2VOzuyQ4uN7Uab42YkwXTu25uAq0SdAehA== dependencies: "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "7.3.2" - "@luma.gl/shadertools" "7.3.2" - "@luma.gl/webgl" "7.3.2" - "@luma.gl/webgl-state-tracker" "7.3.2" - "@luma.gl/webgl2-polyfill" "7.3.2" - math.gl "^3.0.0" - probe.gl "^3.1.1" - seer "^0.2.4" - -"@luma.gl/shadertools@7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-7.3.2.tgz#f850aed1b3e1dedfb236ce02b0129cccd018f651" - integrity sha512-GiOZTvdEr164zYFy1DNRc7mzduSWLNJ34s+YbkJ/0i07E6tK7gHgM29QNCZ/gROvUDDJ5CHxngZqGkb+XquOMQ== + "@luma.gl/constants" "8.5.18" + "@luma.gl/engine" "8.5.18" + "@luma.gl/gltools" "8.5.18" + "@luma.gl/shadertools" "8.5.18" + "@luma.gl/webgl" "8.5.18" + +"@luma.gl/engine@8.5.18": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/engine/-/engine-8.5.18.tgz#78fda10cbd4a576ea04160888e0b4b5003471b18" + integrity sha512-hLdtEPk3yt8ikL3g9qVc5FuMPMdhnj1ykPgmG6Mh4lRlCProgGSlwqWuAkzPYwYqIBqKlPNMv8DavRfsKAKc3g== dependencies: "@babel/runtime" "^7.0.0" - math.gl "^3.0.0" + "@luma.gl/constants" "8.5.18" + "@luma.gl/gltools" "8.5.18" + "@luma.gl/shadertools" "8.5.18" + "@luma.gl/webgl" "8.5.18" + "@math.gl/core" "^3.5.0" + "@probe.gl/env" "^3.5.0" + "@probe.gl/stats" "^3.5.0" + "@types/offscreencanvas" "^2019.7.0" + +"@luma.gl/experimental@^8.5.16": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/experimental/-/experimental-8.5.18.tgz#6162bac53e3b96f9f2662ee5f17683d36f1ff60a" + integrity sha512-Bw8mwO3NVYGwzYr1Edl4LVbT7JORIpymdXpmmoqP9SpWAh5HJmNSS8wt1FDaQGVCgSA/5QpmmZb1NjIKX4B40g== + dependencies: + "@luma.gl/constants" "8.5.18" + "@math.gl/core" "^3.5.0" + earcut "^2.0.6" -"@luma.gl/webgl-state-tracker@7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/webgl-state-tracker/-/webgl-state-tracker-7.3.2.tgz#b927e1c7689fbc75432197eaf0468fc8f0e18a76" - integrity sha512-0LuK3veReSm2UPOiDwC2CRDeE2xk4irqXdhyFO0WSAU1w+YhzbD1hGbjizGczvgfkbz8dFl9h98LbbH75efcKw== +"@luma.gl/gltools@8.5.18": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/gltools/-/gltools-8.5.18.tgz#df8501c01ad6c3b114a5e5d2e6526546df009d40" + integrity sha512-AnZ8fxsJz/wRdUJazsFvTXbh8ypYX9rATPJj8YlDv08DGGFTQiq8MurzbEjXaEYshAu5w9rXd22nQXkQziUhmQ== dependencies: "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "7.3.2" + "@luma.gl/constants" "8.5.18" + "@probe.gl/env" "^3.5.0" + "@probe.gl/log" "^3.5.0" + "@types/offscreencanvas" "^2019.7.0" -"@luma.gl/webgl2-polyfill@7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/webgl2-polyfill/-/webgl2-polyfill-7.3.2.tgz#266a7a2d2c2c338360e8f766984cf559d2230521" - integrity sha512-PMt5xqQ+u7tIqfUaL3s4nuWl604WFNcl1F1ohSUFeEzIIuxFiF6gsdEEvC5VqGoMFxI8T4FOTSeHYIr6uP4+4w== +"@luma.gl/shadertools@8.5.18", "@luma.gl/shadertools@^8.5.16": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/shadertools/-/shadertools-8.5.18.tgz#2007c7173b95c552910fdf722876e25d8f2385a3" + integrity sha512-orkdnlVLB8AO4yf9jXXZqEG/UuwVg/v3Gmo4/F2vdrwkUMN+wUZFUdhssDGEGWvuauZWK9Mbz8XrxC0gmLbWzw== dependencies: "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "7.3.2" + "@math.gl/core" "^3.5.0" -"@luma.gl/webgl@7.3.2": - version "7.3.2" - resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-7.3.2.tgz#57d6ef58d7180cf429a9f98c8389215665b4c3d7" - integrity sha512-eWoPPRJOF5xSpqgggdwspsm8exclwxz20c8vqu8D1b3LJTY7cEpq57CMLvITHcJMMJ834TX/r598efTcF76lpw== +"@luma.gl/webgl@8.5.18": + version "8.5.18" + resolved "https://registry.yarnpkg.com/@luma.gl/webgl/-/webgl-8.5.18.tgz#fe6c06fcc77e6559ff2532e47e589918ec939b3c" + integrity sha512-8pRMq4olLzEv7ToDtCagGDklkIu1iFFBEXT4Rh11ohrfUiDAPfGz5hJrr3m0XtsVfS1CQ5QPWN2tQclmXOL+cQ== dependencies: "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "7.3.2" - "@luma.gl/webgl-state-tracker" "7.3.2" - "@luma.gl/webgl2-polyfill" "7.3.2" - probe.gl "^3.1.1" + "@luma.gl/constants" "8.5.18" + "@luma.gl/gltools" "8.5.18" + "@probe.gl/env" "^3.5.0" + "@probe.gl/stats" "^3.5.0" "@mapbox/geojson-rewind@^0.5.0": version "0.5.2" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" + resolved "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz" integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA== dependencies: get-stream "^6.0.1" @@ -428,47 +815,64 @@ "@mapbox/geojson-types@^1.0.2": version "1.0.2" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6" + resolved "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz" integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw== "@mapbox/jsonlint-lines-primitives@^2.0.2": version "2.0.2" - resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" + resolved "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz" integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ== "@mapbox/mapbox-gl-supported@^1.5.0": version "1.5.0" - resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz#f60b6a55a5d8e5ee908347d2ce4250b15103dc8e" + resolved "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz" integrity sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg== +"@mapbox/martini@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@mapbox/martini/-/martini-0.2.0.tgz#1af70211fbe994abf26e37f1388ca69c02cd43b4" + integrity sha512-7hFhtkb0KTLEls+TRw/rWayq5EeHtTaErgm/NskVoXmtgAQu/9D299aeyj6mzAR/6XUnYRp2lU+4IcrYRFjVsQ== + "@mapbox/point-geometry@0.1.0", "@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0": version "0.1.0" - resolved "https://registry.yarnpkg.com/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz#8a83f9335c7860effa2eeeca254332aa0aeed8f2" + resolved "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz" integrity sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ== +"@mapbox/tile-cover@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@mapbox/tile-cover/-/tile-cover-3.0.2.tgz#e10b1bbfe65ee28a7f1a0127deb699635d0f8d7a" + integrity sha512-A6qvtttsYI66BYi8JMD0v7BzxeuXJf6qSzufmdvvYxDJyXqATZ7ig6OKHFCW7/OsUjpfFu3rB54JM/yHUOVB9g== + dependencies: + "@mapbox/tilebelt" "^1.0.1" + +"@mapbox/tilebelt@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@mapbox/tilebelt/-/tilebelt-1.0.2.tgz#32936c3acad3ea3e669bb083a598bcc7d74b4ec9" + integrity sha512-tGJN2VIgWrXqBTPIxFVklklIpcy6ss8W5ouq+cjNLXPXFraRaDR4Ice+5Q8/uLX+6aH23lWBMydOIn8PcdVcpA== + "@mapbox/tiny-sdf@^1.1.0", "@mapbox/tiny-sdf@^1.1.1": version "1.2.5" - resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz#424c620a96442b20402552be70a7f62a8407cc59" + resolved "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz" integrity sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw== "@mapbox/unitbezier@^0.0.0": version "0.0.0" - resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" + resolved "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz" integrity sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA== "@mapbox/vector-tile@^1.3.1": version "1.3.1" - resolved "https://registry.yarnpkg.com/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz#d3a74c90402d06e89ec66de49ec817ff53409666" + resolved "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz" integrity sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw== dependencies: "@mapbox/point-geometry" "~0.1.0" "@mapbox/whoots-js@^3.1.0": version "3.1.0" - resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" + resolved "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== -"@math.gl/core@3.6.3": +"@math.gl/core@3.6.3", "@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1", "@math.gl/core@^3.6.2": version "3.6.3" resolved "https://registry.yarnpkg.com/@math.gl/core/-/core-3.6.3.tgz#a6bf796ed421093099749d609de8d99a3ac20a53" integrity sha512-jBABmDkj5uuuE0dTDmwwss7Cup5ZwQ6Qb7h1pgvtkEutTrhkcv8SuItQNXmF45494yIHeoGue08NlyeY6wxq2A== @@ -477,7 +881,7 @@ "@math.gl/types" "3.6.3" gl-matrix "^3.4.0" -"@math.gl/culling@^3.0.0", "@math.gl/culling@^3.0.0-beta.3": +"@math.gl/culling@^3.5.1", "@math.gl/culling@^3.6.2": version "3.6.3" resolved "https://registry.yarnpkg.com/@math.gl/culling/-/culling-3.6.3.tgz#91cdfa496748e8873a2e6261415a27a27b6af5f2" integrity sha512-3UERXHbaPlM6pnTk2MI7LeQ5CoelDZzDzghTTcv+HdQCZsT/EOEuEdYimETHtSxiyiOmsX2Un65UBLYT/rbKZg== @@ -486,7 +890,7 @@ "@math.gl/core" "3.6.3" gl-matrix "^3.4.0" -"@math.gl/geospatial@^3.0.0", "@math.gl/geospatial@^3.0.0-beta.3": +"@math.gl/geospatial@^3.5.1": version "3.6.3" resolved "https://registry.yarnpkg.com/@math.gl/geospatial/-/geospatial-3.6.3.tgz#011ebbe8d1660ff79020a81ed218886c353a62e1" integrity sha512-6xf657lJnaecSarSzn02t0cnsCSkWb+39m4+im96v20dZTrLCWZ2glDQVzfuL91meDnDXjH4oyvynp12Mj5MFg== @@ -495,24 +899,40 @@ "@math.gl/core" "3.6.3" gl-matrix "^3.4.0" +"@math.gl/polygon@^3.5.1", "@math.gl/polygon@^3.6.2": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@math.gl/polygon/-/polygon-3.6.3.tgz#0c19c0b059cedde1cd760cc3796e9180f75bcbde" + integrity sha512-FivQ1ZnYcAss1wVifOkHP/ZnlfQy1IL/769uzNtiHxwUbW0kZG3yyOZ9I7fwyzR5Hvqt3ErJKHjSYZr0uVlz5g== + dependencies: + "@math.gl/core" "3.6.3" + +"@math.gl/sun@^3.6.2": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@math.gl/sun/-/sun-3.6.3.tgz#30c15612313b56349c568f21f39c0e0f0e77b2df" + integrity sha512-mrx6CGYYeTNSQttvcw0KVUy+35YDmnjMqpO/o0t06Vcghrt0HNruB/ScRgUSbJrgkbOg1Vcqm23HBd++clzQzw== + dependencies: + "@babel/runtime" "^7.12.0" + "@math.gl/types@3.6.3": version "3.6.3" - resolved "https://registry.yarnpkg.com/@math.gl/types/-/types-3.6.3.tgz#9fa9866feabcbb76de107d78ff3a89c0243ac374" + resolved "https://registry.npmjs.org/@math.gl/types/-/types-3.6.3.tgz" integrity sha512-3uWLVXHY3jQxsXCr/UCNPSc2BG0hNUljhmOBt9l+lNFDp7zHgm0cK2Tw4kj2XfkJy4TgwZTBGwRDQgWEbLbdTA== -"@math.gl/web-mercator@^3.5.5": +"@math.gl/web-mercator@^3.5.1", "@math.gl/web-mercator@^3.5.5", "@math.gl/web-mercator@^3.6.2": version "3.6.3" - resolved "https://registry.yarnpkg.com/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz#ef91168e030eecffc788618d686e8a6c1d7a0bf8" + resolved "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.6.3.tgz" integrity sha512-UVrkSOs02YLehKaehrxhAejYMurehIHPfFQvPFZmdJHglHOU4V2cCUApTVEwOksvCp161ypEqVp+9H6mGhTTcw== dependencies: "@babel/runtime" "^7.12.0" gl-matrix "^3.4.0" -"@nebula.gl/edit-modes@0.15.0": - version "0.15.0" - resolved "https://registry.yarnpkg.com/@nebula.gl/edit-modes/-/edit-modes-0.15.0.tgz#ff0371baefa262f03ed8e1446467cf4017d30582" - integrity sha512-gLlBxxrnoxaMzSXSMcrN3DuEPlRhQNj9y1JFdxcfkq9aNpdh4YxWsB7m4P0orbJ2o2hAS0H5lqu/f9PYQMD3UA== +"@nebula.gl/edit-modes@1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@nebula.gl/edit-modes/-/edit-modes-1.0.4.tgz#df37751768239fb37dfcb697b0b90e11371a47a3" + integrity sha512-x0t73q2wmiVLK15+0DnkpsO7e7L69dZ/3xISEZlo/2pEJc0op2UCJ7BynRyuZq6Bb8ZvwJCVjyspaUGYQqabNg== dependencies: + "@turf/along" ">=6.3.0" + "@turf/area" ">=4.0.0" "@turf/bbox" ">=4.0.0" "@turf/bbox-polygon" ">=4.0.0" "@turf/bearing" ">=4.0.0" @@ -528,21 +948,26 @@ "@turf/helpers" ">=4.0.0" "@turf/intersect" ">=4.0.0" "@turf/line-intersect" ">=4.0.0" + "@turf/midpoint" ">=4.0.0" "@turf/nearest-point-on-line" ">=4.0.0" "@turf/point-to-line-distance" ">=4.0.0" "@turf/polygon-to-line" ">=4.0.0" + "@turf/rewind" ">=4.0.0" "@turf/transform-rotate" ">=4.0.0" "@turf/transform-scale" ">=4.0.0" "@turf/transform-translate" ">=4.0.0" "@turf/union" ">=4.0.0" + geojson "0.5.0" + lodash.throttle "^4.1.1" viewport-mercator-project ">=6.0.0" -"@nebula.gl/layers@0.15.0": - version "0.15.0" - resolved "https://registry.yarnpkg.com/@nebula.gl/layers/-/layers-0.15.0.tgz#6e56c76fae3e57a2d5cc0cebfddb9fddfc39b77b" - integrity sha512-WKD/HoC3HH+RKhVr894zhk2NZsQCy794AhIN/2hjRnoLKNA5SI7CXY42v7yqTCCGOAnJoMEjtLjjmax3ga9lUQ== +"@nebula.gl/layers@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@nebula.gl/layers/-/layers-1.0.4.tgz#5acea95db132cbcb02bbb4a8afa805a0d9adc606" + integrity sha512-jwBGvQK7iIdq05DWl5q7vOIhpU+rVFhR+y30G1P5toz/SD9z3Qadfm2SYDgIcX36Ez45mJMKVllY7hLEG1tSRA== dependencies: - "@nebula.gl/edit-modes" "0.15.0" + "@danmarshall/deckgl-typings" "4.9.12" + "@nebula.gl/edit-modes" "1.0.4" "@turf/bbox" ">=4.0.0" "@turf/bbox-polygon" ">=4.0.0" "@turf/bearing" ">=4.0.0" @@ -568,11 +993,12 @@ cubic-hermite-spline "^1.0.1" geojson-types "^2.0.1" global ">=4.3.0" + h3-js "^3.6.4" viewport-mercator-project ">=6.0.0" "@nodelib/fs.scandir@2.1.5": version "2.1.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz" integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: "@nodelib/fs.stat" "2.0.5" @@ -580,25 +1006,25 @@ "@nodelib/fs.stat@2.0.5": version "2.0.5" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.8": version "1.2.8" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz" integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@probe.gl/env@3.5.4": +"@probe.gl/env@3.5.4", "@probe.gl/env@^3.5.0": version "3.5.4" - resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-3.5.4.tgz#faddd1232f607b634fa9f00502b40706e143426d" + resolved "https://registry.npmjs.org/@probe.gl/env/-/env-3.5.4.tgz" integrity sha512-MtMINUpcPzAp8upQNbm5U1Hp+/EQ8yw0tXccg5Aiz7cl92LsMopDPtgXnCRv2whzcayioHAdg4YIhNPY5fFxMQ== dependencies: "@babel/runtime" "^7.0.0" -"@probe.gl/log@3.5.4": +"@probe.gl/log@3.5.4", "@probe.gl/log@^3.5.0": version "3.5.4" resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-3.5.4.tgz#106c863032242ba1232d7a1afc4acd9905305305" integrity sha512-jnyr6aAdW4PbS55izskE8crpb52hJ/bQwqeJeQywK6sm7Jhh9im2RFbPrjs8CIEVDBqrcwJ1Rm1hEvTKNhKSmA== @@ -606,7 +1032,7 @@ "@babel/runtime" "^7.0.0" "@probe.gl/env" "3.5.4" -"@probe.gl/stats@3.5.4": +"@probe.gl/stats@3.5.4", "@probe.gl/stats@^3.5.0": version "3.5.4" resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-3.5.4.tgz#822979f602fa920ce6d5432f8f3b0e6c3c0606ae" integrity sha512-jtXpv1bphtXTjq7uvTC30zKEIma9j2pMFrqB47zp/LGrZdymF/mfdKzFzo9f1NUyWGaoJL4Yn8ZS+9/BtkoETg== @@ -615,7 +1041,7 @@ "@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.2": version "1.1.0" - resolved "https://registry.yarnpkg.com/@rc-component/portal/-/portal-1.1.0.tgz#6b94450d2c2b00d50b141bd7a0be23bd96503dbe" + resolved "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.0.tgz" integrity sha512-tbXM9SB1r5FOuZjRCljERFByFiEUcMmCWMXLog/NmgCzlAzreXyf23Vei3ZpSMxSMavzPnhCovfZjZdmxS3d1w== dependencies: "@babel/runtime" "^7.18.0" @@ -624,7 +1050,7 @@ "@react-spring/animated@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/animated/-/animated-9.6.1.tgz#ccc626d847cbe346f5f8815d0928183c647eb425" + resolved "https://registry.npmjs.org/@react-spring/animated/-/animated-9.6.1.tgz" integrity sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ== dependencies: "@react-spring/shared" "~9.6.1" @@ -632,7 +1058,7 @@ "@react-spring/core@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/core/-/core-9.6.1.tgz#ebe07c20682b360b06af116ea24e2b609e778c10" + resolved "https://registry.npmjs.org/@react-spring/core/-/core-9.6.1.tgz" integrity sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ== dependencies: "@react-spring/animated" "~9.6.1" @@ -642,7 +1068,7 @@ "@react-spring/konva@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.6.1.tgz#66e63da0e9681e42395e995402a7e73ba6892461" + resolved "https://registry.npmjs.org/@react-spring/konva/-/konva-9.6.1.tgz" integrity sha512-MevnU+tnG1LPsmMRpfJfevfLtI0ObIvrwYc+Xg+kmYJe00vwMRSdulQOztKANKalFXBewwk72XrQCeRLXFaUIg== dependencies: "@react-spring/animated" "~9.6.1" @@ -652,7 +1078,7 @@ "@react-spring/native@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.6.1.tgz#b66e237f2faaa4f88569d5a03b6fb0136bcdf2b9" + resolved "https://registry.npmjs.org/@react-spring/native/-/native-9.6.1.tgz" integrity sha512-ZIfSytxFGLw4gYOb8gsmwG0+JZYxuM/Y1XPCXCkhuoMn+RmOYrr0kQ4gLczbmf+TRxth7OT1c8vBYz0+SCGcIQ== dependencies: "@react-spring/animated" "~9.6.1" @@ -662,12 +1088,12 @@ "@react-spring/rafz@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/rafz/-/rafz-9.6.1.tgz#d71aafb92b78b24e4ff84639f52745afc285c38d" + resolved "https://registry.npmjs.org/@react-spring/rafz/-/rafz-9.6.1.tgz" integrity sha512-v6qbgNRpztJFFfSE3e2W1Uz+g8KnIBs6SmzCzcVVF61GdGfGOuBrbjIcp+nUz301awVmREKi4eMQb2Ab2gGgyQ== "@react-spring/shared@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.6.1.tgz#4e2e4296910656c02bd9fd54c559702bc836ac4e" + resolved "https://registry.npmjs.org/@react-spring/shared/-/shared-9.6.1.tgz" integrity sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw== dependencies: "@react-spring/rafz" "~9.6.1" @@ -675,7 +1101,7 @@ "@react-spring/three@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.6.1.tgz#095fcd1dc6509127c33c14486d88289b89baeb9d" + resolved "https://registry.npmjs.org/@react-spring/three/-/three-9.6.1.tgz" integrity sha512-Tyw2YhZPKJAX3t2FcqvpLRb71CyTe1GvT3V+i+xJzfALgpk10uPGdGaQQ5Xrzmok1340DAeg2pR/MCfaW7b8AA== dependencies: "@react-spring/animated" "~9.6.1" @@ -685,12 +1111,12 @@ "@react-spring/types@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.6.1.tgz#913d3a68c5cbc1124fdb18eff919432f7b6abdde" + resolved "https://registry.npmjs.org/@react-spring/types/-/types-9.6.1.tgz" integrity sha512-POu8Mk0hIU3lRXB3bGIGe4VHIwwDsQyoD1F394OK7STTiX9w4dG3cTLljjYswkQN+hDSHRrj4O36kuVa7KPU8Q== "@react-spring/web@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.6.1.tgz#3e4c03b724d2b545dc2fa2649eb6109318ab9178" + resolved "https://registry.npmjs.org/@react-spring/web/-/web-9.6.1.tgz" integrity sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw== dependencies: "@react-spring/animated" "~9.6.1" @@ -700,7 +1126,7 @@ "@react-spring/zdog@~9.6.1": version "9.6.1" - resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.6.1.tgz#5292c374e23e3846db3eb9d7557ed5a7bb40dada" + resolved "https://registry.npmjs.org/@react-spring/zdog/-/zdog-9.6.1.tgz" integrity sha512-0jSGm2OFW/+/+4dkRp46KzEkcLVfzV2k6DO1om0dLDtQ4q6FpX4dmDTlRc7Apzin6VtfQONMFIGITtbqoS28MQ== dependencies: "@react-spring/animated" "~9.6.1" @@ -710,7 +1136,7 @@ "@socket.io/component-emitter@~3.1.0": version "3.1.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" + resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== "@swc/core-darwin-arm64@1.3.24": @@ -760,12 +1186,12 @@ "@swc/core-win32-x64-msvc@1.3.24": version "1.3.24" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.24.tgz#b53746787e5af021787134d393fd67b0431f90d9" + resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.3.24.tgz" integrity sha512-3AmJRr0hwciwDBbzUNqaftvppzS8v9X/iv/Wl7YaVLBVpPfQvaZzfqLycvNMGLZb5vIKXR/u58txg3dRBGsJtw== "@swc/core@^1.3.22": version "1.3.24" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.3.24.tgz#ef6b30267c1bbd48af62cbc91370fe9b3f5d6a23" + resolved "https://registry.npmjs.org/@swc/core/-/core-1.3.24.tgz" integrity sha512-QMOTd0AgiUT3K1crxLRqd3gw0f3FC8hhH1vvlIlryvYqU4c+FJ/T2G4ZhMKLxQlZ/jX6Rhk0gKINZRBxy2GFyQ== optionalDependencies: "@swc/core-darwin-arm64" "1.3.24" @@ -779,9 +1205,9 @@ "@swc/core-win32-ia32-msvc" "1.3.24" "@swc/core-win32-x64-msvc" "1.3.24" -"@turf/along@^6.5.0": +"@turf/along@>=6.3.0", "@turf/along@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.5.0.tgz#ab12eec58a14de60fe243a62d31a474f415c8fef" + resolved "https://registry.npmjs.org/@turf/along/-/along-6.5.0.tgz" integrity sha512-LLyWQ0AARqJCmMcIEAXF4GEu8usmd4Kbz3qk1Oy5HoRNpZX47+i5exQtmIWKdqJ1MMhW26fCTXgpsEs5zgJ5gw== dependencies: "@turf/bearing" "^6.5.0" @@ -792,7 +1218,7 @@ "@turf/angle@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/angle/-/angle-6.5.0.tgz#985934171284e109d41e19ed48ad91cf9709a928" + resolved "https://registry.npmjs.org/@turf/angle/-/angle-6.5.0.tgz" integrity sha512-4pXMbWhFofJJAOvTMCns6N4C8CMd5Ih4O2jSAG9b3dDHakj3O4yN1+Zbm+NUei+eVEZ9gFeVp9svE3aMDenIkw== dependencies: "@turf/bearing" "^6.5.0" @@ -800,9 +1226,9 @@ "@turf/invariant" "^6.5.0" "@turf/rhumb-bearing" "^6.5.0" -"@turf/area@^6.5.0": +"@turf/area@>=4.0.0", "@turf/area@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/area/-/area-6.5.0.tgz#1d0d7aee01d8a4a3d4c91663ed35cc615f36ad56" + resolved "https://registry.npmjs.org/@turf/area/-/area-6.5.0.tgz" integrity sha512-xCZdiuojokLbQ+29qR6qoMD89hv+JAgWjLrwSEWL+3JV8IXKeNFl6XkEJz9HGkVpnXvQKJoRz4/liT+8ZZ5Jyg== dependencies: "@turf/helpers" "^6.5.0" @@ -810,7 +1236,7 @@ "@turf/bbox-clip@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/bbox-clip/-/bbox-clip-6.5.0.tgz#8e07d51ef8c875f9490d5c8699a2e51918587c94" + resolved "https://registry.npmjs.org/@turf/bbox-clip/-/bbox-clip-6.5.0.tgz" integrity sha512-F6PaIRF8WMp8EmgU/Ke5B1Y6/pia14UAYB5TiBC668w5rVVjy5L8rTm/m2lEkkDMHlzoP9vNY4pxpNthE7rLcQ== dependencies: "@turf/helpers" "^6.5.0" @@ -818,14 +1244,14 @@ "@turf/bbox-polygon@>=4.0.0", "@turf/bbox-polygon@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz#f18128b012eedfa860a521d8f2b3779cc0801032" + resolved "https://registry.npmjs.org/@turf/bbox-polygon/-/bbox-polygon-6.5.0.tgz" integrity sha512-+/r0NyL1lOG3zKZmmf6L8ommU07HliP4dgYToMoTxqzsWzyLjaj/OzgQ8rBmv703WJX+aS6yCmLuIhYqyufyuw== dependencies: "@turf/helpers" "^6.5.0" "@turf/bbox@*", "@turf/bbox@>=4.0.0", "@turf/bbox@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/bbox/-/bbox-6.5.0.tgz#bec30a744019eae420dac9ea46fb75caa44d8dc5" + resolved "https://registry.npmjs.org/@turf/bbox/-/bbox-6.5.0.tgz" integrity sha512-RBbLaao5hXTYyyg577iuMtDB8ehxMlUqHEJiMs8jT1GHkFhr6sYre3lmLsPeYEi/ZKj5TP5tt7fkzNdJ4GIVyw== dependencies: "@turf/helpers" "^6.5.0" @@ -833,7 +1259,7 @@ "@turf/bearing@>=4.0.0", "@turf/bearing@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/bearing/-/bearing-6.5.0.tgz#462a053c6c644434bdb636b39f8f43fb0cd857b0" + resolved "https://registry.npmjs.org/@turf/bearing/-/bearing-6.5.0.tgz" integrity sha512-dxINYhIEMzgDOztyMZc20I7ssYVNEpSv04VbMo5YPQsqa80KO3TFvbuCahMsCAW5z8Tncc8dwBlEFrmRjJG33A== dependencies: "@turf/helpers" "^6.5.0" @@ -841,7 +1267,7 @@ "@turf/bezier-spline@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/bezier-spline/-/bezier-spline-6.5.0.tgz#d1b1764948b0fa3d9aa6e4895aebeba24048b11f" + resolved "https://registry.npmjs.org/@turf/bezier-spline/-/bezier-spline-6.5.0.tgz" integrity sha512-vokPaurTd4PF96rRgGVm6zYYC5r1u98ZsG+wZEv9y3kJTuJRX/O3xIY2QnTGTdbVmAJN1ouOsD0RoZYaVoXORQ== dependencies: "@turf/helpers" "^6.5.0" @@ -849,7 +1275,7 @@ "@turf/boolean-clockwise@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-clockwise/-/boolean-clockwise-6.5.0.tgz#34573ecc18f900080f00e4ff364631a8b1135794" + resolved "https://registry.npmjs.org/@turf/boolean-clockwise/-/boolean-clockwise-6.5.0.tgz" integrity sha512-45+C7LC5RMbRWrxh3Z0Eihsc8db1VGBO5d9BLTOAwU4jR6SgsunTfRWR16X7JUwIDYlCVEmnjcXJNi/kIU3VIw== dependencies: "@turf/helpers" "^6.5.0" @@ -857,7 +1283,7 @@ "@turf/boolean-contains@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz#f802e7432fb53109242d5bf57393ef2f53849bbf" + resolved "https://registry.npmjs.org/@turf/boolean-contains/-/boolean-contains-6.5.0.tgz" integrity sha512-4m8cJpbw+YQcKVGi8y0cHhBUnYT+QRfx6wzM4GI1IdtYH3p4oh/DOBJKrepQyiDzFDaNIjxuWXBh0ai1zVwOQQ== dependencies: "@turf/bbox" "^6.5.0" @@ -868,7 +1294,7 @@ "@turf/boolean-crosses@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-crosses/-/boolean-crosses-6.5.0.tgz#4a1981475b9d6e23b25721f9fb8ef20696ff1648" + resolved "https://registry.npmjs.org/@turf/boolean-crosses/-/boolean-crosses-6.5.0.tgz" integrity sha512-gvshbTPhAHporTlQwBJqyfW+2yV8q/mOTxG6PzRVl6ARsqNoqYQWkd4MLug7OmAqVyBzLK3201uAeBjxbGw0Ng== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -879,7 +1305,7 @@ "@turf/boolean-disjoint@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-disjoint/-/boolean-disjoint-6.5.0.tgz#e291d8f8f8cce7f7bb3c11e23059156a49afc5e4" + resolved "https://registry.npmjs.org/@turf/boolean-disjoint/-/boolean-disjoint-6.5.0.tgz" integrity sha512-rZ2ozlrRLIAGo2bjQ/ZUu4oZ/+ZjGvLkN5CKXSKBcu6xFO6k2bgqeM8a1836tAW+Pqp/ZFsTA5fZHsJZvP2D5g== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -890,7 +1316,7 @@ "@turf/boolean-equal@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-equal/-/boolean-equal-6.5.0.tgz#b1c0ce14e9d9fb7778cddcf22558c9f523fe9141" + resolved "https://registry.npmjs.org/@turf/boolean-equal/-/boolean-equal-6.5.0.tgz" integrity sha512-cY0M3yoLC26mhAnjv1gyYNQjn7wxIXmL2hBmI/qs8g5uKuC2hRWi13ydufE3k4x0aNRjFGlg41fjoYLwaVF+9Q== dependencies: "@turf/clean-coords" "^6.5.0" @@ -900,7 +1326,7 @@ "@turf/boolean-intersects@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-intersects/-/boolean-intersects-6.5.0.tgz#df2b831ea31a4574af6b2fefe391f097a926b9d6" + resolved "https://registry.npmjs.org/@turf/boolean-intersects/-/boolean-intersects-6.5.0.tgz" integrity sha512-nIxkizjRdjKCYFQMnml6cjPsDOBCThrt+nkqtSEcxkKMhAQj5OO7o2CecioNTaX8EayqwMGVKcsz27oP4mKPTw== dependencies: "@turf/boolean-disjoint" "^6.5.0" @@ -909,7 +1335,7 @@ "@turf/boolean-overlap@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-overlap/-/boolean-overlap-6.5.0.tgz#f27c85888c3665d42d613a91a83adf1657cd1385" + resolved "https://registry.npmjs.org/@turf/boolean-overlap/-/boolean-overlap-6.5.0.tgz" integrity sha512-8btMIdnbXVWUa1M7D4shyaSGxLRw6NjMcqKBcsTXcZdnaixl22k7ar7BvIzkaRYN3SFECk9VGXfLncNS3ckQUw== dependencies: "@turf/helpers" "^6.5.0" @@ -921,7 +1347,7 @@ "@turf/boolean-parallel@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-parallel/-/boolean-parallel-6.5.0.tgz#4e8a9dafdccaf18aca95f1265a5eade3f330173f" + resolved "https://registry.npmjs.org/@turf/boolean-parallel/-/boolean-parallel-6.5.0.tgz" integrity sha512-aSHJsr1nq9e5TthZGZ9CZYeXklJyRgR5kCLm5X4urz7+MotMOp/LsGOsvKvK9NeUl9+8OUmfMn8EFTT8LkcvIQ== dependencies: "@turf/clean-coords" "^6.5.0" @@ -931,7 +1357,7 @@ "@turf/boolean-point-in-polygon@>=4.0.0", "@turf/boolean-point-in-polygon@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz#6d2e9c89de4cd2e4365004c1e51490b7795a63cf" + resolved "https://registry.npmjs.org/@turf/boolean-point-in-polygon/-/boolean-point-in-polygon-6.5.0.tgz" integrity sha512-DtSuVFB26SI+hj0SjrvXowGTUCHlgevPAIsukssW6BG5MlNSBQAo70wpICBNJL6RjukXg8d2eXaAWuD/CqL00A== dependencies: "@turf/helpers" "^6.5.0" @@ -939,7 +1365,7 @@ "@turf/boolean-point-on-line@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-point-on-line/-/boolean-point-on-line-6.5.0.tgz#a8efa7bad88760676f395afb9980746bc5b376e9" + resolved "https://registry.npmjs.org/@turf/boolean-point-on-line/-/boolean-point-on-line-6.5.0.tgz" integrity sha512-A1BbuQ0LceLHvq7F/P7w3QvfpmZqbmViIUPHdNLvZimFNLo4e6IQunmzbe+8aSStH9QRZm3VOflyvNeXvvpZEQ== dependencies: "@turf/helpers" "^6.5.0" @@ -947,7 +1373,7 @@ "@turf/boolean-within@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/boolean-within/-/boolean-within-6.5.0.tgz#31a749d3be51065da8c470a1e5613f4d2efdee06" + resolved "https://registry.npmjs.org/@turf/boolean-within/-/boolean-within-6.5.0.tgz" integrity sha512-YQB3oU18Inx35C/LU930D36RAVe7LDXk1kWsQ8mLmuqYn9YdPsDQTMTkLJMhoQ8EbN7QTdy333xRQ4MYgToteQ== dependencies: "@turf/bbox" "^6.5.0" @@ -958,7 +1384,7 @@ "@turf/buffer@>=4.0.0", "@turf/buffer@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/buffer/-/buffer-6.5.0.tgz#22bd0d05b4e1e73eaebc69b8f574a410ff704842" + resolved "https://registry.npmjs.org/@turf/buffer/-/buffer-6.5.0.tgz" integrity sha512-qeX4N6+PPWbKqp1AVkBVWFerGjMYMUyencwfnkCesoznU6qvfugFHNAngNqIBVnJjZ5n8IFyOf+akcxnrt9sNg== dependencies: "@turf/bbox" "^6.5.0" @@ -971,7 +1397,7 @@ "@turf/center-mean@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/center-mean/-/center-mean-6.5.0.tgz#2dc329c003f8012ba9ae7812a61b5647e1ae86a2" + resolved "https://registry.npmjs.org/@turf/center-mean/-/center-mean-6.5.0.tgz" integrity sha512-AAX6f4bVn12pTVrMUiB9KrnV94BgeBKpyg3YpfnEbBpkN/znfVhL8dG8IxMAxAoSZ61Zt9WLY34HfENveuOZ7Q== dependencies: "@turf/bbox" "^6.5.0" @@ -980,7 +1406,7 @@ "@turf/center-median@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/center-median/-/center-median-6.5.0.tgz#1b68e3f288af47f76c247d6bf671f30d8c25c974" + resolved "https://registry.npmjs.org/@turf/center-median/-/center-median-6.5.0.tgz" integrity sha512-dT8Ndu5CiZkPrj15PBvslpuf01ky41DEYEPxS01LOxp5HOUHXp1oJxsPxvc+i/wK4BwccPNzU1vzJ0S4emd1KQ== dependencies: "@turf/center-mean" "^6.5.0" @@ -991,7 +1417,7 @@ "@turf/center-of-mass@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/center-of-mass/-/center-of-mass-6.5.0.tgz#f9e6988bc296b7f763a0137ad6095f54843cf06a" + resolved "https://registry.npmjs.org/@turf/center-of-mass/-/center-of-mass-6.5.0.tgz" integrity sha512-EWrriU6LraOfPN7m1jZi+1NLTKNkuIsGLZc2+Y8zbGruvUW+QV7K0nhf7iZWutlxHXTBqEXHbKue/o79IumAsQ== dependencies: "@turf/centroid" "^6.5.0" @@ -1002,7 +1428,7 @@ "@turf/center@>=4.0.0", "@turf/center@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/center/-/center-6.5.0.tgz#3bcb6bffcb8ba147430cfea84aabaed5dbdd4f07" + resolved "https://registry.npmjs.org/@turf/center/-/center-6.5.0.tgz" integrity sha512-T8KtMTfSATWcAX088rEDKjyvQCBkUsLnK/Txb6/8WUXIeOZyHu42G7MkdkHRoHtwieLdduDdmPLFyTdG5/e7ZQ== dependencies: "@turf/bbox" "^6.5.0" @@ -1010,7 +1436,7 @@ "@turf/centroid@>=4.0.0", "@turf/centroid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/centroid/-/centroid-6.5.0.tgz#ecaa365412e5a4d595bb448e7dcdacfb49eb0009" + resolved "https://registry.npmjs.org/@turf/centroid/-/centroid-6.5.0.tgz" integrity sha512-MwE1oq5E3isewPprEClbfU5pXljIK/GUOMbn22UM3IFPDJX0KeoyLNwghszkdmFp/qMGL/M13MMWvU+GNLXP/A== dependencies: "@turf/helpers" "^6.5.0" @@ -1018,7 +1444,7 @@ "@turf/circle@>=4.0.0", "@turf/circle@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/circle/-/circle-6.5.0.tgz#dc017d8c0131d1d212b7c06f76510c22bbeb093c" + resolved "https://registry.npmjs.org/@turf/circle/-/circle-6.5.0.tgz" integrity sha512-oU1+Kq9DgRnoSbWFHKnnUdTmtcRUMmHoV9DjTXu9vOLNV5OWtAAh1VZ+mzsioGGzoDNT/V5igbFOkMfBQc0B6A== dependencies: "@turf/destination" "^6.5.0" @@ -1026,7 +1452,7 @@ "@turf/clean-coords@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/clean-coords/-/clean-coords-6.5.0.tgz#6690adf764ec4b649710a8a20dab7005efbea53f" + resolved "https://registry.npmjs.org/@turf/clean-coords/-/clean-coords-6.5.0.tgz" integrity sha512-EMX7gyZz0WTH/ET7xV8MyrExywfm9qUi0/MY89yNffzGIEHuFfqwhcCqZ8O00rZIPZHUTxpmsxQSTfzJJA1CPw== dependencies: "@turf/helpers" "^6.5.0" @@ -1034,14 +1460,14 @@ "@turf/clone@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/clone/-/clone-6.5.0.tgz#895860573881ae10a02dfff95f274388b1cda51a" + resolved "https://registry.npmjs.org/@turf/clone/-/clone-6.5.0.tgz" integrity sha512-mzVtTFj/QycXOn6ig+annKrM6ZlimreKYz6f/GSERytOpgzodbQyOgkfwru100O1KQhhjSudKK4DsQ0oyi9cTw== dependencies: "@turf/helpers" "^6.5.0" "@turf/clusters-dbscan@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/clusters-dbscan/-/clusters-dbscan-6.5.0.tgz#e01f854d24fac4899009fc6811854424ea8f0985" + resolved "https://registry.npmjs.org/@turf/clusters-dbscan/-/clusters-dbscan-6.5.0.tgz" integrity sha512-SxZEE4kADU9DqLRiT53QZBBhu8EP9skviSyl+FGj08Y01xfICM/RR9ACUdM0aEQimhpu+ZpRVcUK+2jtiCGrYQ== dependencies: "@turf/clone" "^6.5.0" @@ -1052,7 +1478,7 @@ "@turf/clusters-kmeans@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/clusters-kmeans/-/clusters-kmeans-6.5.0.tgz#aca6f66858af6476b7352a2bbbb392f9ddb7f5b4" + resolved "https://registry.npmjs.org/@turf/clusters-kmeans/-/clusters-kmeans-6.5.0.tgz" integrity sha512-DwacD5+YO8kwDPKaXwT9DV46tMBVNsbi1IzdajZu1JDSWoN7yc7N9Qt88oi+p30583O0UPVkAK+A10WAQv4mUw== dependencies: "@turf/clone" "^6.5.0" @@ -1063,7 +1489,7 @@ "@turf/clusters@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/clusters/-/clusters-6.5.0.tgz#a5ee7b62cdf345db2f1eafe2eb382adc186163e1" + resolved "https://registry.npmjs.org/@turf/clusters/-/clusters-6.5.0.tgz" integrity sha512-Y6gfnTJzQ1hdLfCsyd5zApNbfLIxYEpmDibHUqR5z03Lpe02pa78JtgrgUNt1seeO/aJ4TG1NLN8V5gOrHk04g== dependencies: "@turf/helpers" "^6.5.0" @@ -1071,7 +1497,7 @@ "@turf/collect@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/collect/-/collect-6.5.0.tgz#3749ca7d4b91fbcbe1b9b8858ed70df8b6290910" + resolved "https://registry.npmjs.org/@turf/collect/-/collect-6.5.0.tgz" integrity sha512-4dN/T6LNnRg099m97BJeOcTA5fSI8cu87Ydgfibewd2KQwBexO69AnjEFqfPX3Wj+Zvisj1uAVIZbPmSSrZkjg== dependencies: "@turf/bbox" "^6.5.0" @@ -1081,7 +1507,7 @@ "@turf/combine@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/combine/-/combine-6.5.0.tgz#e0f3468ac9c09c24fa7184ebbd8a79d2e595ef81" + resolved "https://registry.npmjs.org/@turf/combine/-/combine-6.5.0.tgz" integrity sha512-Q8EIC4OtAcHiJB3C4R+FpB4LANiT90t17uOd851qkM2/o6m39bfN5Mv0PWqMZIHWrrosZqRqoY9dJnzz/rJxYQ== dependencies: "@turf/helpers" "^6.5.0" @@ -1089,7 +1515,7 @@ "@turf/concave@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/concave/-/concave-6.5.0.tgz#19ab1a3f04087c478cebc5e631293f3eeb2e7ce4" + resolved "https://registry.npmjs.org/@turf/concave/-/concave-6.5.0.tgz" integrity sha512-I/sUmUC8TC5h/E2vPwxVht+nRt+TnXIPRoztDFvS8/Y0+cBDple9inLSo9nnPXMXidrBlGXZ9vQx/BjZUJgsRQ== dependencies: "@turf/clone" "^6.5.0" @@ -1103,7 +1529,7 @@ "@turf/convex@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/convex/-/convex-6.5.0.tgz#a7613e0d3795e2f5b9ce79a39271e86f54a3d354" + resolved "https://registry.npmjs.org/@turf/convex/-/convex-6.5.0.tgz" integrity sha512-x7ZwC5z7PJB0SBwNh7JCeCNx7Iu+QSrH7fYgK0RhhNop13TqUlvHMirMLRgf2db1DqUetrAO2qHJeIuasquUWg== dependencies: "@turf/helpers" "^6.5.0" @@ -1112,7 +1538,7 @@ "@turf/destination@>=4.0.0", "@turf/destination@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/destination/-/destination-6.5.0.tgz#30a84702f9677d076130e0440d3223ae503fdae1" + resolved "https://registry.npmjs.org/@turf/destination/-/destination-6.5.0.tgz" integrity sha512-4cnWQlNC8d1tItOz9B4pmJdWpXqS0vEvv65bI/Pj/genJnsL7evI0/Xw42RvEGROS481MPiU80xzvwxEvhQiMQ== dependencies: "@turf/helpers" "^6.5.0" @@ -1120,7 +1546,7 @@ "@turf/difference@>=4.0.0", "@turf/difference@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/difference/-/difference-6.5.0.tgz#677b0d5641a93bba2e82f2c683f0d880105b3197" + resolved "https://registry.npmjs.org/@turf/difference/-/difference-6.5.0.tgz" integrity sha512-l8iR5uJqvI+5Fs6leNbhPY5t/a3vipUF/3AeVLpwPQcgmedNXyheYuy07PcMGH5Jdpi5gItOiTqwiU/bUH4b3A== dependencies: "@turf/helpers" "^6.5.0" @@ -1129,7 +1555,7 @@ "@turf/dissolve@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/dissolve/-/dissolve-6.5.0.tgz#65debed7ef185087d842b450ebd01e81cc2e80f6" + resolved "https://registry.npmjs.org/@turf/dissolve/-/dissolve-6.5.0.tgz" integrity sha512-WBVbpm9zLTp0Bl9CE35NomTaOL1c4TQCtEoO43YaAhNEWJOOIhZMFJyr8mbvYruKl817KinT3x7aYjjCMjTAsQ== dependencies: "@turf/helpers" "^6.5.0" @@ -1139,7 +1565,7 @@ "@turf/distance-weight@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/distance-weight/-/distance-weight-6.5.0.tgz#fe1fb45b5ae5ca4e09a898cb0a15c6c79ed0849e" + resolved "https://registry.npmjs.org/@turf/distance-weight/-/distance-weight-6.5.0.tgz" integrity sha512-a8qBKkgVNvPKBfZfEJZnC3DV7dfIsC3UIdpRci/iap/wZLH41EmS90nM+BokAJflUHYy8PqE44wySGWHN1FXrQ== dependencies: "@turf/centroid" "^6.5.0" @@ -1149,7 +1575,7 @@ "@turf/distance@>=4.0.0", "@turf/distance@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/distance/-/distance-6.5.0.tgz#21f04d5f86e864d54e2abde16f35c15b4f36149a" + resolved "https://registry.npmjs.org/@turf/distance/-/distance-6.5.0.tgz" integrity sha512-xzykSLfoURec5qvQJcfifw/1mJa+5UwByZZ5TZ8iaqjGYN0vomhV9aiSLeYdUGtYRESZ+DYC/OzY+4RclZYgMg== dependencies: "@turf/helpers" "^6.5.0" @@ -1157,7 +1583,7 @@ "@turf/ellipse@>=4.0.0", "@turf/ellipse@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/ellipse/-/ellipse-6.5.0.tgz#1e20cc9eb968f35ab891572892a0bffcef5e552a" + resolved "https://registry.npmjs.org/@turf/ellipse/-/ellipse-6.5.0.tgz" integrity sha512-kuXtwFviw/JqnyJXF1mrR/cb496zDTSbGKtSiolWMNImYzGGkbsAsFTjwJYgD7+4FixHjp0uQPzo70KDf3AIBw== dependencies: "@turf/helpers" "^6.5.0" @@ -1167,7 +1593,7 @@ "@turf/envelope@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/envelope/-/envelope-6.5.0.tgz#73e81b9b7ed519bd8a614d36322d6f9fbeeb0579" + resolved "https://registry.npmjs.org/@turf/envelope/-/envelope-6.5.0.tgz" integrity sha512-9Z+FnBWvOGOU4X+fMZxYFs1HjFlkKqsddLuMknRaqcJd6t+NIv5DWvPtDL8ATD2GEExYDiFLwMdckfr1yqJgHA== dependencies: "@turf/bbox" "^6.5.0" @@ -1176,7 +1602,7 @@ "@turf/explode@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/explode/-/explode-6.5.0.tgz#02c292cc143dd629643da5b70bb5b19b9f0f1c6b" + resolved "https://registry.npmjs.org/@turf/explode/-/explode-6.5.0.tgz" integrity sha512-6cSvMrnHm2qAsace6pw9cDmK2buAlw8+tjeJVXMfMyY+w7ZUi1rprWMsY92J7s2Dar63Bv09n56/1V7+tcj52Q== dependencies: "@turf/helpers" "^6.5.0" @@ -1184,7 +1610,7 @@ "@turf/flatten@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/flatten/-/flatten-6.5.0.tgz#0bd26161f4f1759bbad6ba9485e8ee65f3fa72a7" + resolved "https://registry.npmjs.org/@turf/flatten/-/flatten-6.5.0.tgz" integrity sha512-IBZVwoNLVNT6U/bcUUllubgElzpMsNoCw8tLqBw6dfYg9ObGmpEjf9BIYLr7a2Yn5ZR4l7YIj2T7kD5uJjZADQ== dependencies: "@turf/helpers" "^6.5.0" @@ -1192,7 +1618,7 @@ "@turf/flip@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/flip/-/flip-6.5.0.tgz#04b38eae8a78f2cf9240140b25401b16b37d20e2" + resolved "https://registry.npmjs.org/@turf/flip/-/flip-6.5.0.tgz" integrity sha512-oyikJFNjt2LmIXQqgOGLvt70RgE2lyzPMloYWM7OR5oIFGRiBvqVD2hA6MNw6JewIm30fWZ8DQJw1NHXJTJPbg== dependencies: "@turf/clone" "^6.5.0" @@ -1201,7 +1627,7 @@ "@turf/great-circle@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/great-circle/-/great-circle-6.5.0.tgz#2daccbdd1c609a13b00d566ea0ad95457cfc87c2" + resolved "https://registry.npmjs.org/@turf/great-circle/-/great-circle-6.5.0.tgz" integrity sha512-7ovyi3HaKOXdFyN7yy1yOMa8IyOvV46RC1QOQTT+RYUN8ke10eyqExwBpL9RFUPvlpoTzoYbM/+lWPogQlFncg== dependencies: "@turf/helpers" "^6.5.0" @@ -1209,12 +1635,12 @@ "@turf/helpers@6.x", "@turf/helpers@>=4.0.0", "@turf/helpers@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/helpers/-/helpers-6.5.0.tgz#f79af094bd6b8ce7ed2bd3e089a8493ee6cae82e" + resolved "https://registry.npmjs.org/@turf/helpers/-/helpers-6.5.0.tgz" integrity sha512-VbI1dV5bLFzohYYdgqwikdMVpe7pJ9X3E+dlr425wa2/sMJqYDhTO++ec38/pcPvPE6oD9WEEeU3Xu3gza+VPw== "@turf/hex-grid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/hex-grid/-/hex-grid-6.5.0.tgz#aa5ee46e291839d4405db74b7516c6da89ee56f7" + resolved "https://registry.npmjs.org/@turf/hex-grid/-/hex-grid-6.5.0.tgz" integrity sha512-Ln3tc2tgZT8etDOldgc6e741Smg1CsMKAz1/Mlel+MEL5Ynv2mhx3m0q4J9IB1F3a4MNjDeVvm8drAaf9SF33g== dependencies: "@turf/distance" "^6.5.0" @@ -1224,7 +1650,7 @@ "@turf/interpolate@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/interpolate/-/interpolate-6.5.0.tgz#9120def5d4498dd7b7d5e92a263aac3e1fd92886" + resolved "https://registry.npmjs.org/@turf/interpolate/-/interpolate-6.5.0.tgz" integrity sha512-LSH5fMeiGyuDZ4WrDJNgh81d2DnNDUVJtuFryJFup8PV8jbs46lQGfI3r1DJ2p1IlEJIz3pmAZYeTfMMoeeohw== dependencies: "@turf/bbox" "^6.5.0" @@ -1241,7 +1667,7 @@ "@turf/intersect@>=4.0.0", "@turf/intersect@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/intersect/-/intersect-6.5.0.tgz#a14e161ddd0264d0f07ac4e325553c70c421f9e6" + resolved "https://registry.npmjs.org/@turf/intersect/-/intersect-6.5.0.tgz" integrity sha512-2legGJeKrfFkzntcd4GouPugoqPUjexPZnOvfez+3SfIMrHvulw8qV8u7pfVyn2Yqs53yoVCEjS5sEpvQ5YRQg== dependencies: "@turf/helpers" "^6.5.0" @@ -1250,14 +1676,14 @@ "@turf/invariant@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/invariant/-/invariant-6.5.0.tgz#970afc988023e39c7ccab2341bd06979ddc7463f" + resolved "https://registry.npmjs.org/@turf/invariant/-/invariant-6.5.0.tgz" integrity sha512-Wv8PRNCtPD31UVbdJE/KVAWKe7l6US+lJItRR/HOEW3eh+U/JwRCSUl/KZ7bmjM/C+zLNoreM2TU6OoLACs4eg== dependencies: "@turf/helpers" "^6.5.0" "@turf/isobands@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/isobands/-/isobands-6.5.0.tgz#5e0929d9d8d53147074a5cfe4533768782e2a2ce" + resolved "https://registry.npmjs.org/@turf/isobands/-/isobands-6.5.0.tgz" integrity sha512-4h6sjBPhRwMVuFaVBv70YB7eGz+iw0bhPRnp+8JBdX1UPJSXhoi/ZF2rACemRUr0HkdVB/a1r9gC32vn5IAEkw== dependencies: "@turf/area" "^6.5.0" @@ -1271,7 +1697,7 @@ "@turf/isolines@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/isolines/-/isolines-6.5.0.tgz#3435c7cb5a79411207a5657aa4095357cfd35831" + resolved "https://registry.npmjs.org/@turf/isolines/-/isolines-6.5.0.tgz" integrity sha512-6ElhiLCopxWlv4tPoxiCzASWt/jMRvmp6mRYrpzOm3EUl75OhHKa/Pu6Y9nWtCMmVC/RcWtiiweUocbPLZLm0A== dependencies: "@turf/bbox" "^6.5.0" @@ -1282,14 +1708,14 @@ "@turf/kinks@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/kinks/-/kinks-6.5.0.tgz#80e7456367535365012f658cf1a988b39a2c920b" + resolved "https://registry.npmjs.org/@turf/kinks/-/kinks-6.5.0.tgz" integrity sha512-ViCngdPt1eEL7hYUHR2eHR662GvCgTc35ZJFaNR6kRtr6D8plLaDju0FILeFFWSc+o8e3fwxZEJKmFj9IzPiIQ== dependencies: "@turf/helpers" "^6.5.0" "@turf/length@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/length/-/length-6.5.0.tgz#ff4e9072d5f997e1c32a1311d214d184463f83fa" + resolved "https://registry.npmjs.org/@turf/length/-/length-6.5.0.tgz" integrity sha512-5pL5/pnw52fck3oRsHDcSGrj9HibvtlrZ0QNy2OcW8qBFDNgZ4jtl6U7eATVoyWPKBHszW3dWETW+iLV7UARig== dependencies: "@turf/distance" "^6.5.0" @@ -1298,7 +1724,7 @@ "@turf/line-arc@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-arc/-/line-arc-6.5.0.tgz#5ca35516ccf1f3a01149889d9facb39a77b07431" + resolved "https://registry.npmjs.org/@turf/line-arc/-/line-arc-6.5.0.tgz" integrity sha512-I6c+V6mIyEwbtg9P9zSFF89T7QPe1DPTG3MJJ6Cm1MrAY0MdejwQKOpsvNl8LDU2ekHOlz2kHpPVR7VJsoMllA== dependencies: "@turf/circle" "^6.5.0" @@ -1307,7 +1733,7 @@ "@turf/line-chunk@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-chunk/-/line-chunk-6.5.0.tgz#02cefa74564b9cf533a3ac8a5109c97cb7170d10" + resolved "https://registry.npmjs.org/@turf/line-chunk/-/line-chunk-6.5.0.tgz" integrity sha512-i1FGE6YJaaYa+IJesTfyRRQZP31QouS+wh/pa6O3CC0q4T7LtHigyBSYjrbjSLfn2EVPYGlPCMFEqNWCOkC6zg== dependencies: "@turf/helpers" "^6.5.0" @@ -1317,7 +1743,7 @@ "@turf/line-intersect@>=4.0.0", "@turf/line-intersect@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-intersect/-/line-intersect-6.5.0.tgz#dea48348b30c093715d2195d2dd7524aee4cf020" + resolved "https://registry.npmjs.org/@turf/line-intersect/-/line-intersect-6.5.0.tgz" integrity sha512-CS6R1tZvVQD390G9Ea4pmpM6mJGPWoL82jD46y0q1KSor9s6HupMIo1kY4Ny+AEYQl9jd21V3Scz20eldpbTVA== dependencies: "@turf/helpers" "^6.5.0" @@ -1328,7 +1754,7 @@ "@turf/line-offset@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-offset/-/line-offset-6.5.0.tgz#2bbd8fcf9ff82009b72890863da444b190e53689" + resolved "https://registry.npmjs.org/@turf/line-offset/-/line-offset-6.5.0.tgz" integrity sha512-CEXZbKgyz8r72qRvPchK0dxqsq8IQBdH275FE6o4MrBkzMcoZsfSjghtXzKaz9vvro+HfIXal0sTk2mqV1lQTw== dependencies: "@turf/helpers" "^6.5.0" @@ -1337,7 +1763,7 @@ "@turf/line-overlap@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-overlap/-/line-overlap-6.5.0.tgz#10ebb805c2d047463379fc1f997785fa8f3f4cc1" + resolved "https://registry.npmjs.org/@turf/line-overlap/-/line-overlap-6.5.0.tgz" integrity sha512-xHOaWLd0hkaC/1OLcStCpfq55lPHpPNadZySDXYiYjEz5HXr1oKmtMYpn0wGizsLwrOixRdEp+j7bL8dPt4ojQ== dependencies: "@turf/boolean-point-on-line" "^6.5.0" @@ -1351,7 +1777,7 @@ "@turf/line-segment@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-segment/-/line-segment-6.5.0.tgz#ee73f3ffcb7c956203b64ed966d96af380a4dd65" + resolved "https://registry.npmjs.org/@turf/line-segment/-/line-segment-6.5.0.tgz" integrity sha512-jI625Ho4jSuJESNq66Mmi290ZJ5pPZiQZruPVpmHkUw257Pew0alMmb6YrqYNnLUuiVVONxAAKXUVeeUGtycfw== dependencies: "@turf/helpers" "^6.5.0" @@ -1360,7 +1786,7 @@ "@turf/line-slice-along@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-slice-along/-/line-slice-along-6.5.0.tgz#6e7a861d72c6f80caba2c4418b69a776f0292953" + resolved "https://registry.npmjs.org/@turf/line-slice-along/-/line-slice-along-6.5.0.tgz" integrity sha512-KHJRU6KpHrAj+BTgTNqby6VCTnDzG6a1sJx/I3hNvqMBLvWVA2IrkR9L9DtsQsVY63IBwVdQDqiwCuZLDQh4Ng== dependencies: "@turf/bearing" "^6.5.0" @@ -1370,7 +1796,7 @@ "@turf/line-slice@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-slice/-/line-slice-6.5.0.tgz#7b6e0c8e8e93fdb4e65c3b9a123a2ec93a21bdb0" + resolved "https://registry.npmjs.org/@turf/line-slice/-/line-slice-6.5.0.tgz" integrity sha512-vDqJxve9tBHhOaVVFXqVjF5qDzGtKWviyjbyi2QnSnxyFAmLlLnBfMX8TLQCAf2GxHibB95RO5FBE6I2KVPRuw== dependencies: "@turf/helpers" "^6.5.0" @@ -1379,7 +1805,7 @@ "@turf/line-split@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-split/-/line-split-6.5.0.tgz#116d7fbf714457878225187f5820ef98db7b02c2" + resolved "https://registry.npmjs.org/@turf/line-split/-/line-split-6.5.0.tgz" integrity sha512-/rwUMVr9OI2ccJjw7/6eTN53URtGThNSD5I0GgxyFXMtxWiloRJ9MTff8jBbtPWrRka/Sh2GkwucVRAEakx9Sw== dependencies: "@turf/bbox" "^6.5.0" @@ -1395,7 +1821,7 @@ "@turf/line-to-polygon@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/line-to-polygon/-/line-to-polygon-6.5.0.tgz#c919a03064a1cd5cef4c4e4d98dc786e12ffbc89" + resolved "https://registry.npmjs.org/@turf/line-to-polygon/-/line-to-polygon-6.5.0.tgz" integrity sha512-qYBuRCJJL8Gx27OwCD1TMijM/9XjRgXH/m/TyuND4OXedBpIWlK5VbTIO2gJ8OCfznBBddpjiObLBrkuxTpN4Q== dependencies: "@turf/bbox" "^6.5.0" @@ -1405,7 +1831,7 @@ "@turf/mask@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/mask/-/mask-6.5.0.tgz#a97f355ee071ac60d8d3782ae39e5bb4b4e26857" + resolved "https://registry.npmjs.org/@turf/mask/-/mask-6.5.0.tgz" integrity sha512-RQha4aU8LpBrmrkH8CPaaoAfk0Egj5OuXtv6HuCQnHeGNOQt3TQVibTA3Sh4iduq4EPxnZfDjgsOeKtrCA19lg== dependencies: "@turf/helpers" "^6.5.0" @@ -1413,14 +1839,14 @@ "@turf/meta@6.x", "@turf/meta@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/meta/-/meta-6.5.0.tgz#b725c3653c9f432133eaa04d3421f7e51e0418ca" + resolved "https://registry.npmjs.org/@turf/meta/-/meta-6.5.0.tgz" integrity sha512-RrArvtsV0vdsCBegoBtOalgdSOfkBrTJ07VkpiCnq/491W67hnMWmDu7e6Ztw0C3WldRYTXkg3SumfdzZxLBHA== dependencies: "@turf/helpers" "^6.5.0" -"@turf/midpoint@^6.5.0": +"@turf/midpoint@>=4.0.0", "@turf/midpoint@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/midpoint/-/midpoint-6.5.0.tgz#5f9428959309feccaf3f55873a8de70d4121bdce" + resolved "https://registry.npmjs.org/@turf/midpoint/-/midpoint-6.5.0.tgz" integrity sha512-MyTzV44IwmVI6ec9fB2OgZ53JGNlgOpaYl9ArKoF49rXpL84F9rNATndbe0+MQIhdkw8IlzA6xVP4lZzfMNVCw== dependencies: "@turf/bearing" "^6.5.0" @@ -1430,7 +1856,7 @@ "@turf/moran-index@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/moran-index/-/moran-index-6.5.0.tgz#456264bfb014a7b5f527807c9dcf25df3c6b2efd" + resolved "https://registry.npmjs.org/@turf/moran-index/-/moran-index-6.5.0.tgz" integrity sha512-ItsnhrU2XYtTtTudrM8so4afBCYWNaB0Mfy28NZwLjB5jWuAsvyV+YW+J88+neK/ougKMTawkmjQqodNJaBeLQ== dependencies: "@turf/distance-weight" "^6.5.0" @@ -1439,7 +1865,7 @@ "@turf/nearest-point-on-line@>=4.0.0", "@turf/nearest-point-on-line@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/nearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz#8e1cd2cdc0b5acaf4c8d8b3b33bb008d3cb99e7b" + resolved "https://registry.npmjs.org/@turf/nearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz" integrity sha512-WthrvddddvmymnC+Vf7BrkHGbDOUu6Z3/6bFYUGv1kxw8tiZ6n83/VG6kHz4poHOfS0RaNflzXSkmCi64fLBlg== dependencies: "@turf/bearing" "^6.5.0" @@ -1452,7 +1878,7 @@ "@turf/nearest-point-to-line@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/nearest-point-to-line/-/nearest-point-to-line-6.5.0.tgz#5549b48690d523f9af4765fe64a3cbebfbc6bb75" + resolved "https://registry.npmjs.org/@turf/nearest-point-to-line/-/nearest-point-to-line-6.5.0.tgz" integrity sha512-PXV7cN0BVzUZdjj6oeb/ESnzXSfWmEMrsfZSDRgqyZ9ytdiIj/eRsnOXLR13LkTdXVOJYDBuf7xt1mLhM4p6+Q== dependencies: "@turf/helpers" "^6.5.0" @@ -1463,7 +1889,7 @@ "@turf/nearest-point@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/nearest-point/-/nearest-point-6.5.0.tgz#2f1781c26ff3f054005d4ff352042973318b92f1" + resolved "https://registry.npmjs.org/@turf/nearest-point/-/nearest-point-6.5.0.tgz" integrity sha512-fguV09QxilZv/p94s8SMsXILIAMiaXI5PATq9d7YWijLxWUj6Q/r43kxyoi78Zmwwh1Zfqz9w+bCYUAxZ5+euA== dependencies: "@turf/clone" "^6.5.0" @@ -1473,7 +1899,7 @@ "@turf/planepoint@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/planepoint/-/planepoint-6.5.0.tgz#5cb788670c31a6b064ae464180d51b4d550d87de" + resolved "https://registry.npmjs.org/@turf/planepoint/-/planepoint-6.5.0.tgz" integrity sha512-R3AahA6DUvtFbka1kcJHqZ7DMHmPXDEQpbU5WaglNn7NaCQg9HB0XM0ZfqWcd5u92YXV+Gg8QhC8x5XojfcM4Q== dependencies: "@turf/helpers" "^6.5.0" @@ -1481,7 +1907,7 @@ "@turf/point-grid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/point-grid/-/point-grid-6.5.0.tgz#f628d30afe29d60dcbf54b195e46eab48a4fbfaa" + resolved "https://registry.npmjs.org/@turf/point-grid/-/point-grid-6.5.0.tgz" integrity sha512-Iq38lFokNNtQJnOj/RBKmyt6dlof0yhaHEDELaWHuECm1lIZLY3ZbVMwbs+nXkwTAHjKfS/OtMheUBkw+ee49w== dependencies: "@turf/boolean-within" "^6.5.0" @@ -1491,7 +1917,7 @@ "@turf/point-on-feature@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/point-on-feature/-/point-on-feature-6.5.0.tgz#37d07afeb31896e53c0833aa404993ba7d500f0c" + resolved "https://registry.npmjs.org/@turf/point-on-feature/-/point-on-feature-6.5.0.tgz" integrity sha512-bDpuIlvugJhfcF/0awAQ+QI6Om1Y1FFYE8Y/YdxGRongivix850dTeXCo0mDylFdWFPGDo7Mmh9Vo4VxNwW/TA== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -1502,7 +1928,7 @@ "@turf/point-to-line-distance@>=4.0.0", "@turf/point-to-line-distance@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/point-to-line-distance/-/point-to-line-distance-6.5.0.tgz#bc46fe09ea630aaf73f13c40b38a7df79050fff8" + resolved "https://registry.npmjs.org/@turf/point-to-line-distance/-/point-to-line-distance-6.5.0.tgz" integrity sha512-opHVQ4vjUhNBly1bob6RWy+F+hsZDH9SA0UW36pIRzfpu27qipU18xup0XXEePfY6+wvhF6yL/WgCO2IbrLqEA== dependencies: "@turf/bearing" "^6.5.0" @@ -1516,7 +1942,7 @@ "@turf/points-within-polygon@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/points-within-polygon/-/points-within-polygon-6.5.0.tgz#d49f4d7cf19b7a440bf1e06f771ff4e1df13107f" + resolved "https://registry.npmjs.org/@turf/points-within-polygon/-/points-within-polygon-6.5.0.tgz" integrity sha512-YyuheKqjliDsBDt3Ho73QVZk1VXX1+zIA2gwWvuz8bR1HXOkcuwk/1J76HuFMOQI3WK78wyAi+xbkx268PkQzQ== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -1525,7 +1951,7 @@ "@turf/polygon-smooth@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/polygon-smooth/-/polygon-smooth-6.5.0.tgz#00ca366871cb6ea3bee44ff3ea870aaf75711733" + resolved "https://registry.npmjs.org/@turf/polygon-smooth/-/polygon-smooth-6.5.0.tgz" integrity sha512-LO/X/5hfh/Rk4EfkDBpLlVwt3i6IXdtQccDT9rMjXEP32tRgy0VMFmdkNaXoGlSSKf/1mGqLl4y4wHd86DqKbg== dependencies: "@turf/helpers" "^6.5.0" @@ -1533,7 +1959,7 @@ "@turf/polygon-tangents@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/polygon-tangents/-/polygon-tangents-6.5.0.tgz#dc025202727ba2f3347baa95dbca4e0ffdb2ddf5" + resolved "https://registry.npmjs.org/@turf/polygon-tangents/-/polygon-tangents-6.5.0.tgz" integrity sha512-sB4/IUqJMYRQH9jVBwqS/XDitkEfbyqRy+EH/cMRJURTg78eHunvJ708x5r6umXsbiUyQU4eqgPzEylWEQiunw== dependencies: "@turf/bbox" "^6.5.0" @@ -1545,7 +1971,7 @@ "@turf/polygon-to-line@>=4.0.0", "@turf/polygon-to-line@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/polygon-to-line/-/polygon-to-line-6.5.0.tgz#4dc86db66168b32bb83ce448cf966208a447d952" + resolved "https://registry.npmjs.org/@turf/polygon-to-line/-/polygon-to-line-6.5.0.tgz" integrity sha512-5p4n/ij97EIttAq+ewSnKt0ruvuM+LIDzuczSzuHTpq4oS7Oq8yqg5TQ4nzMVuK41r/tALCk7nAoBuw3Su4Gcw== dependencies: "@turf/helpers" "^6.5.0" @@ -1553,7 +1979,7 @@ "@turf/polygonize@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/polygonize/-/polygonize-6.5.0.tgz#8aa0f1e386e96c533a320c426aaf387020320fa3" + resolved "https://registry.npmjs.org/@turf/polygonize/-/polygonize-6.5.0.tgz" integrity sha512-a/3GzHRaCyzg7tVYHo43QUChCspa99oK4yPqooVIwTC61npFzdrmnywMv0S+WZjHZwK37BrFJGFrZGf6ocmY5w== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -1564,7 +1990,7 @@ "@turf/projection@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/projection/-/projection-6.5.0.tgz#d2aad862370bf03f2270701115464a8406c144b2" + resolved "https://registry.npmjs.org/@turf/projection/-/projection-6.5.0.tgz" integrity sha512-/Pgh9mDvQWWu8HRxqpM+tKz8OzgauV+DiOcr3FCjD6ubDnrrmMJlsf6fFJmggw93mtVPrZRL6yyi9aYCQBOIvg== dependencies: "@turf/clone" "^6.5.0" @@ -1573,23 +1999,23 @@ "@turf/random@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/random/-/random-6.5.0.tgz#b19672cf4549557660034d4a303911656df7747e" + resolved "https://registry.npmjs.org/@turf/random/-/random-6.5.0.tgz" integrity sha512-8Q25gQ/XbA7HJAe+eXp4UhcXM9aOOJFaxZ02+XSNwMvY8gtWSCBLVqRcW4OhqilgZ8PeuQDWgBxeo+BIqqFWFQ== dependencies: "@turf/helpers" "^6.5.0" "@turf/rectangle-grid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/rectangle-grid/-/rectangle-grid-6.5.0.tgz#c3ef38e8cfdb763012beb1f22e2b77288a37a5cf" + resolved "https://registry.npmjs.org/@turf/rectangle-grid/-/rectangle-grid-6.5.0.tgz" integrity sha512-yQZ/1vbW68O2KsSB3OZYK+72aWz/Adnf7m2CMKcC+aq6TwjxZjAvlbCOsNUnMAuldRUVN1ph6RXMG4e9KEvKvg== dependencies: "@turf/boolean-intersects" "^6.5.0" "@turf/distance" "^6.5.0" "@turf/helpers" "^6.5.0" -"@turf/rewind@^6.5.0": +"@turf/rewind@>=4.0.0", "@turf/rewind@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/rewind/-/rewind-6.5.0.tgz#bc0088f8ec56f00c8eacd902bbe51e3786cb73a0" + resolved "https://registry.npmjs.org/@turf/rewind/-/rewind-6.5.0.tgz" integrity sha512-IoUAMcHWotBWYwSYuYypw/LlqZmO+wcBpn8ysrBNbazkFNkLf3btSDZMkKJO/bvOzl55imr/Xj4fi3DdsLsbzQ== dependencies: "@turf/boolean-clockwise" "^6.5.0" @@ -1600,7 +2026,7 @@ "@turf/rhumb-bearing@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz#8c41ad62b44fb4e57c14fe790488056684eee7b9" + resolved "https://registry.npmjs.org/@turf/rhumb-bearing/-/rhumb-bearing-6.5.0.tgz" integrity sha512-jMyqiMRK4hzREjQmnLXmkJ+VTNTx1ii8vuqRwJPcTlKbNWfjDz/5JqJlb5NaFDcdMpftWovkW5GevfnuzHnOYA== dependencies: "@turf/helpers" "^6.5.0" @@ -1608,7 +2034,7 @@ "@turf/rhumb-destination@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/rhumb-destination/-/rhumb-destination-6.5.0.tgz#12da8c85e674b182e8b0ec8ea9c5fe2186716dae" + resolved "https://registry.npmjs.org/@turf/rhumb-destination/-/rhumb-destination-6.5.0.tgz" integrity sha512-RHNP1Oy+7xTTdRrTt375jOZeHceFbjwohPHlr9Hf68VdHHPMAWgAKqiX2YgSWDcvECVmiGaBKWus1Df+N7eE4Q== dependencies: "@turf/helpers" "^6.5.0" @@ -1616,7 +2042,7 @@ "@turf/rhumb-distance@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/rhumb-distance/-/rhumb-distance-6.5.0.tgz#ed068004b1469512b857070fbf5cb7b7eabbe592" + resolved "https://registry.npmjs.org/@turf/rhumb-distance/-/rhumb-distance-6.5.0.tgz" integrity sha512-oKp8KFE8E4huC2Z1a1KNcFwjVOqa99isxNOwfo4g3SUABQ6NezjKDDrnvC4yI5YZ3/huDjULLBvhed45xdCrzg== dependencies: "@turf/helpers" "^6.5.0" @@ -1624,14 +2050,14 @@ "@turf/sample@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/sample/-/sample-6.5.0.tgz#00cca024514989448e57fb1bf34e9a33ed3f0755" + resolved "https://registry.npmjs.org/@turf/sample/-/sample-6.5.0.tgz" integrity sha512-kSdCwY7el15xQjnXYW520heKUrHwRvnzx8ka4eYxX9NFeOxaFITLW2G7UtXb6LJK8mmPXI8Aexv23F2ERqzGFg== dependencies: "@turf/helpers" "^6.5.0" "@turf/sector@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/sector/-/sector-6.5.0.tgz#599a87ebbe6ee613b4e04c5928e0ef1fc78fc16c" + resolved "https://registry.npmjs.org/@turf/sector/-/sector-6.5.0.tgz" integrity sha512-cYUOkgCTWqa23SOJBqxoFAc/yGCUsPRdn/ovbRTn1zNTm/Spmk6hVB84LCKOgHqvSF25i0d2kWqpZDzLDdAPbw== dependencies: "@turf/circle" "^6.5.0" @@ -1642,7 +2068,7 @@ "@turf/shortest-path@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/shortest-path/-/shortest-path-6.5.0.tgz#e1fdf9b4758bd20caf845fdc03d0dc2eede2ff0e" + resolved "https://registry.npmjs.org/@turf/shortest-path/-/shortest-path-6.5.0.tgz" integrity sha512-4de5+G7+P4hgSoPwn+SO9QSi9HY5NEV/xRJ+cmoFVRwv2CDsuOPDheHKeuIAhKyeKDvPvPt04XYWbac4insJMg== dependencies: "@turf/bbox" "^6.5.0" @@ -1657,7 +2083,7 @@ "@turf/simplify@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/simplify/-/simplify-6.5.0.tgz#ec435460bde0985b781618b05d97146c32c8bc16" + resolved "https://registry.npmjs.org/@turf/simplify/-/simplify-6.5.0.tgz" integrity sha512-USas3QqffPHUY184dwQdP8qsvcVH/PWBYdXY5am7YTBACaQOMAlf6AKJs9FT8jiO6fQpxfgxuEtwmox+pBtlOg== dependencies: "@turf/clean-coords" "^6.5.0" @@ -1667,7 +2093,7 @@ "@turf/square-grid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/square-grid/-/square-grid-6.5.0.tgz#3a517301b42ed98aa62d727786dc5290998ddbae" + resolved "https://registry.npmjs.org/@turf/square-grid/-/square-grid-6.5.0.tgz" integrity sha512-mlR0ayUdA+L4c9h7p4k3pX6gPWHNGuZkt2c5II1TJRmhLkW2557d6b/Vjfd1z9OVaajb1HinIs1FMSAPXuuUrA== dependencies: "@turf/helpers" "^6.5.0" @@ -1675,7 +2101,7 @@ "@turf/square@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/square/-/square-6.5.0.tgz#ab43eef99d39c36157ab5b80416bbeba1f6b2122" + resolved "https://registry.npmjs.org/@turf/square/-/square-6.5.0.tgz" integrity sha512-BM2UyWDmiuHCadVhHXKIx5CQQbNCpOxB6S/aCNOCLbhCeypKX5Q0Aosc5YcmCJgkwO5BERCC6Ee7NMbNB2vHmQ== dependencies: "@turf/distance" "^6.5.0" @@ -1683,7 +2109,7 @@ "@turf/standard-deviational-ellipse@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/standard-deviational-ellipse/-/standard-deviational-ellipse-6.5.0.tgz#775c7b9a2be6546bf64ea8ac08cdcd80563f2935" + resolved "https://registry.npmjs.org/@turf/standard-deviational-ellipse/-/standard-deviational-ellipse-6.5.0.tgz" integrity sha512-02CAlz8POvGPFK2BKK8uHGUk/LXb0MK459JVjKxLC2yJYieOBTqEbjP0qaWhiBhGzIxSMaqe8WxZ0KvqdnstHA== dependencies: "@turf/center-mean" "^6.5.0" @@ -1695,7 +2121,7 @@ "@turf/tag@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/tag/-/tag-6.5.0.tgz#13eae85f36f9fd8c4e076714a894cb5b7716d381" + resolved "https://registry.npmjs.org/@turf/tag/-/tag-6.5.0.tgz" integrity sha512-XwlBvrOV38CQsrNfrxvBaAPBQgXMljeU0DV8ExOyGM7/hvuGHJw3y8kKnQ4lmEQcmcrycjDQhP7JqoRv8vFssg== dependencies: "@turf/boolean-point-in-polygon" "^6.5.0" @@ -1705,7 +2131,7 @@ "@turf/tesselate@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/tesselate/-/tesselate-6.5.0.tgz#de45b778f8e6a45535d8eb2aacea06f86c6b73fb" + resolved "https://registry.npmjs.org/@turf/tesselate/-/tesselate-6.5.0.tgz" integrity sha512-M1HXuyZFCfEIIKkglh/r5L9H3c5QTEsnMBoZOFQiRnGPGmJWcaBissGb7mTFX2+DKE7FNWXh4TDnZlaLABB0dQ== dependencies: "@turf/helpers" "^6.5.0" @@ -1713,14 +2139,14 @@ "@turf/tin@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/tin/-/tin-6.5.0.tgz#b77bebb48237e6613ac6bc0e37a6658be8c17a09" + resolved "https://registry.npmjs.org/@turf/tin/-/tin-6.5.0.tgz" integrity sha512-YLYikRzKisfwj7+F+Tmyy/LE3d2H7D4kajajIfc9mlik2+esG7IolsX/+oUz1biguDYsG0DUA8kVYXDkobukfg== dependencies: "@turf/helpers" "^6.5.0" "@turf/transform-rotate@>=4.0.0", "@turf/transform-rotate@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/transform-rotate/-/transform-rotate-6.5.0.tgz#e50e96a8779af91d58149eedb00ffd7f6395c804" + resolved "https://registry.npmjs.org/@turf/transform-rotate/-/transform-rotate-6.5.0.tgz" integrity sha512-A2Ip1v4246ZmpssxpcL0hhiVBEf4L8lGnSPWTgSv5bWBEoya2fa/0SnFX9xJgP40rMP+ZzRaCN37vLHbv1Guag== dependencies: "@turf/centroid" "^6.5.0" @@ -1734,7 +2160,7 @@ "@turf/transform-scale@>=4.0.0", "@turf/transform-scale@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/transform-scale/-/transform-scale-6.5.0.tgz#dcccd8b0f139de32e32225a29c107a1279137120" + resolved "https://registry.npmjs.org/@turf/transform-scale/-/transform-scale-6.5.0.tgz" integrity sha512-VsATGXC9rYM8qTjbQJ/P7BswKWXHdnSJ35JlV4OsZyHBMxJQHftvmZJsFbOqVtQnIQIzf2OAly6rfzVV9QLr7g== dependencies: "@turf/bbox" "^6.5.0" @@ -1750,7 +2176,7 @@ "@turf/transform-translate@>=4.0.0", "@turf/transform-translate@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/transform-translate/-/transform-translate-6.5.0.tgz#631b13aca6402898029e03fc2d1f4bc1c667fc3e" + resolved "https://registry.npmjs.org/@turf/transform-translate/-/transform-translate-6.5.0.tgz" integrity sha512-NABLw5VdtJt/9vSstChp93pc6oel4qXEos56RBMsPlYB8hzNTEKYtC146XJvyF4twJeeYS8RVe1u7KhoFwEM5w== dependencies: "@turf/clone" "^6.5.0" @@ -1761,7 +2187,7 @@ "@turf/triangle-grid@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/triangle-grid/-/triangle-grid-6.5.0.tgz#75664e8b9d9c7ca4c845673134a1e0d82b5e6887" + resolved "https://registry.npmjs.org/@turf/triangle-grid/-/triangle-grid-6.5.0.tgz" integrity sha512-2jToUSAS1R1htq4TyLQYPTIsoy6wg3e3BQXjm2rANzw4wPQCXGOxrur1Fy9RtzwqwljlC7DF4tg0OnWr8RjmfA== dependencies: "@turf/distance" "^6.5.0" @@ -1770,7 +2196,7 @@ "@turf/truncate@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/truncate/-/truncate-6.5.0.tgz#c3a16cad959f1be1c5156157d5555c64b19185d8" + resolved "https://registry.npmjs.org/@turf/truncate/-/truncate-6.5.0.tgz" integrity sha512-pFxg71pLk+eJj134Z9yUoRhIi8vqnnKvCYwdT4x/DQl/19RVdq1tV3yqOT3gcTQNfniteylL5qV1uTBDV5sgrg== dependencies: "@turf/helpers" "^6.5.0" @@ -1778,7 +2204,7 @@ "@turf/turf@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/turf/-/turf-6.5.0.tgz#49cd07b942a757f3ebbdba6cb294bbb864825a83" + resolved "https://registry.npmjs.org/@turf/turf/-/turf-6.5.0.tgz" integrity sha512-ipMCPnhu59bh92MNt8+pr1VZQhHVuTMHklciQURo54heoxRzt1neNYZOBR6jdL+hNsbDGAECMuIpAutX+a3Y+w== dependencies: "@turf/along" "^6.5.0" @@ -1889,7 +2315,7 @@ "@turf/union@>=4.0.0", "@turf/union@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/union/-/union-6.5.0.tgz#82d28f55190608f9c7d39559b7f543393b03b82d" + resolved "https://registry.npmjs.org/@turf/union/-/union-6.5.0.tgz" integrity sha512-igYWCwP/f0RFHIlC2c0SKDuM/ObBaqSljI3IdV/x71805QbIvY/BYGcJdyNcgEA6cylIGl/0VSlIbpJHZ9ldhw== dependencies: "@turf/helpers" "^6.5.0" @@ -1898,7 +2324,7 @@ "@turf/unkink-polygon@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/unkink-polygon/-/unkink-polygon-6.5.0.tgz#9e54186dcce08d7e62f608c8fa2d3f0342ebe826" + resolved "https://registry.npmjs.org/@turf/unkink-polygon/-/unkink-polygon-6.5.0.tgz" integrity sha512-8QswkzC0UqKmN1DT6HpA9upfa1HdAA5n6bbuzHy8NJOX8oVizVAqfEPY0wqqTgboDjmBR4yyImsdPGUl3gZ8JQ== dependencies: "@turf/area" "^6.5.0" @@ -1909,31 +2335,36 @@ "@turf/voronoi@^6.5.0": version "6.5.0" - resolved "https://registry.yarnpkg.com/@turf/voronoi/-/voronoi-6.5.0.tgz#afe6715a5c7eff687434010cde45cd4822489434" + resolved "https://registry.npmjs.org/@turf/voronoi/-/voronoi-6.5.0.tgz" integrity sha512-C/xUsywYX+7h1UyNqnydHXiun4UPjK88VDghtoRypR9cLlb7qozkiLRphQxxsCM0KxyxpVPHBVQXdAL3+Yurow== dependencies: "@turf/helpers" "^6.5.0" "@turf/invariant" "^6.5.0" d3-voronoi "1.1.2" -"@types/geojson@*", "@types/geojson@^7946.0.7": +"@types/flatbuffers@^1.10.0": + version "1.10.0" + resolved "https://registry.yarnpkg.com/@types/flatbuffers/-/flatbuffers-1.10.0.tgz#aa74e30ffdc86445f2f060e1808fc9d56b5603ba" + integrity sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA== + +"@types/geojson@*", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": version "7946.0.10" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" + resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz" integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== "@types/geojson@7946.0.8": version "7946.0.8" - resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.8.tgz#30744afdb385e2945e22f3b033f897f76b1f12ca" + resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz" integrity sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA== -"@types/hammerjs@^2.0.41": +"@types/hammerjs@^2.0.36", "@types/hammerjs@^2.0.41": version "2.0.41" - resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.41.tgz#f6ecf57d1b12d2befcce00e928a6a097c22980aa" + resolved "https://registry.npmjs.org/@types/hammerjs/-/hammerjs-2.0.41.tgz" integrity sha512-ewXv/ceBaJprikMcxCmWU1FKyMAQ2X7a9Gtmzw8fcg2kIePI1crERDM818W+XYrxqdBBOdlf2rm137bU+BltCA== "@types/hoist-non-react-statics@^3.3.1": version "3.3.1" - resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz" integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== dependencies: "@types/react" "*" @@ -1941,31 +2372,41 @@ "@types/json5@^0.0.29": version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" + resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/mapbox-gl@^2.0.3": +"@types/mapbox-gl@^2.0.3", "@types/mapbox-gl@^2.6.3": version "2.7.10" - resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz#a3a32a366bad8966c0a40b78209ed430ba018ce1" + resolved "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz" integrity sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw== dependencies: "@types/geojson" "*" +"@types/node@^14.14.37": + version "14.18.36" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835" + integrity sha512-FXKWbsJ6a1hIrRxv+FoukuHnGTgEzKYGi7kilfMae96AL9UNkPFNWJEEYWzdRI9ooIkbr4AKldyuSTLql06vLQ== + +"@types/offscreencanvas@^2019.7.0": + version "2019.7.0" + resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.7.0.tgz#e4a932069db47bb3eabeb0b305502d01586fa90d" + integrity sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg== + "@types/prop-types@*": version "15.7.5" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" + resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== "@types/react-dom@^18.0.9": version "18.0.10" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.0.10.tgz#3b66dec56aa0f16a6cc26da9e9ca96c35c0b4352" + resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.0.10.tgz" integrity sha512-E42GW/JA4Qv15wQdqJq8DL4JhNpB3prJgjgapN3qJT9K2zO5IIAQh4VXvCEDupoqAwnz0cY4RlXeC/ajX5SFHg== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^18.0.26": version "18.0.26" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.0.26.tgz#8ad59fc01fef8eaf5c74f4ea392621749f0b7917" + resolved "https://registry.npmjs.org/@types/react/-/react-18.0.26.tgz" integrity sha512-hCR3PJQsAIXyxhTNSiDFY//LhnMZWpNNr5etoCqx/iUfGc5gXWtQR2Phl908jVR6uPXacojQWTg4qRpkxTuGug== dependencies: "@types/prop-types" "*" @@ -1974,41 +2415,46 @@ "@types/scheduler@*": version "0.16.2" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== +"@types/text-encoding-utf-8@^1.0.1": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@types/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#896e94ce99b653e886a9b925e9dc12c92af7b1ae" + integrity sha512-AQ6zewa0ucLJvtUi5HsErbOFKAcQfRLt9zFLlUOvcXBy2G36a+ZDpCHSGdzJVUD8aNURtIjh9aSjCStNMRCcRQ== + "@types/use-sync-external-store@^0.0.3": version "0.0.3" - resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" + resolved "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== "@vitejs/plugin-react-swc@^3.0.0": version "3.0.1" - resolved "https://registry.yarnpkg.com/@vitejs/plugin-react-swc/-/plugin-react-swc-3.0.1.tgz#7c904f889967f2240e04ac13582399a061468990" + resolved "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.0.1.tgz" integrity sha512-3GQ2oruZO9j8dSHcI0MUeOZQBhjYyDQsF/pKY4Px+CJxn0M16OhgFeEzUjeuwci4zhhjoNIDE9aFNaV5GMQ09g== dependencies: "@swc/core" "^1.3.22" acorn-jsx@^5.3.2: version "5.3.2" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn@^8.8.0: version "8.8.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73" + resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.1.tgz" integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA== add-dom-event-listener@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz#6a92db3a0dd0abc254e095c0f1dc14acbbaae310" + resolved "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz" integrity sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw== dependencies: object-assign "4.x" ajv@^6.10.0, ajv@^6.12.4: version "6.12.6" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" @@ -2018,24 +2464,31 @@ ajv@^6.10.0, ajv@^6.12.4: almost-equal@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/almost-equal/-/almost-equal-1.1.0.tgz#f851c631138757994276aa2efbe8dfa3066cccdd" + resolved "https://registry.npmjs.org/almost-equal/-/almost-equal-1.1.0.tgz" integrity sha512-0V/PkoculFl5+0Lp47JoxUcO0xSxhIBvm+BxHdD/OgXNmdRpRHCFnKVuUoWyS9EzQP+otSGv0m9Lb4yVkQBn2A== ansi-regex@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" + resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== +ansi-styles@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" + integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== + dependencies: + color-convert "^1.9.0" + ansi-styles@^4.1.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" antd@^4.19.2: version "4.24.6" - resolved "https://registry.yarnpkg.com/antd/-/antd-4.24.6.tgz#ca1bd1deccbede9325c75c127790ba8d78c95da6" + resolved "https://registry.npmjs.org/antd/-/antd-4.24.6.tgz" integrity sha512-x4tTXI3aOJukcG/MWQ7PdWHIqGEFInkKPhSHJpSiDvZI5BAvgLicW57WWhnBpJ6m9H9e9FRohC5FRJf0NIwsWQ== dependencies: "@ant-design/colors" "^6.0.0" @@ -2082,22 +2535,55 @@ antd@^4.19.2: rc-util "^5.22.5" scroll-into-view-if-needed "^2.2.25" +apache-arrow@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/apache-arrow/-/apache-arrow-4.0.1.tgz#62e58caa46a6a41966478a19c492380c9efb1d66" + integrity sha512-DyF7GXCbSjsw4P5C8b+qW7OnJKa6w9mJI0mhV0+EfZbVZCmhfiF6ffqcnrI/kzBrRqn9hH/Ft9n5+m4DTbBJpg== + dependencies: + "@types/flatbuffers" "^1.10.0" + "@types/node" "^14.14.37" + "@types/text-encoding-utf-8" "^1.0.1" + command-line-args "5.1.1" + command-line-usage "6.1.1" + flatbuffers "1.12.0" + json-bignum "^0.0.3" + pad-left "^2.1.0" + text-encoding-utf-8 "^1.0.2" + tslib "^2.2.0" + +argparse@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + argparse@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== aria-query@^4.2.2: version "4.2.2" - resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" + resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz" integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA== dependencies: "@babel/runtime" "^7.10.2" "@babel/runtime-corejs3" "^7.10.2" +array-back@^3.0.1: + version "3.1.0" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-3.1.0.tgz#b8859d7a508871c9a7b2cf42f99428f65e96bfb0" + integrity sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q== + +array-back@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/array-back/-/array-back-4.0.2.tgz#8004e999a6274586beeb27342168652fdb89fa1e" + integrity sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg== + array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: version "3.1.6" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" + resolved "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz" integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== dependencies: call-bind "^1.0.2" @@ -2108,12 +2594,12 @@ array-includes@^3.1.4, array-includes@^3.1.5, array-includes@^3.1.6: array-tree-filter@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/array-tree-filter/-/array-tree-filter-2.1.0.tgz#873ac00fec83749f255ac8dd083814b4f6329190" + resolved "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz" integrity sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw== array.prototype.flat@^1.2.5: version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" + resolved "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz" integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== dependencies: call-bind "^1.0.2" @@ -2123,7 +2609,7 @@ array.prototype.flat@^1.2.5: array.prototype.flatmap@^1.3.1: version "1.3.1" - resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" + resolved "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz" integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== dependencies: call-bind "^1.0.2" @@ -2133,7 +2619,7 @@ array.prototype.flatmap@^1.3.1: array.prototype.tosorted@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz#ccf44738aa2b5ac56578ffda97c03fd3e23dd532" + resolved "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz" integrity sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ== dependencies: call-bind "^1.0.2" @@ -2144,37 +2630,37 @@ array.prototype.tosorted@^1.1.1: asap@~2.0.3: version "2.0.6" - resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" + resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== ast-types-flow@^0.0.7: version "0.0.7" - resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" + resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz" integrity sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag== async-validator@^4.1.0: version "4.2.5" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339" + resolved "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz" integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg== async-validator@~1.11.3: version "1.11.5" - resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.11.5.tgz#9d43cf49ef6bb76be5442388d19fb9a6e47597ea" + resolved "https://registry.npmjs.org/async-validator/-/async-validator-1.11.5.tgz" integrity sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w== asynckit@^0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" + resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== axe-core@^4.4.3: version "4.6.1" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.1.tgz#79cccdee3e3ab61a8f42c458d4123a6768e6fbce" + resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz" integrity sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w== axios@^1.1.3: version "1.2.1" - resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" + resolved "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz" integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== dependencies: follow-redirects "^1.15.0" @@ -2183,12 +2669,12 @@ axios@^1.1.3: axobject-query@^2.2.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" + resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" + resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== dependencies: core-js "^2.4.0" @@ -2196,30 +2682,35 @@ babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: balanced-match@^1.0.0: version "1.0.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -big.js@^5.2.2: - version "5.2.2" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" - integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ== - bignumber.js@^8.1.1: version "8.1.1" - resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.1.1.tgz#4b072ae5aea9c20f6730e4e5d529df1271c4d885" + resolved "https://registry.npmjs.org/bignumber.js/-/bignumber.js-8.1.1.tgz" integrity sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ== brace-expansion@^1.1.7: version "1.1.11" - resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" + resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz" integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA== dependencies: balanced-match "^1.0.0" concat-map "0.0.1" +browserslist@^4.21.3: + version "4.21.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987" + integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw== + dependencies: + caniuse-lite "^1.0.30001400" + electron-to-chromium "^1.4.251" + node-releases "^2.0.6" + update-browserslist-db "^1.0.9" + call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz" integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== dependencies: function-bind "^1.1.1" @@ -2227,12 +2718,33 @@ call-bind@^1.0.0, call-bind@^1.0.2: callsites@^3.0.0: version "3.1.0" - resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -chalk@^4.0.0: +caniuse-lite@^1.0.30001400: + version "1.0.30001441" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001441.tgz#987437b266260b640a23cd18fbddb509d7f69f3e" + integrity sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg== + +cartocolor@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.2.tgz#ef1aa12860f6eeedc8d2420e2b9d7337937c4993" + integrity sha512-+Gh9mb6lFxsDOLQlBLPxAHCnWXlg2W8q3AcVwqRcy95TdBbcOU89Wrb6h2Hd/6Ww1Kc1pzXmUdpnWD+xeCG0dg== + dependencies: + colorbrewer "1.0.0" + +chalk@^2.0.0, chalk@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" + integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + +chalk@^4.0.0, chalk@^4.1.0: version "4.1.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" @@ -2240,24 +2752,31 @@ chalk@^4.0.0: clamp@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634" + resolved "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz" integrity sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA== classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1, classnames@^2.3.2: version "2.3.2" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" + resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz" integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== +color-convert@^1.9.0: + version "1.9.3" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" + integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== + dependencies: + color-name "1.1.3" + color-convert@^2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz" integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== dependencies: color-name "~1.1.4" color-interpolate@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/color-interpolate/-/color-interpolate-1.0.5.tgz#d5710ce4244bd8b9feeda003f409edd4073b6217" + resolved "https://registry.npmjs.org/color-interpolate/-/color-interpolate-1.0.5.tgz" integrity sha512-EcWwYtBJdbeHyYq/y5QwVWLBUm4s7+8K37ycgO9OdY6YuAEa0ywAY+ItlAxE1UO5bXW4ugxNhStTV3rsTZ35ZA== dependencies: clamp "^1.0.1" @@ -2265,63 +2784,93 @@ color-interpolate@^1.0.5: color-space "^1.14.3" lerp "^1.0.3" +color-name@1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== + color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== color-parse@^1.2.0: version "1.4.2" - resolved "https://registry.yarnpkg.com/color-parse/-/color-parse-1.4.2.tgz#78651f5d34df1a57f997643d86f7f87268ad4eb5" + resolved "https://registry.npmjs.org/color-parse/-/color-parse-1.4.2.tgz" integrity sha512-RI7s49/8yqDj3fECFZjUI1Yi0z/Gq1py43oNJivAIIDSyJiOZLfYCRQEgn8HEVAj++PcRe8AnL2XF0fRJ3BTnA== dependencies: color-name "^1.0.0" color-space@^1.14.3: version "1.16.0" - resolved "https://registry.yarnpkg.com/color-space/-/color-space-1.16.0.tgz#611781bca41cd8582a1466fd9e28a7d3d89772a2" + resolved "https://registry.npmjs.org/color-space/-/color-space-1.16.0.tgz" integrity sha512-A6WMiFzunQ8KEPFmj02OnnoUnqhmSaHaZ/0LVFcPTdlvm8+3aMJ5x1HRHy3bDHPkovkf4sS0f4wsVvwk71fKkg== dependencies: hsluv "^0.0.3" mumath "^3.3.4" +colorbrewer@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/colorbrewer/-/colorbrewer-1.0.0.tgz#4f97333b969ba7612382be4bc3394b341fb4c8a2" + integrity sha512-NZuIOVdErK/C6jDH3jWT/roxWJbJAinMiqEpbuWniKvQAoWdg6lGra3pPrSHvaIf8PlX8wLs/RAC6nULFJbgmg== + combined-stream@^1.0.8: version "1.0.8" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" + resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== dependencies: delayed-stream "~1.0.0" +command-line-args@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/command-line-args/-/command-line-args-5.1.1.tgz#88e793e5bb3ceb30754a86863f0401ac92fd369a" + integrity sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg== + dependencies: + array-back "^3.0.1" + find-replace "^3.0.0" + lodash.camelcase "^4.3.0" + typical "^4.0.0" + +command-line-usage@6.1.1: + version "6.1.1" + resolved "https://registry.yarnpkg.com/command-line-usage/-/command-line-usage-6.1.1.tgz#c908e28686108917758a49f45efb4f02f76bc03f" + integrity sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA== + dependencies: + array-back "^4.0.1" + chalk "^2.4.2" + table-layout "^1.0.1" + typical "^5.2.0" + commander@2: version "2.20.3" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" + resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== component-classes@^1.2.5: version "1.2.6" - resolved "https://registry.yarnpkg.com/component-classes/-/component-classes-1.2.6.tgz#c642394c3618a4d8b0b8919efccbbd930e5cd691" + resolved "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz" integrity sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA== dependencies: component-indexof "0.0.3" component-indexof@0.0.3: version "0.0.3" - resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24" + resolved "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz" integrity sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw== compute-scroll-into-view@^1.0.20: version "1.0.20" - resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz#1768b5522d1172754f5d0c9b02de3af6be506a43" + resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz" integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg== concat-map@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" + resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== concaveman@*: version "1.2.1" - resolved "https://registry.yarnpkg.com/concaveman/-/concaveman-1.2.1.tgz#47d20b4521125c15fabf453653c2696d9ee41e0b" + resolved "https://registry.npmjs.org/concaveman/-/concaveman-1.2.1.tgz" integrity sha512-PwZYKaM/ckQSa8peP5JpVr7IMJ4Nn/MHIaWUjP4be+KoZ7Botgs8seAZGpmaOM+UZXawcdYRao/px9ycrCihHw== dependencies: point-in-polygon "^1.1.0" @@ -2331,7 +2880,7 @@ concaveman@*: connected-react-router@^6.5.2: version "6.9.3" - resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972" + resolved "https://registry.npmjs.org/connected-react-router/-/connected-react-router-6.9.3.tgz" integrity sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ== dependencies: lodash.isequalwith "^4.4.0" @@ -2340,31 +2889,43 @@ connected-react-router@^6.5.2: immutable "^3.8.1 || ^4.0.0" seamless-immutable "^7.1.3" +convert-source-map@^1.7.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f" + integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A== + +copy-anything@^2.0.1: + version "2.0.6" + resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" + integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw== + dependencies: + is-what "^3.14.1" + copy-to-clipboard@^3.2.0: version "3.3.3" - resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" + resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz" integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA== dependencies: toggle-selection "^1.0.6" core-js-pure@^3.25.1: version "3.27.0" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.27.0.tgz#091dce4799a5aad4cfde930ea747b0a1962388c5" + resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.0.tgz" integrity sha512-fJml7FM6v1HI3Gkg5/Ifc/7Y2qXcJxaDwSROeZGAZfNykSTvUk94WT55TYzJ2lFHK0voSr/d4nOVChLuNCWNpA== core-js@^1.0.0: version "1.2.7" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" + resolved "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz" integrity sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA== -core-js@^2.4.0: +core-js@^2.4.0, core-js@^2.6.5: version "2.6.12" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== create-react-class@^15.5.3: version "15.7.0" - resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e" + resolved "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz" integrity sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng== dependencies: loose-envify "^1.3.1" @@ -2372,7 +2933,7 @@ create-react-class@^15.5.3: cross-spawn@^7.0.2: version "7.0.3" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" @@ -2381,7 +2942,7 @@ cross-spawn@^7.0.2: css-animation@^1.3.2: version "1.6.1" - resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.6.1.tgz#162064a3b0d51f958b7ff37b3d6d4de18e17039e" + resolved "https://registry.npmjs.org/css-animation/-/css-animation-1.6.1.tgz" integrity sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog== dependencies: babel-runtime "6.x" @@ -2389,12 +2950,12 @@ css-animation@^1.3.2: csscolorparser@~1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b" + resolved "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz" integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w== csstype@^3.0.2: version "3.1.1" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== cubic-hermite-spline@^1.0.1: @@ -2404,95 +2965,145 @@ cubic-hermite-spline@^1.0.1: d3-array@1: version "1.2.4" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" + resolved "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz" integrity sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw== +"d3-array@2 - 3", "d3-array@2.10.0 - 3", d3-array@^3.2.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.1.tgz#39331ea706f5709417d31bbb6ec152e0328b39b3" + integrity sha512-gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ== + dependencies: + internmap "1 - 2" + +"d3-color@1 - 3", d3-color@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2" + integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA== + d3-dsv@^1.0.8: version "1.2.0" - resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-1.2.0.tgz#9d5f75c3a5f8abd611f74d3f5847b0d4338b885c" + resolved "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz" integrity sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g== dependencies: commander "2" iconv-lite "0.4" rw "1" +"d3-format@1 - 3", d3-format@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641" + integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA== + d3-geo@1.7.1: version "1.7.1" - resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-1.7.1.tgz#44bbc7a218b1fd859f3d8fd7c443ca836569ce99" + resolved "https://registry.npmjs.org/d3-geo/-/d3-geo-1.7.1.tgz" integrity sha512-O4AempWAr+P5qbk2bC2FuN/sDW4z+dN2wDf9QV3bxQt4M5HfOEeXLgJ/UKQW0+o1Dj8BE+L5kiDbdWUMjsmQpw== dependencies: d3-array "1" d3-hexbin@^0.2.1: version "0.2.2" - resolved "https://registry.yarnpkg.com/d3-hexbin/-/d3-hexbin-0.2.2.tgz#9c5837dacfd471ab05337a9e91ef10bfc4f98831" + resolved "https://registry.npmjs.org/d3-hexbin/-/d3-hexbin-0.2.2.tgz" integrity sha512-KS3fUT2ReD4RlGCjvCEm1RgMtp2NFZumdMu4DBzQK8AZv3fXRM6Xm8I4fSU07UXvH4xxg03NwWKWdvxfS/yc4w== +"d3-interpolate@1.2.0 - 3": + version "3.0.1" + resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d" + integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g== + dependencies: + d3-color "1 - 3" + +d3-scale@^4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396" + integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ== + dependencies: + d3-array "2.10.0 - 3" + d3-format "1 - 3" + d3-interpolate "1.2.0 - 3" + d3-time "2.1.1 - 3" + d3-time-format "2 - 4" + +"d3-time-format@2 - 4": + version "4.1.0" + resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a" + integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg== + dependencies: + d3-time "1 - 3" + +"d3-time@1 - 3", "d3-time@2.1.1 - 3": + version "3.1.0" + resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7" + integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q== + dependencies: + d3-array "2 - 3" + d3-voronoi@1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/d3-voronoi/-/d3-voronoi-1.1.2.tgz#1687667e8f13a2d158c80c1480c5a29cb0d8973c" + resolved "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz" integrity sha512-RhGS1u2vavcO7ay7ZNAPo4xeDh/VYeGof3x5ZLJBQgYhLegxr3s5IykvWmJ94FTU6mcbtp4sloqZ54mP6R4Utw== damerau-levenshtein@^1.0.8: version "1.0.8" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" + resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== date-fns@2.x: version "2.29.3" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" + resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz" integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== dayjs@1.x: version "1.11.7" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== debug@^2.6.9: version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@^3.2.7: +debug@^3.2.6, debug@^3.2.7: version "3.2.7" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.1.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: +debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -deck.gl@^7: - version "7.3.15" - resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-7.3.15.tgz#b212656f695f46cae3d54f8c8afd4386821f2747" - integrity sha512-GM220fClPeH8Zc0cYuypucjlx6DS7TeCQTaqCneugoPU9u7butxgsiWDNWs1ewWtmmvWmTBJTMUzddgPLl55Ng== - dependencies: - "@deck.gl/aggregation-layers" "7.3.15" - "@deck.gl/core" "7.3.15" - "@deck.gl/extensions" "7.3.15" - "@deck.gl/geo-layers" "7.3.15" - "@deck.gl/google-maps" "7.3.15" - "@deck.gl/json" "7.3.15" - "@deck.gl/layers" "7.3.15" - "@deck.gl/mapbox" "7.3.15" - "@deck.gl/mesh-layers" "7.3.15" - "@deck.gl/react" "7.3.15" +deck.gl@^8.8.20: + version "8.8.20" + resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-8.8.20.tgz#049619f7881273c10d963513b1c90335516d4704" + integrity sha512-6aybdEw1TLlnpwOk+c/KZpE6JJ/SbEPQ/vBlzL+ov7Lz2p7nijinVWge9ESpNzCuwFIzAY5evDj0LFREe5jlgA== + dependencies: + "@deck.gl/aggregation-layers" "8.8.20" + "@deck.gl/carto" "8.8.20" + "@deck.gl/core" "8.8.20" + "@deck.gl/extensions" "8.8.20" + "@deck.gl/geo-layers" "8.8.20" + "@deck.gl/google-maps" "8.8.20" + "@deck.gl/json" "8.8.20" + "@deck.gl/layers" "8.8.20" + "@deck.gl/mapbox" "8.8.20" + "@deck.gl/mesh-layers" "8.8.20" + "@deck.gl/react" "8.8.20" deep-diff@^0.3.5: version "0.3.8" - resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" + resolved "https://registry.npmjs.org/deep-diff/-/deep-diff-0.3.8.tgz" integrity sha512-yVn6RZmHiGnxRKR9sJb3iVV2XTF1Ghh2DiWRZ3dMnGc43yUdWWF/kX6lQyk3+P84iprfWKU/8zFTrlkvtFm1ug== deep-equal@1.x, deep-equal@^1.0.0: version "1.1.1" - resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a" + resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz" integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g== dependencies: is-arguments "^1.0.4" @@ -2502,14 +3113,19 @@ deep-equal@1.x, deep-equal@^1.0.0: object-keys "^1.1.1" regexp.prototype.flags "^1.2.0" +deep-extend@~0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" + integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== + deep-is@^0.1.3: version "0.1.4" - resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831" + resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz" integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" + resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz" integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA== dependencies: has-property-descriptors "^1.0.0" @@ -2517,41 +3133,41 @@ define-properties@^1.1.3, define-properties@^1.1.4: delayed-stream@~1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" + resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz" integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== density-clustering@1.3.0: version "1.3.0" - resolved "https://registry.yarnpkg.com/density-clustering/-/density-clustering-1.3.0.tgz#dc9f59c8f0ab97e1624ac64930fd3194817dcac5" + resolved "https://registry.npmjs.org/density-clustering/-/density-clustering-1.3.0.tgz" integrity sha512-icpmBubVTwLnsaor9qH/4tG5+7+f61VcqMN3V3pm9sxxSCt2Jcs0zWOgwZW9ARJYaKD3FumIgHiMOcIMRRAzFQ== doctrine@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz" integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw== dependencies: esutils "^2.0.2" doctrine@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz" integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== dependencies: esutils "^2.0.2" dom-align@^1.7.0: version "1.12.4" - resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.4.tgz#3503992eb2a7cfcb2ed3b2a6d21e0b9c00d54511" + resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz" integrity sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw== dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0: version "1.2.1" - resolved "https://registry.yarnpkg.com/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz#e8f36732dd089b0201a88d7815dc3f88e6d66c7e" + resolved "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz" integrity sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ== dom-serializer@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53" + resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz" integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg== dependencies: domelementtype "^2.3.0" @@ -2565,28 +3181,41 @@ dom-walk@^0.1.0: domelementtype@^2.3.0: version "2.3.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d" + resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz" integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw== domhandler@5.0.3, domhandler@^5.0.1, domhandler@^5.0.2: version "5.0.3" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31" + resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz" integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w== dependencies: domelementtype "^2.3.0" domutils@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c" + resolved "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz" integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q== dependencies: dom-serializer "^2.0.0" domelementtype "^2.3.0" domhandler "^5.0.1" +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + +draco3d@1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/draco3d/-/draco3d-1.4.1.tgz#2abdcf7b59caaac50f7e189aec454176c57146b2" + integrity sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg== + draft-js@^0.10.0, draft-js@~0.10.0: version "0.10.5" - resolved "https://registry.yarnpkg.com/draft-js/-/draft-js-0.10.5.tgz#bfa9beb018fe0533dbb08d6675c371a6b08fa742" + resolved "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz" integrity sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg== dependencies: fbjs "^0.8.15" @@ -2595,29 +3224,29 @@ draft-js@^0.10.0, draft-js@~0.10.0: earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.2: version "2.2.4" - resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== +electron-to-chromium@^1.4.251: + version "1.4.284" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" + integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA== + emoji-regex@^9.2.2: version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" + resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== -emojis-list@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" - integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q== - encoding@^0.1.11: version "0.1.13" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: iconv-lite "^0.6.2" engine.io-client@~6.2.3: version "6.2.3" - resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.2.3.tgz#a8cbdab003162529db85e9de31575097f6d29458" + resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz" integrity sha512-aXPtgF1JS3RuuKcpSrBtimSjYvrbhKW9froICH4s0F3XQWLxsKNxqzG39nnvQZQnva4CMvUK63T7shevxRyYHw== dependencies: "@socket.io/component-emitter" "~3.1.0" @@ -2628,17 +3257,24 @@ engine.io-client@~6.2.3: engine.io-parser@~5.0.3: version "5.0.4" - resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0" + resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz" integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg== entities@^4.2.0, entities@^4.3.0: version "4.4.0" - resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" + resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz" integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== +errno@^0.1.1: + version "0.1.8" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" + integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== + dependencies: + prr "~1.0.1" + es-abstract@^1.19.0, es-abstract@^1.20.4: version "1.20.5" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.5.tgz#e6dc99177be37cacda5988e692c3fa8b218e95d2" + resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.5.tgz" integrity sha512-7h8MM2EQhsCA7pU/Nv78qOXFpD8Rhqd12gYiSJVkrH9+e8VuA8JlPJK/hQjjlLv6pJvx/z1iRFKzYb0XT/RuAQ== dependencies: call-bind "^1.0.2" @@ -2669,14 +3305,14 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: es-shim-unscopables@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz#702e632193201e3edf8713635d083d378e510241" + resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz" integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w== dependencies: has "^1.0.3" es-to-primitive@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz" integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA== dependencies: is-callable "^1.1.4" @@ -2685,7 +3321,7 @@ es-to-primitive@^1.2.1: esbuild@^0.16.3: version "0.16.12" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.16.12.tgz#60850b9ad2f103f1c4316be42c34d5023f27378d" + resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.16.12.tgz" integrity sha512-eq5KcuXajf2OmivCl4e89AD3j8fbV+UTE9vczEzq5haA07U9oOTzBWlh3+6ZdjJR7Rz2QfWZ2uxZyhZxBgJ4+g== optionalDependencies: "@esbuild/android-arm" "0.16.12" @@ -2711,19 +3347,29 @@ esbuild@^0.16.3: "@esbuild/win32-ia32" "0.16.12" "@esbuild/win32-x64" "0.16.12" +escalade@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" + integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== + +escape-string-regexp@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== + escape-string-regexp@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== eslint-config-prettier@^8.3.0: version "8.5.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + resolved "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-import-resolver-node@^0.3.6: version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + resolved "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz" integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: debug "^3.2.7" @@ -2731,14 +3377,14 @@ eslint-import-resolver-node@^0.3.6: eslint-module-utils@^2.7.3: version "2.7.4" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" + resolved "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz" integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== dependencies: debug "^3.2.7" eslint-plugin-import@^2.25.4: version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" + resolved "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz" integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== dependencies: array-includes "^3.1.4" @@ -2757,7 +3403,7 @@ eslint-plugin-import@^2.25.4: eslint-plugin-jsx-a11y@^6.5.1: version "6.6.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz#93736fc91b83fdc38cc8d115deedfc3091aef1ff" + resolved "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.6.1.tgz" integrity sha512-sXgFVNHiWffBq23uiS/JaP6eVR622DqwB4yTzKvGZGcPq6/yZ3WmOZfuBks/vHWo9GaFOqC2ZK4i6+C35knx7Q== dependencies: "@babel/runtime" "^7.18.9" @@ -2776,14 +3422,14 @@ eslint-plugin-jsx-a11y@^6.5.1: eslint-plugin-prettier@^4.0.0: version "4.2.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz#651cbb88b1dab98bfd42f017a12fa6b2d993f94b" + resolved "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.2.1.tgz" integrity sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ== dependencies: prettier-linter-helpers "^1.0.0" eslint-plugin-react@^7.28.0: version "7.31.11" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz#011521d2b16dcf95795df688a4770b4eaab364c8" + resolved "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.31.11.tgz" integrity sha512-TTvq5JsT5v56wPa9OYHzsrOlHzKZKjV+aLgS+55NJP/cuzdiQPC7PfYoUjMoxlffKtvijpk7vA/jmuqRb9nohw== dependencies: array-includes "^3.1.6" @@ -2804,12 +3450,12 @@ eslint-plugin-react@^7.28.0: eslint-plugin-simple-import-sort@^7.0.0: version "7.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz#a1dad262f46d2184a90095a60c66fef74727f0f8" + resolved "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-7.0.0.tgz" integrity sha512-U3vEDB5zhYPNfxT5TYR7u01dboFZp+HNpnGhkDB2g/2E4wZ/g1Q9Ton8UwCLfRV9yAKyYqDh62oHOamvkFxsvw== eslint-scope@^7.1.1: version "7.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz" integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== dependencies: esrecurse "^4.3.0" @@ -2817,24 +3463,24 @@ eslint-scope@^7.1.1: eslint-utils@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz" integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== dependencies: eslint-visitor-keys "^2.0.0" eslint-visitor-keys@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint-visitor-keys@^3.3.0: version "3.3.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== eslint@^8.11.0: version "8.30.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.30.0.tgz#83a506125d089eef7c5b5910eeea824273a33f50" + resolved "https://registry.npmjs.org/eslint/-/eslint-8.30.0.tgz" integrity sha512-MGADB39QqYuzEGov+F/qb18r4i7DohCDOfatHaxI2iGlPuC65bwG2gxgO+7DkyL38dRFaRH7RaRAgU6JKL9rMQ== dependencies: "@eslint/eslintrc" "^1.4.0" @@ -2879,7 +3525,7 @@ eslint@^8.11.0: espree@^9.4.0: version "9.4.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-9.4.1.tgz#51d6092615567a2c2cff7833445e37c28c0065bd" + resolved "https://registry.npmjs.org/espree/-/espree-9.4.1.tgz" integrity sha512-XwctdmTO6SIvCzd9810yyNzIrOrqNYV9Koizx4C/mRhf9uq0o4yHoCEU/670pOxOL/MSraektvSAji79kX90Vg== dependencies: acorn "^8.8.0" @@ -2888,65 +3534,65 @@ espree@^9.4.0: esquery@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: estraverse "^5.1.0" esrecurse@^4.3.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz" integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: estraverse "^5.2.0" estraverse@^5.1.0, estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" + resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== esutils@^2.0.2: version "2.0.3" - resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== expression-eval@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/expression-eval/-/expression-eval-2.1.0.tgz#422915caa46140a7c5b5f248650dea8bf8236e62" + resolved "https://registry.npmjs.org/expression-eval/-/expression-eval-2.1.0.tgz" integrity sha512-FUJO/Akvl/JOWkvlqZaqbkhsEWlCJWDeZG4tzX96UH68D9FeRgYgtb55C2qtqbORC0Q6x5419EDjWu4IT9kQfg== dependencies: jsep "^0.3.0" fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-diff@^1.1.2: version "1.2.0" - resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" + resolved "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-json-stable-stringify@^2.0.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== fast-levenshtein@^2.0.6: version "2.0.6" - resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" + resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz" integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fastq@^1.6.0: version "1.14.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.14.0.tgz#107f69d7295b11e0fccc264e1fc6389f623731ce" + resolved "https://registry.npmjs.org/fastq/-/fastq-1.14.0.tgz" integrity sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg== dependencies: reusify "^1.0.4" fbjs@^0.8.15: version "0.8.18" - resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.18.tgz#9835e0addb9aca2eff53295cd79ca1cfc7c9662a" + resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz" integrity sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA== dependencies: core-js "^1.0.0" @@ -2959,14 +3605,21 @@ fbjs@^0.8.15: file-entry-cache@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== dependencies: flat-cache "^3.0.4" +find-replace@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-replace/-/find-replace-3.0.0.tgz#3e7e23d3b05167a76f770c9fbd5258b0def68c38" + integrity sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ== + dependencies: + array-back "^3.0.1" + find-up@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz" integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== dependencies: locate-path "^6.0.0" @@ -2974,34 +3627,48 @@ find-up@^5.0.0: flat-cache@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz" integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== dependencies: flatted "^3.1.0" rimraf "^3.0.2" +flatbuffers@1.12.0: + version "1.12.0" + resolved "https://registry.yarnpkg.com/flatbuffers/-/flatbuffers-1.12.0.tgz#72e87d1726cb1b216e839ef02658aa87dcef68aa" + integrity sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ== + flatted@^3.1.0: version "3.2.7" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" + resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== follow-redirects@^1.15.0: version "1.15.2" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== form-data@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz" integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== dependencies: asynckit "^0.4.0" combined-stream "^1.0.8" mime-types "^2.1.12" +fs-extra@^7.0.0: + version "7.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" + integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs.realpath@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" + resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz" integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: @@ -3011,12 +3678,12 @@ fsevents@~2.3.2: function-bind@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== function.prototype.name@^1.1.5: version "1.1.5" - resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621" + resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz" integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA== dependencies: call-bind "^1.0.2" @@ -3026,19 +3693,24 @@ function.prototype.name@^1.1.5: functions-have-names@^1.2.2: version "1.2.3" - resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" + resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== +gensync@^1.0.0-beta.2: + version "1.0.0-beta.2" + resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" + integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== + geojson-equality@0.1.6: version "0.1.6" - resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72" + resolved "https://registry.npmjs.org/geojson-equality/-/geojson-equality-0.1.6.tgz" integrity sha512-TqG8YbqizP3EfwP5Uw4aLu6pKkg6JQK9uq/XZ1lXQntvTHD1BBKJWhNpJ2M0ax6TuWMP3oyx6Oq7FCIfznrgpQ== dependencies: deep-equal "^1.0.0" geojson-rbush@3.x: version "3.2.0" - resolved "https://registry.yarnpkg.com/geojson-rbush/-/geojson-rbush-3.2.0.tgz#8b543cf0d56f99b78faf1da52bb66acad6dfc290" + resolved "https://registry.npmjs.org/geojson-rbush/-/geojson-rbush-3.2.0.tgz" integrity sha512-oVltQTXolxvsz1sZnutlSuLDEcQAKYC/uXt9zDzJJ6bu0W+baTI8LZBaTup5afzibEH4N3jlq2p+a152wlBJ7w== dependencies: "@turf/bbox" "*" @@ -3054,12 +3726,17 @@ geojson-types@^2.0.1: geojson-vt@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7" + resolved "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz" integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg== +geojson@0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/geojson/-/geojson-0.5.0.tgz#3cd6c96399be65b56ee55596116fe9191ce701c0" + integrity sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ== + get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: version "1.1.3" - resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz" integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A== dependencies: function-bind "^1.1.1" @@ -3068,12 +3745,12 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: get-stream@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-symbol-description@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6" + resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz" integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw== dependencies: call-bind "^1.0.2" @@ -3081,19 +3758,19 @@ get-symbol-description@^1.0.0: gl-matrix@^3.0.0, gl-matrix@^3.2.1, gl-matrix@^3.4.0: version "3.4.3" - resolved "https://registry.yarnpkg.com/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9" + resolved "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== glob-parent@^6.0.2: version "6.0.2" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz" integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== dependencies: is-glob "^4.0.3" glob@^7.1.3: version "7.2.3" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" @@ -3111,43 +3788,53 @@ global@>=4.3.0: min-document "^2.19.0" process "^0.11.10" +globals@^11.1.0: + version "11.12.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" + integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== + globals@^13.19.0: version "13.19.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.19.0.tgz#7a42de8e6ad4f7242fbcca27ea5b23aca367b5c8" + resolved "https://registry.npmjs.org/globals/-/globals-13.19.0.tgz" integrity sha512-dkQ957uSRWHw7CFXLUtUHQI3g3aWApYhfNR2O6jn/907riyTYKVBmxYVROkBcY614FSSeSJh7Xm7SrUWCxvJMQ== dependencies: type-fest "^0.20.2" gopd@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz" integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== dependencies: get-intrinsic "^1.1.3" +graceful-fs@^4.1.2, graceful-fs@^4.1.6: + version "4.2.10" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" + integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + grapheme-splitter@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" + resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== grid-index@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7" + resolved "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz" integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA== -h3-js@^3.4.3: +h3-js@^3.6.4, h3-js@^3.7.0: version "3.7.2" resolved "https://registry.yarnpkg.com/h3-js/-/h3-js-3.7.2.tgz#61d4feb7bb42868ca9cdb2d5cf9d9dda94f9e5a3" integrity sha512-LPjlHSwB9zQZrMqKloCZmmmt3yZzIK7nqPcXqwU93zT3TtYG6jP4tZBzAPouxut7lLjdFbMQ75wRBiKfpsnY7w== hammerjs@^2.0.8: version "2.0.8" - resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" + resolved "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz" integrity sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ== handsontable@^6: version "6.2.2" - resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-6.2.2.tgz#f1250f3f374abdf7d4a0080950482d3edeea8f07" + resolved "https://registry.npmjs.org/handsontable/-/handsontable-6.2.2.tgz" integrity sha512-Z/sQa51OMHH4RoeBJeANYJMJYmx5SR+/xP8JCh5mzKJnAMKoQWF1zONPNgNCFZ/LdKFmI0f34XKtU0GHW0MG/Q== dependencies: moment "2.20.1" @@ -3156,43 +3843,48 @@ handsontable@^6: has-bigints@^1.0.1, has-bigints@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" + resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== +has-flag@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== + has-flag@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== has-property-descriptors@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861" + resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz" integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ== dependencies: get-intrinsic "^1.1.1" has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" + resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== has-tostringtag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz" integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== dependencies: has-symbols "^1.0.2" has@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" + resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== dependencies: function-bind "^1.1.1" history@^4.9.0: version "4.10.1" - resolved "https://registry.yarnpkg.com/history/-/history-4.10.1.tgz#33371a65e3a83b267434e2b3f3b1b4c58aad4cf3" + resolved "https://registry.npmjs.org/history/-/history-4.10.1.tgz" integrity sha512-36nwAD620w12kuzPAsyINPWJqlNbij+hpK1k9XRloDtym8mxzGYl2c17LnV6IAGB2Dmg4tEa7G7DlawS0+qjew== dependencies: "@babel/runtime" "^7.1.2" @@ -3204,19 +3896,19 @@ history@^4.9.0: hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2: version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" + resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz" integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== dependencies: react-is "^16.7.0" hsluv@^0.0.3: version "0.0.3" - resolved "https://registry.yarnpkg.com/hsluv/-/hsluv-0.0.3.tgz#829107dafb4a9f8b52a1809ed02e091eade6754c" + resolved "https://registry.npmjs.org/hsluv/-/hsluv-0.0.3.tgz" integrity sha512-08iL2VyCRbkQKBySkSh6m8zMUa3sADAxGVWs3Z1aPcUkTJeK0ETG4Fc27tEmQBGUAXZjIsXOZqBvacuVNSC/fQ== html-dom-parser@3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/html-dom-parser/-/html-dom-parser-3.1.2.tgz#c137c42df80e17d185ff35a806925d96cc73f408" + resolved "https://registry.npmjs.org/html-dom-parser/-/html-dom-parser-3.1.2.tgz" integrity sha512-mLTtl3pVn3HnqZSZzW3xVs/mJAKrG1yIw3wlp+9bdoZHHLaBRvELdpfShiPVLyjPypq1Fugv2KMDoGHW4lVXnw== dependencies: domhandler "5.0.3" @@ -3224,7 +3916,7 @@ html-dom-parser@3.1.2: html-react-parser@^3.0.4: version "3.0.6" - resolved "https://registry.yarnpkg.com/html-react-parser/-/html-react-parser-3.0.6.tgz#356b861e6ad48e3221337d5a5929c5e452f8dfdd" + resolved "https://registry.npmjs.org/html-react-parser/-/html-react-parser-3.0.6.tgz" integrity sha512-kFh/qJkz4KJudCcILfI1hQKXTheRyMREXuL/WbWYUAsMsu0EOwV4nO5jA3ecu1LUNpCcebkNcBECxqpswBDlLw== dependencies: domhandler "5.0.3" @@ -3234,7 +3926,7 @@ html-react-parser@^3.0.4: htmlparser2@8.0.1: version "8.0.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-8.0.1.tgz#abaa985474fcefe269bc761a779b544d7196d010" + resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.1.tgz" integrity sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA== dependencies: domelementtype "^2.3.0" @@ -3244,46 +3936,56 @@ htmlparser2@8.0.1: iconv-lite@0.4: version "0.4.24" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2: +iconv-lite@^0.6.2, iconv-lite@^0.6.3: version "0.6.3" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" ieee754@^1.1.12: version "1.2.1" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" + resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== ignore@^5.2.0: version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" + resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz" integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +image-size@^0.7.4: + version "0.7.5" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.5.tgz#269f357cf5797cb44683dfa99790e54c705ead04" + integrity sha512-Hiyv+mXHfFEP7LzUL/llg9RwFxxY+o9N3JVLIeG5E7iFIFAalxvRU9UZthBdYDEVnzHMgjnKJPPpay5BWf1g9g== + +image-size@~0.5.0: + version "0.5.5" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" + integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== + immutable@^3.7.4: version "3.8.2" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" + resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz" integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== "immutable@^3.8.1 || ^4.0.0": version "4.2.1" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.1.tgz#8a4025691018c560a40c67e43d698f816edc44d4" + resolved "https://registry.npmjs.org/immutable/-/immutable-4.2.1.tgz" integrity sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ== immutable@~3.7.4: version "3.7.6" - resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.7.6.tgz#13b4d3cb12befa15482a26fe1b2ebae640071e4b" + resolved "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz" integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw== import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" @@ -3291,12 +3993,20 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: imurmurhash@^0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz" integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== +indefinitely-typed@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/indefinitely-typed/-/indefinitely-typed-1.1.0.tgz#d0acd3645445e89ae1c70129be21609a0aa5a114" + integrity sha512-giaI0hCj+wWZIZZLsmWHI+LrM4Hwc+rEZ/VrgCafKePcnE42fLnQTFt4xspqLin8fCjI5WnQr2fep/0EFqjaxw== + dependencies: + fs-extra "^7.0.0" + minimist "^1.2.5" + inflight@^1.0.4: version "1.0.6" - resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" + resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz" integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" @@ -3304,26 +4014,31 @@ inflight@^1.0.4: inherits@2: version "2.0.4" - resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== inline-style-parser@0.1.1: version "0.1.1" - resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1" + resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz" integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q== internal-slot@^1.0.3: version "1.0.4" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.4.tgz#8551e7baf74a7a6ba5f749cfb16aa60722f0d6f3" + resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.4.tgz" integrity sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ== dependencies: get-intrinsic "^1.1.3" has "^1.0.3" side-channel "^1.0.4" +"internmap@1 - 2": + version "2.0.3" + resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009" + integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg== + is-arguments@^1.0.4: version "1.1.1" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz" integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: call-bind "^1.0.2" @@ -3331,14 +4046,14 @@ is-arguments@^1.0.4: is-bigint@^1.0.1: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz" integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== dependencies: has-bigints "^1.0.1" is-boolean-object@^1.1.0: version "1.1.2" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz" integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" @@ -3346,55 +4061,55 @@ is-boolean-object@^1.1.0: is-callable@^1.1.4, is-callable@^1.2.7: version "1.2.7" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" + resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== is-core-module@^2.8.1, is-core-module@^2.9.0: version "2.11.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== dependencies: has "^1.0.3" is-date-object@^1.0.1: version "1.0.5" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz" integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== dependencies: has-tostringtag "^1.0.0" is-extglob@^2.1.1: version "2.1.1" - resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-glob@^4.0.0, is-glob@^4.0.3: version "4.0.3" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" + resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz" integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg== dependencies: is-extglob "^2.1.1" is-negative-zero@^2.0.2: version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" + resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== is-number-object@^1.0.4: version "1.0.7" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc" + resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz" integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ== dependencies: has-tostringtag "^1.0.0" is-path-inside@^3.0.3: version "3.0.3" - resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283" + resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz" integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ== is-regex@^1.0.4, is-regex@^1.1.4: version "1.1.4" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz" integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" @@ -3402,50 +4117,55 @@ is-regex@^1.0.4, is-regex@^1.1.4: is-shared-array-buffer@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" + resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz" integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== dependencies: call-bind "^1.0.2" is-stream@^1.0.1: version "1.1.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" + resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== dependencies: has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz" integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: has-symbols "^1.0.2" is-weakref@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" + resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== dependencies: call-bind "^1.0.2" +is-what@^3.14.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" + integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== + isarray@0.0.1: version "0.0.1" - resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" + resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz" integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isexe@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isomorphic-fetch@^2.1.1: version "2.2.1" - resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" + resolved "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA== dependencies: node-fetch "^1.0.1" @@ -3453,58 +4173,75 @@ isomorphic-fetch@^2.1.1: js-sdsl@^4.1.4: version "4.2.0" - resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0" + resolved "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz" integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ== -"js-tokens@^3.0.0 || ^4.0.0": +"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^4.1.0: version "4.1.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== dependencies: argparse "^2.0.1" jsep@^0.3.0: version "0.3.5" - resolved "https://registry.yarnpkg.com/jsep/-/jsep-0.3.5.tgz#3fd79ebd92f6f434e4857d5272aaeef7d948264d" + resolved "https://registry.npmjs.org/jsep/-/jsep-0.3.5.tgz" integrity sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA== +jsesc@^2.5.1: + version "2.5.2" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" + integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== + +json-bignum@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/json-bignum/-/json-bignum-0.0.3.tgz#41163b50436c773d82424dbc20ed70db7604b8d7" + integrity sha512-2WHyXj3OfHSgNyuzDbSxI1w2jgw5gkWSWhS7Qg4bWXx1nLk3jnbwfUeS0PSba3IzpTUWdHxBieELUzXRjQB2zg== + json-schema-traverse@^0.4.1: version "0.4.1" - resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz" integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json2mq@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" + resolved "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz" integrity sha512-SzoRg7ux5DWTII9J2qkrZrqV1gt+rTaoufMxEzXbS26Uid0NwaJd123HcoB80TgubEppxxIGdNxCx50fEoEWQA== dependencies: string-convert "^0.2.0" json5@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" + resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz" integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== dependencies: minimist "^1.2.0" -json5@^2.1.2: +json5@^2.2.1: version "2.2.2" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.2.tgz#64471c5bdcc564c18f7c1d4df2e2297f2457c5ab" + resolved "https://registry.npmjs.org/json5/-/json5-2.2.2.tgz" integrity sha512-46Tk9JiOL2z7ytNQWFLpj99RZkVgeHf87yGQKsIkaPz1qSH9UczKH1rO7K3wgRselo0tYMUNfecYpm/p1vC7tQ== +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg== + optionalDependencies: + graceful-fs "^4.1.6" + "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.2: version "3.3.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz#76b3e6e6cece5c69d49a5792c3d01bd1a0cdc7ea" + resolved "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.3.tgz" integrity sha512-fYQHZTZ8jSfmWZ0iyzfwiU4WDX4HpHbMCZ3gPlWYiCl3BoeOTsqKBqnTVfH2rYT7eP5c3sVbeSPHnnJOaTrWiw== dependencies: array-includes "^3.1.5" @@ -3512,90 +4249,130 @@ json5@^2.1.2: kdbush@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" + resolved "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz" integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== +ktx-parse@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/ktx-parse/-/ktx-parse-0.0.4.tgz#6fd3eca82490de8a1e48cb8367a9980451fa1ac4" + integrity sha512-LY3nrmfXl+wZZdPxgJ3ZmLvG+wkOZZP3/dr4RbQj1Pk3Qwz44esOOSFFVQJcNWpXAtiNIC66WgXufX/SYgYz6A== + language-subtag-registry@^0.3.20: version "0.3.22" - resolved "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz#2e1500861b2e457eba7e7ae86877cbd08fa1fd1d" + resolved "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz" integrity sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w== language-tags@^1.0.5: version "1.0.7" - resolved "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.7.tgz#41cc248730f3f12a452c2e2efe32bc0bbce67967" + resolved "https://registry.npmjs.org/language-tags/-/language-tags-1.0.7.tgz" integrity sha512-bSytju1/657hFjgUzPAPqszxH62ouE8nQFoFaVlIQfne4wO/wXC9A4+m8jYve7YBBvi59eq0SUpcshvG8h5Usw== dependencies: language-subtag-registry "^0.3.20" lerp@^1.0.3: version "1.0.3" - resolved "https://registry.yarnpkg.com/lerp/-/lerp-1.0.3.tgz#a18c8968f917896de15ccfcc28d55a6b731e776e" + resolved "https://registry.npmjs.org/lerp/-/lerp-1.0.3.tgz" integrity sha512-70Rh4rCkJDvwWiTsyZ1HmJGvnyfFah4m6iTux29XmasRiZPDBpT9Cfa4ai73+uLZxnlKruUS62jj2lb11wURiA== +less@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/less/-/less-4.1.3.tgz#175be9ddcbf9b250173e0a00b4d6920a5b770246" + integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA== + dependencies: + copy-anything "^2.0.1" + parse-node-version "^1.0.1" + tslib "^2.3.0" + optionalDependencies: + errno "^0.1.1" + graceful-fs "^4.1.2" + image-size "~0.5.0" + make-dir "^2.1.0" + mime "^1.4.1" + needle "^3.1.0" + source-map "~0.6.0" + levn@^0.4.1: version "0.4.1" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz" integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== dependencies: prelude-ls "^1.2.1" type-check "~0.4.0" -loader-utils@^2.0.0: - version "2.0.4" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.4.tgz#8b5cb38b5c34a9a018ee1fc0e6a066d1dfcc528c" - integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw== - dependencies: - big.js "^5.2.2" - emojis-list "^3.0.0" - json5 "^2.1.2" - locate-path@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz" integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== dependencies: p-locate "^5.0.0" lodash.camelcase@^4.3.0: version "4.3.0" - resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + resolved "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== lodash.isequalwith@^4.4.0: version "4.4.0" - resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0" + resolved "https://registry.npmjs.org/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz" integrity sha512-dcZON0IalGBpRmJBmMkaoV7d3I80R2O+FrzsZyHdNSFrANq/cgDqKQNmAHE8UEj4+QYWwwhkQOVdLHiAopzlsQ== lodash.merge@^4.6.2: version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== +lodash.throttle@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" + integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== + lodash.upperfirst@^4.3.1: version "4.3.1" - resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + resolved "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== lodash@^4.16.5, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== long@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" + resolved "https://registry.npmjs.org/long/-/long-3.2.0.tgz" integrity sha512-ZYvPPOMqUwPoDsbJaR10iQJYnMuZhRTvHYl62ErLIEX7RgFlziSBUUvrt3OVfc47QlHHpzPZYP17g3Fv7oeJkg== loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" + resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== dependencies: js-tokens "^3.0.0 || ^4.0.0" +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== + dependencies: + tslib "^2.0.3" + +lru-cache@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" + integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== + dependencies: + yallist "^3.0.2" + +make-dir@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" + integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== + dependencies: + pify "^4.0.1" + semver "^5.6.0" + mapbox-gl@^1.0.0: version "1.13.2" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.2.tgz#76639c44f141f8dff71b7d8f1504f2aed11f7517" + resolved "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.2.tgz" integrity sha512-CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww== dependencies: "@mapbox/geojson-rewind" "^0.5.0" @@ -3622,7 +4399,7 @@ mapbox-gl@^1.0.0: tinyqueue "^2.0.3" vt-pbf "^3.1.1" -math.gl@^3.0.0, math.gl@^3.0.0-beta.3: +math.gl@^3.6.2: version "3.6.3" resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.6.3.tgz#f87e0d24cb33c1a215185ae3a4e16839f1ce6db2" integrity sha512-Yq9CyECvSDox9+5ETi2+x1bGTY5WvGUGL3rJfC4KPoCZAM51MGfrCm6rIn4yOJUVfMPs2a5RwMD+yGS/n1g3gg== @@ -3631,16 +4408,21 @@ math.gl@^3.0.0, math.gl@^3.0.0-beta.3: mime-db@1.52.0: version "1.52.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" + resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== mime-types@^2.1.12: version "2.1.35" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" + resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== dependencies: mime-db "1.52.0" +mime@^1.4.1: + version "1.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" + integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== + min-document@^2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685" @@ -3650,140 +4432,128 @@ min-document@^2.19.0: minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" + resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -mjolnir.js@^2.1.2, mjolnir.js@^2.5.0: +mjolnir.js@^2.5.0, mjolnir.js@^2.7.0: version "2.7.1" - resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.7.1.tgz#4e12590fe168b377c9c669b9c31aa5a62f8b8460" + resolved "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.7.1.tgz" integrity sha512-72BeUWgTv2cj5aZQKpwL8caNUFhXZ9bDm1hxpNj70XJQ62IBnTZmtv/WPxJvtaVNhzNo+D2U8O6ryNI0zImYcw== dependencies: "@types/hammerjs" "^2.0.41" hammerjs "^2.0.8" +moment-timezone@^0.5.33: + version "0.5.40" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.40.tgz#c148f5149fd91dd3e29bf481abc8830ecba16b89" + integrity sha512-tWfmNkRYmBkPJz5mr9GVDn9vRlVZOTe6yqY92rFxiOdWXbjaR0+9LwQnZGGuNR63X456NqmEkbskte8tWL5ePg== + dependencies: + moment ">= 2.9.0" + moment@2.20.1: version "2.20.1" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" + resolved "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz" integrity sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg== -moment@2.x, moment@^2.24.0, moment@^2.29.2: +moment@2.x, "moment@>= 2.9.0", moment@^2.24.0, moment@^2.29.2: version "2.29.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108" + resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== ms@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" + resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz" integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.2: version "2.1.2" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== ms@^2.1.1: version "2.1.3" - resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== mumath@^3.3.4: version "3.3.4" - resolved "https://registry.yarnpkg.com/mumath/-/mumath-3.3.4.tgz#48d4a0f0fd8cad4e7b32096ee89b161a63d30bbf" + resolved "https://registry.npmjs.org/mumath/-/mumath-3.3.4.tgz" integrity sha512-VAFIOG6rsxoc7q/IaY3jdjmrsuX9f15KlRLYTHmixASBZkZEKC1IFqE2BC5CdhXmK6WLM1Re33z//AGmeRI6FA== dependencies: almost-equal "^1.1.0" murmurhash-js@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51" + resolved "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz" integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw== nanoid@^3.3.4: version "3.3.4" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz" integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== natural-compare@^1.4.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== -nebula.gl@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/nebula.gl/-/nebula.gl-0.15.0.tgz#36f6aace30ff4f7f4cf1bc8a5d4c96cd05a2bde0" - integrity sha512-hbr44bLBa3anSYVC8yqYjkenzevE+Bev3q3lp1T6auoVVD4tI+qVUdKJgcdXD3fQZjOtmwbIfk/4kpAYiLI5FQ== +needle@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44" + integrity sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ== dependencies: - "@luma.gl/constants" "^7.0.0" - "@nebula.gl/layers" "0.15.0" - "@turf/bbox" ">=4.0.0" - "@turf/bbox-polygon" ">=4.0.0" - "@turf/bearing" ">=4.0.0" - "@turf/boolean-point-in-polygon" ">=4.0.0" - "@turf/buffer" ">=4.0.0" - "@turf/center" ">=4.0.0" - "@turf/centroid" ">=4.0.0" - "@turf/circle" ">=4.0.0" - "@turf/destination" ">=4.0.0" - "@turf/difference" ">=4.0.0" - "@turf/distance" ">=4.0.0" - "@turf/ellipse" ">=4.0.0" - "@turf/helpers" ">=4.0.0" - "@turf/intersect" ">=4.0.0" - "@turf/line-intersect" ">=4.0.0" - "@turf/nearest-point-on-line" ">=4.0.0" - "@turf/point-to-line-distance" ">=4.0.0" - "@turf/polygon-to-line" ">=4.0.0" - "@turf/transform-rotate" ">=4.0.0" - "@turf/transform-scale" ">=4.0.0" - "@turf/transform-translate" ">=4.0.0" - "@turf/union" ">=4.0.0" - cubic-hermite-spline "^1.0.1" - geojson-types "^2.0.1" - global ">=4.3.0" - viewport-mercator-project ">=6.0.0" + debug "^3.2.6" + iconv-lite "^0.6.3" + sax "^1.2.4" + +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== + dependencies: + lower-case "^2.0.2" + tslib "^2.0.3" node-fetch@^1.0.1: version "1.7.3" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz" integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== dependencies: encoding "^0.1.11" is-stream "^1.0.1" -node-loader@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" - integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q== - dependencies: - loader-utils "^2.0.0" +node-releases@^2.0.6: + version "2.0.8" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" + integrity sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A== numbro@^2.0.6: version "2.3.6" - resolved "https://registry.yarnpkg.com/numbro/-/numbro-2.3.6.tgz#4bd622ebe59ccbc49dad365c5b9eed200781fa21" + resolved "https://registry.npmjs.org/numbro/-/numbro-2.3.6.tgz" integrity sha512-pxpoTT3hVxQGaOA2RTzXR/muonQNd1K1HPJbWo7QOmxPwiPmoFCFfsG9XXgW3uqjyzezJ0P9IvCPDXUtJexjwg== dependencies: bignumber.js "^8.1.1" object-assign@*, object-assign@4.x, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" - resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" + resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.12.2, object-inspect@^1.9.0: version "1.12.2" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea" + resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz" integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ== object-is@^1.0.1: version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" + resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz" integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== dependencies: call-bind "^1.0.2" @@ -3791,12 +4561,12 @@ object-is@^1.0.1: object-keys@^1.1.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== object.assign@^4.1.3, object.assign@^4.1.4: version "4.1.4" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.4.tgz#9673c7c7c351ab8c4d0b516f4343ebf4dfb7799f" + resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz" integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ== dependencies: call-bind "^1.0.2" @@ -3806,7 +4576,7 @@ object.assign@^4.1.3, object.assign@^4.1.4: object.entries@^1.1.6: version "1.1.6" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.6.tgz#9737d0e5b8291edd340a3e3264bb8a3b00d5fa23" + resolved "https://registry.npmjs.org/object.entries/-/object.entries-1.1.6.tgz" integrity sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w== dependencies: call-bind "^1.0.2" @@ -3815,7 +4585,7 @@ object.entries@^1.1.6: object.fromentries@^2.0.6: version "2.0.6" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.6.tgz#cdb04da08c539cffa912dcd368b886e0904bfa73" + resolved "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz" integrity sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg== dependencies: call-bind "^1.0.2" @@ -3824,7 +4594,7 @@ object.fromentries@^2.0.6: object.hasown@^1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.2.tgz#f919e21fad4eb38a57bc6345b3afd496515c3f92" + resolved "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.2.tgz" integrity sha512-B5UIT3J1W+WuWIU55h0mjlwaqxiE5vYENJXIXZ4VFe05pNYrkKuK0U/6aFcb0pKywYJh7IhfoqUfKVmrJJHZHw== dependencies: define-properties "^1.1.4" @@ -3832,7 +4602,7 @@ object.hasown@^1.1.2: object.values@^1.1.5, object.values@^1.1.6: version "1.1.6" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" + resolved "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz" integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== dependencies: call-bind "^1.0.2" @@ -3841,21 +4611,21 @@ object.values@^1.1.5, object.values@^1.1.6: omit.js@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/omit.js/-/omit.js-1.0.2.tgz#91a14f0eba84066dfa015bf30e474c47f30bc858" + resolved "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz" integrity sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ== dependencies: babel-runtime "^6.23.0" once@^1.3.0: version "1.4.0" - resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" + resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" optionator@^0.9.1: version "0.9.1" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz" integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== dependencies: deep-is "^0.1.3" @@ -3867,55 +4637,83 @@ optionator@^0.9.1: p-limit@^3.0.2: version "3.1.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz" integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== dependencies: yocto-queue "^0.1.0" p-locate@^5.0.0: version "5.0.0" - resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz" integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== dependencies: p-limit "^3.0.2" +pad-left@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/pad-left/-/pad-left-2.1.0.tgz#16e6a3b2d44a8e138cb0838cc7cb403a4fc9e994" + integrity sha512-HJxs9K9AztdIQIAIa/OIazRAUW/L6B9hbQDxO4X07roW3eo9XqZc2ur9bn1StH9CnbbI9EgvejHQX7CBpCF1QA== + dependencies: + repeat-string "^1.5.4" + +param-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== + dependencies: + dot-case "^3.0.4" + tslib "^2.0.3" + parent-module@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz" integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== dependencies: callsites "^3.0.0" +parse-node-version@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" + integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== + +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + path-exists@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== path-is-absolute@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" + resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz" integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.7: version "1.0.7" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@^1.7.0: version "1.8.0" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" + resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz" integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA== dependencies: isarray "0.0.1" pbf@^3.2.1: version "3.2.1" - resolved "https://registry.yarnpkg.com/pbf/-/pbf-3.2.1.tgz#b4c1b9e72af966cd82c6531691115cc0409ffe2a" + resolved "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz" integrity sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ== dependencies: ieee754 "^1.1.12" @@ -3923,36 +4721,41 @@ pbf@^3.2.1: performance-now@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" + resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz" integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== picocolors@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" + resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +pify@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" + integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== + pikaday@1.5.1: version "1.5.1" - resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3" + resolved "https://registry.npmjs.org/pikaday/-/pikaday-1.5.1.tgz" integrity sha512-JpGs4DM+DrwhGx/deyi2pUcrUtTcyegR6XOIbFkjSaJp0yYp5d8Bvzlgtl8eaX1gNEqsqJZFIsRMEzdRA1xbDQ== optionalDependencies: moment "2.x" point-in-polygon@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz#b0af2616c01bdee341cbf2894df643387ca03357" + resolved "https://registry.npmjs.org/point-in-polygon/-/point-in-polygon-1.1.0.tgz" integrity sha512-3ojrFwjnnw8Q9242TzgXuTD+eKiutbzyslcq1ydfu82Db2y+Ogbmyrkpv0Hgj31qwT3lbS9+QAAO/pIQM35XRw== polygon-clipping@^0.15.3: version "0.15.3" - resolved "https://registry.yarnpkg.com/polygon-clipping/-/polygon-clipping-0.15.3.tgz#0215840438470ba2e9e6593625e4ea5c1087b4b7" + resolved "https://registry.npmjs.org/polygon-clipping/-/polygon-clipping-0.15.3.tgz" integrity sha512-ho0Xx5DLkgxRx/+n4O74XyJ67DcyN3Tu9bGYKsnTukGAW6ssnuak6Mwcyb1wHy9MZc9xsUWqIoiazkZB5weECg== dependencies: splaytree "^3.1.0" postcss@^8.4.20: version "8.4.20" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56" + resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.20.tgz" integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g== dependencies: nanoid "^3.3.4" @@ -3961,27 +4764,27 @@ postcss@^8.4.20: potpack@^1.0.1: version "1.0.2" - resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" + resolved "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz" integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ== prelude-ls@^1.2.1: version "1.2.1" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prettier-linter-helpers@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b" + resolved "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz" integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w== dependencies: fast-diff "^1.1.2" prettier@^2.4.1: version "2.8.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.1.tgz#4e1fd11c34e2421bc1da9aea9bd8127cd0a35efc" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.8.1.tgz" integrity sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg== -probe.gl@^3.1.0-beta.3, probe.gl@^3.1.1: +probe.gl@^3.4.0: version "3.5.4" resolved "https://registry.yarnpkg.com/probe.gl/-/probe.gl-3.5.4.tgz#9647581b18d7f6928540f77e0c98465d341e6f83" integrity sha512-zCHp8behCySEiH+V32gX12OSBLV5qop8RQ0ahrt0golVpNNLRPTKBOwHULqgUtnOhC5RllDcP5hHABBI7hTnZw== @@ -3998,14 +4801,14 @@ process@^0.11.10: promise@^7.1.1: version "7.3.1" - resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" + resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== dependencies: asap "~2.0.3" -prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== dependencies: loose-envify "^1.4.0" @@ -4014,58 +4817,70 @@ prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, pr protocol-buffers-schema@^3.3.1: version "3.6.0" - resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz#77bc75a48b2ff142c1ad5b5b90c94cd0fa2efd03" + resolved "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz" integrity sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw== proxy-from-env@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" + resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== + punycode@^2.1.0: version "2.1.1" - resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +quadbin@^0.1.2: + version "0.1.5" + resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.5.tgz#aa6dba53d0558236f8070450c90d6ed9b87507c8" + integrity sha512-/MQnN7V73myA+31gTxldTGN8ixqrUCXtUoDvRKSI9QZJOaq0cS9SNQkdToMxjC3ZSM2hN7mleOAn+9QVNlPZOg== + dependencies: + "@mapbox/tile-cover" "^3.0.2" + queue-microtask@^1.2.2: version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== quickselect@^1.0.1: version "1.1.1" - resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2" + resolved "https://registry.npmjs.org/quickselect/-/quickselect-1.1.1.tgz" integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ== quickselect@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-2.0.0.tgz#f19680a486a5eefb581303e023e98faaf25dd018" + resolved "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz" integrity sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw== raf@^3.4.0: version "3.4.1" - resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" + resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz" integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA== dependencies: performance-now "^2.1.0" rbush@2.x, rbush@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/rbush/-/rbush-2.0.2.tgz#bb6005c2731b7ba1d5a9a035772927d16a614605" + resolved "https://registry.npmjs.org/rbush/-/rbush-2.0.2.tgz" integrity sha512-XBOuALcTm+O/H8G90b6pzu6nX6v2zCKiFG4BJho8a+bY6AER6t8uQUZdi5bomQc0AprCWhEGa7ncAbbRap0bRA== dependencies: quickselect "^1.0.1" rbush@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/rbush/-/rbush-3.0.1.tgz#5fafa8a79b3b9afdfe5008403a720cc1de882ecf" + resolved "https://registry.npmjs.org/rbush/-/rbush-3.0.1.tgz" integrity sha512-XRaVO0YecOpEuIvbhbpTrZgoiI6xBlz6hnlr6EHhd+0x9ase6EmeN+hdwwUaJvLcsFFQ8iWVF1GAK1yB0BWi0w== dependencies: quickselect "^2.0.0" rc-align@^4.0.0: version "4.0.15" - resolved "https://registry.yarnpkg.com/rc-align/-/rc-align-4.0.15.tgz#2bbd665cf85dfd0b0244c5a752b07565e9098577" + resolved "https://registry.npmjs.org/rc-align/-/rc-align-4.0.15.tgz" integrity sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA== dependencies: "@babel/runtime" "^7.10.1" @@ -4076,7 +4891,7 @@ rc-align@^4.0.0: rc-animate@^2.10.2, rc-animate@^2.3.0: version "2.11.1" - resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-2.11.1.tgz#2666eeb6f1f2a495a13b2af09e236712278fdb2c" + resolved "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz" integrity sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ== dependencies: babel-runtime "6.x" @@ -4089,7 +4904,7 @@ rc-animate@^2.10.2, rc-animate@^2.3.0: rc-cascader@~3.7.0: version "3.7.0" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.7.0.tgz#98134df578ce1cca22be8fb4319b04df4f3dca36" + resolved "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.7.0.tgz" integrity sha512-SFtGpwmYN7RaWEAGTS4Rkc62ZV/qmQGg/tajr/7mfIkleuu8ro9Hlk6J+aA0x1YS4zlaZBtTcSaXM01QMiEV/A== dependencies: "@babel/runtime" "^7.12.5" @@ -4101,7 +4916,7 @@ rc-cascader@~3.7.0: rc-checkbox@~2.3.0: version "2.3.2" - resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-2.3.2.tgz#f91b3678c7edb2baa8121c9483c664fa6f0aefc1" + resolved "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.3.2.tgz" integrity sha512-afVi1FYiGv1U0JlpNH/UaEXdh6WUJjcWokj/nUN2TgG80bfG+MDdbfHKlLcNNba94mbjy2/SXJ1HDgrOkXGAjg== dependencies: "@babel/runtime" "^7.10.1" @@ -4109,7 +4924,7 @@ rc-checkbox@~2.3.0: rc-collapse@~3.4.2: version "3.4.2" - resolved "https://registry.yarnpkg.com/rc-collapse/-/rc-collapse-3.4.2.tgz#1310be7ad4cd0dcfc622c45f6c3b5ffdee403ad7" + resolved "https://registry.npmjs.org/rc-collapse/-/rc-collapse-3.4.2.tgz" integrity sha512-jpTwLgJzkhAgp2Wpi3xmbTbbYExg6fkptL67Uu5LCRVEj6wqmy0DHTjjeynsjOLsppHGHu41t1ELntZ0lEvS/Q== dependencies: "@babel/runtime" "^7.10.1" @@ -4120,7 +4935,7 @@ rc-collapse@~3.4.2: rc-dialog@~9.0.0, rc-dialog@~9.0.2: version "9.0.2" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-9.0.2.tgz#aadfebdeba145f256c1fac9b9f509f893cdbb5b8" + resolved "https://registry.npmjs.org/rc-dialog/-/rc-dialog-9.0.2.tgz" integrity sha512-s3U+24xWUuB6Bn2Lk/Qt6rufy+uT+QvWkiFhNBcO9APLxcFFczWamaq7x9h8SCuhfc1nHcW4y8NbMsnAjNnWyg== dependencies: "@babel/runtime" "^7.10.1" @@ -4131,7 +4946,7 @@ rc-dialog@~9.0.0, rc-dialog@~9.0.2: rc-drawer@~6.1.0: version "6.1.2" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.2.tgz#032918a21bfa8a7d9e52ada1e7b8ed08c0ae6346" + resolved "https://registry.npmjs.org/rc-drawer/-/rc-drawer-6.1.2.tgz" integrity sha512-mYsTVT8Amy0LRrpVEv7gI1hOjtfMSO/qHAaCDzFx9QBLnms3cAQLJkaxRWM+Eq99oyLhU/JkgoqTg13bc4ogOQ== dependencies: "@babel/runtime" "^7.10.1" @@ -4142,7 +4957,7 @@ rc-drawer@~6.1.0: rc-dropdown@~4.0.0: version "4.0.1" - resolved "https://registry.yarnpkg.com/rc-dropdown/-/rc-dropdown-4.0.1.tgz#f65d9d3d89750241057db59d5a75e43cd4576b68" + resolved "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-4.0.1.tgz" integrity sha512-OdpXuOcme1rm45cR0Jzgfl1otzmU4vuBVb+etXM8vcaULGokAKVpKlw8p6xzspG7jGd/XxShvq+N3VNEfk/l5g== dependencies: "@babel/runtime" "^7.18.3" @@ -4152,7 +4967,7 @@ rc-dropdown@~4.0.0: rc-editor-core@~0.8.3: version "0.8.10" - resolved "https://registry.yarnpkg.com/rc-editor-core/-/rc-editor-core-0.8.10.tgz#6f215bc5df9c33ffa9f6c5b30ca73a7dabe8ab7c" + resolved "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz" integrity sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw== dependencies: babel-runtime "^6.26.0" @@ -4165,7 +4980,7 @@ rc-editor-core@~0.8.3: rc-editor-mention@^1.1.13: version "1.1.13" - resolved "https://registry.yarnpkg.com/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz#9f1cab1065f86b01523840321790c2ab12ac5e8b" + resolved "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz" integrity sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q== dependencies: babel-runtime "^6.23.0" @@ -4179,7 +4994,7 @@ rc-editor-mention@^1.1.13: rc-field-form@~1.27.0: version "1.27.3" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.27.3.tgz#e5262796b91c80848a42a3e7a669bf459f08d63d" + resolved "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.27.3.tgz" integrity sha512-HGqxHnmGQgkPApEcikV4qTg3BLPC82uB/cwBDftDt1pYaqitJfSl5TFTTUMKVEJVT5RqJ2Zi68ME1HmIMX2HAw== dependencies: "@babel/runtime" "^7.18.0" @@ -4188,7 +5003,7 @@ rc-field-form@~1.27.0: rc-form@^2.4.10: version "2.4.12" - resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.12.tgz#4ee8711e90a2584baa7ac276de96bee0d9b0f5f1" + resolved "https://registry.npmjs.org/rc-form/-/rc-form-2.4.12.tgz" integrity sha512-sHfyWRrnjCHkeCYfYAGop2GQBUC6CKMPcJF9h/gL/vTmZB/RN6fNOGKjXrXjFbwFwKXUWBoPtIDDDmXQW9xNdw== dependencies: async-validator "~1.11.3" @@ -4203,7 +5018,7 @@ rc-form@^2.4.10: rc-image@~5.13.0: version "5.13.0" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-5.13.0.tgz#1ed9b852a40b5eff34786ba7d2f0e9d26eeab874" + resolved "https://registry.npmjs.org/rc-image/-/rc-image-5.13.0.tgz" integrity sha512-iZTOmw5eWo2+gcrJMMcnd7SsxVHl3w5xlyCgsULUdJhJbnuI8i/AL0tVOsE7aLn9VfOh1qgDT3mC2G75/c7mqg== dependencies: "@babel/runtime" "^7.11.2" @@ -4215,7 +5030,7 @@ rc-image@~5.13.0: rc-input-number@~7.3.9: version "7.3.11" - resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.3.11.tgz#c7089705a220e1a59ba974fabf89693e00dd2442" + resolved "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.3.11.tgz" integrity sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA== dependencies: "@babel/runtime" "^7.10.1" @@ -4224,7 +5039,7 @@ rc-input-number@~7.3.9: rc-input@~0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/rc-input/-/rc-input-0.1.4.tgz#45cb4ba209ae6cc835a2acb8629d4f8f0cb347e0" + resolved "https://registry.npmjs.org/rc-input/-/rc-input-0.1.4.tgz" integrity sha512-FqDdNz+fV2dKNgfXzcSLKvC+jEs1709t7nD+WdfjrdSaOcefpgc7BUJYadc3usaING+b7ediMTfKxuJBsEFbXA== dependencies: "@babel/runtime" "^7.11.1" @@ -4233,7 +5048,7 @@ rc-input@~0.1.4: rc-mentions@~1.13.1: version "1.13.1" - resolved "https://registry.yarnpkg.com/rc-mentions/-/rc-mentions-1.13.1.tgz#c884b70e1505a197f1b32a7c6b39090db6992a72" + resolved "https://registry.npmjs.org/rc-mentions/-/rc-mentions-1.13.1.tgz" integrity sha512-FCkaWw6JQygtOz0+Vxz/M/NWqrWHB9LwqlY2RtcuFqWJNFK9njijOOzTSsBGANliGufVUzx/xuPHmZPBV0+Hgw== dependencies: "@babel/runtime" "^7.10.1" @@ -4245,7 +5060,7 @@ rc-mentions@~1.13.1: rc-menu@~9.8.0: version "9.8.1" - resolved "https://registry.yarnpkg.com/rc-menu/-/rc-menu-9.8.1.tgz#988cd807f78d2f92eab686f6813f50b165f78405" + resolved "https://registry.npmjs.org/rc-menu/-/rc-menu-9.8.1.tgz" integrity sha512-179weouypfjWJSRvvoo/vPy+StojsMzK2XC5jRNhL1ryt/N/8wAFESte8K6jZJkNp9DHDLFTe+dCGmikKpiFuA== dependencies: "@babel/runtime" "^7.10.1" @@ -4258,7 +5073,7 @@ rc-menu@~9.8.0: rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.6.1, rc-motion@^2.6.2: version "2.6.2" - resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.6.2.tgz#3d31f97e41fb8e4f91a4a4189b6a98ac63342869" + resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.6.2.tgz" integrity sha512-4w1FaX3dtV749P8GwfS4fYnFG4Rb9pxvCYPc/b2fw1cmlHJWNNgOFIz7ysiD+eOrzJSvnLJWlNQQncpNMXwwpg== dependencies: "@babel/runtime" "^7.11.1" @@ -4267,7 +5082,7 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motio rc-notification@~4.6.0: version "4.6.1" - resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-4.6.1.tgz#068e8674f4bd7926a447eca512915d4b41b15c91" + resolved "https://registry.npmjs.org/rc-notification/-/rc-notification-4.6.1.tgz" integrity sha512-NSmFYwrrdY3+un1GvDAJQw62Xi9LNMSsoQyo95tuaYrcad5Bn9gJUL8AREufRxSQAQnr64u3LtP3EUyLYT6bhw== dependencies: "@babel/runtime" "^7.10.1" @@ -4277,7 +5092,7 @@ rc-notification@~4.6.0: rc-overflow@^1.0.0, rc-overflow@^1.2.8: version "1.2.8" - resolved "https://registry.yarnpkg.com/rc-overflow/-/rc-overflow-1.2.8.tgz#40f140fabc244118543e627cdd1ef750d9481a88" + resolved "https://registry.npmjs.org/rc-overflow/-/rc-overflow-1.2.8.tgz" integrity sha512-QJ0UItckWPQ37ZL1dMEBAdY1dhfTXFL9k6oTTcyydVwoUNMnMqCGqnRNA98axSr/OeDKqR6DVFyi8eA5RQI/uQ== dependencies: "@babel/runtime" "^7.11.1" @@ -4287,7 +5102,7 @@ rc-overflow@^1.0.0, rc-overflow@^1.2.8: rc-pagination@~3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/rc-pagination/-/rc-pagination-3.2.0.tgz#4f2fdba9fdac0f48e5c9fb1141973818138af7e1" + resolved "https://registry.npmjs.org/rc-pagination/-/rc-pagination-3.2.0.tgz" integrity sha512-5tIXjB670WwwcAJzAqp2J+cOBS9W3cH/WU1EiYwXljuZ4vtZXKlY2Idq8FZrnYBz8KhN3vwPo9CoV/SJS6SL1w== dependencies: "@babel/runtime" "^7.10.1" @@ -4295,7 +5110,7 @@ rc-pagination@~3.2.0: rc-picker@~2.7.0: version "2.7.0" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-2.7.0.tgz#3c19881da27a0c5ee4c7e7504e21b552bd43a94c" + resolved "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.0.tgz" integrity sha512-oZH6FZ3j4iuBxHB4NvQ6ABRsS2If/Kpty1YFFsji7/aej6ruGmfM7WnJWQ88AoPfpJ++ya5z+nVEA8yCRYGKyw== dependencies: "@babel/runtime" "^7.10.1" @@ -4309,7 +5124,7 @@ rc-picker@~2.7.0: rc-progress@~3.4.1: version "3.4.1" - resolved "https://registry.yarnpkg.com/rc-progress/-/rc-progress-3.4.1.tgz#a9ffe099e88a4fc03afb09d8603162bf0760d743" + resolved "https://registry.npmjs.org/rc-progress/-/rc-progress-3.4.1.tgz" integrity sha512-eAFDHXlk8aWpoXl0llrenPMt9qKHQXphxcVsnKs0FHC6eCSk1ebJtyaVjJUzKe0233ogiLDeEFK1Uihz3s67hw== dependencies: "@babel/runtime" "^7.10.1" @@ -4318,7 +5133,7 @@ rc-progress@~3.4.1: rc-rate@~2.9.0: version "2.9.2" - resolved "https://registry.yarnpkg.com/rc-rate/-/rc-rate-2.9.2.tgz#4a58965d1ecf91896ebae01d458b59056df0b4ea" + resolved "https://registry.npmjs.org/rc-rate/-/rc-rate-2.9.2.tgz" integrity sha512-SaiZFyN8pe0Fgphv8t3+kidlej+cq/EALkAJAc3A0w0XcPaH2L1aggM8bhe1u6GAGuQNAoFvTLjw4qLPGRKV5g== dependencies: "@babel/runtime" "^7.10.1" @@ -4327,7 +5142,7 @@ rc-rate@~2.9.0: rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: version "1.2.1" - resolved "https://registry.yarnpkg.com/rc-resize-observer/-/rc-resize-observer-1.2.1.tgz#7f9715b5d1afe126ade3c107aafd2cebf8a57a99" + resolved "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-1.2.1.tgz" integrity sha512-g53PnWLeVOmt4XWkt2x+QlIdf/PhJSd7JqHhtMrUY370e7wJ+kxbgXicYqvENUcgFiiOiMCd07YsC2GNsoSbnA== dependencies: "@babel/runtime" "^7.20.7" @@ -4337,7 +5152,7 @@ rc-resize-observer@^1.0.0, rc-resize-observer@^1.1.0, rc-resize-observer@^1.2.0: rc-segmented@~2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/rc-segmented/-/rc-segmented-2.1.0.tgz#0e0afe646c1a0e44a0e18785f518c42633ec8efc" + resolved "https://registry.npmjs.org/rc-segmented/-/rc-segmented-2.1.0.tgz" integrity sha512-hUlonro+pYoZcwrH6Vm56B2ftLfQh046hrwif/VwLIw1j3zGt52p5mREBwmeVzXnSwgnagpOpfafspzs1asjGw== dependencies: "@babel/runtime" "^7.11.1" @@ -4347,7 +5162,7 @@ rc-segmented@~2.1.0: rc-select@~14.1.0, rc-select@~14.1.13: version "14.1.16" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.1.16.tgz#0cc4b5a1fc551a2db7c96bc1ece0896317ecdd47" + resolved "https://registry.npmjs.org/rc-select/-/rc-select-14.1.16.tgz" integrity sha512-71XLHleuZmufpdV2vis5oituRkhg2WNvLpVMJBGWRar6WGAVOHXaY9DR5HvwWry3EGTn19BqnL6Xbybje6f8YA== dependencies: "@babel/runtime" "^7.10.1" @@ -4360,7 +5175,7 @@ rc-select@~14.1.0, rc-select@~14.1.13: rc-slider@~10.0.0: version "10.0.1" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.1.tgz#7058c68ff1e1aa4e7c3536e5e10128bdbccb87f9" + resolved "https://registry.npmjs.org/rc-slider/-/rc-slider-10.0.1.tgz" integrity sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q== dependencies: "@babel/runtime" "^7.10.1" @@ -4370,7 +5185,7 @@ rc-slider@~10.0.0: rc-steps@~5.0.0-alpha.2: version "5.0.0" - resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-5.0.0.tgz#2e2403f2dd69eb3966d65f461f7e3a8ee1ef69fe" + resolved "https://registry.npmjs.org/rc-steps/-/rc-steps-5.0.0.tgz" integrity sha512-9TgRvnVYirdhbV0C3syJFj9EhCRqoJAsxt4i1rED5o8/ZcSv5TLIYyo4H8MCjLPvbe2R+oBAm/IYBEtC+OS1Rw== dependencies: "@babel/runtime" "^7.16.7" @@ -4379,7 +5194,7 @@ rc-steps@~5.0.0-alpha.2: rc-switch@~3.2.0: version "3.2.2" - resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-3.2.2.tgz#d001f77f12664d52595b4f6fb425dd9e66fba8e8" + resolved "https://registry.npmjs.org/rc-switch/-/rc-switch-3.2.2.tgz" integrity sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A== dependencies: "@babel/runtime" "^7.10.1" @@ -4388,7 +5203,7 @@ rc-switch@~3.2.0: rc-table@~7.26.0: version "7.26.0" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.26.0.tgz#9d517e7fa512e7571fdcc453eb1bf19edfac6fbc" + resolved "https://registry.npmjs.org/rc-table/-/rc-table-7.26.0.tgz" integrity sha512-0cD8e6S+DTGAt5nBZQIPFYEaIukn17sfa5uFL98faHlH/whZzD8ii3dbFL4wmUDEL4BLybhYop+QUfZJ4CPvNQ== dependencies: "@babel/runtime" "^7.10.1" @@ -4399,7 +5214,7 @@ rc-table@~7.26.0: rc-tabs@~12.4.1: version "12.4.2" - resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.4.2.tgz#487a1b3f8d8cf0bfc121224013dab00d4a8e0532" + resolved "https://registry.npmjs.org/rc-tabs/-/rc-tabs-12.4.2.tgz" integrity sha512-FFlGwuTjQUznWzJtyhmHc6KAp5lRQFxKUv9Aj1UtsOYe2e7WGmuzcrd+/LQchuPe0VjhaZPdGkmFGcqGqNO6ow== dependencies: "@babel/runtime" "^7.11.2" @@ -4412,7 +5227,7 @@ rc-tabs@~12.4.1: rc-textarea@^0.4.0, rc-textarea@~0.4.5: version "0.4.7" - resolved "https://registry.yarnpkg.com/rc-textarea/-/rc-textarea-0.4.7.tgz#627f662d46f99e0059d1c1ebc8db40c65339fe90" + resolved "https://registry.npmjs.org/rc-textarea/-/rc-textarea-0.4.7.tgz" integrity sha512-IQPd1CDI3mnMlkFyzt2O4gQ2lxUsnBAeJEoZGJnkkXgORNqyM9qovdrCj9NzcRfpHgLdzaEbU3AmobNFGUznwQ== dependencies: "@babel/runtime" "^7.10.1" @@ -4423,7 +5238,7 @@ rc-textarea@^0.4.0, rc-textarea@~0.4.5: rc-tooltip@~5.2.0: version "5.2.2" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.2.2.tgz#e5cafa8ecebf78108936a0bcb93c150fa81ac93b" + resolved "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-5.2.2.tgz" integrity sha512-jtQzU/18S6EI3lhSGoDYhPqNpWajMtS5VV/ld1LwyfrDByQpYmw/LW6U7oFXXLukjfDHQ7Ju705A82PRNFWYhg== dependencies: "@babel/runtime" "^7.11.2" @@ -4432,7 +5247,7 @@ rc-tooltip@~5.2.0: rc-tree-select@~5.5.0: version "5.5.5" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.5.5.tgz#d28b3b45da1e820cd21762ba0ee93c19429bb369" + resolved "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.5.5.tgz" integrity sha512-k2av7jF6tW9bIO4mQhaVdV4kJ1c54oxV3/hHVU+oD251Gb5JN+m1RbJFTMf1o0rAFqkvto33rxMdpafaGKQRJw== dependencies: "@babel/runtime" "^7.10.1" @@ -4443,7 +5258,7 @@ rc-tree-select@~5.5.0: rc-tree@~5.7.0: version "5.7.2" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.7.2.tgz#270ea7d9e1b2e5e81cd3659eba2fbd022a4831f6" + resolved "https://registry.npmjs.org/rc-tree/-/rc-tree-5.7.2.tgz" integrity sha512-nmnL6qLnfwVckO5zoqKL2I9UhwDqzyCtjITQCkwhimyz1zfuFkG5ZPIXpzD/Guzso94qQA/QrMsvzic5W6QDjg== dependencies: "@babel/runtime" "^7.10.1" @@ -4454,7 +5269,7 @@ rc-tree@~5.7.0: rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc-trigger@^5.3.1: version "5.3.4" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.3.4.tgz#6b4b26e32825677c837d1eb4d7085035eecf9a61" + resolved "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz" integrity sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw== dependencies: "@babel/runtime" "^7.18.3" @@ -4465,7 +5280,7 @@ rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc- rc-upload@~4.3.0: version "4.3.4" - resolved "https://registry.yarnpkg.com/rc-upload/-/rc-upload-4.3.4.tgz#83ff7d3867631c37adbfd72ea3d1fd7e97ca84af" + resolved "https://registry.npmjs.org/rc-upload/-/rc-upload-4.3.4.tgz" integrity sha512-uVbtHFGNjHG/RyAfm9fluXB6pvArAGyAx8z7XzXXyorEgVIWj6mOlriuDm0XowDHYz4ycNK0nE0oP3cbFnzxiQ== dependencies: "@babel/runtime" "^7.18.3" @@ -4474,7 +5289,7 @@ rc-upload@~4.3.0: rc-util@^4.10.0, rc-util@^4.15.3: version "4.21.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-4.21.1.tgz#88602d0c3185020aa1053d9a1e70eac161becb05" + resolved "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz" integrity sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg== dependencies: add-dom-event-listener "^1.1.0" @@ -4485,7 +5300,7 @@ rc-util@^4.10.0, rc-util@^4.15.3: rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: version "5.27.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.27.1.tgz#d12f02b9577b04299c0f1a235c8acbcf56e2824b" + resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.27.1.tgz" integrity sha512-PsjHA+f+KBCz+YTZxrl3ukJU5RoNKoe3KSNMh0xGiISbR67NaM9E9BiMjCwxa3AcCUOg/rZ+V0ZKLSimAA+e3w== dependencies: "@babel/runtime" "^7.18.3" @@ -4493,7 +5308,7 @@ rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16. rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: version "3.4.13" - resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz#20acc934b263abcf7b7c161f50ef82281b2f7e8d" + resolved "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz" integrity sha512-cPOVDmcNM7rH6ANotanMDilW/55XnFPw0Jh/GQYtrzZSy3AmWvCnqVNyNC/pgg3lfVmX2994dlzAhuUrd4jG7w== dependencies: "@babel/runtime" "^7.20.0" @@ -4503,7 +5318,7 @@ rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: react-dom@^18.2.0: version "18.2.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" + resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" @@ -4511,22 +5326,22 @@ react-dom@^18.2.0: react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0: version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== react-is@^18.0.0: version "18.2.0" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b" + resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== react-lifecycles-compat@^3.0.4: version "3.0.4" - resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" + resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== react-map-gl@^5: version "5.3.21" - resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.21.tgz#7d28cdfe382d599d4ac8cccf7d794a3a0f06b65b" + resolved "https://registry.npmjs.org/react-map-gl/-/react-map-gl-5.3.21.tgz" integrity sha512-hNVYiPBjgfVIcDV70OU9QnzvNCI1NhLm5OHjyY1rKPOKqzV4m9jjuXEKUaWC72vqIHk1Dzb+gG78xWOpqVi6uw== dependencies: "@babel/runtime" "^7.0.0" @@ -4540,12 +5355,12 @@ react-map-gl@^5: react-property@2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/react-property/-/react-property-2.0.0.tgz#2156ba9d85fa4741faf1918b38efc1eae3c6a136" + resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz" integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== react-redux@^8.0.4: version "8.0.5" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.5.tgz#e5fb8331993a019b8aaf2e167a93d10af469c7bd" + resolved "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz" integrity sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw== dependencies: "@babel/runtime" "^7.12.1" @@ -4557,7 +5372,7 @@ react-redux@^8.0.4: react-router-dom@^5.0.1: version "5.3.4" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-5.3.4.tgz#2ed62ffd88cae6db134445f4a0c0ae8b91d2e5e6" + resolved "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.3.4.tgz" integrity sha512-m4EqFMHv/Ih4kpcBCONHbkT68KoAeHN4p3lAGoNryfHi0dMy0kCzEZakiKRsvg5wHZ/JLrLW8o8KomWiz/qbYQ== dependencies: "@babel/runtime" "^7.12.13" @@ -4570,7 +5385,7 @@ react-router-dom@^5.0.1: react-router@5.3.4, react-router@^5.0.1: version "5.3.4" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-5.3.4.tgz#8ca252d70fcc37841e31473c7a151cf777887bb5" + resolved "https://registry.npmjs.org/react-router/-/react-router-5.3.4.tgz" integrity sha512-Ys9K+ppnJah3QuaRiLxk+jDWOR1MekYQrlytiXxC1RyfbdsZkS5pvKAzCCr031xHixZwpnsYNT5xysdFHQaYsA== dependencies: "@babel/runtime" "^7.12.13" @@ -4585,7 +5400,7 @@ react-router@5.3.4, react-router@^5.0.1: react-spring@^9.2.5: version "9.6.1" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.6.1.tgz#e715b2fa523c1a3acfdcf1aaa93e081620b8cc8e" + resolved "https://registry.npmjs.org/react-spring/-/react-spring-9.6.1.tgz" integrity sha512-BeP80R4SLb1bZHW/Q62nECoScHw/fH+jzGkD7dc892HNGa+lbGIJXURc6U7N8JfZ8peEO46nPxR57aUMuYzquQ== dependencies: "@react-spring/core" "~9.6.1" @@ -4597,43 +5412,48 @@ react-spring@^9.2.5: react@^18.2.0: version "18.2.0" - resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" + resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" +reduce-flatten@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/reduce-flatten/-/reduce-flatten-2.0.0.tgz#734fd84e65f375d7ca4465c69798c25c9d10ae27" + integrity sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w== + redux-logger@^3.0.6: version "3.0.6" - resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" + resolved "https://registry.npmjs.org/redux-logger/-/redux-logger-3.0.6.tgz" integrity sha512-JoCIok7bg/XpqA1JqCqXFypuqBbQzGQySrhFzewB7ThcnysTO30l4VCst86AuB9T9tuT03MAA56Jw2PNhRSNCg== dependencies: deep-diff "^0.3.5" redux-thunk@^2.4.1: version "2.4.2" - resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" + resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz" integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== redux@^4.1.2: version "4.2.0" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" + resolved "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz" integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== dependencies: "@babel/runtime" "^7.9.2" regenerator-runtime@^0.11.0: version "0.11.1" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" + resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.11: +regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4: version "0.13.11" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9" + resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz" integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg== regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" + resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz" integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== dependencies: call-bind "^1.0.2" @@ -4642,34 +5462,39 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3: regexpp@^3.2.0: version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== +repeat-string@^1.5.4: + version "1.6.1" + resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" + integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w== + resize-observer-polyfill@^1.5.1: version "1.5.1" - resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" + resolved "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== resolve-from@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== resolve-pathname@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" + resolved "https://registry.npmjs.org/resolve-pathname/-/resolve-pathname-3.0.0.tgz" integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== resolve-protobuf-schema@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz#9ca9a9e69cf192bbdaf1006ec1973948aa4a3758" + resolved "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz" integrity sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ== dependencies: protocol-buffers-schema "^3.3.1" resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: version "1.22.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: is-core-module "^2.9.0" @@ -4678,7 +5503,7 @@ resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: resolve@^2.0.0-next.3: version "2.0.0-next.4" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" + resolved "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz" integrity sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ== dependencies: is-core-module "^2.9.0" @@ -4687,50 +5512,43 @@ resolve@^2.0.0-next.3: reusify@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== rimraf@^3.0.2: version "3.0.2" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" robust-predicates@^2.0.4: version "2.0.4" - resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-2.0.4.tgz#0a2367a93abd99676d075981707f29cfb402248b" + resolved "https://registry.npmjs.org/robust-predicates/-/robust-predicates-2.0.4.tgz" integrity sha512-l4NwboJM74Ilm4VKfbAtFeGq7aEjWL+5kVFcmgFA2MrdnQWx9iE/tUGvxY5HyMI7o/WpSIUFLbC5fbeaHgSCYg== rollup@^3.7.0: version "3.8.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.8.1.tgz#d4af8aca7c60d5b8c0281be79ea2fab6b41d458f" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.8.1.tgz" integrity sha512-4yh9eMW7byOroYcN8DlF9P/2jCpu6txVIHjEqquQVSx7DI0RgyCCN3tjrcy4ra6yVtV336aLBB3v2AarYAxePQ== optionalDependencies: fsevents "~2.3.2" run-parallel@^1.1.9: version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz" integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== dependencies: queue-microtask "^1.2.2" rw@1, rw@^1.3.3: version "1.3.3" - resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" + resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -s2-geometry@^1.2.10: - version "1.2.10" - resolved "https://registry.yarnpkg.com/s2-geometry/-/s2-geometry-1.2.10.tgz#c6ff22f3eccafd0eea491b60b44c141b9887acab" - integrity sha512-5WejfQu1XZ25ZerW8uL6xP1sM2krcOYKhI6TbfybGRf+vTQLrm3E+4n0+1lWg+MYqFjPzoe51zKhn2sBRMCt5g== - dependencies: - long "^3.2.0" - safe-regex-test@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.0.tgz#793b874d524eb3640d1873aad03596db2d4f2295" + resolved "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz" integrity sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA== dependencies: call-bind "^1.0.2" @@ -4739,63 +5557,68 @@ safe-regex-test@^1.0.0: "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" - resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sax@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" + integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== + scheduler@^0.23.0: version "0.23.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe" + resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz" integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw== dependencies: loose-envify "^1.1.0" scroll-into-view-if-needed@^2.2.25: version "2.2.31" - resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz#d3c482959dc483e37962d1521254e3295d0d1587" + resolved "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz" integrity sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA== dependencies: compute-scroll-into-view "^1.0.20" seamless-immutable@^7.1.3: version "7.1.4" - resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8" + resolved "https://registry.npmjs.org/seamless-immutable/-/seamless-immutable-7.1.4.tgz" integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A== -seer@^0.2.4: - version "0.2.5" - resolved "https://registry.yarnpkg.com/seer/-/seer-0.2.5.tgz#f0975153741f4d1c3916a144eef4738458bcb05a" - integrity sha512-//0Zwt0x97KQhIWrp4oq9AVNvGA2ctCx4dmFddpkORjRr6bW+hyC8eOhWBVIhiU3uHv1XLU1dekfFKOi28RGHA== +semver@^5.6.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" + integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== semver@^6.3.0: version "6.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" + resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== setimmediate@^1.0.5: version "1.0.5" - resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" + resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== shallowequal@^1.1.0: version "1.1.0" - resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8" + resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ== shebang-command@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz" integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== dependencies: shebang-regex "^3.0.0" shebang-regex@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== side-channel@^1.0.4: version "1.0.4" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz" integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== dependencies: call-bind "^1.0.0" @@ -4804,12 +5627,12 @@ side-channel@^1.0.4: skmeans@0.9.7: version "0.9.7" - resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d" + resolved "https://registry.npmjs.org/skmeans/-/skmeans-0.9.7.tgz" integrity sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg== socket.io-client@^4.5.3: version "4.5.4" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.5.4.tgz#d3cde8a06a6250041ba7390f08d2468ccebc5ac9" + resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.5.4.tgz" integrity sha512-ZpKteoA06RzkD32IbqILZ+Cnst4xewU7ZYK12aS1mzHftFFjpoMz69IuhP/nL25pJfao/amoPI527KnuhFm01g== dependencies: "@socket.io/component-emitter" "~3.1.0" @@ -4819,7 +5642,7 @@ socket.io-client@^4.5.3: socket.io-parser@~4.2.1: version "4.2.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.1.tgz#01c96efa11ded938dcb21cbe590c26af5eff65e5" + resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.1.tgz" integrity sha512-V4GrkLy+HeF1F/en3SpUaM+7XxYXpuMUWLGde1kSSh5nQMN4hLrbPIkD+otwh6q9R6NOQBN4AMaOZ2zVjui82g== dependencies: "@socket.io/component-emitter" "~3.1.0" @@ -4827,22 +5650,32 @@ socket.io-parser@~4.2.1: source-map-js@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" + resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== +source-map@~0.6.0: + version "0.6.1" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" + integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== + splaytree@^3.1.0: version "3.1.1" - resolved "https://registry.yarnpkg.com/splaytree/-/splaytree-3.1.1.tgz#e1bc8e68e64ef5a9d5f09d36e6d9f3621795a438" + resolved "https://registry.npmjs.org/splaytree/-/splaytree-3.1.1.tgz" integrity sha512-9FaQ18FF0+sZc/ieEeXHt+Jw2eSpUgUtTLDYB/HXKWvhYVyOc7h1hzkn5MMO3GPib9MmXG1go8+OsBBzs/NMww== +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== + string-convert@^0.2.0: version "0.2.1" - resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" + resolved "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== string.prototype.matchall@^4.0.8: version "4.0.8" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz#3bf85722021816dcd1bf38bb714915887ca79fd3" + resolved "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.8.tgz" integrity sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg== dependencies: call-bind "^1.0.2" @@ -4856,7 +5689,7 @@ string.prototype.matchall@^4.0.8: string.prototype.trimend@^1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz#c4a27fa026d979d79c04f17397f250a462944533" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz" integrity sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ== dependencies: call-bind "^1.0.2" @@ -4865,7 +5698,7 @@ string.prototype.trimend@^1.0.6: string.prototype.trimstart@^1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz#e90ab66aa8e4007d92ef591bbf3cd422c56bdcf4" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz" integrity sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA== dependencies: call-bind "^1.0.2" @@ -4874,101 +5707,136 @@ string.prototype.trimstart@^1.0.6: strip-ansi@^6.0.1: version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" strip-bom@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz" integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA== strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== style-to-js@1.1.2: version "1.1.2" - resolved "https://registry.yarnpkg.com/style-to-js/-/style-to-js-1.1.2.tgz#6821c53b86a236571236d9d15688389e81a2a893" + resolved "https://registry.npmjs.org/style-to-js/-/style-to-js-1.1.2.tgz" integrity sha512-aMG8jJpEF0SCGbQFY8W8CT+EjQ9ubp35FOZG3prWkNjxW/a1bEeSod0tkWiP+6iiOCDIIrQykUDkPY5LbNF87g== dependencies: style-to-object "0.4.0" style-to-object@0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/style-to-object/-/style-to-object-0.4.0.tgz#fdcee2ba7f195f96023a44a124683f70d463dd24" + resolved "https://registry.npmjs.org/style-to-object/-/style-to-object-0.4.0.tgz" integrity sha512-dAjq2m87tPn/TcYTeqMhXJRhu96WYWcxMFQxs3Y9jfYpq2jG+38u4tj0Lst6DOiYXmDuNxVJ2b1Z2uPC6wTEeg== dependencies: inline-style-parser "0.1.1" supercluster@^7.1.0: version "7.1.5" - resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" + resolved "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz" integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg== dependencies: kdbush "^3.0.0" +supports-color@^5.3.0: + version "5.5.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== + dependencies: + has-flag "^3.0.0" + supports-color@^7.1.0: version "7.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz" integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" + resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== +table-layout@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/table-layout/-/table-layout-1.0.2.tgz#c4038a1853b0136d63365a734b6931cf4fad4a04" + integrity sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A== + dependencies: + array-back "^4.0.1" + deep-extend "~0.6.0" + typical "^5.2.0" + wordwrapjs "^4.0.0" + tabulator-tables@^4.4.1: version "4.9.3" - resolved "https://registry.yarnpkg.com/tabulator-tables/-/tabulator-tables-4.9.3.tgz#89ea8f9bffc11ba9a789369b5165ac82da26f4f0" + resolved "https://registry.npmjs.org/tabulator-tables/-/tabulator-tables-4.9.3.tgz" integrity sha512-iwwQqAEGGxlgrBpcmJJvMJrfjGLcCXOB3AOb/DGkXqBy1YKoYA36hIl7qXGp6Jo8dSkzFAlDT6pKLZgyhs9OnQ== +text-encoding-utf-8@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz#585b62197b0ae437e3c7b5d0af27ac1021e10d13" + integrity sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg== + text-table@^0.2.0: version "0.2.0" - resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +texture-compressor@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/texture-compressor/-/texture-compressor-1.0.2.tgz#b5a54a9e5f9eb884d7c33b149f1f23a429465cd4" + integrity sha512-dStVgoaQ11mA5htJ+RzZ51ZxIZqNOgWKAIvtjLrW1AliQQLCmrDqNzQZ8Jh91YealQ95DXt4MEduLzJmbs6lig== + dependencies: + argparse "^1.0.10" + image-size "^0.7.4" + tiny-invariant@^1.0.2: version "1.3.1" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" + resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz" integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw== tiny-warning@^1.0.0: version "1.0.3" - resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" + resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== tinyqueue@^2.0.3: version "2.0.3" - resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" + resolved "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz" integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA== +to-fast-properties@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" + integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== + toggle-selection@^1.0.6: version "1.0.6" - resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32" + resolved "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz" integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ== topojson-client@3.x: version "3.1.0" - resolved "https://registry.yarnpkg.com/topojson-client/-/topojson-client-3.1.0.tgz#22e8b1ed08a2b922feeb4af6f53b6ef09a467b99" + resolved "https://registry.npmjs.org/topojson-client/-/topojson-client-3.1.0.tgz" integrity sha512-605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw== dependencies: commander "2" topojson-server@3.x: version "3.0.1" - resolved "https://registry.yarnpkg.com/topojson-server/-/topojson-server-3.0.1.tgz#d2b3ec095b6732299be76a48406111b3201a34f5" + resolved "https://registry.npmjs.org/topojson-server/-/topojson-server-3.0.1.tgz" integrity sha512-/VS9j/ffKr2XAOjlZ9CgyyeLmgJ9dMwq6Y0YEON8O7p/tGGk+dCWnrE03zEdu7i4L7YsFZLEPZPzCvcB7lEEXw== dependencies: commander "2" tsconfig-paths@^3.14.1: version "3.14.1" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz" integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" @@ -4976,31 +5844,46 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + turf-jsts@*: version "1.2.3" - resolved "https://registry.yarnpkg.com/turf-jsts/-/turf-jsts-1.2.3.tgz#59757f542afbff9a577bbf411f183b8f48d38aa4" + resolved "https://registry.npmjs.org/turf-jsts/-/turf-jsts-1.2.3.tgz" integrity sha512-Ja03QIJlPuHt4IQ2FfGex4F4JAr8m3jpaHbFbQrgwr7s7L6U8ocrHiF3J1+wf9jzhGKxvDeaCAnGDot8OjGFyA== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== dependencies: prelude-ls "^1.2.1" type-fest@^0.20.2: version "0.20.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== +typical@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-4.0.0.tgz#cbeaff3b9d7ae1e2bbfaf5a4e6f11eccfde94fc4" + integrity sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw== + +typical@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" + integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== + ua-parser-js@^0.7.30: version "0.7.32" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.32.tgz#cd8c639cdca949e30fa68c44b7813ef13e36d211" + resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz" integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== unbox-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" + resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz" integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw== dependencies: call-bind "^1.0.2" @@ -5008,41 +5891,59 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +universalify@^0.1.0: + version "0.1.2" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" + integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== + +update-browserslist-db@^1.0.9: + version "1.0.10" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" + integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + dependencies: + escalade "^3.1.1" + picocolors "^1.0.0" + uri-js@^4.2.2: version "4.4.1" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz" integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" use-sync-external-store@^1.0.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" + resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== value-equal@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" + resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== viewport-mercator-project@>=6.0.0, viewport-mercator-project@^7.0.4: version "7.0.4" - resolved "https://registry.yarnpkg.com/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz#67feec04135484bf424dd4890d630e82116b31e6" + resolved "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz" integrity sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg== dependencies: "@math.gl/web-mercator" "^3.5.5" -viewport-mercator-project@^6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/viewport-mercator-project/-/viewport-mercator-project-6.2.3.tgz#4122040f51ef9553fa41a46bcc6502977b3909c6" - integrity sha512-QQb0/qCLlP4DdfbHHSWVYXpghB2wkLIiiZQnoelOB59mXKQSyZVxjreq1S+gaBJFpcGkWEcyVtre0+2y2DTl/Q== +vite-plugin-imp@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/vite-plugin-imp/-/vite-plugin-imp-2.3.1.tgz#dac2b63f7365de102ffbfb7edd0e9e9f3919d91e" + integrity sha512-Lp0FZBIIfXq/PyTRh+5e5tqgS6vJZewAx/fodgf/Z1Pk1jQzMiKw5gRn0xXqDEbm7A7avz6X1Le01Mp/LYMtoQ== dependencies: - "@babel/runtime" "^7.0.0" - gl-matrix "^3.0.0" + "@babel/core" "^7.12.10" + "@babel/generator" "^7.12.11" + "@babel/parser" "^7.12.11" + "@babel/traverse" "^7.12.12" + chalk "^4.1.0" + param-case "^3.0.4" + pascal-case "^3.1.2" vite@^4.0.0: version "4.0.3" - resolved "https://registry.yarnpkg.com/vite/-/vite-4.0.3.tgz#de27ad3f263a03ae9419cdc8bc07721eadcba8b9" + resolved "https://registry.npmjs.org/vite/-/vite-4.0.3.tgz" integrity sha512-HvuNv1RdE7deIfQb8mPk51UKjqptO/4RXZ5yXSAvurd5xOckwS/gg8h9Tky3uSbnjYTgUm0hVCet1cyhKd73ZA== dependencies: esbuild "^0.16.3" @@ -5054,7 +5955,7 @@ vite@^4.0.0: vt-pbf@^3.1.1: version "3.1.3" - resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" + resolved "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz" integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA== dependencies: "@mapbox/point-geometry" "0.1.0" @@ -5063,19 +5964,19 @@ vt-pbf@^3.1.1: warning@^4.0.3: version "4.0.3" - resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" + resolved "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz" integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w== dependencies: loose-envify "^1.0.0" whatwg-fetch@>=0.10.0: version "3.6.2" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" + resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz" integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== which-boxed-primitive@^1.0.2: version "1.0.2" - resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== dependencies: is-bigint "^1.0.1" @@ -5086,32 +5987,45 @@ which-boxed-primitive@^1.0.2: which@^2.0.1: version "2.0.2" - resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== dependencies: isexe "^2.0.0" word-wrap@^1.2.3: version "1.2.3" - resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz" integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== +wordwrapjs@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/wordwrapjs/-/wordwrapjs-4.0.1.tgz#d9790bccfb110a0fc7836b5ebce0937b37a8b98f" + integrity sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA== + dependencies: + reduce-flatten "^2.0.0" + typical "^5.2.0" + wrappy@1: version "1.0.2" - resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" + resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz" integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== ws@~8.2.3: version "8.2.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba" + resolved "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz" integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA== xmlhttprequest-ssl@~2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" + resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz" integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== +yallist@^3.0.2: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" + integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== + yocto-queue@^0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From 73a102aecfe27f752927e91a888caf02b59bf4ad Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 15:30:03 +0800 Subject: [PATCH 012/126] Update antd --- package.json | 6 +- src/components/Dashboard/Modals.jsx | 1 - .../DatabaseEditor/ExportDatabaseModal.jsx | 1 - .../DatabaseEditor/NewScheduleModal.jsx | 1 - .../InputEditor/EditSelectedModal.jsx | 1 - src/components/Project/NewProjectModal.jsx | 1 - src/components/Project/NewScenarioModal.jsx | 1 - src/components/Project/OpenProjectModal.jsx | 1 - .../Project/RenameScenarioModal.jsx | 1 - .../Project/ScenarioGenerateDataForm.jsx | 1 - .../Project/ScenarioImportDataForm.jsx | 1 - src/components/Tools/Tool.jsx | 1 - yarn.lock | 460 +++++++----------- 13 files changed, 192 insertions(+), 285 deletions(-) diff --git a/package.json b/package.json index f220c06..9421028 100644 --- a/package.json +++ b/package.json @@ -37,13 +37,13 @@ "vite-plugin-imp": "^2.3.1" }, "dependencies": { - "@ant-design/compatible": "^1.1.0", - "@ant-design/icons": "^4.7.0", + "@ant-design/compatible": "^5.1.1", + "@ant-design/icons": "^4.8.0", "@babel/polyfill": "^7.12.1", "@handsontable/react": "^3.1.2", "@nebula.gl/layers": "^1.0.4", "@turf/turf": "^6.5.0", - "antd": "^4.19.2", + "antd": "^5.1.1", "axios": "^1.1.3", "color-interpolate": "^1.0.5", "connected-react-router": "^6.5.2", diff --git a/src/components/Dashboard/Modals.jsx b/src/components/Dashboard/Modals.jsx index 2dd9821..76af8bd 100644 --- a/src/components/Dashboard/Modals.jsx +++ b/src/components/Dashboard/Modals.jsx @@ -1,7 +1,6 @@ import { useState, useEffect, useRef, useContext } from 'react'; import { FolderOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal, Select, Input, Radio, Button, Skeleton } from 'antd'; import axios from 'axios'; import { ModalContext } from '../../utils/ModalManager'; diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index 1810cad..6fbc212 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -1,6 +1,5 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal, message, Alert } from 'antd'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; diff --git a/src/components/DatabaseEditor/NewScheduleModal.jsx b/src/components/DatabaseEditor/NewScheduleModal.jsx index 3b407dd..b213b51 100644 --- a/src/components/DatabaseEditor/NewScheduleModal.jsx +++ b/src/components/DatabaseEditor/NewScheduleModal.jsx @@ -1,6 +1,5 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal, Select } from 'antd'; import { FormItemWrapper } from '../Tools/Parameter'; diff --git a/src/components/InputEditor/EditSelectedModal.jsx b/src/components/InputEditor/EditSelectedModal.jsx index 72651bb..55290b4 100644 --- a/src/components/InputEditor/EditSelectedModal.jsx +++ b/src/components/InputEditor/EditSelectedModal.jsx @@ -1,7 +1,6 @@ import { useRef } from 'react'; import { useDispatch, useSelector } from 'react-redux'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal, Input, Select } from 'antd'; import 'tabulator-tables/dist/css/tabulator.min.css'; import { updateInputData } from '../../actions/inputEditor'; diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index f3f740e..c831c88 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -1,6 +1,5 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; diff --git a/src/components/Project/NewScenarioModal.jsx b/src/components/Project/NewScenarioModal.jsx index 866b642..53323e4 100644 --- a/src/components/Project/NewScenarioModal.jsx +++ b/src/components/Project/NewScenarioModal.jsx @@ -1,6 +1,5 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal, Radio, Input } from 'antd'; import axios from 'axios'; import { useOpenScenario } from './Project'; diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index 93f6380..d5d40e8 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -1,6 +1,5 @@ import { useRef, useState, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; diff --git a/src/components/Project/RenameScenarioModal.jsx b/src/components/Project/RenameScenarioModal.jsx index 1220f14..cc92fd3 100644 --- a/src/components/Project/RenameScenarioModal.jsx +++ b/src/components/Project/RenameScenarioModal.jsx @@ -1,6 +1,5 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper } from '../Tools/Parameter'; diff --git a/src/components/Project/ScenarioGenerateDataForm.jsx b/src/components/Project/ScenarioGenerateDataForm.jsx index 1d94f43..fdc4052 100644 --- a/src/components/Project/ScenarioGenerateDataForm.jsx +++ b/src/components/Project/ScenarioGenerateDataForm.jsx @@ -1,7 +1,6 @@ import { forwardRef, useState } from 'react'; import { SettingOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Checkbox, Row, Card, Input, Col } from 'antd'; import axios from 'axios'; import EditableMap from '../Map/EditableMap'; diff --git a/src/components/Project/ScenarioImportDataForm.jsx b/src/components/Project/ScenarioImportDataForm.jsx index 752861d..e2ef166 100644 --- a/src/components/Project/ScenarioImportDataForm.jsx +++ b/src/components/Project/ScenarioImportDataForm.jsx @@ -4,7 +4,6 @@ import { MinusCircleOutlined, } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Input, Button, Dropdown, Menu } from 'antd'; const ScenarioImportDataForm = ({ form, visible }) => { diff --git a/src/components/Tools/Tool.jsx b/src/components/Tools/Tool.jsx index 85d31fa..50bab63 100644 --- a/src/components/Tools/Tool.jsx +++ b/src/components/Tools/Tool.jsx @@ -1,7 +1,6 @@ import { useEffect, useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; import { Skeleton, Divider, Collapse, Button, Spin as AntSpin } from 'antd'; import { fetchToolParams, diff --git a/yarn.lock b/yarn.lock index 0b590a2..69970d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,27 +17,43 @@ dependencies: "@ctrl/tinycolor" "^3.4.0" -"@ant-design/compatible@^1.1.0": - version "1.1.2" - resolved "https://registry.npmjs.org/@ant-design/compatible/-/compatible-1.1.2.tgz" - integrity sha512-Qsx5Qw97eiSgcxyQDlY45QSbvGn0gUdpX8XFImPvzZpKwabqQ2HnXXuUlb8RbrkURswaPIoyLEGKDPeogIaURA== +"@ant-design/compatible@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@ant-design/compatible/-/compatible-5.1.1.tgz#e9188b782f9c8ec93ca787dfd3722318055fd6ce" + integrity sha512-frGsAfzW49y5dq5U9jFDnIsYsEO84IYWF0mNKHCEYE+vyAPbZ+Kzlpv9CBqHtRy4cc0yVE5LHAuNqavKY/cigw== dependencies: - "@ant-design/icons" "^4.0.0" classnames "^2.2.6" + dayjs "^1.11.4" lodash.camelcase "^4.3.0" lodash.upperfirst "^4.3.1" - omit.js "^1.0.2" - rc-animate "^2.10.2" - rc-editor-mention "^1.1.13" - rc-form "^2.4.10" - rc-util "^4.10.0" + rc-animate "^3.1.1" + rc-form "^2.4.12" + rc-util "^5.24.5" + +"@ant-design/css-animation@^1.7.2": + version "1.7.3" + resolved "https://registry.yarnpkg.com/@ant-design/css-animation/-/css-animation-1.7.3.tgz#60a1c970014e86b28f940510d69e503e428f1136" + integrity sha512-LrX0OGZtW+W6iLnTAqnTaoIsRelYeuLZWsrmBJFUXDALQphPsN8cE5DCsmoSlL0QYb94BQxINiuS70Ar/8BNgA== + +"@ant-design/cssinjs@^1.3.0": + version "1.3.2" + resolved "https://registry.yarnpkg.com/@ant-design/cssinjs/-/cssinjs-1.3.2.tgz#f149bb3b970ec2ad166bc920bd40f4ec172c702a" + integrity sha512-WQt7hb+PRM62lyL1VmknaH9C1l9zPjQ2kzB24ZrPX5IXJTUlKZueXYLpg8tmcaj3GAr4eLHy8fDWb0Qxsjp5TQ== + dependencies: + "@babel/runtime" "^7.11.1" + "@emotion/hash" "^0.8.0" + "@emotion/unitless" "^0.7.5" + classnames "^2.3.1" + csstype "^3.0.10" + rc-util "^5.27.0" + stylis "^4.0.13" "@ant-design/icons-svg@^4.2.1": version "4.2.1" resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz" integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== -"@ant-design/icons@^4.0.0", "@ant-design/icons@^4.7.0": +"@ant-design/icons@^4.7.0": version "4.8.0" resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.0.tgz" integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== @@ -48,16 +64,27 @@ classnames "^2.2.6" rc-util "^5.9.4" -"@ant-design/react-slick@~0.29.1": - version "0.29.2" - resolved "https://registry.npmjs.org/@ant-design/react-slick/-/react-slick-0.29.2.tgz" - integrity sha512-kgjtKmkGHa19FW21lHnAfyyH9AAoh35pBdcJ53rHmQ3O+cfFHGHnUbj/HFrRNJ5vIts09FKJVAD8RpaC+RaWfA== +"@ant-design/icons@^4.8.0": + version "4.8.0" + resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.8.0.tgz#3084e2bb494cac3dad6c0392f77c1efc90ee1fa4" + integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== + dependencies: + "@ant-design/colors" "^6.0.0" + "@ant-design/icons-svg" "^4.2.1" + "@babel/runtime" "^7.11.2" + classnames "^2.2.6" + rc-util "^5.9.4" + +"@ant-design/react-slick@~1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@ant-design/react-slick/-/react-slick-1.0.0.tgz#4696eecaa2dea0429e47ae24c267015cfd6df35c" + integrity sha512-OKxZsn8TAf8fYxP79rDXgLs9zvKMTslK6dJ4iLhDXOujUqC5zJPBRszyrcEHXcMPOm1Sgk40JgyF3yiL/Swd7w== dependencies: "@babel/runtime" "^7.10.4" classnames "^2.2.5" json2mq "^0.2.0" - lodash "^4.17.21" resize-observer-polyfill "^1.5.1" + throttle-debounce "^5.0.0" "@babel/code-frame@^7.18.6": version "7.18.6" @@ -403,6 +430,16 @@ resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.8.20.tgz#56b9f0ec46b97a2ee09636191830482d04a3b6dd" integrity sha512-Pk23yFR00WPC0lHkTzRduZytWqHcgftqSWDZicyZZ5qjoafcxOYEPvyMPEknoEcjrb/sE/bWMd3RyxPRQRB+sw== +"@emotion/hash@^0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" + integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow== + +"@emotion/unitless@^0.7.5": + version "0.7.5" + resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" + integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== + "@esbuild/android-arm64@0.16.12": version "0.16.12" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.12.tgz#86c4fdd7c0d65fe9dcbe138fbe72720658ec3b88" @@ -1039,7 +1076,14 @@ dependencies: "@babel/runtime" "^7.0.0" -"@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.2": +"@rc-component/mini-decimal@^1.0.1": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@rc-component/mini-decimal/-/mini-decimal-1.0.1.tgz#e5dbc20a6a5b0e234d279bc71ce730ab865d3910" + integrity sha512-9N8nRk0oKj1qJzANKl+n9eNSMUGsZtjwNuDCiZ/KA+dt1fE3zq5x2XxclRcAbOIXnZcJ53ozP2Pa60gyELXagA== + dependencies: + "@babel/runtime" "^7.18.0" + +"@rc-component/portal@^1.0.0-6", "@rc-component/portal@^1.0.0-8", "@rc-component/portal@^1.0.0-9", "@rc-component/portal@^1.0.2": version "1.1.0" resolved "https://registry.npmjs.org/@rc-component/portal/-/portal-1.1.0.tgz" integrity sha512-tbXM9SB1r5FOuZjRCljERFByFiEUcMmCWMXLog/NmgCzlAzreXyf23Vei3ZpSMxSMavzPnhCovfZjZdmxS3d1w== @@ -1048,6 +1092,17 @@ classnames "^2.3.2" rc-util "^5.24.4" +"@rc-component/tour@~1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@rc-component/tour/-/tour-1.1.0.tgz#17b43b5c0bdfb6a8ab3027b1977d960952616d9e" + integrity sha512-Cy45VnNEDq6DLF5eKonIflObDfofbPq7AJpSf18qLN+j9+wW+sNlRv3JnCMDUsCdhSlnM4+yJ1RMokKp9GCpOQ== + dependencies: + "@babel/runtime" "^7.18.0" + "@rc-component/portal" "^1.0.0-9" + classnames "^2.3.2" + rc-trigger "^5.3.4" + rc-util "^5.24.4" + "@react-spring/animated@~9.6.1": version "9.6.1" resolved "https://registry.npmjs.org/@react-spring/animated/-/animated-9.6.1.tgz" @@ -2486,54 +2541,58 @@ ansi-styles@^4.1.0: dependencies: color-convert "^2.0.1" -antd@^4.19.2: - version "4.24.6" - resolved "https://registry.npmjs.org/antd/-/antd-4.24.6.tgz" - integrity sha512-x4tTXI3aOJukcG/MWQ7PdWHIqGEFInkKPhSHJpSiDvZI5BAvgLicW57WWhnBpJ6m9H9e9FRohC5FRJf0NIwsWQ== +antd@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/antd/-/antd-5.1.1.tgz#e5971bd907e4edca0e298bdc4a6aed4d4c5bdd41" + integrity sha512-nybYEAoFHwAn4WrUQS2I/p+oii/g1nAd60W3n+4CponfrniH/i01idHjT1pR3e7WyFQo6vngrcJUxUxuo3lK5g== dependencies: "@ant-design/colors" "^6.0.0" + "@ant-design/cssinjs" "^1.3.0" "@ant-design/icons" "^4.7.0" - "@ant-design/react-slick" "~0.29.1" + "@ant-design/react-slick" "~1.0.0" "@babel/runtime" "^7.18.3" "@ctrl/tinycolor" "^3.4.0" + "@rc-component/tour" "~1.1.0" classnames "^2.2.6" copy-to-clipboard "^3.2.0" - lodash "^4.17.21" - moment "^2.29.2" - rc-cascader "~3.7.0" + dayjs "^1.11.1" + qrcode.react "^3.1.0" + rc-cascader "~3.8.0" rc-checkbox "~2.3.0" rc-collapse "~3.4.2" rc-dialog "~9.0.2" - rc-drawer "~6.1.0" + rc-drawer "~6.1.1" rc-dropdown "~4.0.0" rc-field-form "~1.27.0" rc-image "~5.13.0" rc-input "~0.1.4" - rc-input-number "~7.3.9" + rc-input-number "~7.4.0" rc-mentions "~1.13.1" rc-menu "~9.8.0" rc-motion "^2.6.1" - rc-notification "~4.6.0" + rc-notification "~5.0.0-alpha.9" rc-pagination "~3.2.0" - rc-picker "~2.7.0" + rc-picker "~3.1.1" rc-progress "~3.4.1" rc-rate "~2.9.0" rc-resize-observer "^1.2.0" rc-segmented "~2.1.0" - rc-select "~14.1.13" + rc-select "~14.2.0" rc-slider "~10.0.0" - rc-steps "~5.0.0-alpha.2" - rc-switch "~3.2.0" - rc-table "~7.26.0" - rc-tabs "~12.4.1" + rc-steps "~6.0.0-alpha.2" + rc-switch "~4.0.0" + rc-table "~7.28.3" + rc-tabs "~12.5.1" rc-textarea "~0.4.5" rc-tooltip "~5.2.0" rc-tree "~5.7.0" - rc-tree-select "~5.5.0" + rc-tree-select "~5.6.0" rc-trigger "^5.2.10" rc-upload "~4.3.0" - rc-util "^5.22.5" - scroll-into-view-if-needed "^2.2.25" + rc-util "^5.25.2" + scroll-into-view-if-needed "^3.0.3" + shallowequal "^1.1.0" + throttle-debounce "^5.0.0" apache-arrow@^4.0.0: version "4.0.1" @@ -2628,11 +2687,6 @@ array.prototype.tosorted@^1.1.1: es-shim-unscopables "^1.0.0" get-intrinsic "^1.1.3" -asap@~2.0.3: - version "2.0.6" - resolved "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz" - integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== - ast-types-flow@^0.0.7: version "0.0.7" resolved "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz" @@ -2672,7 +2726,7 @@ axobject-query@^2.2.0: resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz" integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA== -babel-runtime@6.x, babel-runtime@^6.23.0, babel-runtime@^6.26.0: +babel-runtime@6.x: version "6.26.0" resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz" integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g== @@ -2846,22 +2900,10 @@ commander@2: resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -component-classes@^1.2.5: - version "1.2.6" - resolved "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz" - integrity sha512-hPFGULxdwugu1QWW3SvVOCUHLzO34+a2J6Wqy0c5ASQkfi9/8nZcBB0ZohaEbXOQlCflMAEMmEWk7u7BVs4koA== - dependencies: - component-indexof "0.0.3" - -component-indexof@0.0.3: - version "0.0.3" - resolved "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz" - integrity sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw== - -compute-scroll-into-view@^1.0.20: - version "1.0.20" - resolved "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz" - integrity sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg== +compute-scroll-into-view@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-2.0.3.tgz#e78c9804a2396a7a47159523b23b0695ad2391cc" + integrity sha512-mj/AjC7WqXeVlUB6zUq5Qrivb6et0kyasDQcbCWLDusYUqaXng+BfOnhCdRqPOa5/dWNn5e9+u40H6w2BYRdNQ== concat-map@0.0.1: version "0.0.1" @@ -2913,11 +2955,6 @@ core-js-pure@^3.25.1: resolved "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.27.0.tgz" integrity sha512-fJml7FM6v1HI3Gkg5/Ifc/7Y2qXcJxaDwSROeZGAZfNykSTvUk94WT55TYzJ2lFHK0voSr/d4nOVChLuNCWNpA== -core-js@^1.0.0: - version "1.2.7" - resolved "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz" - integrity sha512-ZiPp9pZlgxpWRu0M+YWbm6+aQ84XEfH1JRXvfOc/fILWI0VKhLC2LX13X1NYq4fULzLMq7Hfh43CSo2/aIaUPA== - core-js@^2.4.0, core-js@^2.6.5: version "2.6.12" resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz" @@ -2940,20 +2977,12 @@ cross-spawn@^7.0.2: shebang-command "^2.0.0" which "^2.0.1" -css-animation@^1.3.2: - version "1.6.1" - resolved "https://registry.npmjs.org/css-animation/-/css-animation-1.6.1.tgz" - integrity sha512-/48+/BaEaHRY6kNQ2OIPzKf9A6g8WjZYjhiNDNuIVbsm5tXCGIAsHDjB4Xu1C4vXJtUWZo26O68OQkDpNBaPog== - dependencies: - babel-runtime "6.x" - component-classes "^1.2.5" - csscolorparser@~1.0.3: version "1.0.3" resolved "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz" integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w== -csstype@^3.0.2: +csstype@^3.0.10, csstype@^3.0.2: version "3.1.1" resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz" integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== @@ -3048,14 +3077,9 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -date-fns@2.x: - version "2.29.3" - resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.3.tgz" - integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== - -dayjs@1.x: +dayjs@^1.11.1, dayjs@^1.11.4: version "1.11.7" - resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== debug@^2.6.9: @@ -3160,7 +3184,7 @@ dom-align@^1.7.0: resolved "https://registry.npmjs.org/dom-align/-/dom-align-1.12.4.tgz" integrity sha512-R8LUSEay/68zE5c8/3BDxiTEvgb4xZTF0RKmAHfiEVN3klfIpXfi2/QCoiWPccVQ0J/ZGdz9OjzL4uJEP/MRAw== -dom-scroll-into-view@1.x, dom-scroll-into-view@^1.2.0: +dom-scroll-into-view@1.x: version "1.2.1" resolved "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-1.2.1.tgz" integrity sha512-LwNVg3GJOprWDO+QhLL1Z9MMgWe/KAFLxVWKzjRTxNSPn8/LLDIfmuG71YHznXCqaqTjvHJDYO1MEAgX6XCNbQ== @@ -3213,15 +3237,6 @@ draco3d@1.4.1: resolved "https://registry.yarnpkg.com/draco3d/-/draco3d-1.4.1.tgz#2abdcf7b59caaac50f7e189aec454176c57146b2" integrity sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg== -draft-js@^0.10.0, draft-js@~0.10.0: - version "0.10.5" - resolved "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz" - integrity sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg== - dependencies: - fbjs "^0.8.15" - immutable "~3.7.4" - object-assign "^4.1.0" - earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.2: version "2.2.4" resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz" @@ -3237,13 +3252,6 @@ emoji-regex@^9.2.2: resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== -encoding@^0.1.11: - version "0.1.13" - resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz" - integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== - dependencies: - iconv-lite "^0.6.2" - engine.io-client@~6.2.3: version "6.2.3" resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.2.3.tgz" @@ -3590,19 +3598,6 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -fbjs@^0.8.15: - version "0.8.18" - resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.18.tgz" - integrity sha512-EQaWFK+fEPSoibjNy8IxUtaFOMXcWsY0JaVrQoZR9zC8N2Ygf9iDITPWjUTVIax95b6I742JFLqASHfsag/vKA== - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.30" - file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz" @@ -3941,7 +3936,7 @@ iconv-lite@0.4: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.2, iconv-lite@^0.6.3: +iconv-lite@^0.6.3: version "0.6.3" resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== @@ -3968,21 +3963,11 @@ image-size@~0.5.0: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== -immutable@^3.7.4: - version "3.8.2" - resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz" - integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg== - "immutable@^3.8.1 || ^4.0.0": version "4.2.1" resolved "https://registry.npmjs.org/immutable/-/immutable-4.2.1.tgz" integrity sha512-7WYV7Q5BTs0nlQm7tl92rDYYoyELLKHoDMBKhrxEoiV4mrfVdRz8hzPiYOzH7yWjzoVEamxRuAqhxL2PLRwZYQ== -immutable@~3.7.4: - version "3.7.6" - resolved "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz" - integrity sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw== - import-fresh@^3.0.0, import-fresh@^3.2.1: version "3.3.0" resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz" @@ -4122,11 +4107,6 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" -is-stream@^1.0.1: - version "1.1.0" - resolved "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz" - integrity sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ== - is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz" @@ -4163,14 +4143,6 @@ isexe@^2.0.0: resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz" integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== -isomorphic-fetch@^2.1.1: - version "2.2.1" - resolved "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz" - integrity sha512-9c4TNAKYXM5PRyVcwUZrF3W09nQ+sO7+jydgs4ZGW9dhsLG2VOlISJABombdQqQRXCwuYG3sYV/puGf5rp0qmA== - dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" - js-sdsl@^4.1.4: version "4.2.0" resolved "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.2.0.tgz" @@ -4331,7 +4303,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.16.5, lodash@^4.17.21, lodash@^4.17.4: +lodash@^4.17.4: version "4.17.21" resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4462,7 +4434,7 @@ moment@2.20.1: resolved "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz" integrity sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg== -moment@2.x, "moment@>= 2.9.0", moment@^2.24.0, moment@^2.29.2: +moment@2.x, "moment@>= 2.9.0": version "2.29.4" resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz" integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w== @@ -4521,14 +4493,6 @@ no-case@^3.0.4: lower-case "^2.0.2" tslib "^2.0.3" -node-fetch@^1.0.1: - version "1.7.3" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz" - integrity sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ== - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - node-releases@^2.0.6: version "2.0.8" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.8.tgz#0f349cdc8fcfa39a92ac0be9bc48b7706292b9ae" @@ -4541,7 +4505,7 @@ numbro@^2.0.6: dependencies: bignumber.js "^8.1.1" -object-assign@*, object-assign@4.x, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@*, object-assign@4.x, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== @@ -4609,13 +4573,6 @@ object.values@^1.1.5, object.values@^1.1.6: define-properties "^1.1.4" es-abstract "^1.20.4" -omit.js@^1.0.2: - version "1.0.2" - resolved "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz" - integrity sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ== - dependencies: - babel-runtime "^6.23.0" - once@^1.3.0: version "1.4.0" resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz" @@ -4799,14 +4756,7 @@ process@^0.11.10: resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== -promise@^7.1.1: - version "7.3.1" - resolved "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz" - integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg== - dependencies: - asap "~2.0.3" - -prop-types@15.x, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: +prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz" integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== @@ -4835,6 +4785,11 @@ punycode@^2.1.0: resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== +qrcode.react@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-3.1.0.tgz#5c91ddc0340f768316fbdb8fff2765134c2aecd8" + integrity sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q== + quadbin@^0.1.2: version "0.1.5" resolved "https://registry.yarnpkg.com/quadbin/-/quadbin-0.1.5.tgz#aa6dba53d0558236f8070450c90d6ed9b87507c8" @@ -4889,28 +4844,25 @@ rc-align@^4.0.0: rc-util "^5.26.0" resize-observer-polyfill "^1.5.1" -rc-animate@^2.10.2, rc-animate@^2.3.0: - version "2.11.1" - resolved "https://registry.npmjs.org/rc-animate/-/rc-animate-2.11.1.tgz" - integrity sha512-1NyuCGFJG/0Y+9RKh5y/i/AalUCA51opyyS/jO2seELpgymZm2u9QV3xwODwEuzkmeQ1BDPxMLmYLcTJedPlkQ== +rc-animate@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/rc-animate/-/rc-animate-3.1.1.tgz#defdd863f56816c222534e4dc68feddecd081386" + integrity sha512-8wg2Zg3EETy0k/9kYuis30NJNQg1D6/WSQwnCiz6SvyxQXNet/rVraRz3bPngwY6rcU2nlRvoShiYOorXyF7Sg== dependencies: - babel-runtime "6.x" + "@ant-design/css-animation" "^1.7.2" classnames "^2.2.6" - css-animation "^1.3.2" - prop-types "15.x" raf "^3.4.0" rc-util "^4.15.3" - react-lifecycles-compat "^3.0.4" -rc-cascader@~3.7.0: - version "3.7.0" - resolved "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.7.0.tgz" - integrity sha512-SFtGpwmYN7RaWEAGTS4Rkc62ZV/qmQGg/tajr/7mfIkleuu8ro9Hlk6J+aA0x1YS4zlaZBtTcSaXM01QMiEV/A== +rc-cascader@~3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.8.0.tgz#5eaca8998b2e3f5692d13f16bfe2346eccc87c6a" + integrity sha512-zCz/NzsNRQ1TIfiR3rQNxjeRvgRHEkNdo0FjHQZ6Ay6n4tdCmMrM7+81ThNaf21JLQ1gS2AUG2t5uikGV78obA== dependencies: "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" classnames "^2.3.1" - rc-select "~14.1.0" + rc-select "~14.2.0" rc-tree "~5.7.0" rc-util "^5.6.1" @@ -4944,9 +4896,9 @@ rc-dialog@~9.0.0, rc-dialog@~9.0.2: rc-motion "^2.3.0" rc-util "^5.21.0" -rc-drawer@~6.1.0: +rc-drawer@~6.1.1: version "6.1.2" - resolved "https://registry.npmjs.org/rc-drawer/-/rc-drawer-6.1.2.tgz" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-6.1.2.tgz#032918a21bfa8a7d9e52ada1e7b8ed08c0ae6346" integrity sha512-mYsTVT8Amy0LRrpVEv7gI1hOjtfMSO/qHAaCDzFx9QBLnms3cAQLJkaxRWM+Eq99oyLhU/JkgoqTg13bc4ogOQ== dependencies: "@babel/runtime" "^7.10.1" @@ -4965,33 +4917,6 @@ rc-dropdown@~4.0.0: rc-trigger "^5.3.1" rc-util "^5.17.0" -rc-editor-core@~0.8.3: - version "0.8.10" - resolved "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz" - integrity sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw== - dependencies: - babel-runtime "^6.26.0" - classnames "^2.2.5" - draft-js "^0.10.0" - immutable "^3.7.4" - lodash "^4.16.5" - prop-types "^15.5.8" - setimmediate "^1.0.5" - -rc-editor-mention@^1.1.13: - version "1.1.13" - resolved "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz" - integrity sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q== - dependencies: - babel-runtime "^6.23.0" - classnames "^2.2.5" - dom-scroll-into-view "^1.2.0" - draft-js "~0.10.0" - immutable "~3.7.4" - prop-types "^15.5.8" - rc-animate "^2.3.0" - rc-editor-core "~0.8.3" - rc-field-form@~1.27.0: version "1.27.3" resolved "https://registry.npmjs.org/rc-field-form/-/rc-field-form-1.27.3.tgz" @@ -5001,9 +4926,9 @@ rc-field-form@~1.27.0: async-validator "^4.1.0" rc-util "^5.8.0" -rc-form@^2.4.10: +rc-form@^2.4.12: version "2.4.12" - resolved "https://registry.npmjs.org/rc-form/-/rc-form-2.4.12.tgz" + resolved "https://registry.yarnpkg.com/rc-form/-/rc-form-2.4.12.tgz#4ee8711e90a2584baa7ac276de96bee0d9b0f5f1" integrity sha512-sHfyWRrnjCHkeCYfYAGop2GQBUC6CKMPcJF9h/gL/vTmZB/RN6fNOGKjXrXjFbwFwKXUWBoPtIDDDmXQW9xNdw== dependencies: async-validator "~1.11.3" @@ -5028,12 +4953,13 @@ rc-image@~5.13.0: rc-motion "^2.6.2" rc-util "^5.0.6" -rc-input-number@~7.3.9: - version "7.3.11" - resolved "https://registry.npmjs.org/rc-input-number/-/rc-input-number-7.3.11.tgz" - integrity sha512-aMWPEjFeles6PQnMqP5eWpxzsvHm9rh1jQOWXExUEIxhX62Fyl/ptifLHOn17+waDG1T/YUb6flfJbvwRhHrbA== +rc-input-number@~7.4.0: + version "7.4.0" + resolved "https://registry.yarnpkg.com/rc-input-number/-/rc-input-number-7.4.0.tgz#b8b4ffa8bbc04198e79ce8b9611756d046d128ec" + integrity sha512-r/Oub/sPYbzqLNUOHnnc9sbCu78a81KX+RCbRwmpvB4W6nptUySbdWS5KHV4Hak5CAE1LAd+wWm5JjvZizG1FA== dependencies: "@babel/runtime" "^7.10.1" + "@rc-component/mini-decimal" "^1.0.1" classnames "^2.2.5" rc-util "^5.23.0" @@ -5071,7 +4997,7 @@ rc-menu@~9.8.0: rc-util "^5.12.0" shallowequal "^1.1.0" -rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.6.1, rc-motion@^2.6.2: +rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.3.0, rc-motion@^2.3.4, rc-motion@^2.4.3, rc-motion@^2.4.4, rc-motion@^2.6.0, rc-motion@^2.6.1, rc-motion@^2.6.2: version "2.6.2" resolved "https://registry.npmjs.org/rc-motion/-/rc-motion-2.6.2.tgz" integrity sha512-4w1FaX3dtV749P8GwfS4fYnFG4Rb9pxvCYPc/b2fw1cmlHJWNNgOFIz7ysiD+eOrzJSvnLJWlNQQncpNMXwwpg== @@ -5080,14 +5006,14 @@ rc-motion@^2.0.0, rc-motion@^2.0.1, rc-motion@^2.2.0, rc-motion@^2.3.0, rc-motio classnames "^2.2.1" rc-util "^5.21.0" -rc-notification@~4.6.0: - version "4.6.1" - resolved "https://registry.npmjs.org/rc-notification/-/rc-notification-4.6.1.tgz" - integrity sha512-NSmFYwrrdY3+un1GvDAJQw62Xi9LNMSsoQyo95tuaYrcad5Bn9gJUL8AREufRxSQAQnr64u3LtP3EUyLYT6bhw== +rc-notification@~5.0.0-alpha.9: + version "5.0.0" + resolved "https://registry.yarnpkg.com/rc-notification/-/rc-notification-5.0.0.tgz#afdaa86fdf9c96e767690f2e891747beb3100d19" + integrity sha512-mTqMD5Uip1tJhX74opHrmC/CG1wtkxuCcaiCaPDFWPJ/o50OgYYi3nPV10Pwgb8mK8dqg9DDQKISWAcKmcVlXQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - rc-motion "^2.2.0" + rc-motion "^2.6.0" rc-util "^5.20.1" rc-overflow@^1.0.0, rc-overflow@^1.2.8: @@ -5108,16 +5034,13 @@ rc-pagination@~3.2.0: "@babel/runtime" "^7.10.1" classnames "^2.2.1" -rc-picker@~2.7.0: - version "2.7.0" - resolved "https://registry.npmjs.org/rc-picker/-/rc-picker-2.7.0.tgz" - integrity sha512-oZH6FZ3j4iuBxHB4NvQ6ABRsS2If/Kpty1YFFsji7/aej6ruGmfM7WnJWQ88AoPfpJ++ya5z+nVEA8yCRYGKyw== +rc-picker@~3.1.1: + version "3.1.4" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-3.1.4.tgz#4806dc36a78424abaee610830777c8e22a23c74c" + integrity sha512-4qANXNc3C02YENNQvun329zf9VLvSQ2W8RkKQRu8k1P+EtSGqe3klcAKCfz/1TuCiDvgRjJlzRmyZAkwvsbI8w== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" - date-fns "2.x" - dayjs "1.x" - moment "^2.24.0" rc-trigger "^5.0.4" rc-util "^5.4.0" shallowequal "^1.1.0" @@ -5160,10 +5083,10 @@ rc-segmented@~2.1.0: rc-motion "^2.4.4" rc-util "^5.17.0" -rc-select@~14.1.0, rc-select@~14.1.13: - version "14.1.16" - resolved "https://registry.npmjs.org/rc-select/-/rc-select-14.1.16.tgz" - integrity sha512-71XLHleuZmufpdV2vis5oituRkhg2WNvLpVMJBGWRar6WGAVOHXaY9DR5HvwWry3EGTn19BqnL6Xbybje6f8YA== +rc-select@~14.2.0: + version "14.2.0" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.2.0.tgz#60e83a7d5a5dae7fd9e3918d9b209074ea2c92d4" + integrity sha512-tvxHmbAA0EIhBkB7dyaRhcBUIWHocQbUFY/fBlezj2jg5p65a5VQ/UhBg2I9TA1wjpsr5CCx0ruZPkYcUMjDoQ== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -5171,7 +5094,7 @@ rc-select@~14.1.0, rc-select@~14.1.13: rc-overflow "^1.0.0" rc-trigger "^5.0.4" rc-util "^5.16.1" - rc-virtual-list "^3.2.0" + rc-virtual-list "^3.4.13" rc-slider@~10.0.0: version "10.0.1" @@ -5183,28 +5106,28 @@ rc-slider@~10.0.0: rc-util "^5.18.1" shallowequal "^1.1.0" -rc-steps@~5.0.0-alpha.2: - version "5.0.0" - resolved "https://registry.npmjs.org/rc-steps/-/rc-steps-5.0.0.tgz" - integrity sha512-9TgRvnVYirdhbV0C3syJFj9EhCRqoJAsxt4i1rED5o8/ZcSv5TLIYyo4H8MCjLPvbe2R+oBAm/IYBEtC+OS1Rw== +rc-steps@~6.0.0-alpha.2: + version "6.0.0" + resolved "https://registry.yarnpkg.com/rc-steps/-/rc-steps-6.0.0.tgz#f7148f8097d5d135f19b96c1b4f4b50ad6093753" + integrity sha512-+KfMZIty40mYCQSDvYbZ1jwnuObLauTiIskT1hL4FFOBHP6ZOr8LK0m143yD3kEN5XKHSEX1DIwCj3AYZpoeNQ== dependencies: "@babel/runtime" "^7.16.7" classnames "^2.2.3" rc-util "^5.16.1" -rc-switch@~3.2.0: - version "3.2.2" - resolved "https://registry.npmjs.org/rc-switch/-/rc-switch-3.2.2.tgz" - integrity sha512-+gUJClsZZzvAHGy1vZfnwySxj+MjLlGRyXKXScrtCTcmiYNPzxDFOxdQ/3pK1Kt/0POvwJ/6ALOR8gwdXGhs+A== +rc-switch@~4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rc-switch/-/rc-switch-4.0.0.tgz#55fbf99fc2d680791175037d379e170ba51fbe78" + integrity sha512-IfrYC99vN0gKaTyjQdqYuADU0eH00SAFHg3jOp8HrmUpJruhV1SohJzrCbPqPraZeX/6X/QKkdLfkdnUub05WA== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.1" rc-util "^5.0.1" -rc-table@~7.26.0: - version "7.26.0" - resolved "https://registry.npmjs.org/rc-table/-/rc-table-7.26.0.tgz" - integrity sha512-0cD8e6S+DTGAt5nBZQIPFYEaIukn17sfa5uFL98faHlH/whZzD8ii3dbFL4wmUDEL4BLybhYop+QUfZJ4CPvNQ== +rc-table@~7.28.3: + version "7.28.3" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.28.3.tgz#826c789b1cf8ed93137aa488919cf6d9a5f0b9bc" + integrity sha512-jiPtBDqcs0wF0KOJgkhDgxN6+vq4jHbteddE15IR6RajlVkAk+kRIecyBY28b+vg199yQiu/NGuSRKJKEGOWBQ== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" @@ -5212,10 +5135,10 @@ rc-table@~7.26.0: rc-util "^5.22.5" shallowequal "^1.1.0" -rc-tabs@~12.4.1: - version "12.4.2" - resolved "https://registry.npmjs.org/rc-tabs/-/rc-tabs-12.4.2.tgz" - integrity sha512-FFlGwuTjQUznWzJtyhmHc6KAp5lRQFxKUv9Aj1UtsOYe2e7WGmuzcrd+/LQchuPe0VjhaZPdGkmFGcqGqNO6ow== +rc-tabs@~12.5.1: + version "12.5.5" + resolved "https://registry.yarnpkg.com/rc-tabs/-/rc-tabs-12.5.5.tgz#8b34c2ea58f7d9fe141de252f24e69b26df34221" + integrity sha512-Y0k+JK4IN2cr0+MstkYK6MryvURhUc8JvHDCXujbUA6zHVTnWeTikOspGgvHPrlfZRl7WS+DPyMdEFE6RwlueQ== dependencies: "@babel/runtime" "^7.11.2" classnames "2.x" @@ -5245,14 +5168,14 @@ rc-tooltip@~5.2.0: classnames "^2.3.1" rc-trigger "^5.0.0" -rc-tree-select@~5.5.0: - version "5.5.5" - resolved "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-5.5.5.tgz" - integrity sha512-k2av7jF6tW9bIO4mQhaVdV4kJ1c54oxV3/hHVU+oD251Gb5JN+m1RbJFTMf1o0rAFqkvto33rxMdpafaGKQRJw== +rc-tree-select@~5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.6.0.tgz#f34147f4c14341430bcece481804496d0abd3371" + integrity sha512-XG6pu0a9l6+mzhQqUYfR2VIONbe/3LjVc3wKt28k6uBMZsI1j+SSxRyt/7jWRq8Kok8jHJBQASlDg6ehr9Sp0w== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - rc-select "~14.1.0" + rc-select "~14.2.0" rc-tree "~5.7.0" rc-util "^5.16.1" @@ -5267,7 +5190,7 @@ rc-tree@~5.7.0: rc-util "^5.16.1" rc-virtual-list "^3.4.8" -rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc-trigger@^5.3.1: +rc-trigger@^5.0.0, rc-trigger@^5.0.4, rc-trigger@^5.1.2, rc-trigger@^5.2.10, rc-trigger@^5.3.1, rc-trigger@^5.3.4: version "5.3.4" resolved "https://registry.npmjs.org/rc-trigger/-/rc-trigger-5.3.4.tgz" integrity sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw== @@ -5287,7 +5210,7 @@ rc-upload@~4.3.0: classnames "^2.2.5" rc-util "^5.2.0" -rc-util@^4.10.0, rc-util@^4.15.3: +rc-util@^4.15.3: version "4.21.1" resolved "https://registry.npmjs.org/rc-util/-/rc-util-4.21.1.tgz" integrity sha512-Z+vlkSQVc1l8O2UjR3WQ+XdWlhj5q9BMQNLk2iOBch75CqPfrJyGtcWMcnhRlNuDu0Ndtt4kLVO8JI8BrABobg== @@ -5298,7 +5221,7 @@ rc-util@^4.10.0, rc-util@^4.15.3: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: +rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16.0, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.19.2, rc-util@^5.2.0, rc-util@^5.2.1, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.21.2, rc-util@^5.22.5, rc-util@^5.23.0, rc-util@^5.24.4, rc-util@^5.24.5, rc-util@^5.25.2, rc-util@^5.26.0, rc-util@^5.27.0, rc-util@^5.4.0, rc-util@^5.6.1, rc-util@^5.8.0, rc-util@^5.9.4: version "5.27.1" resolved "https://registry.npmjs.org/rc-util/-/rc-util-5.27.1.tgz" integrity sha512-PsjHA+f+KBCz+YTZxrl3ukJU5RoNKoe3KSNMh0xGiISbR67NaM9E9BiMjCwxa3AcCUOg/rZ+V0ZKLSimAA+e3w== @@ -5306,7 +5229,7 @@ rc-util@^5.0.1, rc-util@^5.0.6, rc-util@^5.12.0, rc-util@^5.15.0, rc-util@^5.16. "@babel/runtime" "^7.18.3" react-is "^16.12.0" -rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: +rc-virtual-list@^3.4.13, rc-virtual-list@^3.4.8: version "3.4.13" resolved "https://registry.npmjs.org/rc-virtual-list/-/rc-virtual-list-3.4.13.tgz" integrity sha512-cPOVDmcNM7rH6ANotanMDilW/55XnFPw0Jh/GQYtrzZSy3AmWvCnqVNyNC/pgg3lfVmX2994dlzAhuUrd4jG7w== @@ -5572,12 +5495,12 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" -scroll-into-view-if-needed@^2.2.25: - version "2.2.31" - resolved "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz" - integrity sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA== +scroll-into-view-if-needed@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.0.3.tgz#57256bef78f3c3c288070d2aaa63cf547aa11e70" + integrity sha512-QoCH0lVw0tbA7Rl6sToH7e1tO3n95Oi6JgBgC8hEpNNZUC91MfasJ/4E1ZdbzGueNDZ+Y7ObfRaelKUgTyPbJA== dependencies: - compute-scroll-into-view "^1.0.20" + compute-scroll-into-view "^2.0.2" seamless-immutable@^7.1.3: version "7.1.4" @@ -5594,11 +5517,6 @@ semver@^6.3.0: resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz" - integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== - shallowequal@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz" @@ -5736,6 +5654,11 @@ style-to-object@0.4.0: dependencies: inline-style-parser "0.1.1" +stylis@^4.0.13: + version "4.1.3" + resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" + integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== + supercluster@^7.1.0: version "7.1.5" resolved "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz" @@ -5795,6 +5718,11 @@ texture-compressor@^1.0.2: argparse "^1.0.10" image-size "^0.7.4" +throttle-debounce@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-5.0.0.tgz#a17a4039e82a2ed38a5e7268e4132d6960d41933" + integrity sha512-2iQTSgkkc1Zyk0MeVrt/3BvuOXYPl/R8Z0U2xxo9rjwNciaHDG3R+Lm6dh4EeUci49DanvBnuqI6jshoQQRGEg== + tiny-invariant@^1.0.2: version "1.3.1" resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz" @@ -5876,11 +5804,6 @@ typical@^5.2.0: resolved "https://registry.yarnpkg.com/typical/-/typical-5.2.0.tgz#4daaac4f2b5315460804f0acf6cb69c52bb93066" integrity sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg== -ua-parser-js@^0.7.30: - version "0.7.32" - resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.32.tgz" - integrity sha512-f9BESNVhzlhEFf2CHMSj40NWOjYPl1YKYbrvIr/hFTDEmLq7SRbWvm7FcdcpCYT95zrOhC7gZSxjdnnTpBcwVw== - unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz" @@ -5969,11 +5892,6 @@ warning@^4.0.3: dependencies: loose-envify "^1.0.0" -whatwg-fetch@>=0.10.0: - version "3.6.2" - resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz" - integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== - which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz" From e1221da640de68389d39d82b979b789e87205657 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 15:42:51 +0800 Subject: [PATCH 013/126] Update axios --- package.json | 2 +- yarn.lock | 61 +++++++++++++++++++++------------------------------- 2 files changed, 26 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 9421028..f0d6d92 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@nebula.gl/layers": "^1.0.4", "@turf/turf": "^6.5.0", "antd": "^5.1.1", - "axios": "^1.1.3", + "axios": "^1.2.2", "color-interpolate": "^1.0.5", "connected-react-router": "^6.5.2", "deck.gl": "^8.8.20", diff --git a/yarn.lock b/yarn.lock index 69970d6..1fc1ef8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -53,18 +53,7 @@ resolved "https://registry.npmjs.org/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz" integrity sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw== -"@ant-design/icons@^4.7.0": - version "4.8.0" - resolved "https://registry.npmjs.org/@ant-design/icons/-/icons-4.8.0.tgz" - integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== - dependencies: - "@ant-design/colors" "^6.0.0" - "@ant-design/icons-svg" "^4.2.1" - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - rc-util "^5.9.4" - -"@ant-design/icons@^4.8.0": +"@ant-design/icons@^4.7.0", "@ant-design/icons@^4.8.0": version "4.8.0" resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.8.0.tgz#3084e2bb494cac3dad6c0392f77c1efc90ee1fa4" integrity sha512-T89P2jG2vM7OJ0IfGx2+9FC5sQjtTzRSz+mCHTXkFn/ELZc2YpfStmYHmqzq2Jx55J0F7+O6i5/ZKFSVNWCKNg== @@ -844,7 +833,7 @@ "@mapbox/geojson-rewind@^0.5.0": version "0.5.2" - resolved "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA== dependencies: get-stream "^6.0.1" @@ -852,17 +841,17 @@ "@mapbox/geojson-types@^1.0.2": version "1.0.2" - resolved "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6" integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw== "@mapbox/jsonlint-lines-primitives@^2.0.2": version "2.0.2" - resolved "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ== "@mapbox/mapbox-gl-supported@^1.5.0": version "1.5.0" - resolved "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz#f60b6a55a5d8e5ee908347d2ce4250b15103dc8e" integrity sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg== "@mapbox/martini@^0.2.0": @@ -894,7 +883,7 @@ "@mapbox/unitbezier@^0.0.0": version "0.0.0" - resolved "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" integrity sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA== "@mapbox/vector-tile@^1.3.1": @@ -906,7 +895,7 @@ "@mapbox/whoots-js@^3.1.0": version "3.1.0" - resolved "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz" + resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe" integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q== "@math.gl/core@3.6.3", "@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1", "@math.gl/core@^3.6.2": @@ -2259,7 +2248,7 @@ "@turf/turf@^6.5.0": version "6.5.0" - resolved "https://registry.npmjs.org/@turf/turf/-/turf-6.5.0.tgz" + resolved "https://registry.yarnpkg.com/@turf/turf/-/turf-6.5.0.tgz#49cd07b942a757f3ebbdba6cb294bbb864825a83" integrity sha512-ipMCPnhu59bh92MNt8+pr1VZQhHVuTMHklciQURo54heoxRzt1neNYZOBR6jdL+hNsbDGAECMuIpAutX+a3Y+w== dependencies: "@turf/along" "^6.5.0" @@ -2712,10 +2701,10 @@ axe-core@^4.4.3: resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.6.1.tgz" integrity sha512-lCZN5XRuOnpG4bpMq8v0khrWtUOn+i8lZSb6wHZH56ZfbIEv6XwJV84AAueh9/zi7qPVJ/E4yz6fmsiyOmXR4w== -axios@^1.1.3: - version "1.2.1" - resolved "https://registry.npmjs.org/axios/-/axios-1.2.1.tgz" - integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== +axios@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" + integrity sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -2979,7 +2968,7 @@ cross-spawn@^7.0.2: csscolorparser@~1.0.3: version "1.0.3" - resolved "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz" + resolved "https://registry.yarnpkg.com/csscolorparser/-/csscolorparser-1.0.3.tgz#b34f391eea4da8f3e98231e2ccd8df9c041f171b" integrity sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w== csstype@^3.0.10, csstype@^3.0.2: @@ -3721,7 +3710,7 @@ geojson-types@^2.0.1: geojson-vt@^3.2.1: version "3.2.1" - resolved "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz" + resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7" integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg== geojson@0.5.0: @@ -3740,7 +3729,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3: get-stream@^6.0.1: version "6.0.1" - resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== get-symbol-description@^1.0.0: @@ -3814,7 +3803,7 @@ grapheme-splitter@^1.0.4: grid-index@^1.1.0: version "1.1.0" - resolved "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz" + resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7" integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA== h3-js@^3.6.4, h3-js@^3.7.0: @@ -4221,7 +4210,7 @@ jsonfile@^4.0.0: kdbush@^3.0.0: version "3.0.0" - resolved "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz" + resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== ktx-parse@^0.0.4: @@ -4344,7 +4333,7 @@ make-dir@^2.1.0: mapbox-gl@^1.0.0: version "1.13.2" - resolved "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-1.13.2.tgz" + resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.2.tgz#76639c44f141f8dff71b7d8f1504f2aed11f7517" integrity sha512-CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww== dependencies: "@mapbox/geojson-rewind" "^0.5.0" @@ -4463,7 +4452,7 @@ mumath@^3.3.4: murmurhash-js@^1.0.0: version "1.0.0" - resolved "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz" + resolved "https://registry.yarnpkg.com/murmurhash-js/-/murmurhash-js-1.0.0.tgz#b06278e21fc6c37fa5313732b0412bcb6ae15f51" integrity sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw== nanoid@^3.3.4: @@ -4721,7 +4710,7 @@ postcss@^8.4.20: potpack@^1.0.1: version "1.0.2" - resolved "https://registry.npmjs.org/potpack/-/potpack-1.0.2.tgz" + resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ== prelude-ls@^1.2.1: @@ -5241,7 +5230,7 @@ rc-virtual-list@^3.4.13, rc-virtual-list@^3.4.8: react-dom@^18.2.0: version "18.2.0" - resolved "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== dependencies: loose-envify "^1.1.0" @@ -5264,7 +5253,7 @@ react-lifecycles-compat@^3.0.4: react-map-gl@^5: version "5.3.21" - resolved "https://registry.npmjs.org/react-map-gl/-/react-map-gl-5.3.21.tgz" + resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.21.tgz#7d28cdfe382d599d4ac8cccf7d794a3a0f06b65b" integrity sha512-hNVYiPBjgfVIcDV70OU9QnzvNCI1NhLm5OHjyY1rKPOKqzV4m9jjuXEKUaWC72vqIHk1Dzb+gG78xWOpqVi6uw== dependencies: "@babel/runtime" "^7.0.0" @@ -5335,7 +5324,7 @@ react-spring@^9.2.5: react@^18.2.0: version "18.2.0" - resolved "https://registry.npmjs.org/react/-/react-18.2.0.tgz" + resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" @@ -5661,7 +5650,7 @@ stylis@^4.0.13: supercluster@^7.1.0: version "7.1.5" - resolved "https://registry.npmjs.org/supercluster/-/supercluster-7.1.5.tgz" + resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg== dependencies: kdbush "^3.0.0" @@ -5878,7 +5867,7 @@ vite@^4.0.0: vt-pbf@^3.1.1: version "3.1.3" - resolved "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz" + resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA== dependencies: "@mapbox/point-geometry" "0.1.0" From 42aa0a6cacbea274e9628c3b373b89f071a2d235 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 19:21:17 +0800 Subject: [PATCH 014/126] Update nebulagl deps --- src/components/Map/EditableMap.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Map/EditableMap.jsx b/src/components/Map/EditableMap.jsx index 29221e2..da873c9 100644 --- a/src/components/Map/EditableMap.jsx +++ b/src/components/Map/EditableMap.jsx @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import DeckGL from '@deck.gl/react'; import ReactMapGL from 'react-map-gl'; import mapStyles from '../../constants/mapStyles'; -import { EditableGeoJsonLayer } from 'nebula.gl'; +import { EditableGeoJsonLayer } from '@nebula.gl/layers'; import { Button } from 'antd'; import 'mapbox-gl/dist/mapbox-gl.css'; import './EditableMap.css'; From f1cc4fe1392e53919754191327b38de6fe4f6539 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 19:57:35 +0800 Subject: [PATCH 015/126] Add content components --- package.json | 1 + src/components/Content/Content.jsx | 169 ++++++++++++++++++++ src/components/Project/NewProjectModal.jsx | 21 +-- src/components/Project/OpenProjectModal.jsx | 6 +- src/components/Tools/Parameter.jsx | 68 ++++---- src/utils/file.js | 53 ++++++ yarn.lock | 5 + 7 files changed, 276 insertions(+), 47 deletions(-) create mode 100644 src/components/Content/Content.jsx create mode 100644 src/utils/file.js diff --git a/package.json b/package.json index f0d6d92..8e30d4d 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "handsontable": "^6", "history": "^4.9.0", "html-react-parser": "^3.0.4", + "path-browserify": "^1.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", "react-map-gl": "^5", diff --git a/src/components/Content/Content.jsx b/src/components/Content/Content.jsx new file mode 100644 index 0000000..55c3dd4 --- /dev/null +++ b/src/components/Content/Content.jsx @@ -0,0 +1,169 @@ +import { FileOutlined, FolderFilled, FolderTwoTone } from '@ant-design/icons'; +import { Breadcrumb, Button, Modal } from 'antd'; +import { useEffect, useState } from 'react'; +import { getContentInfo } from '../../utils/file'; + +const DialogModel = ({ open, setOpen, onSuccess = () => {} }) => { + const [content, setContent] = useState({ + name: null, + path: null, + contents: [], + }); + + const updateContent = async (contentPath = '', root_path = null) => { + const contentInfo = await getContentInfo( + contentPath, + 'directory', + root_path + ); + setContent(contentInfo); + }; + + const refreshContent = async () => { + await updateContent(content.path); + }; + + const handleOk = () => { + onSuccess(content.path); + setOpen(false); + }; + + const handleCancel = () => { + setOpen(false); + }; + + useEffect(() => { + updateContent(); + }, []); + + return ( + + + + + ); +}; + +const ContentTable = ({ content, updateContent }) => { + const { path, contents } = content; + + return ( +
+
+ +
+ +
+ {contents.length ? ( + contents + .sort((current, next) => current.type.localeCompare(next.type)) + .map((info, index) => ( + + )) + ) : ( +
Nothing Found
+ )} +
+
+ ); +}; + +const ContentBreadcrumb = ({ path, updateContent }) => { + const splitPaths = (path) => {}; + const paths = splitPaths(path); + + const crumbs = paths.map((path, index) => ( + {path} + )); + + return ( +
+ + + { + updateContent(); + }} + /> + + {crumbs} + +
+ ); +}; + +const ContentRow = ({ content, updateContent }) => { + const [isHovering, setIsHovering] = useState(false); + + const handleMouseEnter = () => { + setIsHovering(true); + }; + + const handleMouseLeave = () => { + setIsHovering(false); + }; + + const handleClick = () => { + if (type == 'directory') updateContent(path); + }; + + const handleKey = (e) => { + if (e.key === 'Enter') handleClick(); + }; + + const { name, path, type } = content; + const contentIcon = + type == 'directory' ? ( + + ) : ( + + ); + + return ( +
+ {contentIcon} + + {name} + +
+ ); +}; + +export default DialogModel; diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index c831c88..6e8cb0b 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -4,6 +4,7 @@ import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; +import { checkExist, dirname, joinPath } from '../../utils/file'; const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { const [confirmLoading, setConfirmLoading] = useState(false); @@ -59,7 +60,7 @@ const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { > ); @@ -76,13 +77,13 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { required={true} rules={[ { - validator: (rule, value, callback) => { - if ( - value.length != 0 && - fs.existsSync( - path.join(form.getFieldValue('project_root'), value) - ) - ) { + validator: async (rule, value, callback) => { + const contentPath = joinPath( + form.getFieldValue('project_root'), + value + ); + const pathExists = await checkExist('', 'directory', contentPath); + if (value.length != 0 && pathExists) { callback('Folder with name already exists in path'); } else { callback(); @@ -98,8 +99,8 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { help="Path of new Project" rules={[ { - validator: (rule, value, callback) => { - if (value.length !== 0 && path.resolve(value) !== value) { + validator: async (rule, value, callback) => { + if (value.length == 0) { callback('Path entered is invalid'); } else { callback(); diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index d5d40e8..d2a63b5 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -3,6 +3,7 @@ import { Form } from '@ant-design/compatible'; import { Modal } from 'antd'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; +import { checkExist } from '../../utils/file'; const OpenProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { const [confirmLoading, setConfirmLoading] = useState(false); @@ -62,8 +63,9 @@ const OpenProjectForm = Form.create()(({ form, initialValue }) => { help="Path of Project" rules={[ { - validator: (rule, value, callback) => { - if (path.resolve(value) !== value) { + validator: async (rule, value, callback) => { + const pathExists = await checkExist('', 'directory', value); + if (!pathExists) { callback('Path entered is invalid'); } else { callback(); diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index 20c0e51..4a9f05c 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -1,8 +1,9 @@ -import { forwardRef } from 'react'; -import { EllipsisOutlined, PlusOutlined } from '@ant-design/icons'; +import { forwardRef, useState } from 'react'; +import { PlusOutlined, SearchOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; -import '@ant-design/compatible/assets/index.css'; -import { Input, Switch, Select, Divider, Button } from 'antd'; +import { Input, Switch, Select, Divider, Button, Space } from 'antd'; +import DialogModel from '../Content/Content'; +import { checkExist } from '../../utils/file'; const Parameter = ({ parameter, form }) => { const { name, type, value, choices, help } = parameter; @@ -48,8 +49,11 @@ const Parameter = ({ parameter, form }) => { help={help} rules={[ { - validator: (rule, value, callback) => { - if (!fs.existsSync(value)) { + validator: async (rule, value, callback) => { + const contentType = + type == 'PathParameter' ? 'directory' : 'file'; + const pathExists = await checkExist('', contentType, value); + if (!pathExists) { callback('Path does not exist'); } else { callback(); @@ -289,8 +293,8 @@ export const FormItemWrapper = ({ return ( {form.getFieldDecorator(name, { @@ -298,7 +302,6 @@ export const FormItemWrapper = ({ rules: [{ required: required }, ...rules], ...config, })(inputComponent)} -
{help} ); @@ -306,34 +309,29 @@ export const FormItemWrapper = ({ export const OpenDialogInput = forwardRef((props, ref) => { const { form, type, id, ...rest } = props; + const [open, setOpen] = useState(false); + + const onSuccess = (contentPath) => { + form.setFieldsValue({ [id]: contentPath }); + }; + return ( - openDialog(form, type, id)} - > - - - } - {...rest} - /> + <> + + + + + + ); }); - -const openDialog = async (form, type, name) => { - const options = - type === 'PathParameter' - ? { properties: ['openDirectory'] } - : { properties: ['openFile'] }; - - const paths = await ipcRenderer.invoke('open-dialog', options); - if (paths && paths.length) { - form.setFieldsValue({ [name]: paths[0] }); - } -}; +OpenDialogInput.displayName = 'OpenDialogInput'; export default Parameter; diff --git a/src/utils/file.js b/src/utils/file.js new file mode 100644 index 0000000..613347a --- /dev/null +++ b/src/utils/file.js @@ -0,0 +1,53 @@ +import axios from 'axios'; +import path from 'path-browserify'; + +class FileNotFoundError extends Error { + constructor(message, options) { + // Need to pass `options` as the second parameter to install the "cause" property. + super(message, options); + } +} + +export const getContentInfo = async ( + content_path = '', + content_type = 'directory', + root_path = null +) => { + try { + const url = `${import.meta.env.VITE_CEA_URL}/api/contents/${content_path}`; + const { data } = await axios.get(url, { + params: { type: content_type, ...(root_path && { root: root_path }) }, + }); + return data; + } catch (error) { + if (error.response.status == 404) throw new FileNotFoundError(); + else throw error; + } +}; + +export const checkExist = async ( + content_path, + content_type, + root_path = null +) => { + try { + await getContentInfo(content_path, content_type, root_path); + return true; + } catch (error) { + if (error instanceof FileNotFoundError) return false; + else throw error; + } +}; + +export const dirname = (fullPath) => { + const { base, dir, name } = path.parse(fullPath); + const isWin = base == name; + + if (isWin) + return path.dirname(fullPath.replace(/\\/g, '/')).replace(/\//g, '\\'); + else return dir; +}; + +export const joinPath = (dir, suffix) => { + return path.join(dir, suffix); +}; diff --git a/yarn.lock b/yarn.lock index 1fc1ef8..52dc127 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4630,6 +4630,11 @@ pascal-case@^3.1.2: no-case "^3.0.4" tslib "^2.0.3" +path-browserify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" + integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== + path-exists@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz" From 99c0df63d00210e2a91a26fefb1c8fd21fc31f5e Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 19:57:50 +0800 Subject: [PATCH 016/126] Remove body padding --- src/app.global.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app.global.css b/src/app.global.css index 0c0d3f3..22ed674 100644 --- a/src/app.global.css +++ b/src/app.global.css @@ -1,6 +1,6 @@ -#app { - height: 100vh; - overflow: hidden; +body{ + margin: 0px; + padding: 0px; } .trigger { From 346efa353b112099c141b6f179503198f0379771 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 20:18:03 +0800 Subject: [PATCH 017/126] Remove all file interactions --- .../DatabaseEditor/ExportDatabaseModal.jsx | 12 ++-- src/components/Project/NewProjectModal.jsx | 6 +- src/components/Project/NewScenarioModal.jsx | 5 +- src/components/Project/OpenProjectModal.jsx | 6 +- .../Project/RenameScenarioModal.jsx | 12 +--- .../Project/ScenarioImportDataForm.jsx | 42 +------------ src/components/Tools/Parameter.jsx | 60 +++++++++---------- 7 files changed, 41 insertions(+), 102 deletions(-) diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index 6fbc212..08a75a8 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -1,8 +1,8 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal, message, Alert } from 'antd'; +import { Modal, message, Alert, Input } from 'antd'; import axios from 'axios'; -import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; +import { FormItemWrapper } from '../Tools/Parameter'; import { useSelector } from 'react-redux'; const ExportDatabaseModal = ({ visible, setVisible }) => { @@ -82,11 +82,7 @@ const ExportForm = Form.create()(({ form }) => { rules={[ { validator: (rule, value, callback) => { - if ( - value.length != 0 && - form.getFieldValue('path').length != 0 && - fs.existsSync(path.join(form.getFieldValue('path'), value)) - ) { + if (value.length != 0) { callback('Folder with name already exists in path'); } else { callback(); @@ -112,7 +108,7 @@ const ExportForm = Form.create()(({ form }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index 6e8cb0b..5bf22a4 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -1,8 +1,8 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal } from 'antd'; +import { Modal, Input } from 'antd'; import axios from 'axios'; -import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; +import { FormItemWrapper } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; import { checkExist, dirname, joinPath } from '../../utils/file'; @@ -108,7 +108,7 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/NewScenarioModal.jsx b/src/components/Project/NewScenarioModal.jsx index 53323e4..11e9c6b 100644 --- a/src/components/Project/NewScenarioModal.jsx +++ b/src/components/Project/NewScenarioModal.jsx @@ -90,10 +90,7 @@ const NewScenarioForm = Form.create()( }, { validator: (rule, value, callback) => { - if ( - value.length != 0 && - fs.existsSync(path.join(project, value)) - ) { + if (value.length != 0) { callback('Scenario with name already exists in project'); } else { callback(); diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index d2a63b5..174c892 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -1,7 +1,7 @@ import { useRef, useState, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal } from 'antd'; -import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; +import { Modal, Input } from 'antd'; +import { FormItemWrapper } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; import { checkExist } from '../../utils/file'; @@ -73,7 +73,7 @@ const OpenProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/RenameScenarioModal.jsx b/src/components/Project/RenameScenarioModal.jsx index cc92fd3..c246d62 100644 --- a/src/components/Project/RenameScenarioModal.jsx +++ b/src/components/Project/RenameScenarioModal.jsx @@ -60,13 +60,6 @@ const RenameScenarioModal = ({ }; const RenameScenarioForm = Form.create()(({ form, project }) => { - const checkName = (project, name) => { - const dirs = fs - .readdirSync(project) - .filter((f) => fs.statSync(path.join(project, f)).isDirectory()); - return dirs.includes(name); - }; - return (
{ rules={[ { validator: (rule, value, callback) => { - if ( - value.length != 0 && - checkName(project, form.getFieldValue('name')) - ) { + if (value.length != 0) { callback('Scenario with name already exists in the project'); } else { callback(); diff --git a/src/components/Project/ScenarioImportDataForm.jsx b/src/components/Project/ScenarioImportDataForm.jsx index e2ef166..7b732f9 100644 --- a/src/components/Project/ScenarioImportDataForm.jsx +++ b/src/components/Project/ScenarioImportDataForm.jsx @@ -1,8 +1,4 @@ -import { - DownOutlined, - EllipsisOutlined, - MinusCircleOutlined, -} from '@ant-design/icons'; +import { DownOutlined, MinusCircleOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import { Input, Button, Dropdown, Menu } from 'antd'; @@ -55,24 +51,6 @@ const ScenarioImportDataForm = ({ form, visible }) => { }); }; - const openDialog = async (id, file) => { - const options = { - properties: ['openFile'], - filters: [ - { - name: `${file} file`, - extensions: inputFiles[file].extension.map((fileExtension) => - fileExtension.substr(1) - ), - }, - ], - }; - const paths = await ipcRenderer.invoke('open-dialog', options); - if (paths && paths.length) { - form.setFieldsValue({ [id]: paths[0] }); - } - }; - // Check if file is valid const vaildFile = (fileType, filePath) => { return true; @@ -110,14 +88,7 @@ const ScenarioImportDataForm = ({ form, visible }) => { visible ? { validator: (rule, value, callback) => { - if (!fs.existsSync(value)) { - if ( - ['zone', 'typology'].includes(key) && - value === '' - ) { - callback(); - } else callback('Path does not exist'); - } else if (!vaildFile(key, value)) + if (!vaildFile(key, value)) callback(`Select a vaild ${key} file`); else callback(); }, @@ -128,15 +99,6 @@ const ScenarioImportDataForm = ({ form, visible }) => { openDialog(`files[${key}]`, key)} - > - - - } /> )} {['zone', 'typology'].includes(key) ? null : ( diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index 4a9f05c..2a823e3 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -1,8 +1,6 @@ -import { forwardRef, useState } from 'react'; -import { PlusOutlined, SearchOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; -import { Input, Switch, Select, Divider, Button, Space } from 'antd'; -import DialogModel from '../Content/Content'; +import { PlusOutlined } from '@ant-design/icons'; +import { Input, Switch, Select, Divider, Button } from 'antd'; import { checkExist } from '../../utils/file'; const Parameter = ({ parameter, form }) => { @@ -61,7 +59,7 @@ const Parameter = ({ parameter, form }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); } @@ -202,7 +200,6 @@ const Parameter = ({ parameter, form }) => {
openDialog(form, 'PathParameter', name)} role="button" tabIndex={0} > @@ -240,7 +237,6 @@ const Parameter = ({ parameter, form }) => {
openDialog(form, type, name)} role="button" tabIndex={0} > @@ -307,31 +303,29 @@ export const FormItemWrapper = ({ ); }; -export const OpenDialogInput = forwardRef((props, ref) => { - const { form, type, id, ...rest } = props; - const [open, setOpen] = useState(false); - - const onSuccess = (contentPath) => { - form.setFieldsValue({ [id]: contentPath }); - }; - - return ( - <> - - - - - - - ); -}); -OpenDialogInput.displayName = 'OpenDialogInput'; +// export const OpenDialogInput = forwardRef((props, ref) => { +// const { form, type, id, ...rest } = props; +// const [open, setOpen] = useState(false); +// const onSuccess = (contentPath) => { +// form.setFieldsValue({ [id]: contentPath }); +// }; +// return ( +// <> +// +// +// +// +// +// +// ); +// }); +// OpenDialogInput.displayName = 'OpenDialogInput'; export default Parameter; From d11c14200fc689ca6a705f4ab7f0794b0b787fe0 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Thu, 29 Dec 2022 20:23:16 +0800 Subject: [PATCH 018/126] Comment out --- .eslintrc.js | 4 ++-- src/store/configureStore.dev.js | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 3043356..4310f42 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -35,8 +35,8 @@ module.exports = { 'react/react-in-jsx-scope': 'off', 'jsx-a11y/accessible-emoji': 'off', 'react/prop-types': 'off', - 'simple-import-sort/imports': 'error', - 'simple-import-sort/exports': 'error', + // 'simple-import-sort/imports': 'error', + // 'simple-import-sort/exports': 'error', 'jsx-a11y/anchor-is-valid': [ 'error', { diff --git a/src/store/configureStore.dev.js b/src/store/configureStore.dev.js index 7c63ded..e193291 100644 --- a/src/store/configureStore.dev.js +++ b/src/store/configureStore.dev.js @@ -57,13 +57,13 @@ const configureStore = (initialState) => { // Create Store const store = createStore(rootReducer, initialState, enhancer); - if (module.hot) { - module.hot.accept( - '../reducers', - // eslint-disable-next-line global-require - () => store.replaceReducer(createRootReducer(history)) - ); - } + // if (module.hot) { + // module.hot.accept( + // '../reducers', + // // eslint-disable-next-line global-require + // () => store.replaceReducer(createRootReducer(history)) + // ); + // } return store; }; From f307e8ba4005425d13865ee8abc44263ef8e172f Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 21:24:23 +0800 Subject: [PATCH 019/126] Use browser history --- src/constants/routes.json | 2 +- src/store/configureStore.dev.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/constants/routes.json b/src/constants/routes.json index c3d006e..876b93c 100644 --- a/src/constants/routes.json +++ b/src/constants/routes.json @@ -6,4 +6,4 @@ "DASHBOARD": "/dashboard", "PROJECT_OVERVIEW": "/project", "SPLASH": "/splash" -} +} \ No newline at end of file diff --git a/src/store/configureStore.dev.js b/src/store/configureStore.dev.js index e193291..9aad7e3 100644 --- a/src/store/configureStore.dev.js +++ b/src/store/configureStore.dev.js @@ -1,12 +1,12 @@ import { createStore, applyMiddleware, compose } from 'redux'; import thunk from 'redux-thunk'; -import { createHashHistory } from 'history'; +import { createBrowserHistory } from 'history'; import { routerMiddleware, routerActions } from 'connected-react-router'; import { createLogger } from 'redux-logger'; import createRootReducer from '../reducers'; import httpMiddleware from './httpMiddleware'; -const history = createHashHistory(); +const history = createBrowserHistory(); const rootReducer = createRootReducer(history); From d00586858c7d712fecd5243f918841d1d2c63766 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 22:16:42 +0800 Subject: [PATCH 020/126] Fix isWin function --- src/components/Project/NewProjectModal.jsx | 2 +- src/utils/file.js | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index 5bf22a4..310fc62 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -43,7 +43,7 @@ const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { }); }; - const handleCancel = (e) => { + const handleCancel = () => { setVisible(false); }; diff --git a/src/utils/file.js b/src/utils/file.js index 613347a..2865d82 100644 --- a/src/utils/file.js +++ b/src/utils/file.js @@ -39,13 +39,15 @@ export const checkExist = async ( } }; -export const dirname = (fullPath) => { - const { base, dir, name } = path.parse(fullPath); - const isWin = base == name; +const isWin = (fullPath) => { + const { base } = path.parse(fullPath); + return base == fullPath; +}; - if (isWin) +export const dirname = (fullPath) => { + if (isWin(fullPath)) return path.dirname(fullPath.replace(/\\/g, '/')).replace(/\//g, '\\'); - else return dir; + else return path.dirname(fullPath); }; export const joinPath = (dir, suffix) => { From a4a6d1f3a9ec347286987f91da7f0ec9edd8c807 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 22:50:36 +0800 Subject: [PATCH 021/126] Load project info on refresh --- src/containers/HomePage.jsx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/containers/HomePage.jsx b/src/containers/HomePage.jsx index b95f742..388ab46 100644 --- a/src/containers/HomePage.jsx +++ b/src/containers/HomePage.jsx @@ -1,4 +1,4 @@ -import {} from 'react'; +import { useEffect } from 'react'; import { Route, Switch } from 'react-router-dom'; import { Layout } from 'antd'; import SideNav from '../components/HomePage/SideNav'; @@ -6,16 +6,32 @@ import Header from '../components/HomePage/Header'; import { ToolRoute } from '../components/Tools/Tool'; import InputEditor from '../components/InputEditor/InputEditor'; import Dashboard from '../components/Dashboard/Dashboard'; -import Project from '../components/Project/Project'; +import Project, { useFetchProject } from '../components/Project/Project'; import StatusBar from '../components/StatusBar/StatusBar'; import Landing from '../components/Landing/Landing'; import DatabaseEditor from '../components/DatabaseEditor/DatabaseEditor'; import routes from '../constants/routes'; +import { useDispatch, useSelector } from 'react-redux'; +import { updateScenario } from '../actions/project'; const { Content } = Layout; const HomePage = () => { + const fetchProject = useFetchProject(); + const dispatch = useDispatch(); + + const { + info: { project, scenario_name: scenarioName }, + } = useSelector((state) => state.project); + + useEffect(() => { + fetchProject(project).then(({ scenarios_list: scenariosList }) => { + // Set scenario back if it exists + if (scenariosList.includes(scenarioName)) + dispatch(updateScenario(scenarioName)); + }); + }, []); return ( <> From a6c70743851fbb588c038727e3505ad7b2e0d87e Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:04:15 +0800 Subject: [PATCH 022/126] Ensure scenario is selected before showing content --- src/components/DatabaseEditor/DatabaseEditor.jsx | 5 +++++ src/components/InputEditor/InputEditor.jsx | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/DatabaseEditor/DatabaseEditor.jsx b/src/components/DatabaseEditor/DatabaseEditor.jsx index cc43530..df0d01d 100644 --- a/src/components/DatabaseEditor/DatabaseEditor.jsx +++ b/src/components/DatabaseEditor/DatabaseEditor.jsx @@ -52,9 +52,14 @@ const useValidateDatabasePath = () => { }; const DatabaseEditor = () => { + const { + info: { scenario_name: scenarioName }, + } = useSelector((state) => state.project); + const [valid, error, checkDBPathValidity] = useValidateDatabasePath(); const goToScript = useChangeRoute(`${routes.TOOLS}/data-initializer`); + if (scenarioName === null) return
No scenario selected.
; if (valid === null) return ( { + const { + info: { scenario_name: scenarioName }, + } = useSelector((state) => state.project); + const { status, error } = useSelector((state) => state.inputData); const dispatch = useDispatch(); useEffect(() => { - dispatch(fetchInputData()); + if (scenarioName !== null) dispatch(fetchInputData()); // Reset input data state on umount return () => { dispatch(resetInputData()); }; - }, []); + }, [scenarioName]); + if (scenarioName === null) return
No scenario selected.
; if (error) return ; if (status == 'fetching') return ( From 0c5903d27a1879fd2eb06365f08093b2248d2290 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:29:03 +0800 Subject: [PATCH 023/126] Add space to menu --- src/components/Project/ScenarioCard.jsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/Project/ScenarioCard.jsx b/src/components/Project/ScenarioCard.jsx index 72cbcc4..50d9d70 100644 --- a/src/components/Project/ScenarioCard.jsx +++ b/src/components/Project/ScenarioCard.jsx @@ -1,6 +1,16 @@ import { useState, useEffect } from 'react'; import { DownOutlined } from '@ant-design/icons'; -import { Card, Row, Col, Button, Modal, Tag, Dropdown, Menu } from 'antd'; +import { + Card, + Row, + Col, + Button, + Modal, + Tag, + Dropdown, + Menu, + Space, +} from 'antd'; import axios from 'axios'; import { deleteScenario, useOpenScenario, useFetchProject } from './Project'; import RenameScenarioModal from './RenameScenarioModal'; @@ -20,12 +30,12 @@ const ScenarioCard = ({ scenarioName, project, active }) => { } extra={ - <> + - + } > From cdc81f26f6594a23cd4d031a55f86e89341c9660 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:34:30 +0800 Subject: [PATCH 024/126] Fix scenario rename --- src/components/Project/RenameScenarioModal.jsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/Project/RenameScenarioModal.jsx b/src/components/Project/RenameScenarioModal.jsx index c246d62..4ad4fd7 100644 --- a/src/components/Project/RenameScenarioModal.jsx +++ b/src/components/Project/RenameScenarioModal.jsx @@ -4,6 +4,7 @@ import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper } from '../Tools/Parameter'; import { useFetchProject } from './Project'; +import { checkExist, joinPath } from '../../utils/file'; const RenameScenarioModal = ({ scenarioName, @@ -15,7 +16,7 @@ const RenameScenarioModal = ({ const formRef = useRef(); const fetchProject = useFetchProject(); - const handleOk = (e) => { + const handleOk = () => { formRef.current.validateFields(async (err, values) => { if (!err) { setConfirmLoading(true); @@ -70,8 +71,10 @@ const RenameScenarioForm = Form.create()(({ form, project }) => { required={true} rules={[ { - validator: (rule, value, callback) => { - if (value.length != 0) { + validator: async (rule, value, callback) => { + const contentPath = joinPath(project, value); + const pathExists = await checkExist('', 'directory', contentPath); + if (value.length != 0 && pathExists) { callback('Scenario with name already exists in the project'); } else { callback(); From 039a41b158ba03463f4fcf9836af31accced4139 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Dec 2022 23:51:20 +0800 Subject: [PATCH 025/126] Fix export database --- .../DatabaseEditor/DatabaseEditor.jsx | 4 +-- .../DatabaseEditor/ExportDatabaseModal.jsx | 27 +++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/components/DatabaseEditor/DatabaseEditor.jsx b/src/components/DatabaseEditor/DatabaseEditor.jsx index df0d01d..ce14708 100644 --- a/src/components/DatabaseEditor/DatabaseEditor.jsx +++ b/src/components/DatabaseEditor/DatabaseEditor.jsx @@ -33,7 +33,7 @@ const useValidateDatabasePath = () => { try { setValid(null); setError(null); - const resp = await axios.get( + await axios.get( `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/check` ); setValid(true); @@ -185,7 +185,7 @@ const SaveDatabaseButton = () => { setModalVisible(true); try { console.log(databasesData); - const resp = await axios.put( + await axios.put( `${import.meta.env.VITE_CEA_URL}/api/inputs/databases`, databasesData ); diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index 08a75a8..e78192a 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -4,6 +4,7 @@ import { Modal, message, Alert, Input } from 'antd'; import axios from 'axios'; import { FormItemWrapper } from '../Tools/Parameter'; import { useSelector } from 'react-redux'; +import { checkExist, joinPath } from '../../utils/file'; const ExportDatabaseModal = ({ visible, setVisible }) => { const databaseChanges = useSelector((state) => state.databaseEditor.changes); @@ -16,7 +17,7 @@ const ExportDatabaseModal = ({ visible, setVisible }) => { setConfirmLoading(true); console.log('Received values of form: ', values); try { - const resp = axios.put( + axios.put( `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/copy`, values ); @@ -25,7 +26,7 @@ const ExportDatabaseModal = ({ visible, setVisible }) => { message.config({ top: 120, }); - message.success('Database succesfully exported'); + message.success('Database successfully exported'); } catch (err) { console.error(err.response); setConfirmLoading(false); @@ -81,9 +82,16 @@ const ExportForm = Form.create()(({ form }) => { required={true} rules={[ { - validator: (rule, value, callback) => { + validator: async (rule, value, callback) => { if (value.length != 0) { - callback('Folder with name already exists in path'); + const contentPath = joinPath(form.getFieldValue('path'), value); + const pathExists = await checkExist( + '', + 'directory', + contentPath + ); + if (pathExists) + callback('Folder with name already exists in path'); } else { callback(); } @@ -97,17 +105,6 @@ const ExportForm = Form.create()(({ form }) => { initialValue="" help="Path to export Database" required={true} - rules={[ - { - validator: (rule, value, callback) => { - if (value.length !== 0 && path.resolve(value) !== value) { - callback('Path entered is invalid'); - } else { - callback(); - } - }, - }, - ]} inputComponent={} /> From b22ce738fafabb653871a634411c1ec47a16f51f Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 00:23:28 +0800 Subject: [PATCH 026/126] Fix styles --- src/components/Project/Project.jsx | 2 +- src/components/StatusBar/StatusBar.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Project/Project.jsx b/src/components/Project/Project.jsx index ce198f2..84d4f06 100644 --- a/src/components/Project/Project.jsx +++ b/src/components/Project/Project.jsx @@ -35,7 +35,7 @@ const Project = () => { title={

{projectTitle}

-
+
Date: Fri, 30 Dec 2022 16:40:51 +0800 Subject: [PATCH 027/126] Disable context menu in map --- src/components/Map/Map.jsx | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index cfba846..a5cae4d 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -2,10 +2,7 @@ import { useRef, useEffect, useState, useCallback } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import DeckGL from '@deck.gl/react'; import { GeoJsonLayer } from '@deck.gl/layers'; -import ReactMapGL, { - _MapContext as MapContext, - NavigationControl, -} from 'react-map-gl'; +import ReactMapGL, { _MapContext as MapContext } from 'react-map-gl'; import mapStyles from '../../constants/mapStyles'; import { area as calcArea, length as calcLength } from '@turf/turf'; import inputEndpoints from '../../constants/inputEndpoints'; @@ -261,7 +258,7 @@ const DeckGLMap = ({ data, colors }) => { }, [data, visibility, extruded, selected]); return ( - <> +
evt.preventDefault()}> {
- +
); }; From 6758a80637eb8405b671e0bc11d2cb2eadee49d8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 19:26:27 +0800 Subject: [PATCH 028/126] Update geometry selection z-index --- src/components/Map/Map.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Map/Map.css b/src/components/Map/Map.css index b62ca68..e1a0c2e 100644 --- a/src/components/Map/Map.css +++ b/src/components/Map/Map.css @@ -34,10 +34,10 @@ display: inline-block; text-align: center; position: absolute; + z-index: 5; left: 50%; top: 15px; transform: translateX(-50%); - z-index: 1; background: rgba(255, 255, 255, 0.9); } From a2d3882661a0cb147d47028fd38a1d9e5b851041 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 20:13:19 +0800 Subject: [PATCH 029/126] Update mapStyles.json --- src/constants/mapStyles.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/constants/mapStyles.json b/src/constants/mapStyles.json index 33a215c..fa7d3d7 100644 --- a/src/constants/mapStyles.json +++ b/src/constants/mapStyles.json @@ -5,14 +5,12 @@ "osm-tiles": { "type": "raster", "tiles": [ - "http://a.tile.openstreetmap.org/{z}/{x}/{y}.png", - "http://b.tile.openstreetmap.org/{z}/{x}/{y}.png", - "http://b.tile.openstreetmap.org/{z}/{x}/{y}.png" + "https://tile.openstreetmap.org/{z}/{x}/{y}.png" ], "tileSize": 256, "minzoom": 0, - "maxzoom": 22, - "attribution": "Map data © OpenStreetMap contributors" + "maxzoom": 19, + "attribution": "© OpenStreetMap contributors" } }, "layers": [ @@ -47,4 +45,4 @@ } ] } -} +} \ No newline at end of file From da8ffd447f3c89c17fd10183eddc3088394709a5 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 20:45:34 +0800 Subject: [PATCH 030/126] Fix input editor map --- package.json | 4 +- src/components/Map/Map.jsx | 274 +++++++--------------------------- src/components/Map/Toggle.jsx | 107 +++++++++++++ yarn.lock | 157 +++++++++++-------- 4 files changed, 265 insertions(+), 277 deletions(-) create mode 100644 src/components/Map/Toggle.jsx diff --git a/package.json b/package.json index 8e30d4d..d65dd0f 100644 --- a/package.json +++ b/package.json @@ -51,10 +51,12 @@ "handsontable": "^6", "history": "^4.9.0", "html-react-parser": "^3.0.4", + "mapbox-gl": "npm:empty-npm-package@1.0.0", + "maplibre-gl": "^2.4.0", "path-browserify": "^1.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-map-gl": "^5", + "react-map-gl": "^7.0.20", "react-redux": "^8.0.4", "react-router": "^5.0.1", "react-router-dom": "^5.0.1", diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index a5cae4d..19343e6 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -1,45 +1,38 @@ import { useRef, useEffect, useState, useCallback } from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import DeckGL from '@deck.gl/react'; -import { GeoJsonLayer } from '@deck.gl/layers'; -import ReactMapGL, { _MapContext as MapContext } from 'react-map-gl'; + +import { GeoJsonLayer } from '@deck.gl/layers/typed'; +import { MapboxOverlay } from '@deck.gl/mapbox/typed'; + import mapStyles from '../../constants/mapStyles'; import { area as calcArea, length as calcLength } from '@turf/turf'; -import inputEndpoints from '../../constants/inputEndpoints'; -import axios from 'axios'; -import { - Toggle3DControl, - ToggleMapStyleControl, - ResetCameraControl, -} from './MapButtons'; import { setSelected } from '../../actions/inputEditor'; import './Map.css'; +import Map from 'react-map-gl'; +import { useControl } from 'react-map-gl'; +import maplibregl from 'maplibre-gl'; +import 'maplibre-gl/dist/maplibre-gl.css'; +import { LayerToggle, NetworkToggle } from './Toggle'; + // Initial viewport settings const defaultViewState = { longitude: 0, latitude: 0, - zoom: 0, + zoom: 1, pitch: 0, bearing: 0, }; -function useRefWithCallback(callback) { - const ref = useRef(null); - const setRef = useCallback((node) => { - if (node) { - callback(node); - } - ref.current = node; - }, []); - - return [setRef]; +function DeckGLOverlay(props) { + const overlay = useControl(() => new MapboxOverlay(props)); + overlay.setProps(props); + return null; } const DeckGLMap = ({ data, colors }) => { - const [mapRef] = useRefWithCallback(calcCameraOptions); + const mapRef = useRef(); const cameraOptions = useRef(); - const glRef = useRef(); const selectedLayer = useRef(); const dispatch = useDispatch(); const selected = useSelector((state) => state.inputData.selected); @@ -59,21 +52,25 @@ const DeckGLMap = ({ data, colors }) => { }); const [mapStyle, setMapStyle] = useState('LIGHT_MAP'); - function calcCameraOptions(node) { - const map = node.getMap(); - if (data.zone) { - const bbox = data.zone.bbox; - cameraOptions.current = map.cameraForBounds(bbox, { - maxZoom: 20, - }); - setViewState({ - ...viewState, - zoom: cameraOptions.current.zoom, - latitude: cameraOptions.current.center.lat, - longitude: cameraOptions.current.center.lng, - }); - } - } + const onMapLoad = useCallback(() => { + console.debug('Map loaded.'); + + const mapbox = mapRef.current.getMap(); + const bbox = data?.zone.bbox; + if (bbox === null) return; + + cameraOptions.current = mapbox.cameraForBounds(bbox, { + maxZoom: 16, + padding: 8, + }); + + setViewState({ + ...viewState, + zoom: cameraOptions.current.zoom, + latitude: cameraOptions.current.center.lat, + longitude: cameraOptions.current.center.lng, + }); + }); const renderLayers = () => { const network_type = visibility.dc ? 'dc' : 'dh'; @@ -213,11 +210,12 @@ const DeckGLMap = ({ data, colors }) => { setViewState(viewState); }; - const onDragStart = (info, event) => { - let dToggleButton = document.getElementById('3d-button'); - if (event.rightButton && !extruded) { - dToggleButton.click(); - } + const onPitchStart = (event) => { + // let dToggleButton = document.getElementById('3d-button'); + // if (event.rightButton && !extruded) { + // dToggleButton.click(); + // } + console.log(event); }; const onClick = ({ object, layer }, event) => { @@ -242,159 +240,29 @@ const DeckGLMap = ({ data, colors }) => { } }; - useEffect( - // Clear WebGL context - () => () => { - if (glRef.current) { - const extension = glRef.current.getExtension('WEBGL_lose_context'); - if (extension) extension.loseContext(); - } - }, - [] - ); - useEffect(() => { setLayers(renderLayers()); }, [data, visibility, extruded, selected]); return ( -
evt.preventDefault()}> - (glRef.current = gl)} + <> + e.preventDefault()} + {...viewState} > - - - - -
- - - -
-
-
- ); -}; - -const NetworkToggle = ({ data, setVisibility }) => { - const handleChange = (e) => { - const { value } = e.target; - setVisibility((oldValue) => ({ - ...oldValue, - dc: value === 'dc', - dh: value === 'dh', - })); - }; - return ( -
- Network Type: - {data.dc && ( - - )} - {data.dh && ( - - )} - {!data.dc && !data.dh &&
No networks found
} -
- ); -}; + -const LayerToggle = ({ data, setVisibility }) => { - const handleChange = (e) => { - const { value, checked } = e.target; - setVisibility((oldValue) => ({ ...oldValue, [value]: checked })); - }; - return ( -
- {data.zone && ( - - - - )} - {data.surroundings && ( - - - - )} - {data.streets && ( - - - - )} - {(data.dh || data.dc) && ( - - - - )} -
+ + + +
+ ); }; @@ -471,32 +339,4 @@ const buildingColor = ( return colors.disconnected; }; -export const useGeoJsons = (layerList) => { - const [geojsons, setGeoJsons] = useState(); - - useEffect(() => { - let promises = layerList.map((type) => { - return axios - .get(`${import.meta.env.VITE_CEA_URL}${inputEndpoints[type]}`) - .catch((error) => { - return console.error(error.response.data); - }); - }); - axios - .all(promises) - .then((results) => { - let _data = {}; - for (var i = 0; i < layerList.length; i++) { - if (results[i] && results[i].status === 200) { - _data[layerList[i]] = results[i].data; - } - } - setGeoJsons(_data); - }) - .catch((error) => console.error(error)); - }, []); - - return [geojsons, setGeoJsons]; -}; - export default DeckGLMap; diff --git a/src/components/Map/Toggle.jsx b/src/components/Map/Toggle.jsx new file mode 100644 index 0000000..f4dda92 --- /dev/null +++ b/src/components/Map/Toggle.jsx @@ -0,0 +1,107 @@ +export const NetworkToggle = ({ data, setVisibility }) => { + const handleChange = (e) => { + const { value } = e.target; + setVisibility((oldValue) => ({ + ...oldValue, + dc: value === 'dc', + dh: value === 'dh', + })); + }; + return ( +
+ Network Type: + {data.dc && ( + + )} + {data.dh && ( + + )} + {!data.dc && !data.dh &&
No networks found
} +
+ ); +}; + +export const LayerToggle = ({ data, setVisibility }) => { + const handleChange = (e) => { + const { value, checked } = e.target; + setVisibility((oldValue) => ({ ...oldValue, [value]: checked })); + }; + return ( +
+ {data.zone && ( + + + + )} + {data.surroundings && ( + + + + )} + {data.streets && ( + + + + )} + {(data.dh || data.dc) && ( + + + + )} +
+ ); +}; diff --git a/yarn.lock b/yarn.lock index 52dc127..a2d2f72 100644 --- a/yarn.lock +++ b/yarn.lock @@ -831,7 +831,7 @@ "@probe.gl/env" "^3.5.0" "@probe.gl/stats" "^3.5.0" -"@mapbox/geojson-rewind@^0.5.0": +"@mapbox/geojson-rewind@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" integrity sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA== @@ -839,20 +839,15 @@ get-stream "^6.0.1" minimist "^1.2.6" -"@mapbox/geojson-types@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz#9aecf642cb00eab1080a57c4f949a65b4a5846d6" - integrity sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw== - "@mapbox/jsonlint-lines-primitives@^2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" integrity sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ== -"@mapbox/mapbox-gl-supported@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-1.5.0.tgz#f60b6a55a5d8e5ee908347d2ce4250b15103dc8e" - integrity sha512-/PT1P6DNf7vjEEiPkVIRJkvibbqWtqnyGaBz3nfRdcxclNSnSdaLU5tfAgcD7I8Yt5i+L19s406YLl1koLnLbg== +"@mapbox/mapbox-gl-supported@^2.0.1": + version "2.0.1" + resolved "https://registry.yarnpkg.com/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz#c15367178d8bfe4765e6b47b542fe821ce259c7b" + integrity sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ== "@mapbox/martini@^0.2.0": version "0.2.0" @@ -876,15 +871,20 @@ resolved "https://registry.yarnpkg.com/@mapbox/tilebelt/-/tilebelt-1.0.2.tgz#32936c3acad3ea3e669bb083a598bcc7d74b4ec9" integrity sha512-tGJN2VIgWrXqBTPIxFVklklIpcy6ss8W5ouq+cjNLXPXFraRaDR4Ice+5Q8/uLX+6aH23lWBMydOIn8PcdVcpA== -"@mapbox/tiny-sdf@^1.1.0", "@mapbox/tiny-sdf@^1.1.1": +"@mapbox/tiny-sdf@^1.1.0": version "1.2.5" resolved "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz" integrity sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw== -"@mapbox/unitbezier@^0.0.0": - version "0.0.0" - resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz#15651bd553a67b8581fb398810c98ad86a34524e" - integrity sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA== +"@mapbox/tiny-sdf@^2.0.5": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@mapbox/tiny-sdf/-/tiny-sdf-2.0.5.tgz#cdba698d3d65087643130f9af43a2b622ce0b372" + integrity sha512-OhXt2lS//WpLdkqrzo/KwB7SRD8AiNTFFzuo9n14IBupzIMa67yGItcK7I2W9D8Ghpa4T04Sw9FWsKCJG50Bxw== + +"@mapbox/unitbezier@^0.0.1": + version "0.0.1" + resolved "https://registry.yarnpkg.com/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz#d32deb66c7177e9e9dfc3bbd697083e2e657ff01" + integrity sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw== "@mapbox/vector-tile@^1.3.1": version "1.3.1" @@ -2391,7 +2391,7 @@ resolved "https://registry.yarnpkg.com/@types/flatbuffers/-/flatbuffers-1.10.0.tgz#aa74e30ffdc86445f2f060e1808fc9d56b5603ba" integrity sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA== -"@types/geojson@*", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": +"@types/geojson@*", "@types/geojson@^7946.0.10", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": version "7946.0.10" resolved "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz" integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== @@ -2419,13 +2419,27 @@ resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== -"@types/mapbox-gl@^2.0.3", "@types/mapbox-gl@^2.6.3": +"@types/mapbox-gl@^2.6.0", "@types/mapbox-gl@^2.6.3": version "2.7.10" resolved "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.10.tgz" integrity sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw== dependencies: "@types/geojson" "*" +"@types/mapbox__point-geometry@*", "@types/mapbox__point-geometry@^0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz#488a9b76e8457d6792ea2504cdd4ecdd9860a27e" + integrity sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA== + +"@types/mapbox__vector-tile@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz#8fa1379dbaead1e1b639b8d96cfd174404c379d6" + integrity sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g== + dependencies: + "@types/geojson" "*" + "@types/mapbox__point-geometry" "*" + "@types/pbf" "*" + "@types/node@^14.14.37": version "14.18.36" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.36.tgz#c414052cb9d43fab67d679d5f3c641be911f5835" @@ -2436,6 +2450,11 @@ resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.7.0.tgz#e4a932069db47bb3eabeb0b305502d01586fa90d" integrity sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg== +"@types/pbf@*", "@types/pbf@^3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.2.tgz#8d291ad68b4b8c533e96c174a2e3e6399a59ed61" + integrity sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ== + "@types/prop-types@*": version "15.7.5" resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz" @@ -3226,7 +3245,7 @@ draco3d@1.4.1: resolved "https://registry.yarnpkg.com/draco3d/-/draco3d-1.4.1.tgz#2abdcf7b59caaac50f7e189aec454176c57146b2" integrity sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg== -earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.2: +earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.4: version "2.2.4" resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== @@ -3740,7 +3759,7 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -gl-matrix@^3.0.0, gl-matrix@^3.2.1, gl-matrix@^3.4.0: +gl-matrix@^3.0.0, gl-matrix@^3.4.0, gl-matrix@^3.4.3: version "3.4.3" resolved "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz" integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA== @@ -3764,6 +3783,15 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +global-prefix@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" + integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== + dependencies: + ini "^1.3.5" + kind-of "^6.0.2" + which "^1.3.1" + global@>=4.3.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -3801,11 +3829,6 @@ grapheme-splitter@^1.0.4: resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== -grid-index@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7" - integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA== - h3-js@^3.6.4, h3-js@^3.7.0: version "3.7.2" resolved "https://registry.yarnpkg.com/h3-js/-/h3-js-3.7.2.tgz#61d4feb7bb42868ca9cdb2d5cf9d9dda94f9e5a3" @@ -3991,6 +4014,11 @@ inherits@2: resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== +ini@^1.3.5: + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== + inline-style-parser@0.1.1: version "0.1.1" resolved "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz" @@ -4213,6 +4241,11 @@ kdbush@^3.0.0: resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0" integrity sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew== +kind-of@^6.0.2: + version "6.0.3" + resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" + integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== + ktx-parse@^0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/ktx-parse/-/ktx-parse-0.0.4.tgz#6fd3eca82490de8a1e48cb8367a9980451fa1ac4" @@ -4331,34 +4364,40 @@ make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" -mapbox-gl@^1.0.0: - version "1.13.2" - resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-1.13.2.tgz#76639c44f141f8dff71b7d8f1504f2aed11f7517" - integrity sha512-CPjtWygL+f7naL+sGHoC2JQR0DG7u+9ik6WdkjjVmz2uy0kBC2l+aKfdi3ZzUR7VKSQJ6Mc/CeCN+6iVNah+ww== +"mapbox-gl@npm:empty-npm-package@1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/empty-npm-package/-/empty-npm-package-1.0.0.tgz#fda29eb6de5efa391f73d578697853af55f6793a" + integrity sha512-q4Mq/+XO7UNDdMiPpR/LIBIW1Zl4V0Z6UT9aKGqIAnBCtCb3lvZJM1KbDbdzdC8fKflwflModfjR29Nt0EpcwA== + +maplibre-gl@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-2.4.0.tgz#2b53dbf526626bf4ee92ad4f33f13ef09e5af182" + integrity sha512-csNFylzntPmHWidczfgCZpvbTSmhaWvLRj9e1ezUDBEPizGgshgm3ea1T5TCNEEBq0roauu7BPuRZjA3wO4KqA== dependencies: - "@mapbox/geojson-rewind" "^0.5.0" - "@mapbox/geojson-types" "^1.0.2" + "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" - "@mapbox/mapbox-gl-supported" "^1.5.0" + "@mapbox/mapbox-gl-supported" "^2.0.1" "@mapbox/point-geometry" "^0.1.0" - "@mapbox/tiny-sdf" "^1.1.1" - "@mapbox/unitbezier" "^0.0.0" + "@mapbox/tiny-sdf" "^2.0.5" + "@mapbox/unitbezier" "^0.0.1" "@mapbox/vector-tile" "^1.3.1" "@mapbox/whoots-js" "^3.1.0" + "@types/geojson" "^7946.0.10" + "@types/mapbox__point-geometry" "^0.1.2" + "@types/mapbox__vector-tile" "^1.3.0" + "@types/pbf" "^3.0.2" csscolorparser "~1.0.3" - earcut "^2.2.2" + earcut "^2.2.4" geojson-vt "^3.2.1" - gl-matrix "^3.2.1" - grid-index "^1.1.0" - minimist "^1.2.5" + gl-matrix "^3.4.3" + global-prefix "^3.0.0" murmurhash-js "^1.0.0" pbf "^3.2.1" - potpack "^1.0.1" + potpack "^1.0.2" quickselect "^2.0.0" - rw "^1.3.3" - supercluster "^7.1.0" + supercluster "^7.1.5" tinyqueue "^2.0.3" - vt-pbf "^3.1.1" + vt-pbf "^3.1.3" math.gl@^3.6.2: version "3.6.3" @@ -4403,7 +4442,7 @@ minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz" integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g== -mjolnir.js@^2.5.0, mjolnir.js@^2.7.0: +mjolnir.js@^2.7.0: version "2.7.1" resolved "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.7.1.tgz" integrity sha512-72BeUWgTv2cj5aZQKpwL8caNUFhXZ9bDm1hxpNj70XJQ62IBnTZmtv/WPxJvtaVNhzNo+D2U8O6ryNI0zImYcw== @@ -4713,7 +4752,7 @@ postcss@^8.4.20: picocolors "^1.0.0" source-map-js "^1.0.2" -potpack@^1.0.1: +potpack@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.2.tgz#23b99e64eb74f5741ffe7656b5b5c4ddce8dfc14" integrity sha512-choctRBIV9EMT9WGAZHn3V7t0Z2pMQyl0EZE6pFc/6ml3ssw7Dlf/oAOvFwjm1HVsqfQN8GfeFyJ+d8tRzqueQ== @@ -5256,19 +5295,12 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-map-gl@^5: - version "5.3.21" - resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-5.3.21.tgz#7d28cdfe382d599d4ac8cccf7d794a3a0f06b65b" - integrity sha512-hNVYiPBjgfVIcDV70OU9QnzvNCI1NhLm5OHjyY1rKPOKqzV4m9jjuXEKUaWC72vqIHk1Dzb+gG78xWOpqVi6uw== +react-map-gl@^7.0.20: + version "7.0.20" + resolved "https://registry.yarnpkg.com/react-map-gl/-/react-map-gl-7.0.20.tgz#84435319290a61142b558c05c32da91474d585a7" + integrity sha512-Q1formrWEdt9vY5DyW2vgdmAPuSMH2TFn8xKMlA+cmBlyS8veQvVTGoq4lAm8p3Hb/90ZpNmMtI4s107r931vQ== dependencies: - "@babel/runtime" "^7.0.0" - "@types/geojson" "^7946.0.7" - "@types/mapbox-gl" "^2.0.3" - mapbox-gl "^1.0.0" - mjolnir.js "^2.5.0" - prop-types "^15.7.2" - resize-observer-polyfill "^1.5.1" - viewport-mercator-project "^7.0.4" + "@types/mapbox-gl" "^2.6.0" react-property@2.0.0: version "2.0.0" @@ -5458,7 +5490,7 @@ run-parallel@^1.1.9: dependencies: queue-microtask "^1.2.2" -rw@1, rw@^1.3.3: +rw@1: version "1.3.3" resolved "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== @@ -5653,7 +5685,7 @@ stylis@^4.0.13: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.1.3.tgz#fd2fbe79f5fed17c55269e16ed8da14c84d069f7" integrity sha512-GP6WDNWf+o403jrEp9c5jibKavrtLW+/qYGhFxFrG8maXhwTBI7gLLhiBb0o7uFccWN+EOS9aMO6cGHWAO07OA== -supercluster@^7.1.0: +supercluster@^7.1.5: version "7.1.5" resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-7.1.5.tgz#65a6ce4a037a972767740614c19051b64b8be5a3" integrity sha512-EulshI3pGUM66o6ZdH3ReiFcvHpM3vAigyK+vcxdjpJyEbIIrtbmBdY23mGgnI24uXiGFvrGq9Gkum/8U7vJWg== @@ -5838,7 +5870,7 @@ value-equal@^1.0.1: resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== -viewport-mercator-project@>=6.0.0, viewport-mercator-project@^7.0.4: +viewport-mercator-project@>=6.0.0: version "7.0.4" resolved "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz" integrity sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg== @@ -5870,7 +5902,7 @@ vite@^4.0.0: optionalDependencies: fsevents "~2.3.2" -vt-pbf@^3.1.1: +vt-pbf@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/vt-pbf/-/vt-pbf-3.1.3.tgz#68fd150756465e2edae1cc5c048e063916dcfaac" integrity sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA== @@ -5897,6 +5929,13 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" + integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== + dependencies: + isexe "^2.0.0" + which@^2.0.1: version "2.0.2" resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz" From 176da4a55c4a69443794fad994acfe9dd4a52ff8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 22:22:13 +0800 Subject: [PATCH 031/126] Fix network toggle color --- src/components/Map/Map.jsx | 26 +++++++++++--- src/components/Map/Toggle.jsx | 67 ++++++++++++++++++----------------- 2 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index 19343e6..c0ce4a6 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -46,10 +46,11 @@ const DeckGLMap = ({ data, colors }) => { zone: !!data.zone, surroundings: !!data.surroundings, streets: !!data.streets, - dc: !!data.dc, - dh: !!data.dh && !data.dc, + dc: data?.dc !== null, + dh: data?.dh !== null && data?.dc === null, network: true, }); + const [mapStyle, setMapStyle] = useState('LIGHT_MAP'); const onMapLoad = useCallback(() => { @@ -97,7 +98,7 @@ const DeckGLMap = ({ data, colors }) => { network_type ), updateTriggers: { - getFillColor: selected, + getFillColor: [selected, visibility.dc], }, pickable: true, @@ -240,6 +241,14 @@ const DeckGLMap = ({ data, colors }) => { } }; + const onNetworkChange = (value) => { + setVisibility((oldValue) => ({ + ...oldValue, + dc: value === 'dc', + dh: value === 'dh', + })); + }; + useEffect(() => { setLayers(renderLayers()); }, [data, visibility, extruded, selected]); @@ -258,7 +267,14 @@ const DeckGLMap = ({ data, colors }) => { > - +
@@ -315,7 +331,7 @@ function updateTooltip({ x, y, object, layer }) { const nodeFillColor = (type, colors, network) => { if (type === 'NONE') { - return network === 'dc' ? colors.dc : colors.dh; + return network === 'dc' ? colors.dc : network === 'dh' ? colors.dh : null; } else if (type === 'CONSUMER') { return [255, 255, 255]; } else if (type === 'PLANT') { diff --git a/src/components/Map/Toggle.jsx b/src/components/Map/Toggle.jsx index f4dda92..4256a5d 100644 --- a/src/components/Map/Toggle.jsx +++ b/src/components/Map/Toggle.jsx @@ -1,40 +1,41 @@ -export const NetworkToggle = ({ data, setVisibility }) => { - const handleChange = (e) => { - const { value } = e.target; - setVisibility((oldValue) => ({ - ...oldValue, - dc: value === 'dc', - dh: value === 'dh', - })); +import { useState } from 'react'; + +export const NetworkToggle = ({ + cooling, + heating, + initialValue = null, + onChange = () => {}, +}) => { + const [selected, setSelected] = useState(initialValue); + + const handleChange = (value) => { + setSelected(value); + onChange(value); + }; + + const RadioInput = ({ value, label }) => { + return ( + + ); }; + return (
Network Type: - {data.dc && ( - - )} - {data.dh && ( - - )} - {!data.dc && !data.dh &&
No networks found
} + {cooling && } + {heating && } + {!cooling && !heating &&
No networks found
}
); }; From fea4fa9a942a9da510e2f6ca9d13f61d22a03dc5 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 30 Dec 2022 23:24:18 +0800 Subject: [PATCH 032/126] Create new map controls --- src/components/Map/Map.css | 11 +++++++ src/components/Map/Map.jsx | 63 ++++++++++++++++++++++++++++++++------ 2 files changed, 65 insertions(+), 9 deletions(-) diff --git a/src/components/Map/Map.css b/src/components/Map/Map.css index e1a0c2e..d0f8f3e 100644 --- a/src/components/Map/Map.css +++ b/src/components/Map/Map.css @@ -44,3 +44,14 @@ #layers-group span { padding: 5px; } + +#map-controls { + position: absolute; + z-index: 5; + right: 0; + background: #fff; + padding: 12px; + display: flex; + flex-direction: column; + gap: 8px; +} diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index c0ce4a6..0bd453c 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -14,6 +14,7 @@ import { useControl } from 'react-map-gl'; import maplibregl from 'maplibre-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; import { LayerToggle, NetworkToggle } from './Toggle'; +import { Button, Switch } from 'antd'; // Initial viewport settings const defaultViewState = { @@ -34,6 +35,7 @@ const DeckGLMap = ({ data, colors }) => { const mapRef = useRef(); const cameraOptions = useRef(); const selectedLayer = useRef(); + const firstPitch = useRef(false); const dispatch = useDispatch(); const selected = useSelector((state) => state.inputData.selected); const connectedBuildings = useSelector( @@ -65,12 +67,13 @@ const DeckGLMap = ({ data, colors }) => { padding: 8, }); - setViewState({ - ...viewState, + setViewState((state) => ({ + ...state, zoom: cameraOptions.current.zoom, + bearing: cameraOptions.current.bearing, latitude: cameraOptions.current.center.lat, longitude: cameraOptions.current.center.lng, - }); + })); }); const renderLayers = () => { @@ -211,12 +214,11 @@ const DeckGLMap = ({ data, colors }) => { setViewState(viewState); }; - const onPitchStart = (event) => { - // let dToggleButton = document.getElementById('3d-button'); - // if (event.rightButton && !extruded) { - // dToggleButton.click(); - // } - console.log(event); + const onPitchStart = () => { + if (!firstPitch.current) { + setExtruded(true); + firstPitch.current = true; + } }; const onClick = ({ object, layer }, event) => { @@ -259,6 +261,7 @@ const DeckGLMap = ({ data, colors }) => { ref={mapRef} mapLib={maplibregl} mapStyle={mapStyles[mapStyle]} + minZoom={1} onLoad={onMapLoad} onMove={onViewStateChange} onPitchStart={onPitchStart} @@ -276,6 +279,48 @@ const DeckGLMap = ({ data, colors }) => { onChange={onNetworkChange} /> + +
+
+ Dark Mode: + { + setMapStyle(checked ? 'DARK_MAP' : 'LIGHT_MAP'); + }} + /> +
+
+ 3D Buildings: + { + setExtruded(checked); + }} + /> +
+ +
From a5a9a8163412fbc87b478c8bdc73019405df261d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 01:46:39 +0800 Subject: [PATCH 033/126] Fix editable map --- package.json | 3 +- src/components/Map/EditableMap.css | 19 ++ src/components/Map/EditableMap.jsx | 163 ++++++++---------- .../Project/ScenarioGenerateDataForm.jsx | 2 +- yarn.lock | 51 +++++- 5 files changed, 144 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index d65dd0f..0e37b12 100644 --- a/package.json +++ b/package.json @@ -41,18 +41,19 @@ "@ant-design/icons": "^4.8.0", "@babel/polyfill": "^7.12.1", "@handsontable/react": "^3.1.2", - "@nebula.gl/layers": "^1.0.4", "@turf/turf": "^6.5.0", "antd": "^5.1.1", "axios": "^1.2.2", "color-interpolate": "^1.0.5", "connected-react-router": "^6.5.2", "deck.gl": "^8.8.20", + "events": "^3.3.0", "handsontable": "^6", "history": "^4.9.0", "html-react-parser": "^3.0.4", "mapbox-gl": "npm:empty-npm-package@1.0.0", "maplibre-gl": "^2.4.0", + "nebula.gl": "^1.0.4", "path-browserify": "^1.0.1", "react": "^18.2.0", "react-dom": "^18.2.0", diff --git a/src/components/Map/EditableMap.css b/src/components/Map/EditableMap.css index 50702c7..283b536 100644 --- a/src/components/Map/EditableMap.css +++ b/src/components/Map/EditableMap.css @@ -6,3 +6,22 @@ width: 100%; height: 100%; } + +#edit-map-buttons { + position: absolute; + right: 0; + padding: 10px; + z-index: 5; + display: flex; + gap: 10px; +} + +#edit-map-area-info { + position: absolute; + left: 0; + padding: 10px; + z-index: 5; + display: flex; + gap: 10px; + background-color: rgba(255, 255, 255, 0.7); +} diff --git a/src/components/Map/EditableMap.jsx b/src/components/Map/EditableMap.jsx index da873c9..2b34be5 100644 --- a/src/components/Map/EditableMap.jsx +++ b/src/components/Map/EditableMap.jsx @@ -1,12 +1,18 @@ import { useState, useEffect } from 'react'; -import DeckGL from '@deck.gl/react'; -import ReactMapGL from 'react-map-gl'; +import Map from 'react-map-gl'; import mapStyles from '../../constants/mapStyles'; -import { EditableGeoJsonLayer } from '@nebula.gl/layers'; +import { + DrawPolygonMode, + EditableGeoJsonLayer, + ModifyMode, + ViewMode, +} from 'nebula.gl'; import { Button } from 'antd'; -import 'mapbox-gl/dist/mapbox-gl.css'; +import maplibregl from 'maplibre-gl'; +import 'maplibre-gl/dist/maplibre-gl.css'; import './EditableMap.css'; import { area as calcArea, polygon } from '@turf/turf'; +import { DeckGL } from 'deck.gl'; const defaultViewState = { longitude: 0, @@ -33,49 +39,51 @@ export const calcPolyArea = (geojson) => { const EditableMap = ({ location = defaultViewState, - geojson = null, - outputGeojson = null, + geojson = EMPTY_FEATURE, + setValue = () => {}, }) => { const [viewState, setViewState] = useState(defaultViewState); - const [mode, setMode] = useState('view'); + const [mode, setMode] = useState(null); const [data, setData] = useState(geojson !== null ? geojson : EMPTY_FEATURE); const [selectedFeatureIndexes, setSelectedFeatureIndexes] = useState([]); - const hasData = !!data.features.length; + const hasData = data.features.length > 0; const layer = new EditableGeoJsonLayer({ id: 'geojson-layer', data: data, - mode: mode, + mode: + mode === 'draw' + ? DrawPolygonMode + : mode === 'edit' + ? ModifyMode + : ViewMode, selectedFeatureIndexes: selectedFeatureIndexes, - onEdit: ({ updatedData }) => { - if (mode === 'drawPolygon') { - setMode('view'); - setSelectedFeatureIndexes([0]); + onEdit: (e) => { + if (e.editType === 'addFeature') { + setData(e.updatedData); + setMode(null); + } else if ( + ['removePosition', 'movePosition', 'addPosition'].includes(e.editType) + ) { + setData(e.updatedData); } - setData(updatedData); }, - - onLayerClick: () => {}, }); - const onViewStateChange = ({ viewState }) => { - setViewState(viewState); - }; - - const changeToDraw = () => { - if (mode !== 'drawPolygon') { - setMode('drawPolygon'); + const ToggleDraw = () => { + if (mode !== 'draw') { + setMode('draw'); } else { - setMode('view'); + setMode(null); } }; - const changeToEdit = () => { - if (mode !== 'modify') { - setMode('modify'); + const ToggleEdit = () => { + if (mode !== 'edit') { + setMode('edit'); } else { - setMode('view'); + setMode(null); } }; @@ -85,84 +93,61 @@ const EditableMap = ({ }; useEffect(() => { - setTimeout( - () => setViewState((viewState) => ({ ...viewState, ...location })), - 0 - ); + setViewState((viewState) => ({ ...viewState, ...location })); }, [location]); useEffect(() => { - if (outputGeojson) { - if (hasData) { - outputGeojson(data); - } else { - outputGeojson(null); - } - } + if (mode === 'draw') setData(EMPTY_FEATURE); + else if (mode === 'edit') setSelectedFeatureIndexes([0]); + else setSelectedFeatureIndexes([]); + }, [mode]); + + useEffect(() => { + setValue(data); }, [data]); return ( <> {hasData && ( -
- {`Selected Area: ${calcPolyArea(data)} km2`} +
+ {`Area size: ${calcPolyArea(data)} km2`}
)} -
- {hasData ? null : ( +
+ {hasData ? ( + <> + + + + ) : ( )} - {!hasData ? null : ( - - )} - {!hasData || mode === 'modify' ? null : ( - - )}
- - { - document.getElementById('edit-map-buttons').style.display = 'block'; + +
e.preventDefault()}> + { + setViewState(viewState); }} - /> - + > + + +
); }; diff --git a/src/components/Project/ScenarioGenerateDataForm.jsx b/src/components/Project/ScenarioGenerateDataForm.jsx index fdc4052..7325abd 100644 --- a/src/components/Project/ScenarioGenerateDataForm.jsx +++ b/src/components/Project/ScenarioGenerateDataForm.jsx @@ -269,7 +269,7 @@ const ScenarioMap = ({ form }) => {
)} diff --git a/yarn.lock b/yarn.lock index a2d2f72..27bb8f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -760,7 +760,7 @@ dependencies: "@babel/runtime" "^7.3.1" -"@luma.gl/constants@8.5.18", "@luma.gl/constants@^8.5.16": +"@luma.gl/constants@8.5.18", "@luma.gl/constants@^8.5.10", "@luma.gl/constants@^8.5.16": version "8.5.18" resolved "https://registry.yarnpkg.com/@luma.gl/constants/-/constants-8.5.18.tgz#f18886dfb1407225cd18cb792e490219f91eb3d2" integrity sha512-lQLGAlroQaeJkAUwrb1fRiHlMBP9/ukyjnZ1QlYgXYyeC7/9XhLx4rqBlOzQ2sxcTHHwi73nHD0P2XmVuAccBg== @@ -987,7 +987,7 @@ lodash.throttle "^4.1.1" viewport-mercator-project ">=6.0.0" -"@nebula.gl/layers@^1.0.4": +"@nebula.gl/layers@1.0.4": version "1.0.4" resolved "https://registry.yarnpkg.com/@nebula.gl/layers/-/layers-1.0.4.tgz#5acea95db132cbcb02bbb4a8afa805a0d9adc606" integrity sha512-jwBGvQK7iIdq05DWl5q7vOIhpU+rVFhR+y30G1P5toz/SD9z3Qadfm2SYDgIcX36Ez45mJMKVllY7hLEG1tSRA== @@ -3572,6 +3572,11 @@ esutils@^2.0.2: resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +events@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" + integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== + expression-eval@^2.0.0: version "2.1.0" resolved "https://registry.npmjs.org/expression-eval/-/expression-eval-2.1.0.tgz" @@ -4504,6 +4509,41 @@ natural-compare@^1.4.0: resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz" integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== +nebula.gl@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/nebula.gl/-/nebula.gl-1.0.4.tgz#2763af1fc40148eae5fa97c1cb301157845b36da" + integrity sha512-B9kMO45N830E0K1b+TQbv/2cNOCGzixHCQNeJCJ6sAHrKxaT2851tnHlW3EgD/zfvgw3B9yGWqWpXUihm8d4PA== + dependencies: + "@luma.gl/constants" "^8.5.10" + "@nebula.gl/layers" "1.0.4" + "@turf/bbox" ">=4.0.0" + "@turf/bbox-polygon" ">=4.0.0" + "@turf/bearing" ">=4.0.0" + "@turf/boolean-point-in-polygon" ">=4.0.0" + "@turf/buffer" ">=4.0.0" + "@turf/center" ">=4.0.0" + "@turf/centroid" ">=4.0.0" + "@turf/circle" ">=4.0.0" + "@turf/destination" ">=4.0.0" + "@turf/difference" ">=4.0.0" + "@turf/distance" ">=4.0.0" + "@turf/ellipse" ">=4.0.0" + "@turf/helpers" ">=4.0.0" + "@turf/intersect" ">=4.0.0" + "@turf/line-intersect" ">=4.0.0" + "@turf/nearest-point-on-line" ">=4.0.0" + "@turf/point-to-line-distance" ">=4.0.0" + "@turf/polygon-to-line" ">=4.0.0" + "@turf/transform-rotate" ">=4.0.0" + "@turf/transform-scale" ">=4.0.0" + "@turf/transform-translate" ">=4.0.0" + "@turf/union" ">=4.0.0" + cubic-hermite-spline "^1.0.1" + geojson-types "^2.0.1" + global ">=4.3.0" + uuid "7.0.3" + viewport-mercator-project ">=6.0.0" + needle@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/needle/-/needle-3.2.0.tgz#07d240ebcabfd65c76c03afae7f6defe6469df44" @@ -5865,6 +5905,11 @@ use-sync-external-store@^1.0.0: resolved "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== +uuid@7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" + integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== + value-equal@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz" @@ -5872,7 +5917,7 @@ value-equal@^1.0.1: viewport-mercator-project@>=6.0.0: version "7.0.4" - resolved "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz" + resolved "https://registry.yarnpkg.com/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz#67feec04135484bf424dd4890d630e82116b31e6" integrity sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg== dependencies: "@math.gl/web-mercator" "^3.5.5" From 8f3e94eddbac4b97628b2d53fcd7365e3982eddd Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 02:06:56 +0800 Subject: [PATCH 034/126] Move react map back as static map --- src/components/Map/Map.jsx | 60 ++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index 0bd453c..cb3de25 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -1,8 +1,8 @@ import { useRef, useEffect, useState, useCallback } from 'react'; import { useSelector, useDispatch } from 'react-redux'; +import { DeckGL } from 'deck.gl'; import { GeoJsonLayer } from '@deck.gl/layers/typed'; -import { MapboxOverlay } from '@deck.gl/mapbox/typed'; import mapStyles from '../../constants/mapStyles'; import { area as calcArea, length as calcLength } from '@turf/turf'; @@ -10,7 +10,6 @@ import { setSelected } from '../../actions/inputEditor'; import './Map.css'; import Map from 'react-map-gl'; -import { useControl } from 'react-map-gl'; import maplibregl from 'maplibre-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; import { LayerToggle, NetworkToggle } from './Toggle'; @@ -20,17 +19,11 @@ import { Button, Switch } from 'antd'; const defaultViewState = { longitude: 0, latitude: 0, - zoom: 1, + zoom: 0, pitch: 0, bearing: 0, }; -function DeckGLOverlay(props) { - const overlay = useControl(() => new MapboxOverlay(props)); - overlay.setProps(props); - return null; -} - const DeckGLMap = ({ data, colors }) => { const mapRef = useRef(); const cameraOptions = useRef(); @@ -176,7 +169,7 @@ const DeckGLMap = ({ data, colors }) => { getFillColor: (f) => nodeFillColor(f.properties['Type'], colors, 'dc'), getLineWidth: 3, - getRadius: 3, + getPointRadius: 3, pickable: true, autoHighlight: true, @@ -198,7 +191,7 @@ const DeckGLMap = ({ data, colors }) => { getFillColor: (f) => nodeFillColor(f.properties['Type'], colors, 'dh'), getLineWidth: 3, - getRadius: 3, + getPointRadius: 3, pickable: true, autoHighlight: true, @@ -210,12 +203,8 @@ const DeckGLMap = ({ data, colors }) => { return _layers; }; - const onViewStateChange = ({ viewState }) => { - setViewState(viewState); - }; - - const onPitchStart = () => { - if (!firstPitch.current) { + const onDragStart = (info, event) => { + if (!firstPitch.current && event.rightButton) { setExtruded(true); firstPitch.current = true; } @@ -256,20 +245,27 @@ const DeckGLMap = ({ data, colors }) => { }, [data, visibility, extruded, selected]); return ( - <> - e.preventDefault()} - {...viewState} +
{ + e.preventDefault(); + }} + > + { + setViewState(viewState); + }} + onDragStart={onDragStart} > - - + { Reset Camera
- +
- +
); }; From 598676ab1b2eeef1fe6a95d3a9cde7339685b00d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 02:56:45 +0800 Subject: [PATCH 035/126] Fix scenario tools form style --- .../Project/ScenarioGenerateDataForm.jsx | 182 ++++++++++-------- src/components/Tools/Parameter.jsx | 2 +- 2 files changed, 99 insertions(+), 85 deletions(-) diff --git a/src/components/Project/ScenarioGenerateDataForm.jsx b/src/components/Project/ScenarioGenerateDataForm.jsx index 7325abd..13998bf 100644 --- a/src/components/Project/ScenarioGenerateDataForm.jsx +++ b/src/components/Project/ScenarioGenerateDataForm.jsx @@ -33,6 +33,98 @@ const ScenarioGenerateDataForm = ({ form, visible }) => { } }; + const ZoneTool = () => ( +
+
+ + Zone + + showModal('zone-helper')} /> + + *Selected by default + +
+ - Query zone geometry from Open Street Maps. +
+ ); + + const SurroundingsTool = () => ( +
+
+ + Surroundings + + showModal('surroundings-helper')} /> + + *Requires zone file. + +
+ - Query Surroundings geometry from Open Street Maps. +
+ ); + + const StreetsTool = () => ( +
+
+ + Streets + + showModal('streets-helper')} /> + + *Requires zone and surroundings file. + +
+ - Query streets geometry from Open Street Maps. +
+ ); + + const TerrainTool = () => ( +
+
+ + Terrain + + showModal('terrain-helper')} /> + + *Requires zone and surroundings file. + +
+ - Creates a fixed elevation terrain file. +
+ ); + + const WeatherTool = () => ( +
+
+ Weather + showModal('weather-helper')} /> +
+ - Set the weather file for the scenario. +
+ ); + return (
{ initialValue: ['zone'], })( -
- - - Zone - - showModal('zone-helper')} /> - - *Selected by default - - - - Query zone geometry from Open Street Maps. -
- -
- - - Surroundings - - showModal('surroundings-helper')} - /> - - *Requires zone file. - - - - - Query Surroundings geometry from Open Street Maps. - -
- -
- - - Streets - - showModal('streets-helper')} /> - - *Requires zone and surroundings file. - - - - Query streets geometry from Open Street Maps. -
- -
- - - Terrain - - showModal('terrain-helper')} /> - - *Requires zone and surroundings file. - - - - Creates a fixed elevation terrain file. -
- -
- - Weather - showModal('weather-helper')} /> - - - Set the weather file for the scenario. +
+ + + + +
)} diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index 2a823e3..ebf48f3 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -289,7 +289,7 @@ export const FormItemWrapper = ({ return ( From dcdc04e0708dbbda98af4364d2070b6355315bd1 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 03:27:59 +0800 Subject: [PATCH 036/126] Fix latlon input style --- .../Project/ScenarioGenerateDataForm.jsx | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/src/components/Project/ScenarioGenerateDataForm.jsx b/src/components/Project/ScenarioGenerateDataForm.jsx index 13998bf..e7a4020 100644 --- a/src/components/Project/ScenarioGenerateDataForm.jsx +++ b/src/components/Project/ScenarioGenerateDataForm.jsx @@ -239,21 +239,15 @@ const ScenarioMap = ({ form }) => { -

Location

+
Location
{form.getFieldDecorator('location', { initialValue: '', })( - - Go - - } + )} @@ -302,7 +296,7 @@ const LatLongInput = forwardRef( return ( -

Latitude

+
Latitude
{ @@ -312,27 +306,21 @@ const LatLongInput = forwardRef( /> -

Longitude

- Longitude
+ { triggerChange({ long: e.target.value }); }} - onPressEnter={onClick} - addonAfter={ - - } /> ); } ); +LatLongInput.displayName = 'LatLongInput'; export default ScenarioGenerateDataForm; From 4b65172e2d99e6f120286cd2aed0415ca9d41450 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 03:37:16 +0800 Subject: [PATCH 037/126] Fix scenario name validation --- src/components/Project/NewScenarioModal.jsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/Project/NewScenarioModal.jsx b/src/components/Project/NewScenarioModal.jsx index 11e9c6b..846e83c 100644 --- a/src/components/Project/NewScenarioModal.jsx +++ b/src/components/Project/NewScenarioModal.jsx @@ -8,6 +8,7 @@ import ScenarioGenerateDataForm from './ScenarioGenerateDataForm'; import ScenarioImportDataForm from './ScenarioImportDataForm'; import Parameter from '../Tools/Parameter'; import { withErrorBoundary } from '../../utils/ErrorBoundary'; +import { checkExist, joinPath } from '../../utils/file'; const NewScenarioModal = ({ visible, setVisible, project }) => { const [confirmLoading, setConfirmLoading] = useState(false); @@ -89,8 +90,14 @@ const NewScenarioForm = Form.create()( transform: (value) => value.trim(), }, { - validator: (rule, value, callback) => { - if (value.length != 0) { + validator: async (rule, value, callback) => { + const contentPath = joinPath(project, value); + const pathExists = await checkExist( + '', + 'directory', + contentPath + ); + if (value.length != 0 && pathExists) { callback('Scenario with name already exists in project'); } else { callback(); From 146138183494d64de8bf96d6690b5c2808a3a18f Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 31 Dec 2022 03:41:31 +0800 Subject: [PATCH 038/126] Add reset compass --- src/components/Map/Map.jsx | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index cb3de25..e0f3da1 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -316,6 +316,20 @@ const DeckGLMap = ({ data, colors }) => { > Reset Camera +
From b8b1211a8c286f142d2f3b658ee8c799194e0595 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Sat, 31 Dec 2022 07:21:38 +0800 Subject: [PATCH 039/126] Update Table.jsx --- src/components/InputEditor/Table.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/InputEditor/Table.jsx b/src/components/InputEditor/Table.jsx index cca0a70..0137cc8 100644 --- a/src/components/InputEditor/Table.jsx +++ b/src/components/InputEditor/Table.jsx @@ -125,14 +125,20 @@ const InputEditorButtons = ({ changes }) => { return (
- From 01228b5fdc205e92f1b02afa6705bf5532224749 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Sun, 1 Jan 2023 02:19:12 +0800 Subject: [PATCH 040/126] Remove sider from redux --- package.json | 6 +-- src/actions/homepage.js | 6 --- src/components/HomePage/Header.jsx | 52 +++++++++++++------ src/components/HomePage/SideNav.jsx | 50 +++++++++++------- .../{ => HomePage}/StatusBar/StatusBar.css | 1 - .../{ => HomePage}/StatusBar/StatusBar.jsx | 2 +- src/containers/HomePage.jsx | 20 +++++-- src/reducers/homepage.js | 12 ----- src/reducers/index.js | 2 - yarn.lock | 12 ++--- 10 files changed, 93 insertions(+), 70 deletions(-) delete mode 100644 src/actions/homepage.js rename src/components/{ => HomePage}/StatusBar/StatusBar.css (98%) rename src/components/{ => HomePage}/StatusBar/StatusBar.jsx (99%) delete mode 100644 src/reducers/homepage.js diff --git a/package.json b/package.json index 0e37b12..bdb1b68 100644 --- a/package.json +++ b/package.json @@ -58,12 +58,12 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-map-gl": "^7.0.20", - "react-redux": "^8.0.4", + "react-redux": "^8.0.5", "react-router": "^5.0.1", "react-router-dom": "^5.0.1", "react-spring": "^9.2.5", - "redux": "^4.1.2", - "redux-thunk": "^2.4.1", + "redux": "^4.2.0", + "redux-thunk": "^2.4.2", "socket.io-client": "^4.5.3", "tabulator-tables": "^4.4.1" } diff --git a/src/actions/homepage.js b/src/actions/homepage.js deleted file mode 100644 index 28697dc..0000000 --- a/src/actions/homepage.js +++ /dev/null @@ -1,6 +0,0 @@ -export const SET_COLLAPSED = 'SET_COLLAPSED'; - -export const setCollapsed = (collapsed) => ({ - type: SET_COLLAPSED, - payload: { collapsed }, -}); diff --git a/src/components/HomePage/Header.jsx b/src/components/HomePage/Header.jsx index 2fc062d..ac174c6 100644 --- a/src/components/HomePage/Header.jsx +++ b/src/components/HomePage/Header.jsx @@ -1,17 +1,47 @@ -import { useSelector, useDispatch } from 'react-redux'; -import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; +import { useSelector } from 'react-redux'; import { Layout } from 'antd'; import SearchBar from './Searchbar'; -import { setCollapsed } from '../../actions/homepage'; +import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; +import { useContext } from 'react'; +import { LayoutContext } from '../../containers/HomePage'; const { Header: AntHeader } = Layout; const Header = () => { - const { collapsed } = useSelector((state) => state.sider); const { project_name: projectName, scenario_name: scenarioName } = useSelector((state) => state.project.info); const { pathname } = useSelector((state) => state.router.location); - const dispatch = useDispatch(); + + const { collapsed, setCollapsed } = useContext(LayoutContext); + + const CollapseButton = () => { + return ( +
+ {collapsed ? ( + { + setCollapsed(false); + }} + /> + ) : ( + { + setCollapsed(true); + }} + /> + )} +
+ ); + }; return ( { }} >
- dispatch(setCollapsed(!collapsed))} - > - {collapsed ? : } - + {pathname !== '/' && ( { )}
-
+
diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index 098bb6d..ce1e65c 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -1,5 +1,5 @@ -import { Children, cloneElement, useState } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; +import { Children, cloneElement, useContext, useEffect, useState } from 'react'; +import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; import { BarChartOutlined, @@ -14,47 +14,47 @@ import { } from '@ant-design/icons'; import { Layout, Menu } from 'antd'; -import { setCollapsed } from '../../actions/homepage'; import ToolsMenu from './ToolsMenu'; import routes from '../../constants/routes'; import ceaLogo from '../../assets/cea-logo.png'; +import { LayoutContext } from '../../containers/HomePage'; const { Sider } = Layout; const { SubMenu } = Menu; const SideNav = () => { - // TODO: Maybe use context instead of redux for this - const { collapsed } = useSelector((state) => state.sider); const { location } = useSelector((state) => state.router); - const dispatch = useDispatch(); - const [broken, setBroken] = useState(false); + const { collapsed, setCollapsed } = useContext(LayoutContext); + const [breakpoint, setBreakpoint] = useState(false); const [prevCollapsed, setPrevCollapsed] = useState(true); const selectedKey = location.pathname; const collapseSider = (breakpoint) => { - setBroken(breakpoint); if (breakpoint) { setPrevCollapsed(collapsed); if (!collapsed) { - dispatch(setCollapsed(true)); + setCollapsed(true); } } else { - dispatch(setCollapsed(prevCollapsed)); + setCollapsed(prevCollapsed); } }; + useEffect(() => { + collapseSider(breakpoint); + }, [breakpoint]); + return ( collapseSider(breakpoint)} + collapsedWidth={breakpoint ? '0' : '80'} + onBreakpoint={setBreakpoint} trigger={null} collapsible collapsed={collapsed} - // defaultCollapsed="true" >
Logo @@ -137,7 +137,11 @@ const SideNav = () => { - shell.openExternal('https://cityenergyanalyst.com/blog-1') + window.open( + 'https://cityenergyanalyst.com/blog-1', + '_blank', + 'noreferrer' + ) } > @@ -148,8 +152,10 @@ const SideNav = () => { - shell.openExternal( - 'http://city-energy-analyst.readthedocs.io/en/latest/' + window.open( + 'http://city-energy-analyst.readthedocs.io/en/latest/', + '_blank', + 'noreferrer' ) } > @@ -161,8 +167,10 @@ const SideNav = () => { - shell.openExternal( - 'https://github.com/architecture-building-systems/cityenergyanalyst/issues/new' + window.open( + 'https://github.com/architecture-building-systems/cityenergyanalyst/issues/new', + '_blank', + 'noreferrer' ) } > @@ -174,8 +182,10 @@ const SideNav = () => { - shell.openExternal( - 'https://github.com/architecture-building-systems/CityEnergyAnalyst/issues?utf8=%E2%9C%93&q=is%3Aopen%26closed+label%3A%22known+issue%22+' + window.open( + 'https://github.com/architecture-building-systems/CityEnergyAnalyst/issues?utf8=%E2%9C%93&q=is%3Aopen%26closed+label%3A%22known+issue%22+', + '_blank', + 'noreferrer' ) } > diff --git a/src/components/StatusBar/StatusBar.css b/src/components/HomePage/StatusBar/StatusBar.css similarity index 98% rename from src/components/StatusBar/StatusBar.css rename to src/components/HomePage/StatusBar/StatusBar.css index 1007773..6bb5140 100644 --- a/src/components/StatusBar/StatusBar.css +++ b/src/components/HomePage/StatusBar/StatusBar.css @@ -5,7 +5,6 @@ background-color: #333; display: flex; justify-content: space-between; - position: fixed; z-index: 9999; } diff --git a/src/components/StatusBar/StatusBar.jsx b/src/components/HomePage/StatusBar/StatusBar.jsx similarity index 99% rename from src/components/StatusBar/StatusBar.jsx rename to src/components/HomePage/StatusBar/StatusBar.jsx index 6fa7235..f4d661c 100644 --- a/src/components/StatusBar/StatusBar.jsx +++ b/src/components/HomePage/StatusBar/StatusBar.jsx @@ -14,7 +14,7 @@ import { import { Popover, notification, Button, Modal } from 'antd'; import io from 'socket.io-client'; import axios from 'axios'; -import { fetchJobs, updateJob, dismissJob } from '../../actions/jobs'; +import { fetchJobs, updateJob, dismissJob } from '../../../actions/jobs'; import './StatusBar.css'; const socket = io(`${import.meta.env.VITE_CEA_URL}`); diff --git a/src/containers/HomePage.jsx b/src/containers/HomePage.jsx index 388ab46..cb6bbb8 100644 --- a/src/containers/HomePage.jsx +++ b/src/containers/HomePage.jsx @@ -1,4 +1,4 @@ -import { useEffect } from 'react'; +import { createContext, useEffect, useState } from 'react'; import { Route, Switch } from 'react-router-dom'; import { Layout } from 'antd'; import SideNav from '../components/HomePage/SideNav'; @@ -7,16 +7,27 @@ import { ToolRoute } from '../components/Tools/Tool'; import InputEditor from '../components/InputEditor/InputEditor'; import Dashboard from '../components/Dashboard/Dashboard'; import Project, { useFetchProject } from '../components/Project/Project'; -import StatusBar from '../components/StatusBar/StatusBar'; import Landing from '../components/Landing/Landing'; import DatabaseEditor from '../components/DatabaseEditor/DatabaseEditor'; import routes from '../constants/routes'; import { useDispatch, useSelector } from 'react-redux'; import { updateScenario } from '../actions/project'; +import StatusBar from '../components/HomePage/StatusBar/StatusBar'; const { Content } = Layout; +export const LayoutContext = createContext(); + +const ContextProvider = ({ children }) => { + const [collapsed, setCollapsed] = useState(false); + return ( + + {children} + + ); +}; + const HomePage = () => { const fetchProject = useFetchProject(); const dispatch = useDispatch(); @@ -32,8 +43,9 @@ const HomePage = () => { dispatch(updateScenario(scenarioName)); }); }, []); + return ( - <> + { - + ); }; diff --git a/src/reducers/homepage.js b/src/reducers/homepage.js deleted file mode 100644 index 9766327..0000000 --- a/src/reducers/homepage.js +++ /dev/null @@ -1,12 +0,0 @@ -import { SET_COLLAPSED } from '../actions/homepage'; - -const sider = (state = { collapsed: true }, { type, payload }) => { - switch (type) { - case SET_COLLAPSED: - return { ...state, ...payload }; - default: - return state; - } -}; - -export default sider; diff --git a/src/reducers/index.js b/src/reducers/index.js index eb07fde..8cb0071 100644 --- a/src/reducers/index.js +++ b/src/reducers/index.js @@ -1,7 +1,6 @@ import { combineReducers } from 'redux'; import { connectRouter } from 'connected-react-router'; -import sider from './homepage'; import project from './project'; import { toolList, toolParams, toolSaving } from './tools'; import inputData from './inputEditor'; @@ -11,7 +10,6 @@ import databaseEditor from './databaseEditor'; export default function createRootReducer(history) { return combineReducers({ router: connectRouter(history), - sider, project, toolList, toolParams, diff --git a/yarn.lock b/yarn.lock index 27bb8f7..9cada8d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5347,9 +5347,9 @@ react-property@2.0.0: resolved "https://registry.npmjs.org/react-property/-/react-property-2.0.0.tgz" integrity sha512-kzmNjIgU32mO4mmH5+iUyrqlpFQhF8K2k7eZ4fdLSOPFrD1XgEuSBv9LDEgxRXTMBqMd8ppT0x6TIzqE5pdGdw== -react-redux@^8.0.4: +react-redux@^8.0.5: version "8.0.5" - resolved "https://registry.npmjs.org/react-redux/-/react-redux-8.0.5.tgz" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-8.0.5.tgz#e5fb8331993a019b8aaf2e167a93d10af469c7bd" integrity sha512-Q2f6fCKxPFpkXt1qNRZdEDLlScsDWyrgSj0mliK59qU6W5gvBiKkdMEG2lJzhd1rCctf0hb6EtePPLZ2e0m1uw== dependencies: "@babel/runtime" "^7.12.1" @@ -5418,14 +5418,14 @@ redux-logger@^3.0.6: dependencies: deep-diff "^0.3.5" -redux-thunk@^2.4.1: +redux-thunk@^2.4.2: version "2.4.2" - resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz" + resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.2.tgz#b9d05d11994b99f7a91ea223e8b04cf0afa5ef3b" integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q== -redux@^4.1.2: +redux@^4.2.0: version "4.2.0" - resolved "https://registry.npmjs.org/redux/-/redux-4.2.0.tgz" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.0.tgz#46f10d6e29b6666df758780437651eeb2b969f13" integrity sha512-oSBmcKKIuIR4ME29/AeNUnl5L+hvBq7OaJWzaptTQJAntaPvxIJqfnjbaEiCzzaIz+XmVILfqAM3Ob0aXLPfjA== dependencies: "@babel/runtime" "^7.9.2" From 5abbf9e46d1d3e6216e957bcb4e6fdf302ede4ac Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Sun, 1 Jan 2023 15:55:42 +0800 Subject: [PATCH 041/126] Fix status bar css --- src/components/HomePage/StatusBar/StatusBar.css | 7 +++++-- src/components/HomePage/StatusBar/StatusBar.jsx | 6 +----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/components/HomePage/StatusBar/StatusBar.css b/src/components/HomePage/StatusBar/StatusBar.css index 6bb5140..fd7f226 100644 --- a/src/components/HomePage/StatusBar/StatusBar.css +++ b/src/components/HomePage/StatusBar/StatusBar.css @@ -9,9 +9,12 @@ } .cea-status-bar-button { - margin: 0 5px; - padding: 5px; + display: flex; + gap: 8px; + padding: 0 8px; + margin: 0 8px; height: 100%; + align-items: center; } .cea-status-bar-button * { diff --git a/src/components/HomePage/StatusBar/StatusBar.jsx b/src/components/HomePage/StatusBar/StatusBar.jsx index f4d661c..8fd3eac 100644 --- a/src/components/HomePage/StatusBar/StatusBar.jsx +++ b/src/components/HomePage/StatusBar/StatusBar.jsx @@ -69,11 +69,7 @@ const JobOutputLogger = () => { if (message.length < 1) return null; - return ( - <> - {message} - - ); + return {message}; }; const JobListPopover = () => { From f727ee884543530d0fc389694108713eb693e1f5 Mon Sep 17 00:00:00 2001 From: Reynold Mok Date: Sun, 1 Jan 2023 23:31:48 +0800 Subject: [PATCH 042/126] Use grid css instead of antd for layout --- src/app.global.css | 34 +----- src/components/HomePage/Header.jsx | 43 +++----- .../HomePage/{ => SearchBar}/SearchBar.css | 0 .../HomePage/{ => SearchBar}/SearchBar.jsx | 3 +- src/components/HomePage/SideNav.jsx | 18 +-- src/containers/HomePage.css | 103 ++++++++++++++++++ src/containers/HomePage.jsx | 40 +++---- 7 files changed, 144 insertions(+), 97 deletions(-) rename src/components/HomePage/{ => SearchBar}/SearchBar.css (100%) rename src/components/HomePage/{ => SearchBar}/SearchBar.jsx (98%) create mode 100644 src/containers/HomePage.css diff --git a/src/app.global.css b/src/app.global.css index 22ed674..ae11531 100644 --- a/src/app.global.css +++ b/src/app.global.css @@ -1,4 +1,4 @@ -body{ +body { margin: 0px; padding: 0px; } @@ -15,38 +15,6 @@ body{ color: #1890ff; } -.logo { - display: flex; - justify-content: center; - height: 50px; - margin: 16px; -} - -.logo .title { - color: white; - margin: auto 12px; - white-space: nowrap; - text-overflow: ellipsis; - overflow-x: hidden; -} - -.logo .title.inactive { - opacity: 0; - width: 0; - margin: 0; - transition-duration: 0.5s; - transition-property: opacity, width; - transition-timing-function: cubic-bezier(0.645, 0.045, 0.355, 1); - -webkit-transition-delay: 0s; - -moz-transition-delay: 0s; - -o-transition-delay: 0s; - transition-delay: 0s; -} - -/* .ant-form-item { - margin-bottom: 8px; -} */ - pre { text-align: left; } diff --git a/src/components/HomePage/Header.jsx b/src/components/HomePage/Header.jsx index ac174c6..eb26de8 100644 --- a/src/components/HomePage/Header.jsx +++ b/src/components/HomePage/Header.jsx @@ -1,12 +1,9 @@ import { useSelector } from 'react-redux'; -import { Layout } from 'antd'; -import SearchBar from './Searchbar'; +import SearchBar from './Searchbar/SearchBar'; import { MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; import { useContext } from 'react'; import { LayoutContext } from '../../containers/HomePage'; -const { Header: AntHeader } = Layout; - const Header = () => { const { project_name: projectName, scenario_name: scenarioName } = useSelector((state) => state.project.info); @@ -18,9 +15,6 @@ const Header = () => { return (
@@ -44,45 +38,38 @@ const Header = () => { }; return ( - -
+
{pathname !== '/' && ( - - +
+
Current Project: {projectName} - - +
+
Scenario: {scenarioName} - - +
+
)}
- +
); }; diff --git a/src/components/HomePage/SearchBar.css b/src/components/HomePage/SearchBar/SearchBar.css similarity index 100% rename from src/components/HomePage/SearchBar.css rename to src/components/HomePage/SearchBar/SearchBar.css diff --git a/src/components/HomePage/SearchBar.jsx b/src/components/HomePage/SearchBar/SearchBar.jsx similarity index 98% rename from src/components/HomePage/SearchBar.jsx rename to src/components/HomePage/SearchBar/SearchBar.jsx index 8d7d441..8d7660f 100644 --- a/src/components/HomePage/SearchBar.jsx +++ b/src/components/HomePage/SearchBar/SearchBar.jsx @@ -54,7 +54,7 @@ const SearchBar = () => { }, [value]); return ( -
+
} @@ -62,6 +62,7 @@ const SearchBar = () => { onChange={handleChange} onFocus={handleFocus} onBlur={handleBlur} + style={{ width: 280 }} /> {visible && input.length ? ( { return ( - ); -}; - -const ScenarioMenuItem = ({ children, ...props }) => { - const scenarioName = useSelector((state) => state.project.info.scenario_name); - if (scenarioName === null) return null; - return Children.map(children, (child) => cloneElement(child, { ...props })); + Known Issues + + ), + key: 'known-issue', + icon: , + }, + ], + }, + ]; }; export default SideNav; diff --git a/src/components/HomePage/ToolsMenu.jsx b/src/components/HomePage/ToolsMenu.jsx deleted file mode 100644 index 9e7859d..0000000 --- a/src/components/HomePage/ToolsMenu.jsx +++ /dev/null @@ -1,83 +0,0 @@ -import { useEffect } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; -import { Link } from 'react-router-dom'; -import { ToolOutlined } from '@ant-design/icons'; -import { Menu, Tooltip } from 'antd'; -import { fetchToolList } from '../../actions/tools'; -import routes from '../../constants/routes'; - -const { SubMenu } = Menu; - -const ToolsMenu = (props) => { - const { status, tools } = useSelector((state) => state.toolList); - const dispatch = useDispatch(); - - useEffect(() => { - dispatch(fetchToolList()); - }, []); - - let toolMenu = null; - if (status == 'fetching') { - toolMenu = Fetching Tools...; - } else if (status == 'failed') { - toolMenu = Error Fetching Tools; - } else if (Object.keys(tools).length) { - const toolCategoryList = Object.keys(tools).map((category) => { - const toolList = tools[category].map((tool) => { - const { name, label, description } = tool; - return ( - - ); - }); - return ( - {category}} - style={{ minWidth: '200px' }} - > - {toolList} - - ); - }); - - toolMenu = toolCategoryList; - } else { - toolMenu = No Tools Found; - } - - return ( - - - Tools - - } - {...props} - > - {toolMenu} - - ); -}; - -const ToolItem = (props) => { - const { name, label, description, ...rest } = props; - return ( - - - -
- {label} -
- - - - ); -}; - -export default ToolsMenu; diff --git a/src/components/Project/ScenarioCard.jsx b/src/components/Project/ScenarioCard.jsx index e793237..c15fab0 100644 --- a/src/components/Project/ScenarioCard.jsx +++ b/src/components/Project/ScenarioCard.jsx @@ -157,19 +157,21 @@ const EditScenarioMenu = ({ scenarioName, project }) => { - setModalVisible(true)}> - Rename - - - - Delete - - + setModalVisible(true)}> + Rename + , + , + + Delete + , + ]} + /> } trigger={['click']} getPopupContainer={() => { diff --git a/src/components/Project/ScenarioImportDataForm.jsx b/src/components/Project/ScenarioImportDataForm.jsx index 3939a5f..c6eb36f 100644 --- a/src/components/Project/ScenarioImportDataForm.jsx +++ b/src/components/Project/ScenarioImportDataForm.jsx @@ -64,13 +64,13 @@ const ScenarioImportDataForm = ({ form, visible }) => { > - {fileChoices.map((choice) => ( + ( addField(choice)}> {choice} ))} - + /> } trigger={['click']} > From 528799f3bc4c22143621ecabc6df61b1a207c746 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 14 Feb 2024 11:33:49 +0100 Subject: [PATCH 063/126] Fix tabs pane deprecation --- src/components/DatabaseEditor/Database.jsx | 16 ++++++++++------ .../DatabaseEditor/UseTypesDatabase.jsx | 10 +++++----- src/components/InputEditor/InputEditor.jsx | 13 ++++++------- src/components/InputEditor/ScheduleEditor.jsx | 17 ++++++++++------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/components/DatabaseEditor/Database.jsx b/src/components/DatabaseEditor/Database.jsx index b5746b6..0f656bd 100644 --- a/src/components/DatabaseEditor/Database.jsx +++ b/src/components/DatabaseEditor/Database.jsx @@ -10,18 +10,22 @@ const Database = ({ name, data, schema }) => { const sheetNames = Object.keys(data); return ( - - {sheetNames.map((sheetName) => ( - + ({ + key: `${name}-${sheetName}`, + label: sheetName, + children: ( - - ))} - + ), + }))} + /> ); }; diff --git a/src/components/DatabaseEditor/UseTypesDatabase.jsx b/src/components/DatabaseEditor/UseTypesDatabase.jsx index 65e0822..f38ae0e 100644 --- a/src/components/DatabaseEditor/UseTypesDatabase.jsx +++ b/src/components/DatabaseEditor/UseTypesDatabase.jsx @@ -136,11 +136,11 @@ const SchedulesTypeTab = ({ tabPosition="bottom" activeKey={selectedType} onChange={setSelected} - > - {Object.keys(scheduleData).map((scheduleType) => ( - - ))} - + items={Object.keys(scheduleData).map((scheduleType) => ({ + key: scheduleType, + label: scheduleType, + }))} + />
); }; diff --git a/src/components/InputEditor/InputEditor.jsx b/src/components/InputEditor/InputEditor.jsx index 157226f..f3a7f19 100644 --- a/src/components/InputEditor/InputEditor.jsx +++ b/src/components/InputEditor/InputEditor.jsx @@ -69,10 +69,7 @@ const InputTable = () => { const [tab, setTab] = useState('zone'); if (typeof tables == 'undefined') return null; - console.debug(tables); - const TabPanes = [...Object.keys(tables), 'schedules'].map((key) => ( - - )); + return (
{ activeKey={tab} onChange={setTab} animated={false} - > - {TabPanes} - + items={[...Object.keys(tables), 'schedules'].map((key) => ({ + key: key, + label: key, + }))} + />
diff --git a/src/components/InputEditor/ScheduleEditor.jsx b/src/components/InputEditor/ScheduleEditor.jsx index e55fd6b..ca55dc5 100644 --- a/src/components/InputEditor/ScheduleEditor.jsx +++ b/src/components/InputEditor/ScheduleEditor.jsx @@ -351,19 +351,22 @@ const YearTable = ({ selected, schedules, loading }) => { }; const ScheduleTab = ({ tab, setTab, schedules }) => { - const TabPanes = getScheduleTypes(schedules).map((schedule) => ( - - )); - useEffect(() => { if (!tab) setTab(getScheduleTypes(schedules)[0] || null); }, [schedules]); if (!tab) return null; return ( - - {TabPanes} - + ({ + key: schedule, + label: schedule, + }))} + /> ); }; From 6114cd593ae3368194e25ac458082d1dfd477d69 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 14 Feb 2024 12:09:37 +0100 Subject: [PATCH 064/126] Fix menu items error --- src/components/Dashboard/Plot.jsx | 57 ++++++++++++------- .../DatabaseEditor/DatabaseTopMenu.jsx | 17 +++--- src/components/Project/ScenarioCard.jsx | 41 +++++++------ .../Project/ScenarioImportDataForm.jsx | 22 ++++--- 4 files changed, 78 insertions(+), 59 deletions(-) diff --git a/src/components/Dashboard/Plot.jsx b/src/components/Dashboard/Plot.jsx index d530d4a..3dddc41 100644 --- a/src/components/Dashboard/Plot.jsx +++ b/src/components/Dashboard/Plot.jsx @@ -203,29 +203,44 @@ const EditMenu = memo(({ index, activePlotRef }) => { activePlotRef.current = index; }; - const menu = ( - - Change Plot - , - - Edit Parameters - , - , - -
Delete Plot
- , - ]} - /> - ); + const items = [ + { + key: 'changePlot', + label: 'Change Plot', + }, + { + key: 'editParameters', + label: 'Edit Parameters', + }, + { + type: 'divider', + }, + { + key: 'deletePlot', + label:
Delete Plot
, + }, + ]; + + const onClick = ({ key }) => { + switch (key) { + case 'changePlot': + showModalChangePlot(); + break; + case 'editParameters': + showModalEditParameters(); + break; + case 'deletePlot': + showModalDeletePlot(); + break; + default: + break; + } + }; return ( - <> - - - - + + + ); }); EditMenu.displayName = 'EditMenu'; diff --git a/src/components/DatabaseEditor/DatabaseTopMenu.jsx b/src/components/DatabaseEditor/DatabaseTopMenu.jsx index a042261..a7f70b1 100644 --- a/src/components/DatabaseEditor/DatabaseTopMenu.jsx +++ b/src/components/DatabaseEditor/DatabaseTopMenu.jsx @@ -32,15 +32,14 @@ const DatabaseTopMenu = () => { else setSelected(key); }} selectedKeys={[selectedKey]} - items={Object.keys(data).map((category) => ( - - {Object.keys(data[category]).map((name) => ( - - {name.replace('_', '-')} - - ))} - - ))} + items={Object.keys(data).map((category) => ({ + key: category, + label: category.toUpperCase(), + children: Object.keys(data[category]).map((name) => ({ + key: `${category}:${name}`, + label: name.replace('_', '-'), + })), + }))} /> { okText: `DELETE (${secondsToGo})`, }); }, 1000); + setTimeout(() => { clearInterval(timer); modal.update({ @@ -153,26 +154,32 @@ const EditScenarioMenu = ({ scenarioName, project }) => { }, secondsToGo * 1000); }; + const items = [ + { + key: 'rename', + label: 'Rename', + }, + { type: 'divider' }, + { key: 'delete', label:
Delete
}, + ]; + + const onClick = ({ key }) => { + switch (key) { + case 'rename': + setModalVisible(true); + break; + case 'delete': + showConfirm(); + break; + default: + break; + } + }; + return ( setModalVisible(true)}> - Rename - , - , - - Delete - , - ]} - /> - } + menu={{ items, onClick }} trigger={['click']} getPopupContainer={() => { return document.getElementById(`${scenarioName}-edit-button`); diff --git a/src/components/Project/ScenarioImportDataForm.jsx b/src/components/Project/ScenarioImportDataForm.jsx index c6eb36f..b740ba9 100644 --- a/src/components/Project/ScenarioImportDataForm.jsx +++ b/src/components/Project/ScenarioImportDataForm.jsx @@ -56,24 +56,22 @@ const ScenarioImportDataForm = ({ form, visible }) => { return true; }; + const items = fileChoices.map((choice) => ({ + key: choice, + label: choice, + })); + + const onClick = ({ key }) => { + addField(key); + }; + return (
- ( - addField(choice)}> - {choice} - - ))} - /> - } - trigger={['click']} - > + From f061d64b6ac19372c761c69f040864bcd92421f6 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:48:31 +0100 Subject: [PATCH 065/126] Fix spinner style --- src/components/HomePage/CenterSpinner.jsx | 16 ++++------------ src/containers/HomePage.css | 4 +++- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/components/HomePage/CenterSpinner.jsx b/src/components/HomePage/CenterSpinner.jsx index 3e3cd9f..e7628d9 100644 --- a/src/components/HomePage/CenterSpinner.jsx +++ b/src/components/HomePage/CenterSpinner.jsx @@ -1,18 +1,10 @@ import { Spin } from 'antd'; -const CenterSpinner = ({ style = {}, ...props }) => { +const CenterSpinner = ({ tip = '', indicator = <> }) => { return ( -
- -
+ +
+ ); }; diff --git a/src/containers/HomePage.css b/src/containers/HomePage.css index 16562d3..966c576 100644 --- a/src/containers/HomePage.css +++ b/src/containers/HomePage.css @@ -31,15 +31,17 @@ #homepage-content-container { grid-area: content; overflow: auto; + padding: 18px; } #homepage-content { - margin: 18px; padding: 24px; box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 6px -1px, rgba(0, 0, 0, 0.06) 0px 2px 4px -1px; background: #fff; border-radius: 8px; + box-sizing: border-box; + min-height: 100%; } #homepage-status-bar-container { From 338c232de08210adb9ed8c6c019183bc0da9c7dd Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:59:43 +0100 Subject: [PATCH 066/126] Fix danger button color --- src/components/Dashboard/Dashboard.jsx | 2 +- src/components/InputEditor/Table.jsx | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx index b52fe6c..1c162d4 100644 --- a/src/components/Dashboard/Dashboard.jsx +++ b/src/components/Dashboard/Dashboard.jsx @@ -174,7 +174,7 @@ const DashButtons = () => { Set Scenario )} - @@ -479,7 +479,7 @@ const useTableData = (tab) => { ...columnDef, minWidth: 100, // Hack to allow editing when double clicking - cellDblClick: () => { }, + cellDblClick: () => {}, }; if (typeof columns[tab][column].choices != 'undefined') return { @@ -512,9 +512,9 @@ const useTableData = (tab) => { 'regex:^([1-9][0-9]*|0)?(\\.\\d+)?$', ...(columns[tab][column].constraints ? Object.keys(columns[tab][column].constraints).map( - (constraint) => - `${constraint}:${columns[tab][column].constraints[constraint]}` - ) + (constraint) => + `${constraint}:${columns[tab][column].constraints[constraint]}` + ) : []), ], mutatorEdit: (value) => Number(value), From 8b7b08eabbe2ed84d1c9a3100fc0aa19a56e2e0d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 14 Feb 2024 14:07:15 +0100 Subject: [PATCH 067/126] Fix collapse children deprecation --- src/components/Tools/Parameter.jsx | 1 - src/components/Tools/Tool.jsx | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index ebf48f3..b768e04 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -151,7 +151,6 @@ const Parameter = ({ parameter, form }) => { mode="multiple" style={{ width: '100%' }} placeholder="Nothing Selected" - showArrow maxTagCount={10} dropdownRender={(menu) => (
diff --git a/src/components/Tools/Tool.jsx b/src/components/Tools/Tool.jsx index f368b02..6b847c3 100644 --- a/src/components/Tools/Tool.jsx +++ b/src/components/Tools/Tool.jsx @@ -136,21 +136,19 @@ const ToolForm = Form.create()( let categoricalParams = null; if (categoricalParameters && Object.keys(categoricalParameters).length) { - const categories = Object.keys(categoricalParameters).map((category) => { - const { Panel } = Collapse; - const Parameters = categoricalParameters[category].map((param) => ( + const categories = Object.keys(categoricalParameters).map((category) => ({ + key: category, + label: category, + children: categoricalParameters[category].map((param) => ( - )); - return ( - - {Parameters} - - ); - }); + )), + })); categoricalParams = ( - - {categories} - + ); } From ac90c5e5531a89016aad53479463f69d393fc144 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 12:51:22 +0100 Subject: [PATCH 068/126] Fix tool menu items key --- src/components/HomePage/SideNav.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index f917f9a..dc6c75b 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -173,7 +173,7 @@ const toolMenuItems = (status, tools) => { ), - key: name, + key: `${routes.TOOLS}/${name}`, })), }; }); From e6f86a786c5341aa366625a43a4856fc66c6583c Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 14:09:08 +0100 Subject: [PATCH 069/126] Update email address --- .eslintrc.js | 29 +++++++++++++++++++---------- .vscode/settings.json | 4 ++-- package.json | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4310f42..7796174 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,12 +1,4 @@ module.exports = { - root: true, - parserOptions: { - ecmaVersion: 2020, - sourceType: 'module', - ecmaFeatures: { - jsx: true, - }, - }, settings: { react: { version: 'detect', @@ -20,16 +12,33 @@ module.exports = { }, env: { browser: true, - amd: true, + es2021: true, node: true, }, extends: [ 'eslint:recommended', 'plugin:react/recommended', + 'plugin:react-hooks/recommended', + 'plugin:import/recommended', 'plugin:jsx-a11y/recommended', 'plugin:prettier/recommended', // Make sure this is always the last element in the array. ], - plugins: ['simple-import-sort', 'prettier'], + overrides: [ + { + env: { + node: true, + }, + files: ['.eslintrc.{js,cjs}'], + parserOptions: { + sourceType: 'script', + }, + }, + ], + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + }, + plugins: ['simple-import-sort'], rules: { 'prettier/prettier': ['error', {}, { usePrettierrc: true }], 'react/react-in-jsx-scope': 'off', diff --git a/.vscode/settings.json b/.vscode/settings.json index 76d16f1..e492c60 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,9 +1,9 @@ { "editor.formatOnSave": true, - "eslint.packageManager": "yarn", "search.exclude": { "**/node_modules": true, "**/dist": true, "**/yarn.lock": true - } + }, + "editor.defaultFormatter": "esbenp.prettier-vscode" } diff --git a/package.json b/package.json index 59b8991..f4977ee 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "keywords": [], "author": { "name": "Reynold Mok", - "email": "reyold@hotmail.com" + "email": "reynold.mok@arch.ethz.ch" }, "license": "MIT", "devDependencies": { From e1ed35494db53393007f555215dc9bc080ca75a1 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:06:28 +0100 Subject: [PATCH 070/126] Remove unused plugin --- package.json | 2 -- vite.config.mjs | 28 +--------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/package.json b/package.json index f4977ee..dbddde5 100644 --- a/package.json +++ b/package.json @@ -30,11 +30,9 @@ "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-react": "^7.33.2", "eslint-plugin-simple-import-sort": "^7.0.0", - "less": "^4.1.3", "prettier": "^2.4.1", "redux-logger": "^3.0.6", "vite": "^5.1.1", - "vite-plugin-imp": "^2.3.1" }, "dependencies": { "@ant-design/compatible": "^5.1.2", diff --git a/vite.config.mjs b/vite.config.mjs index ffd7cc6..e214f89 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -1,33 +1,7 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react-swc'; -import vitePluginImp from 'vite-plugin-imp'; // https://vitejs.dev/config/ export default defineConfig({ - css: { - preprocessorOptions: { - less: { - javascriptEnabled: true, - }, - }, - }, - optimizeDeps: { - esbuildOptions: { - // Node.js global to browser globalThis - define: { - global: 'globalThis', - }, - }, - }, - plugins: [ - react(), - vitePluginImp({ - libList: [ - { - libName: 'antd', - style: (name) => `antd/es/${name}/style`, - }, - ], - }), - ], + plugins: [react()], }); From 306a8e661a7673a3c597bfcbd79c848d46a44fc2 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:05:32 +0100 Subject: [PATCH 071/126] Add initial implementation with electron --- .env.electron | 1 + .eslintrc.js | 3 +- .gitignore | 1 + electron/main.js | 54 ++ electron/preload.js | 7 + package.json | 29 +- src/utils/index.jsx | 5 + vite.config.mjs | 12 +- yarn.lock | 1871 ++++++++++++++++++++++++++++++++----------- 9 files changed, 1493 insertions(+), 490 deletions(-) create mode 100644 .env.electron create mode 100644 electron/main.js create mode 100644 electron/preload.js diff --git a/.env.electron b/.env.electron new file mode 100644 index 0000000..4d33794 --- /dev/null +++ b/.env.electron @@ -0,0 +1 @@ +VITE_CEA_URL="http://localhost:5050" diff --git a/.eslintrc.js b/.eslintrc.js index 7796174..9d39ee5 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -38,7 +38,7 @@ module.exports = { ecmaVersion: 'latest', sourceType: 'module', }, - plugins: ['simple-import-sort'], + plugins: ['react-refresh', 'simple-import-sort'], rules: { 'prettier/prettier': ['error', {}, { usePrettierrc: true }], 'react/react-in-jsx-scope': 'off', @@ -54,5 +54,6 @@ module.exports = { aspects: ['invalidHref', 'preferButton'], }, ], + 'react-refresh/only-export-components': 'warn', }, }; diff --git a/.gitignore b/.gitignore index a547bf3..8e3556d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ node_modules dist dist-ssr *.local +out # Editor directories and files .vscode/* diff --git a/electron/main.js b/electron/main.js new file mode 100644 index 0000000..c5a1c09 --- /dev/null +++ b/electron/main.js @@ -0,0 +1,54 @@ +const { app, BrowserWindow, screen: electronScreen } = require('electron'); +const path = require('path'); + +const isDev = process.env.NODE_ENV === 'development'; + +const createMainWindow = () => { + let mainWindow = new BrowserWindow({ + width: electronScreen.getPrimaryDisplay().workArea.width, + height: electronScreen.getPrimaryDisplay().workArea.height, + show: false, + backgroundColor: 'white', + webPreferences: { + preload: path.join(__dirname, './preload.js'), + nodeIntegration: false, + contextIsolation: true, + enableRemoteModule: true, + devTools: isDev, + }, + }); + + if (isDev) { + mainWindow.loadURL('http://localhost:5173'); + mainWindow.openDevTools(); + } else { + mainWindow.loadFile(path.join(__dirname, '../dist/index.html')); + } + + mainWindow.once('ready-to-show', () => mainWindow.show()); + + mainWindow.on('closed', () => { + mainWindow = null; + }); + + mainWindow.webContents.on('new-window', (event, url) => { + event.preventDefault(); + mainWindow.loadURL(url); + }); +}; + +app.whenReady().then(() => { + createMainWindow(); + + app.on('activate', () => { + if (!BrowserWindow.getAllWindows().length) { + createMainWindow(); + } + }); +}); + +app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { + app.quit(); + } +}); diff --git a/electron/preload.js b/electron/preload.js new file mode 100644 index 0000000..e0dbdce --- /dev/null +++ b/electron/preload.js @@ -0,0 +1,7 @@ +const { contextBridge } = require('electron'); + +contextBridge.exposeInMainWorld('versions', { + node: () => process.versions.node, + chrome: () => process.versions.chrome, + electron: () => process.versions.electron, +}); diff --git a/package.json b/package.json index dbddde5..83bdac3 100644 --- a/package.json +++ b/package.json @@ -3,15 +3,16 @@ "productName": "CityEnergyAnalyst-GUI", "version": "3.32.0", "description": "Official GUI of the City Energy Analyst tool", - "homepage": "http://www.cityenergyanalyst.com", "repository": "github:architecture-building-systems/CityEnergyAnalyst-GUI", "scripts": { "dev": "vite", "build": "vite build", + "build-electron": "vite build --mode electron", "preview": "vite preview", "lint:fix": "eslint ./src --ext .jsx,.js,.ts,.tsx --quiet --fix --ignore-path ./.gitignore", "lint:format": "prettier --loglevel warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ", - "lint": "yarn lint:format && yarn lint:fix " + "electron:start": "concurrently \"yarn dev\" \"wait-on http://localhost:5173 && electron .\"", + "electron:build": "yarn build-electron && electron-builder build --publish never" }, "keywords": [], "author": { @@ -23,16 +24,22 @@ "@types/react": "^18.0.26", "@types/react-dom": "^18.0.9", "@vitejs/plugin-react-swc": "^3.6.0", + "concurrently": "^8.2.2", + "electron": "^28.2.3", + "electron-builder": "^24.9.1", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.1", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-react": "^7.33.2", + "eslint-plugin-react-hooks": "^4.6.0", + "eslint-plugin-react-refresh": "^0.4.5", "eslint-plugin-simple-import-sort": "^7.0.0", - "prettier": "^2.4.1", + "prettier": "^3.2.5", "redux-logger": "^3.0.6", - "vite": "^5.1.1", + "vite": "^5.1.3", + "wait-on": "^7.2.0" }, "dependencies": { "@ant-design/compatible": "^5.1.2", @@ -63,5 +70,17 @@ "redux-thunk": "^2.4.2", "socket.io-client": "^4.5.3", "tabulator-tables": "^4.4.1" + }, + "main": "electron/main.js", + "build": { + "appId": "CityEnergyAnalyst", + "productName": "CityEnergyAnalyst", + "directories": { + "output": "out" + }, + "files": [ + "dist/**/*", + "electron/**" + ] } -} +} \ No newline at end of file diff --git a/src/utils/index.jsx b/src/utils/index.jsx index 678a5b9..dd0cf78 100644 --- a/src/utils/index.jsx +++ b/src/utils/index.jsx @@ -70,3 +70,8 @@ export const AsyncError = ({ title = 'Something went wrong', error }) => { ); }; + +export const isElectron = () => { + const userAgent = navigator.userAgent.toLowerCase(); + return userAgent.indexOf(' electron/') !== -1; +}; diff --git a/vite.config.mjs b/vite.config.mjs index e214f89..4829763 100644 --- a/vite.config.mjs +++ b/vite.config.mjs @@ -2,6 +2,14 @@ import { defineConfig } from 'vite'; import react from '@vitejs/plugin-react-swc'; // https://vitejs.dev/config/ -export default defineConfig({ - plugins: [react()], +export default defineConfig(({ mode }) => { + if (mode === 'electron') + return { + plugins: [react()], + base: './', + }; + else + return { + plugins: [react()], + }; }); diff --git a/yarn.lock b/yarn.lock index 9ae48c7..18c190c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,19 +2,16 @@ # yarn lockfile v1 +"7zip-bin@~5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/7zip-bin/-/7zip-bin-5.2.0.tgz#7a03314684dd6572b7dfa89e68ce31d60286854d" + integrity sha512-ukTPVhqG4jNzMro2qA9HSCSSVJN3aN7tlb+hfqYCt3ER0yWroeA2VR38MNrOHLQ/cVj+DaIMad0kFCtWWowh/A== + "@aashutoshrathi/word-wrap@^1.2.3": version "1.2.6" resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@ampproject/remapping@^2.2.0": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" - integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== - dependencies: - "@jridgewell/gen-mapping" "^0.3.0" - "@jridgewell/trace-mapping" "^0.3.9" - "@ant-design/colors@^6.0.0": version "6.0.0" resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" @@ -99,151 +96,6 @@ resize-observer-polyfill "^1.5.1" throttle-debounce "^5.0.0" -"@babel/code-frame@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244" - integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA== - dependencies: - "@babel/highlight" "^7.23.4" - chalk "^2.4.2" - -"@babel/compat-data@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" - integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== - -"@babel/core@^7.12.10": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" - integrity sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw== - dependencies: - "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-compilation-targets" "^7.23.6" - "@babel/helper-module-transforms" "^7.23.3" - "@babel/helpers" "^7.23.9" - "@babel/parser" "^7.23.9" - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" - convert-source-map "^2.0.0" - debug "^4.1.0" - gensync "^1.0.0-beta.2" - json5 "^2.2.3" - semver "^6.3.1" - -"@babel/generator@^7.12.11", "@babel/generator@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e" - integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw== - dependencies: - "@babel/types" "^7.23.6" - "@jridgewell/gen-mapping" "^0.3.2" - "@jridgewell/trace-mapping" "^0.3.17" - jsesc "^2.5.1" - -"@babel/helper-compilation-targets@^7.23.6": - version "7.23.6" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991" - integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ== - dependencies: - "@babel/compat-data" "^7.23.5" - "@babel/helper-validator-option" "^7.23.5" - browserslist "^4.22.2" - lru-cache "^5.1.1" - semver "^6.3.1" - -"@babel/helper-environment-visitor@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167" - integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA== - -"@babel/helper-function-name@^7.23.0": - version "7.23.0" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759" - integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw== - dependencies: - "@babel/template" "^7.22.15" - "@babel/types" "^7.23.0" - -"@babel/helper-hoist-variables@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb" - integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-module-imports@^7.22.15": - version "7.22.15" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz#16146307acdc40cc00c3b2c647713076464bdbf0" - integrity sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w== - dependencies: - "@babel/types" "^7.22.15" - -"@babel/helper-module-transforms@^7.23.3": - version "7.23.3" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1" - integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ== - dependencies: - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-module-imports" "^7.22.15" - "@babel/helper-simple-access" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/helper-validator-identifier" "^7.22.20" - -"@babel/helper-simple-access@^7.22.5": - version "7.22.5" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de" - integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-split-export-declaration@^7.22.6": - version "7.22.6" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c" - integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g== - dependencies: - "@babel/types" "^7.22.5" - -"@babel/helper-string-parser@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" - integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== - -"@babel/helper-validator-identifier@^7.22.20": - version "7.22.20" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" - integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== - -"@babel/helper-validator-option@^7.23.5": - version "7.23.5" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" - integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== - -"@babel/helpers@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.23.9.tgz#c3e20bbe7f7a7e10cb9b178384b4affdf5995c7d" - integrity sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ== - dependencies: - "@babel/template" "^7.23.9" - "@babel/traverse" "^7.23.9" - "@babel/types" "^7.23.9" - -"@babel/highlight@^7.23.4": - version "7.23.4" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b" - integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A== - dependencies: - "@babel/helper-validator-identifier" "^7.22.20" - chalk "^2.4.2" - js-tokens "^4.0.0" - -"@babel/parser@^7.12.11", "@babel/parser@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.9.tgz#7b903b6149b0f8fa7ad564af646c4c38a77fc44b" - integrity sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA== - "@babel/polyfill@^7.12.1": version "7.12.1" resolved "https://registry.yarnpkg.com/@babel/polyfill/-/polyfill-7.12.1.tgz#1f2d6371d1261bbd961f3c5d5909150e12d0bd96" @@ -259,40 +111,6 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/template@^7.22.15", "@babel/template@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.23.9.tgz#f881d0487cba2828d3259dcb9ef5005a9731011a" - integrity sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" - -"@babel/traverse@^7.12.12", "@babel/traverse@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.9.tgz#2f9d6aead6b564669394c5ce0f9302bb65b9d950" - integrity sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg== - dependencies: - "@babel/code-frame" "^7.23.5" - "@babel/generator" "^7.23.6" - "@babel/helper-environment-visitor" "^7.22.20" - "@babel/helper-function-name" "^7.23.0" - "@babel/helper-hoist-variables" "^7.22.5" - "@babel/helper-split-export-declaration" "^7.22.6" - "@babel/parser" "^7.23.9" - "@babel/types" "^7.23.9" - debug "^4.3.1" - globals "^11.1.0" - -"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.23.9": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.9.tgz#1dd7b59a9a2b5c87f8b41e52770b5ecbf492e002" - integrity sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q== - dependencies: - "@babel/helper-string-parser" "^7.23.4" - "@babel/helper-validator-identifier" "^7.22.20" - to-fast-properties "^2.0.0" - "@ctrl/tinycolor@^3.4.0", "@ctrl/tinycolor@^3.6.1": version "3.6.1" resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31" @@ -449,6 +267,72 @@ dependencies: "@babel/runtime" "^7.0.0" +"@develar/schema-utils@~2.6.5": + version "2.6.5" + resolved "https://registry.yarnpkg.com/@develar/schema-utils/-/schema-utils-2.6.5.tgz#3ece22c5838402419a6e0425f85742b961d9b6c6" + integrity sha512-0cp4PsWQ/9avqTVMCtZ+GirikIA36ikvjtHweU4/j8yLtgObI0+JUPhYFScgwlteveGB1rt3Cm8UhN04XayDig== + dependencies: + ajv "^6.12.0" + ajv-keywords "^3.4.1" + +"@electron/asar@^3.2.1": + version "3.2.8" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.8.tgz#2ea722f3452583dbd4ffdcc4b4f5dc903f1d8178" + integrity sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg== + dependencies: + commander "^5.0.0" + glob "^7.1.6" + minimatch "^3.0.4" + +"@electron/get@^2.0.0": + version "2.0.3" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-2.0.3.tgz#fba552683d387aebd9f3fcadbcafc8e12ee4f960" + integrity sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ== + dependencies: + debug "^4.1.1" + env-paths "^2.2.0" + fs-extra "^8.1.0" + got "^11.8.5" + progress "^2.0.3" + semver "^6.2.0" + sumchecker "^3.0.1" + optionalDependencies: + global-agent "^3.0.0" + +"@electron/notarize@2.1.0": + version "2.1.0" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" + integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.1" + promise-retry "^2.0.1" + +"@electron/osx-sign@1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@electron/osx-sign/-/osx-sign-1.0.5.tgz#0af7149f2fce44d1a8215660fd25a9fb610454d8" + integrity sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww== + dependencies: + compare-version "^0.1.2" + debug "^4.3.4" + fs-extra "^10.0.0" + isbinaryfile "^4.0.8" + minimist "^1.2.6" + plist "^3.0.5" + +"@electron/universal@1.4.1": + version "1.4.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.4.1.tgz#3fbda2a5ed9ff9f3304c8e8316b94c1e3a7b3785" + integrity sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ== + dependencies: + "@electron/asar" "^3.2.1" + "@malept/cross-spawn-promise" "^1.1.0" + debug "^4.3.1" + dir-compare "^3.0.0" + fs-extra "^9.0.1" + minimatch "^3.0.4" + plist "^3.0.4" + "@emotion/hash@^0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413" @@ -611,6 +495,18 @@ resolved "https://registry.yarnpkg.com/@handsontable/react/-/react-3.1.3.tgz#382ff655c17469bd587010e50281f0f47c3c0e79" integrity sha512-XuLP0rmpkXAi55kmw1YtK1Icn2gtkHe0xT99inNgLiGGFMnv3ll1Y8NCfwHqSp0EMnpwpbO6wbN+ZBE/huwPwA== +"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb" + integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ== + +"@hapi/topo@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + dependencies: + "@hapi/hoek" "^9.0.0" + "@humanwhocodes/config-array@^0.11.13": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" @@ -630,37 +526,17 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917" integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw== -"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": - version "0.3.3" - resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098" - integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ== - dependencies: - "@jridgewell/set-array" "^1.0.1" - "@jridgewell/sourcemap-codec" "^1.4.10" - "@jridgewell/trace-mapping" "^0.3.9" - -"@jridgewell/resolve-uri@^3.1.0": - version "3.1.1" - resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" - integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== - -"@jridgewell/set-array@^1.0.1": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" - integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== - -"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": - version "1.4.15" - resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" - integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== - -"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": - version "0.3.22" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz#72a621e5de59f5f1ef792d0793a82ee20f645e4c" - integrity sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw== +"@isaacs/cliui@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" + integrity sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA== dependencies: - "@jridgewell/resolve-uri" "^3.1.0" - "@jridgewell/sourcemap-codec" "^1.4.14" + string-width "^5.1.2" + string-width-cjs "npm:string-width@^4.2.0" + strip-ansi "^7.0.1" + strip-ansi-cjs "npm:strip-ansi@^6.0.1" + wrap-ansi "^8.1.0" + wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@loaders.gl/3d-tiles@^3.4.13": version "3.4.14" @@ -900,6 +776,23 @@ "@probe.gl/env" "^3.5.0" "@probe.gl/stats" "^3.5.0" +"@malept/cross-spawn-promise@^1.1.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz#504af200af6b98e198bce768bc1730c6936ae01d" + integrity sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ== + dependencies: + cross-spawn "^7.0.1" + +"@malept/flatpak-bundler@^0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@malept/flatpak-bundler/-/flatpak-bundler-0.4.0.tgz#e8a32c30a95d20c2b1bb635cc580981a06389858" + integrity sha512-9QOtNffcOF/c1seMCDnjckb3R9WHcG34tky+FHpNKKCW0wc/scYLwMtO+ptyGUfMW0/b/n4qRiALlaFHc9Oj7Q== + dependencies: + debug "^4.1.1" + fs-extra "^9.0.0" + lodash "^4.17.15" + tmp-promise "^3.0.2" + "@mapbox/geojson-rewind@^0.5.2": version "0.5.2" resolved "https://registry.yarnpkg.com/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz#591a5d71a9cd1da1a0bf3420b3bea31b0fc7946a" @@ -1121,6 +1014,11 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@pkgjs/parseargs@^0.11.0": + version "0.11.0" + resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" + integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== + "@pkgr/core@^0.1.0": version "0.1.1" resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.1.tgz#1ec17e2edbec25c8306d424ecfbf13c7de1aaa31" @@ -1380,6 +1278,28 @@ resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.10.0.tgz#4eedd01af3a82c1acb0fe6d837ebf339c4cbf839" integrity sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ== +"@sideway/address@^4.1.5": + version "4.1.5" + resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5" + integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@sideway/formula@^3.0.1": + version "3.0.1" + resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f" + integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg== + +"@sideway/pinpoint@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df" + integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ== + +"@sindresorhus/is@^4.0.0": + version "4.6.0" + resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" + integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== + "@socket.io/component-emitter@~3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" @@ -1464,6 +1384,18 @@ resolved "https://registry.yarnpkg.com/@swc/types/-/types-0.1.5.tgz#043b731d4f56a79b4897a3de1af35e75d56bc63a" integrity sha512-myfUej5naTBWnqOCc/MdVOLVjXUXtIA+NpDrDBKJtLLg2shUjBu3cZmB/85RyitKc55+lUUyl7oRfLOvkr2hsw== +"@szmarczak/http-timer@^4.0.5": + version "4.0.6" + resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807" + integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w== + dependencies: + defer-to-connect "^2.0.0" + +"@tootallnate/once@2": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf" + integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A== + "@turf/along@>=6.3.0", "@turf/along@^6.5.0": version "6.5.0" resolved "https://registry.yarnpkg.com/@turf/along/-/along-6.5.0.tgz#ab12eec58a14de60fe243a62d31a474f415c8fef" @@ -2646,11 +2578,35 @@ "@turf/invariant" "^6.5.0" d3-voronoi "1.1.2" +"@types/cacheable-request@^6.0.1": + version "6.0.3" + resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" + integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw== + dependencies: + "@types/http-cache-semantics" "*" + "@types/keyv" "^3.1.4" + "@types/node" "*" + "@types/responselike" "^1.0.0" + +"@types/debug@^4.1.6": + version "4.1.12" + resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.12.tgz#a155f21690871953410df4b6b6f53187f0500917" + integrity sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ== + dependencies: + "@types/ms" "*" + "@types/estree@1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== +"@types/fs-extra@9.0.13", "@types/fs-extra@^9.0.11": + version "9.0.13" + resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-9.0.13.tgz#7594fbae04fe7f1918ce8b3d213f74ff44ac1f45" + integrity sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA== + dependencies: + "@types/node" "*" + "@types/geojson-vt@3.2.5": version "3.2.5" resolved "https://registry.yarnpkg.com/@types/geojson-vt/-/geojson-vt-3.2.5.tgz#b6c356874991d9ab4207533476dfbcdb21e38408" @@ -2681,11 +2637,23 @@ "@types/react" "*" hoist-non-react-statics "^3.3.0" +"@types/http-cache-semantics@*": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4" + integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA== + "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/keyv@^3.1.4": + version "3.1.4" + resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6" + integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg== + dependencies: + "@types/node" "*" + "@types/mapbox-gl@>=1.0.0", "@types/mapbox-gl@^2.6.3": version "2.7.21" resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz#b0cad1e4c3d1bf1592444de36a4f27e890310416" @@ -2707,6 +2675,25 @@ "@types/mapbox__point-geometry" "*" "@types/pbf" "*" +"@types/ms@*": + version "0.7.34" + resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.34.tgz#10964ba0dee6ac4cd462e2795b6bebd407303433" + integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== + +"@types/node@*": + version "20.11.17" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292" + integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw== + dependencies: + undici-types "~5.26.4" + +"@types/node@^18.11.18": + version "18.19.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.15.tgz#313a9d75435669a57fc28dc8694e7f4c4319f419" + integrity sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA== + dependencies: + undici-types "~5.26.4" + "@types/offscreencanvas@^2019.7.0": version "2019.7.3" resolved "https://registry.yarnpkg.com/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz#90267db13f64d6e9ccb5ae3eac92786a7c77a516" @@ -2717,6 +2704,14 @@ resolved "https://registry.yarnpkg.com/@types/pbf/-/pbf-3.0.5.tgz#a9495a58d8c75be4ffe9a0bd749a307715c07404" integrity sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA== +"@types/plist@^3.0.1": + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/plist/-/plist-3.0.5.tgz#9a0c49c0f9886c8c8696a7904dd703f6284036e0" + integrity sha512-E6OCaRmAe4WDmWNsL/9RMqdkkzDCY1etutkflWk4c+AcjDU07Pcz1fQwTX0TQz+Pxqn9i4L1TU3UFpjnrcDgxA== + dependencies: + "@types/node" "*" + xmlbuilder ">=11.0.1" + "@types/prop-types@*": version "15.7.11" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" @@ -2738,6 +2733,13 @@ "@types/scheduler" "*" csstype "^3.0.2" +"@types/responselike@^1.0.0": + version "1.0.3" + resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50" + integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw== + dependencies: + "@types/node" "*" + "@types/scheduler@*": version "0.16.8" resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" @@ -2755,6 +2757,18 @@ resolved "https://registry.yarnpkg.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz#b6725d5f4af24ace33b36fafd295136e75509f43" integrity sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA== +"@types/verror@^1.10.3": + version "1.10.9" + resolved "https://registry.yarnpkg.com/@types/verror/-/verror-1.10.9.tgz#420c32adb9a2dd50b3db4c8f96501e05a0e72941" + integrity sha512-MLx9Z+9lGzwEuW16ubGeNkpBDE84RpB/NyGgg6z2BTpWzKkGU451cAY3UkUzZEp72RHF585oJ3V8JVNqIplcAQ== + +"@types/yauzl@^2.9.1": + version "2.10.3" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.3.tgz#e9b2808b4f109504a03cda958259876f61017999" + integrity sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q== + dependencies: + "@types/node" "*" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -2767,6 +2781,11 @@ dependencies: "@swc/core" "^1.3.107" +"@xmldom/xmldom@^0.8.8": + version "0.8.10" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.8.10.tgz#a1337ca426aa61cef9fe15b5b28e340a72f6fa99" + integrity sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw== + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -2784,7 +2803,19 @@ add-dom-event-listener@^1.1.0: dependencies: object-assign "4.x" -ajv@^6.12.4: +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + +ajv-keywords@^3.4.1: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + +ajv@^6.10.0, ajv@^6.12.0, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2804,20 +2835,23 @@ ansi-regex@^5.0.1: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304" integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ== -ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA== - dependencies: - color-convert "^1.9.0" +ansi-regex@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a" + integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA== -ansi-styles@^4.1.0: +ansi-styles@^4.0.0, ansi-styles@^4.1.0: version "4.3.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: color-convert "^2.0.1" +ansi-styles@^6.1.0: + version "6.2.1" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5" + integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== + antd@^5.14.1: version "5.14.1" resolved "https://registry.yarnpkg.com/antd/-/antd-5.14.1.tgz#e56faf6a421911543a0d232e2564a6b42d3696fa" @@ -2871,6 +2905,45 @@ antd@^5.14.1: scroll-into-view-if-needed "^3.1.0" throttle-debounce "^5.0.0" +app-builder-bin@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" + integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== + +app-builder-lib@24.9.1: + version "24.9.1" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.9.1.tgz#bf3568529298b4de8595ed1acbb351fe27db5ba4" + integrity sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g== + dependencies: + "7zip-bin" "~5.2.0" + "@develar/schema-utils" "~2.6.5" + "@electron/notarize" "2.1.0" + "@electron/osx-sign" "1.0.5" + "@electron/universal" "1.4.1" + "@malept/flatpak-bundler" "^0.4.0" + "@types/fs-extra" "9.0.13" + async-exit-hook "^2.0.1" + bluebird-lst "^1.0.9" + builder-util "24.8.1" + builder-util-runtime "9.2.3" + chromium-pickle-js "^0.2.0" + debug "^4.3.4" + ejs "^3.1.8" + electron-publish "24.8.1" + form-data "^4.0.0" + fs-extra "^10.1.0" + hosted-git-info "^4.1.0" + is-ci "^3.0.0" + isbinaryfile "^5.0.0" + js-yaml "^4.1.0" + lazy-val "^1.0.5" + minimatch "^5.1.1" + read-config-file "6.3.2" + sanitize-filename "^1.6.3" + semver "^7.3.8" + tar "^6.1.12" + temp-file "^3.4.0" + argparse@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -2986,6 +3059,11 @@ arraybuffer.prototype.slice@^1.0.2: is-array-buffer "^3.0.4" is-shared-array-buffer "^1.0.2" +assert-plus@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== + assign-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" @@ -2996,6 +3074,16 @@ ast-types-flow@^0.0.8: resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.8.tgz#0a85e1c92695769ac13a428bb653e7538bea27d6" integrity sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + +async-exit-hook@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/async-exit-hook/-/async-exit-hook-2.0.1.tgz#8bd8b024b0ec9b1c01cccb9af9db29bd717dfaf3" + integrity sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw== + async-validator@^4.1.0: version "4.2.5" resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339" @@ -3006,6 +3094,11 @@ async-validator@~1.11.3: resolved "https://registry.yarnpkg.com/async-validator/-/async-validator-1.11.5.tgz#9d43cf49ef6bb76be5442388d19fb9a6e47597ea" integrity sha512-XNtCsMAeAH1pdLMEg1z8/Bb3a8cdCbui9QbJATRFHHHW5kT6+NPI3zSVQUXgikTFITzsg+kYY5NTWhM2Orwt9w== +async@^3.2.3: + version "3.2.5" + resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66" + integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg== + asynciterator.prototype@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz#8c5df0514936cdd133604dfcc9d3fb93f09b2b62" @@ -3018,6 +3111,11 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== +at-least-node@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" + integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== + available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" @@ -3028,7 +3126,7 @@ axe-core@=4.7.0: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.0.tgz#34ba5a48a8b564f67e103f0aa5768d76e15bbbbf" integrity sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ== -axios@^1.6.7: +axios@^1.6.1, axios@^1.6.7: version "1.6.7" resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.7.tgz#7b48c2e27c96f9c68a2f8f31e2ab19f59b06b0a7" integrity sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA== @@ -3057,11 +3155,33 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== +base64-js@^1.3.1, base64-js@^1.5.1: + version "1.5.1" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a" + integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA== + "bignumber.js@^8 || ^9": version "9.1.2" resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c" integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug== +bluebird-lst@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/bluebird-lst/-/bluebird-lst-1.0.9.tgz#a64a0e4365658b9ab5fe875eb9dfb694189bb41c" + integrity sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw== + dependencies: + bluebird "^3.5.5" + +bluebird@^3.5.5: + version "3.7.2" + resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" + integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== + +boolean@^3.0.1: + version "3.2.0" + resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b" + integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw== + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3070,21 +3190,71 @@ brace-expansion@^1.1.7: balanced-match "^1.0.0" concat-map "0.0.1" -browserslist@^4.22.2: - version "4.22.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.3.tgz#299d11b7e947a6b843981392721169e27d60c5a6" - integrity sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A== +brace-expansion@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae" + integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA== dependencies: - caniuse-lite "^1.0.30001580" - electron-to-chromium "^1.4.648" - node-releases "^2.0.14" - update-browserslist-db "^1.0.13" + balanced-match "^1.0.0" buf-compare@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/buf-compare/-/buf-compare-1.0.1.tgz#fef28da8b8113a0a0db4430b0b6467b69730b34a" integrity sha512-Bvx4xH00qweepGc43xFvMs5BKASXTbHaHm6+kDYIK9p/4iFwjATQkmPKHQSgJZzKbAymhztRbXUf1Nqhzl73/Q== +buffer-crc32@~0.2.3: + version "0.2.13" + resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" + integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== + +buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" + integrity sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg== + +buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== + +buffer@^5.1.0: + version "5.7.1" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + +builder-util-runtime@9.2.3: + version "9.2.3" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c" + integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw== + dependencies: + debug "^4.3.4" + sax "^1.2.4" + +builder-util@24.8.1: + version "24.8.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.8.1.tgz#594d45b0c86d1d17f5c7bebbb77405080b2571c2" + integrity sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw== + dependencies: + "7zip-bin" "~5.2.0" + "@types/debug" "^4.1.6" + app-builder-bin "4.0.0" + bluebird-lst "^1.0.9" + builder-util-runtime "9.2.3" + chalk "^4.1.2" + cross-spawn "^7.0.3" + debug "^4.3.4" + fs-extra "^10.1.0" + http-proxy-agent "^5.0.0" + https-proxy-agent "^5.0.1" + is-ci "^3.0.0" + js-yaml "^4.1.0" + source-map-support "^0.5.19" + stat-mode "^1.0.0" + temp-file "^3.4.0" + bytewise-core@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/bytewise-core/-/bytewise-core-1.2.3.tgz#3fb410c7e91558eb1ab22a82834577aa6bd61d42" @@ -3100,6 +3270,24 @@ bytewise@^1.1.0: bytewise-core "^1.2.2" typewise "^1.0.3" +cacheable-lookup@^5.0.3: + version "5.0.4" + resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005" + integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA== + +cacheable-request@^7.0.2: + version "7.0.4" + resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817" + integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg== + dependencies: + clone-response "^1.0.2" + get-stream "^5.1.0" + http-cache-semantics "^4.0.0" + keyv "^4.0.0" + lowercase-keys "^2.0.0" + normalize-url "^6.0.1" + responselike "^2.0.0" + call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" @@ -3116,11 +3304,6 @@ callsites@^3.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== -caniuse-lite@^1.0.30001580: - version "1.0.30001587" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz#a0bce920155fa56a1885a69c74e1163fc34b4881" - integrity sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA== - cartocolor@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/cartocolor/-/cartocolor-4.0.2.tgz#ef1aa12860f6eeedc8d2420e2b9d7337937c4993" @@ -3128,16 +3311,7 @@ cartocolor@^4.0.2: dependencies: colorbrewer "1.0.0" -chalk@^2.4.2: - version "2.4.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3145,6 +3319,21 @@ chalk@^4.0.0, chalk@^4.1.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chownr@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece" + integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== + +chromium-pickle-js@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz#04a106672c18b085ab774d983dfa3ea138f22205" + integrity sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw== + +ci-info@^3.2.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.9.0.tgz#4279a62028a7b1f262f3473fc9605f5e218c59b4" + integrity sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ== + clamp@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/clamp/-/clamp-1.0.1.tgz#66a0e64011816e37196828fdc8c8c147312c8634" @@ -3155,12 +3344,29 @@ classnames@2.x, classnames@^2.2.1, classnames@^2.2.3, classnames@^2.2.5, classna resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b" integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow== -color-convert@^1.9.0: - version "1.9.3" - resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - color-name "1.1.3" + slice-ansi "^3.0.0" + string-width "^4.2.0" + +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + +clone-response@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.3.tgz#af2032aa47816399cf5f0a1d0db902f517abb8c3" + integrity sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA== + dependencies: + mimic-response "^1.0.0" color-convert@^2.0.1: version "2.0.1" @@ -3179,11 +3385,6 @@ color-interpolate@^1.0.5: color-space "^1.14.3" lerp "^1.0.3" -color-name@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== - color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" @@ -3221,6 +3422,16 @@ commander@2: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" + integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== + +compare-version@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080" + integrity sha512-pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A== + compute-scroll-into-view@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz#753f11d972596558d8fe7c6bcbc8497690ab4c87" @@ -3241,6 +3452,29 @@ concaveman@*: robust-predicates "^2.0.4" tinyqueue "^2.0.3" +concurrently@^8.2.2: + version "8.2.2" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-8.2.2.tgz#353141985c198cfa5e4a3ef90082c336b5851784" + integrity sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg== + dependencies: + chalk "^4.1.2" + date-fns "^2.30.0" + lodash "^4.17.21" + rxjs "^7.8.1" + shell-quote "^1.8.1" + spawn-command "0.0.2" + supports-color "^8.1.1" + tree-kill "^1.2.2" + yargs "^17.7.2" + +config-file-ts@^0.2.4: + version "0.2.6" + resolved "https://registry.yarnpkg.com/config-file-ts/-/config-file-ts-0.2.6.tgz#b424ff74612fb37f626d6528f08f92ddf5d22027" + integrity sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w== + dependencies: + glob "^10.3.10" + typescript "^5.3.3" + connected-react-router@^6.5.2: version "6.9.3" resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972" @@ -3252,18 +3486,6 @@ connected-react-router@^6.5.2: immutable "^3.8.1 || ^4.0.0" seamless-immutable "^7.1.3" -convert-source-map@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a" - integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg== - -copy-anything@^2.0.1: - version "2.0.6" - resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480" - integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw== - dependencies: - is-what "^3.14.1" - copy-to-clipboard@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz#55ac43a1db8ae639a4bd99511c148cdd1b83a1b0" @@ -3284,6 +3506,18 @@ core-js@^2.4.0, core-js@^2.6.5: resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== +core-util-is@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== + +crc@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6" + integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ== + dependencies: + buffer "^5.1.0" + create-react-class@^15.5.3: version "15.7.0" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.7.0.tgz#7499d7ca2e69bb51d13faf59bd04f0c65a1d6c1e" @@ -3292,7 +3526,7 @@ create-react-class@^15.5.3: loose-envify "^1.3.1" object-assign "^4.1.1" -cross-spawn@^7.0.2: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -3396,11 +3630,25 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== +date-fns@^2.30.0: + version "2.30.0" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0" + integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw== + dependencies: + "@babel/runtime" "^7.21.0" + dayjs@^1.11.10, dayjs@^1.11.4: version "1.11.10" resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0" integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== + dependencies: + ms "2.1.2" + debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -3408,13 +3656,6 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1, debug@~4.3.2: - version "4.3.4" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" - integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== - dependencies: - ms "2.1.2" - deck.gl@^8.9.34: version "8.9.34" resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-8.9.34.tgz#990193a7779a0175f6887490c4acfabb19357491" @@ -3433,6 +3674,13 @@ deck.gl@^8.9.34: "@deck.gl/mesh-layers" "8.9.34" "@deck.gl/react" "8.9.34" +decompress-response@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc" + integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ== + dependencies: + mimic-response "^3.1.0" + deep-diff@^0.3.5: version "0.3.8" resolved "https://registry.yarnpkg.com/deep-diff/-/deep-diff-0.3.8.tgz#c01de63efb0eec9798801d40c7e0dae25b582c84" @@ -3462,6 +3710,11 @@ deep-strict-equal@^0.2.0: dependencies: core-assert "^0.2.0" +defer-to-connect@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" + integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== + define-data-property@^1.0.1, define-data-property@^1.1.2: version "1.1.3" resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.3.tgz#281845e04737d709c2de99e278546189b65d3055" @@ -3496,6 +3749,47 @@ dequal@^2.0.3: resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be" integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA== +detect-node@^2.0.4: + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== + +dir-compare@^3.0.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/dir-compare/-/dir-compare-3.3.0.tgz#2c749f973b5c4b5d087f11edaae730db31788416" + integrity sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg== + dependencies: + buffer-equal "^1.0.0" + minimatch "^3.0.4" + +dmg-builder@24.9.1: + version "24.9.1" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.9.1.tgz#04bf6c0dcd235f6214511f2358a78ed2b9379421" + integrity sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ== + dependencies: + app-builder-lib "24.9.1" + builder-util "24.8.1" + builder-util-runtime "9.2.3" + fs-extra "^10.1.0" + iconv-lite "^0.6.2" + js-yaml "^4.1.0" + optionalDependencies: + dmg-license "^1.0.11" + +dmg-license@^1.0.11: + version "1.0.11" + resolved "https://registry.yarnpkg.com/dmg-license/-/dmg-license-1.0.11.tgz#7b3bc3745d1b52be7506b4ee80cb61df6e4cd79a" + integrity sha512-ZdzmqwKmECOWJpqefloC5OJy1+WZBBse5+MR88z9g9Zn4VY+WYUkAyojmhzJckH5YbbZGcYIuGAkY5/Ys5OM2Q== + dependencies: + "@types/plist" "^3.0.1" + "@types/verror" "^1.10.3" + ajv "^6.10.0" + crc "^3.8.0" + iconv-corefoundation "^1.1.7" + plist "^3.0.4" + smart-buffer "^4.0.2" + verror "^1.10.0" + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -3550,13 +3844,15 @@ domutils@^3.0.1: domelementtype "^2.3.0" domhandler "^5.0.3" -dot-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" - integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" +dotenv-expand@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/dotenv-expand/-/dotenv-expand-5.1.0.tgz#3fbaf020bfd794884072ea26b1e9791d45a629f0" + integrity sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA== + +dotenv@^9.0.2: + version "9.0.2" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-9.0.2.tgz#dacc20160935a37dea6364aa1bef819fb9b6ab05" + integrity sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg== draco3d@1.5.5: version "1.5.5" @@ -3568,16 +3864,74 @@ earcut@^2.0.0, earcut@^2.0.6, earcut@^2.2.4: resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== -electron-to-chromium@^1.4.648: - version "1.4.667" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.667.tgz#2767d998548e5eeeaf8bdaffd67b56796bfbed3d" - integrity sha512-66L3pLlWhTNVUhnmSA5+qDM3fwnXsM6KAqE36e2w4KN0g6pkEtlT5bs41FQtQwVwKnfhNBXiWRLPs30HSxd7Kw== +eastasianwidth@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" + integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== + +ejs@^3.1.8: + version "3.1.9" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361" + integrity sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ== + dependencies: + jake "^10.8.5" + +electron-builder@^24.9.1: + version "24.9.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.9.1.tgz#4aee03947963b829a7f48a850fe02c219311ef63" + integrity sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg== + dependencies: + app-builder-lib "24.9.1" + builder-util "24.8.1" + builder-util-runtime "9.2.3" + chalk "^4.1.2" + dmg-builder "24.9.1" + fs-extra "^10.1.0" + is-ci "^3.0.0" + lazy-val "^1.0.5" + read-config-file "6.3.2" + simple-update-notifier "2.0.0" + yargs "^17.6.2" + +electron-publish@24.8.1: + version "24.8.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.8.1.tgz#4216740372bf4297a429543402a1a15ce8c3560b" + integrity sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw== + dependencies: + "@types/fs-extra" "^9.0.11" + builder-util "24.8.1" + builder-util-runtime "9.2.3" + chalk "^4.1.2" + fs-extra "^10.1.0" + lazy-val "^1.0.5" + mime "^2.5.2" + +electron@^28.2.3: + version "28.2.3" + resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b" + integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA== + dependencies: + "@electron/get" "^2.0.0" + "@types/node" "^18.11.18" + extract-zip "^2.0.1" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== emoji-regex@^9.2.2: version "9.2.2" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== +end-of-stream@^1.1.0: + version "1.4.4" + resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" + integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q== + dependencies: + once "^1.4.0" + engine.io-client@~6.5.2: version "6.5.3" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.5.3.tgz#4cf6fa24845029b238f83c628916d9149c399bc5" @@ -3599,12 +3953,15 @@ entities@^4.2.0, entities@^4.4.0: resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== -errno@^0.1.1: - version "0.1.8" - resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" - integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== - dependencies: - prr "~1.0.1" +env-paths@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +err-code@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" + integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== es-abstract@^1.22.1, es-abstract@^1.22.3: version "1.22.3" @@ -3714,6 +4071,11 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" +es6-error@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" + integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== + esbuild@^0.19.3: version "0.19.12" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04" @@ -3748,11 +4110,6 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== - escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" @@ -3832,6 +4189,16 @@ eslint-plugin-prettier@^5.1.3: prettier-linter-helpers "^1.0.0" synckit "^0.8.6" +eslint-plugin-react-hooks@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz#4c3e697ad95b77e93f8646aaa1630c1ba607edd3" + integrity sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g== + +eslint-plugin-react-refresh@^0.4.5: + version "0.4.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.5.tgz#6b9b307bad3feba2244ef64a1a15485ac70a2d0f" + integrity sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w== + eslint-plugin-react@^7.33.2: version "7.33.2" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" @@ -3976,6 +4343,22 @@ extend-shallow@^3.0.0: assign-symbols "^1.0.0" is-extendable "^1.0.1" +extract-zip@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== + dependencies: + debug "^4.1.1" + get-stream "^5.1.0" + yauzl "^2.10.0" + optionalDependencies: + "@types/yauzl" "^2.9.1" + +extsprintf@^1.2.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" + integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -4010,6 +4393,13 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" +fd-slicer@~1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" + integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== + dependencies: + pend "~1.2.0" + file-entry-cache@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" @@ -4017,6 +4407,13 @@ file-entry-cache@^6.0.1: dependencies: flat-cache "^3.0.4" +filelist@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5" + integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q== + dependencies: + minimatch "^5.0.1" + find-up@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" @@ -4051,6 +4448,14 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +foreground-child@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d" + integrity sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg== + dependencies: + cross-spawn "^7.0.0" + signal-exit "^4.0.1" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -4060,6 +4465,15 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +fs-extra@^10.0.0, fs-extra@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf" + integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9" @@ -4069,6 +4483,32 @@ fs-extra@^7.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" + integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^4.0.0" + universalify "^0.1.0" + +fs-extra@^9.0.0, fs-extra@^9.0.1: + version "9.1.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d" + integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== + dependencies: + at-least-node "^1.0.0" + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + +fs-minipass@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb" + integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg== + dependencies: + minipass "^3.0.0" + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" @@ -4099,11 +4539,6 @@ functions-have-names@^1.2.3: resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== -gensync@^1.0.0-beta.2: - version "1.0.0-beta.2" - resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" - integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg== - geojson-equality@0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/geojson-equality/-/geojson-equality-0.1.6.tgz#a171374ef043e5d4797995840bae4648e0752d72" @@ -4137,6 +4572,11 @@ geojson@0.5.0: resolved "https://registry.yarnpkg.com/geojson/-/geojson-0.5.0.tgz#3cd6c96399be65b56ee55596116fe9191ce701c0" integrity sha512-/Bx5lEn+qRF4TfQ5aLu6NH+UKtvIv7Lhc487y/c8BdludrCTpiWf9wyI0RTyqg49MFefIAvFDuEi5Dfd/zgNxQ== +get-caller-file@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" + integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== + get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2, get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" @@ -4148,6 +4588,13 @@ get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" +get-stream@^5.1.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== + dependencies: + pump "^3.0.0" + get-stream@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -4179,7 +4626,18 @@ glob-parent@^6.0.2: dependencies: is-glob "^4.0.3" -glob@^7.1.3: +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + +glob@^7.1.3, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -4191,6 +4649,18 @@ glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + global-prefix@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" @@ -4208,11 +4678,6 @@ global@>=4.3.0: min-document "^2.19.0" process "^0.11.10" -globals@^11.1.0: - version "11.12.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== - globals@^13.19.0: version "13.24.0" resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171" @@ -4220,7 +4685,7 @@ globals@^13.19.0: dependencies: type-fest "^0.20.2" -globalthis@^1.0.3: +globalthis@^1.0.1, globalthis@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf" integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA== @@ -4234,7 +4699,24 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -graceful-fs@^4.1.2, graceful-fs@^4.1.6: +got@^11.8.5: + version "11.8.6" + resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" + integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== + dependencies: + "@sindresorhus/is" "^4.0.0" + "@szmarczak/http-timer" "^4.0.5" + "@types/cacheable-request" "^6.0.1" + "@types/responselike" "^1.0.0" + cacheable-lookup "^5.0.3" + cacheable-request "^7.0.2" + decompress-response "^6.0.0" + http2-wrapper "^1.0.0-beta.5.2" + lowercase-keys "^2.0.0" + p-cancelable "^2.0.0" + responselike "^2.0.0" + +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -4268,11 +4750,6 @@ has-bigints@^1.0.1, has-bigints@^1.0.2: resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ== -has-flag@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== - has-flag@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" @@ -4328,6 +4805,13 @@ hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react- dependencies: react-is "^16.7.0" +hosted-git-info@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224" + integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== + dependencies: + lru-cache "^6.0.0" + hsluv@^0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/hsluv/-/hsluv-0.0.3.tgz#829107dafb4a9f8b52a1809ed02e091eade6754c" @@ -4361,6 +4845,44 @@ htmlparser2@8.0.2: domutils "^3.0.1" entities "^4.4.0" +http-cache-semantics@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz#abe02fcb2985460bf0323be664436ec3476a6d5a" + integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== + +http-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43" + integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w== + dependencies: + "@tootallnate/once" "2" + agent-base "6" + debug "4" + +http2-wrapper@^1.0.0-beta.5.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d" + integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg== + dependencies: + quick-lru "^5.1.1" + resolve-alpn "^1.0.0" + +https-proxy-agent@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" + integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== + dependencies: + agent-base "6" + debug "4" + +iconv-corefoundation@^1.1.7: + version "1.1.7" + resolved "https://registry.yarnpkg.com/iconv-corefoundation/-/iconv-corefoundation-1.1.7.tgz#31065e6ab2c9272154c8b0821151e2c88f1b002a" + integrity sha512-T10qvkw0zz4wnm560lOEg0PovVqUXuOFhhHAkixw8/sycy7TJt7v/RrkEKEQnAw2viPSJu6iAkErxnzR0g8PpQ== + dependencies: + cli-truncate "^2.1.0" + node-addon-api "^1.6.3" + iconv-lite@0.4: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -4368,14 +4890,14 @@ iconv-lite@0.4: dependencies: safer-buffer ">= 2.1.2 < 3" -iconv-lite@^0.6.3: +iconv-lite@^0.6.2: version "0.6.3" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -ieee754@^1.1.12: +ieee754@^1.1.12, ieee754@^1.1.13: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -4390,11 +4912,6 @@ image-size@^0.7.4: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.7.5.tgz#269f357cf5797cb44683dfa99790e54c705ead04" integrity sha512-Hiyv+mXHfFEP7LzUL/llg9RwFxxY+o9N3JVLIeG5E7iFIFAalxvRU9UZthBdYDEVnzHMgjnKJPPpay5BWf1g9g== -image-size@~0.5.0: - version "0.5.5" - resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" - integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== - "immutable@^3.8.1 || ^4.0.0": version "4.3.5" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0" @@ -4501,6 +5018,13 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== +is-ci@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867" + integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ== + dependencies: + ci-info "^3.2.0" + is-core-module@^2.13.0, is-core-module@^2.13.1: version "2.13.1" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384" @@ -4544,6 +5068,11 @@ is-finalizationregistry@^1.0.2: dependencies: call-bind "^1.0.2" +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + is-generator-function@^1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" @@ -4648,11 +5177,6 @@ is-weakset@^2.0.1: call-bind "^1.0.2" get-intrinsic "^1.1.1" -is-what@^3.14.1: - version "3.14.1" - resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" - integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA== - isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -4663,6 +5187,16 @@ isarray@^2.0.5: resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== +isbinaryfile@^4.0.8: + version "4.0.10" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" + integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw== + +isbinaryfile@^5.0.0: + version "5.0.2" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.2.tgz#fe6e4dfe2e34e947ffa240c113444876ba393ae0" + integrity sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -4684,7 +5218,37 @@ iterator.prototype@^1.1.2: reflect.getprototypeof "^1.0.4" set-function-name "^2.0.1" -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + +jake@^10.8.5: + version "10.8.7" + resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" + integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w== + dependencies: + async "^3.2.3" + chalk "^4.0.2" + filelist "^1.0.4" + minimatch "^3.1.2" + +joi@^17.11.0: + version "17.12.1" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.1.tgz#3347ecf4cd3301962d42191c021b165eef1f395b" + integrity sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ== + dependencies: + "@hapi/hoek" "^9.3.0" + "@hapi/topo" "^5.1.0" + "@sideway/address" "^4.1.5" + "@sideway/formula" "^3.0.1" + "@sideway/pinpoint" "^2.0.0" + +"js-tokens@^3.0.0 || ^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== @@ -4701,11 +5265,6 @@ jsep@^0.3.0: resolved "https://registry.yarnpkg.com/jsep/-/jsep-0.3.5.tgz#3fd79ebd92f6f434e4857d5272aaeef7d948264d" integrity sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA== -jsesc@^2.5.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== - json-buffer@3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13" @@ -4731,6 +5290,11 @@ json-stringify-pretty-compact@^4.0.0: resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz#cf4844770bddee3cb89a6170fe4b00eee5dbf1d4" integrity sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q== +json-stringify-safe@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== + json2mq@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a" @@ -4745,7 +5309,7 @@ json5@^1.0.2: dependencies: minimist "^1.2.0" -json5@^2.2.3: +json5@^2.2.0: version "2.2.3" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== @@ -4757,6 +5321,15 @@ jsonfile@^4.0.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae" + integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ== + dependencies: + universalify "^2.0.0" + optionalDependencies: + graceful-fs "^4.1.6" + "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.3.5: version "3.3.5" resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" @@ -4772,7 +5345,7 @@ kdbush@^4.0.2: resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-4.0.2.tgz#2f7b7246328b4657dd122b6c7f025fbc2c868e39" integrity sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA== -keyv@^4.5.3: +keyv@^4.0.0, keyv@^4.5.3: version "4.5.4" resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93" integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw== @@ -4801,6 +5374,11 @@ language-tags@^1.0.9: dependencies: language-subtag-registry "^0.3.20" +lazy-val@^1.0.4, lazy-val@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.5.tgz#6cf3b9f5bc31cee7ee3e369c0832b7583dcd923d" + integrity sha512-0/BnGCCfyUMkBpeDgWihanIAF9JmZhHBgUhEqzvf+adhNGLoP6TaiI5oF8oyb3I45P+PcnrqihSf01M0l0G5+Q== + lerc@^4.0.1: version "4.0.4" resolved "https://registry.yarnpkg.com/lerc/-/lerc-4.0.4.tgz#1034f132104123c1d22469e382fb2c57a2bf8f84" @@ -4811,23 +5389,6 @@ lerp@^1.0.3: resolved "https://registry.yarnpkg.com/lerp/-/lerp-1.0.3.tgz#a18c8968f917896de15ccfcc28d55a6b731e776e" integrity sha512-70Rh4rCkJDvwWiTsyZ1HmJGvnyfFah4m6iTux29XmasRiZPDBpT9Cfa4ai73+uLZxnlKruUS62jj2lb11wURiA== -less@^4.1.3: - version "4.2.0" - resolved "https://registry.yarnpkg.com/less/-/less-4.2.0.tgz#cbefbfaa14a4cd388e2099b2b51f956e1465c450" - integrity sha512-P3b3HJDBtSzsXUl0im2L7gTO5Ubg8mEN6G8qoTS77iXxXX4Hvu4Qj540PZDvQ8V6DmX6iXo98k7Md0Cm1PrLaA== - dependencies: - copy-anything "^2.0.1" - parse-node-version "^1.0.1" - tslib "^2.3.0" - optionalDependencies: - errno "^0.1.1" - graceful-fs "^4.1.2" - image-size "~0.5.0" - make-dir "^2.1.0" - mime "^1.4.1" - needle "^3.1.0" - source-map "~0.6.0" - levn@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" @@ -4868,7 +5429,7 @@ lodash.upperfirst@^4.3.1: resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== -lodash@^4.17.15, lodash@^4.17.4: +lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.4: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4890,27 +5451,22 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3 dependencies: js-tokens "^3.0.0 || ^4.0.0" -lower-case@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" - integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== - dependencies: - tslib "^2.0.3" +lowercase-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" + integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" - integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w== +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== dependencies: - yallist "^3.0.2" + yallist "^4.0.0" -make-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== - dependencies: - pify "^4.0.1" - semver "^5.6.0" +"lru-cache@^9.1.1 || ^10.0.0": + version "10.2.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.2.0.tgz#0bd445ca57363465900f4d1f9bd8db343a4d95c3" + integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== maplibre-gl@^4.0.0: version "4.0.0" @@ -4944,6 +5500,13 @@ maplibre-gl@^4.0.0: tinyqueue "^2.0.3" vt-pbf "^3.1.3" +matcher@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/matcher/-/matcher-3.0.0.tgz#bd9060f4c5b70aa8041ccc6f80368760994f30ca" + integrity sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng== + dependencies: + escape-string-regexp "^4.0.0" + math.gl@^3.6.2: version "3.6.3" resolved "https://registry.yarnpkg.com/math.gl/-/math.gl-3.6.3.tgz#f87e0d24cb33c1a215185ae3a4e16839f1ce6db2" @@ -4963,10 +5526,20 @@ mime-types@^2.1.12: dependencies: mime-db "1.52.0" -mime@^1.4.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" - integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@^2.5.2: + version "2.6.0" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" + integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== + +mimic-response@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" + integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ== + +mimic-response@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9" + integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ== min-document@^2.19.0: version "2.19.0" @@ -4975,18 +5548,57 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: +minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== dependencies: brace-expansion "^1.1.7" +minimatch@^5.0.1, minimatch@^5.1.1: + version "5.1.6" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96" + integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g== + dependencies: + brace-expansion "^2.0.1" + +minimatch@^9.0.1: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6, minimist@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== +minipass@^3.0.0: + version "3.3.6" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a" + integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw== + dependencies: + yallist "^4.0.0" + +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== + +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + +minizlib@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" + integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg== + dependencies: + minipass "^3.0.0" + yallist "^4.0.0" + mjolnir.js@^2.7.0: version "2.7.1" resolved "https://registry.yarnpkg.com/mjolnir.js/-/mjolnir.js-2.7.1.tgz#4e12590fe168b377c9c669b9c31aa5a62f8b8460" @@ -4995,6 +5607,11 @@ mjolnir.js@^2.7.0: "@types/hammerjs" "^2.0.41" hammerjs "^2.0.8" +mkdirp@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== + moment-timezone@^0.5.33: version "0.5.45" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.45.tgz#cb685acd56bac10e69d93c536366eb65aa6bcf5c" @@ -5079,26 +5696,15 @@ nebula.gl@^1.0.4: uuid "7.0.3" viewport-mercator-project ">=6.0.0" -needle@^3.1.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/needle/-/needle-3.3.1.tgz#63f75aec580c2e77e209f3f324e2cdf3d29bd049" - integrity sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q== - dependencies: - iconv-lite "^0.6.3" - sax "^1.2.4" - -no-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" - integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== - dependencies: - lower-case "^2.0.2" - tslib "^2.0.3" +node-addon-api@^1.6.3: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-releases@^2.0.14: - version "2.0.14" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" - integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +normalize-url@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" + integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== numbro@^2.0.6: version "2.4.0" @@ -5186,7 +5792,7 @@ object.values@^1.1.6, object.values@^1.1.7: define-properties "^1.2.0" es-abstract "^1.22.1" -once@^1.3.0: +once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== @@ -5205,6 +5811,11 @@ optionator@^0.9.3: prelude-ls "^1.2.1" type-check "^0.4.0" +p-cancelable@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf" + integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg== + p-limit@^3.0.2: version "3.1.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" @@ -5219,14 +5830,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -param-case@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" - integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== - dependencies: - dot-case "^3.0.4" - tslib "^2.0.3" - parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -5234,19 +5837,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-node-version@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b" - integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA== - -pascal-case@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" - integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== - dependencies: - no-case "^3.0.4" - tslib "^2.0.3" - path-browserify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" @@ -5272,6 +5862,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-to-regexp@^1.7.0: version "1.8.0" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a" @@ -5287,6 +5885,11 @@ pbf@^3.2.1: ieee754 "^1.1.12" resolve-protobuf-schema "^2.1.0" +pend@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" + integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg== + performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -5297,11 +5900,6 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -pify@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g== - pikaday@1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3" @@ -5309,6 +5907,15 @@ pikaday@1.5.1: optionalDependencies: moment "2.x" +plist@^3.0.4, plist@^3.0.5: + version "3.1.0" + resolved "https://registry.yarnpkg.com/plist/-/plist-3.1.0.tgz#797a516a93e62f5bde55e0b9cc9c967f860893c9" + integrity sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ== + dependencies: + "@xmldom/xmldom" "^0.8.8" + base64-js "^1.5.1" + xmlbuilder "^15.1.1" + point-in-polygon@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/point-in-polygon/-/point-in-polygon-1.1.0.tgz#b0af2616c01bdee341cbf2894df643387ca03357" @@ -5348,16 +5955,29 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.4.1: - version "2.8.8" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da" - integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q== +prettier@^3.2.5: + version "3.2.5" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368" + integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A== process@^0.11.10: version "0.11.10" resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182" integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A== +progress@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +promise-retry@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22" + integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g== + dependencies: + err-code "^2.0.2" + retry "^0.12.0" + prop-types@^15.5.10, prop-types@^15.6.2, prop-types@^15.7.2, prop-types@^15.8.1: version "15.8.1" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" @@ -5377,10 +5997,13 @@ proxy-from-env@^1.1.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== -prr@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" - integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== +pump@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" + integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww== + dependencies: + end-of-stream "^1.1.0" + once "^1.3.1" punycode@^2.1.0: version "2.3.1" @@ -5404,6 +6027,11 @@ queue-microtask@^1.2.2: resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== +quick-lru@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932" + integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA== + quickselect@^1.0.1: version "1.1.1" resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2" @@ -5917,6 +6545,18 @@ react@^18.2.0: dependencies: loose-envify "^1.1.0" +read-config-file@6.3.2: + version "6.3.2" + resolved "https://registry.yarnpkg.com/read-config-file/-/read-config-file-6.3.2.tgz#556891aa6ffabced916ed57457cb192e61880411" + integrity sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q== + dependencies: + config-file-ts "^0.2.4" + dotenv "^9.0.2" + dotenv-expand "^5.1.0" + js-yaml "^4.1.0" + json5 "^2.2.0" + lazy-val "^1.0.4" + redux-logger@^3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf" @@ -5974,11 +6614,21 @@ regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: es-errors "^1.3.0" set-function-name "^2.0.1" +require-directory@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== + resize-observer-polyfill@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464" integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg== +resolve-alpn@^1.0.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9" + integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g== + resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -6014,18 +6664,42 @@ resolve@^2.0.0-next.4: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +responselike@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc" + integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw== + dependencies: + lowercase-keys "^2.0.0" + +retry@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== + reusify@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.2: +rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: glob "^7.1.3" +roarr@^2.15.3: + version "2.15.4" + resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" + integrity sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A== + dependencies: + boolean "^3.0.1" + detect-node "^2.0.4" + globalthis "^1.0.1" + json-stringify-safe "^5.0.1" + semver-compare "^1.0.0" + sprintf-js "^1.1.2" + robust-predicates@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-2.0.4.tgz#0a2367a93abd99676d075981707f29cfb402248b" @@ -6070,6 +6744,13 @@ rw@1, rw@^1.3.3: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== +rxjs@^7.8.1: + version "7.8.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== + dependencies: + tslib "^2.1.0" + safe-array-concat@^1.0.1, safe-array-concat@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" @@ -6094,6 +6775,13 @@ safe-regex-test@^1.0.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sanitize-filename@^1.6.3: + version "1.6.3" + resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.3.tgz#755ebd752045931977e30b2025d340d7c9090378" + integrity sha512-y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg== + dependencies: + truncate-utf8-bytes "^1.0.0" + sax@^1.2.4: version "1.3.0" resolved "https://registry.yarnpkg.com/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0" @@ -6118,16 +6806,30 @@ seamless-immutable@^7.1.3: resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8" integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A== -semver@^5.6.0: - version "5.7.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" - integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== +semver-compare@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" + integrity sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow== -semver@^6.3.1: +semver@^6.2.0, semver@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== +semver@^7.3.2, semver@^7.3.8, semver@^7.5.3: + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== + dependencies: + lru-cache "^6.0.0" + +serialize-error@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18" + integrity sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw== + dependencies: + type-fest "^0.13.1" + set-function-length@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.1.tgz#47cc5945f2c771e2cf261c6737cf9684a2a5e425" @@ -6176,6 +6878,11 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +shell-quote@^1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== + side-channel@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" @@ -6186,11 +6893,37 @@ side-channel@^1.0.4: get-intrinsic "^1.2.4" object-inspect "^1.13.1" +signal-exit@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" + integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== + +simple-update-notifier@2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz#d70b92bdab7d6d90dfd73931195a30b6e3d7cebb" + integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w== + dependencies: + semver "^7.5.3" + skmeans@0.9.7: version "0.9.7" resolved "https://registry.yarnpkg.com/skmeans/-/skmeans-0.9.7.tgz#72670cebb728508f56e29c0e10d11e623529ce5d" integrity sha512-hNj1/oZ7ygsfmPZ7ZfN5MUBRoGg1gtpnImuJBgLO0ljQ67DtJuiQaiYdS4lUA6s0KCwnPhGivtC/WRwIZLkHyg== +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +smart-buffer@^4.0.2: + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== + socket.io-client@^4.5.3: version "4.7.4" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.7.4.tgz#5f0e060ff34ac0a4b4c5abaaa88e0d1d928c64c8" @@ -6236,11 +6969,24 @@ source-map-js@^1.0.2: resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map@~0.6.0: +source-map-support@^0.5.19: + version "0.5.21" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f" + integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w== + dependencies: + buffer-from "^1.0.0" + source-map "^0.6.0" + +source-map@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== +spawn-command@0.0.2: + version "0.0.2" + resolved "https://registry.yarnpkg.com/spawn-command/-/spawn-command-0.0.2.tgz#9544e1a43ca045f8531aac1a48cb29bdae62338e" + integrity sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ== + splaytree@^3.1.0: version "3.1.2" resolved "https://registry.yarnpkg.com/splaytree/-/splaytree-3.1.2.tgz#d1db2691665a3c69d630de98d55145a6546dc166" @@ -6253,16 +6999,44 @@ split-string@^3.0.1: dependencies: extend-shallow "^3.0.0" +sprintf-js@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a" + integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA== + sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + string-convert@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/string-convert/-/string-convert-0.2.1.tgz#6982cc3049fbb4cd85f8b24568b9d9bf39eeff97" integrity sha512-u/1tdPl4yQnPBjnVrmdLo9gtuLvELKsAoRapekWggdiQNvvvum+jYF329d84NAa660KQw7pB2n36KrIKVoXa3A== +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^5.0.1, string-width@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" + integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== + dependencies: + eastasianwidth "^0.2.0" + emoji-regex "^9.2.2" + strip-ansi "^7.0.1" + string.prototype.matchall@^4.0.8: version "4.0.10" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" @@ -6305,13 +7079,20 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" -strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== dependencies: ansi-regex "^5.0.1" +strip-ansi@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.1.0.tgz#d5b6568ca689d8561370b0707685d22434faff45" + integrity sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ== + dependencies: + ansi-regex "^6.0.1" + strip-bom@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" @@ -6346,6 +7127,13 @@ stylis@^4.0.13: resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.3.1.tgz#ed8a9ebf9f76fe1e12d462f5cc3c4c980b23a7eb" integrity sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ== +sumchecker@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/sumchecker/-/sumchecker-3.0.1.tgz#6377e996795abb0b6d348e9b3e1dfb24345a8e42" + integrity sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg== + dependencies: + debug "^4.1.0" + supercluster@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-8.0.1.tgz#9946ba123538e9e9ab15de472531f604e7372df5" @@ -6353,13 +7141,6 @@ supercluster@^8.0.1: dependencies: kdbush "^4.0.2" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - supports-color@^7.1.0: version "7.2.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" @@ -6367,6 +7148,13 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" +supports-color@^8.1.1: + version "8.1.1" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c" + integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== + dependencies: + has-flag "^4.0.0" + supports-preserve-symlinks-flag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" @@ -6385,6 +7173,26 @@ tabulator-tables@^4.4.1: resolved "https://registry.yarnpkg.com/tabulator-tables/-/tabulator-tables-4.9.3.tgz#89ea8f9bffc11ba9a789369b5165ac82da26f4f0" integrity sha512-iwwQqAEGGxlgrBpcmJJvMJrfjGLcCXOB3AOb/DGkXqBy1YKoYA36hIl7qXGp6Jo8dSkzFAlDT6pKLZgyhs9OnQ== +tar@^6.1.12: + version "6.2.0" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.0.tgz#b14ce49a79cb1cd23bc9b016302dea5474493f73" + integrity sha512-/Wo7DcT0u5HUV486xg675HtjNd3BXZ6xDbzsCUZPt5iw8bTQ63bP0Raut3mvro9u+CUyq7YQd8Cx55fsZXxqLQ== + dependencies: + chownr "^2.0.0" + fs-minipass "^2.0.0" + minipass "^5.0.0" + minizlib "^2.1.1" + mkdirp "^1.0.3" + yallist "^4.0.0" + +temp-file@^3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/temp-file/-/temp-file-3.4.0.tgz#766ea28911c683996c248ef1a20eea04d51652c7" + integrity sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg== + dependencies: + async-exit-hook "^2.0.1" + fs-extra "^10.0.0" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -6423,10 +7231,19 @@ tinyqueue@^2.0.3: resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08" integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA== -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog== +tmp-promise@^3.0.2: + version "3.0.3" + resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7" + integrity sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ== + dependencies: + tmp "^0.2.0" + +tmp@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== + dependencies: + rimraf "^3.0.0" toggle-selection@^1.0.6: version "1.0.6" @@ -6447,6 +7264,18 @@ topojson-server@3.x: dependencies: commander "2" +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== + +truncate-utf8-bytes@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz#405923909592d56f78a5818434b0b78489ca5f2b" + integrity sha512-95Pu1QXQvruGEhv62XCMO3Mm90GscOCClvrIUwCM0PYOXK3kaF3l3sIHxx71ThJfcbM2O5Au6SO3AWCSEfW4mQ== + dependencies: + utf8-byte-length "^1.0.1" + tsconfig-paths@^3.15.0: version "3.15.0" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz#5299ec605e55b1abb23ec939ef15edaf483070d4" @@ -6457,7 +7286,7 @@ tsconfig-paths@^3.15.0: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^2.0.3, tslib@^2.3.0, tslib@^2.6.2: +tslib@^2.1.0, tslib@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== @@ -6474,6 +7303,11 @@ type-check@^0.4.0, type-check@~0.4.0: dependencies: prelude-ls "^1.2.1" +type-fest@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz#0172cb5bce80b0bd542ea348db50c7e21834d934" + integrity sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg== + type-fest@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -6518,6 +7352,11 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" +typescript@^5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" + integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + typewise-core@^1.2, typewise-core@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/typewise-core/-/typewise-core-1.2.0.tgz#97eb91805c7f55d2f941748fa50d315d991ef195" @@ -6540,6 +7379,11 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" +undici-types@~5.26.4: + version "5.26.5" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617" + integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA== + union-value@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" @@ -6555,13 +7399,10 @@ universalify@^0.1.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== -update-browserslist-db@^1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4" - integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg== - dependencies: - escalade "^3.1.1" - picocolors "^1.0.0" +universalify@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== uri-js@^4.2.2: version "4.4.1" @@ -6575,6 +7416,11 @@ use-sync-external-store@^1.0.0: resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a" integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA== +utf8-byte-length@^1.0.1: + version "1.0.4" + resolved "https://registry.yarnpkg.com/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz#f45f150c4c66eee968186505ab93fcbb8ad6bf61" + integrity sha512-4+wkEYLBbWxqTahEsWrhxepcoVOJ+1z5PGIjPZxRkytcdSUaNjIjBM7Xn8E+pdSuV7SzvWovBFA54FO0JSoqhA== + uuid@7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" @@ -6585,6 +7431,15 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== +verror@^1.10.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.1.tgz#4bf09eeccf4563b109ed4b3d458380c972b0cdeb" + integrity sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg== + dependencies: + assert-plus "^1.0.0" + core-util-is "1.0.2" + extsprintf "^1.2.0" + viewport-mercator-project@>=6.0.0: version "7.0.4" resolved "https://registry.yarnpkg.com/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz#67feec04135484bf424dd4890d630e82116b31e6" @@ -6592,23 +7447,10 @@ viewport-mercator-project@>=6.0.0: dependencies: "@math.gl/web-mercator" "^3.5.5" -vite-plugin-imp@^2.3.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/vite-plugin-imp/-/vite-plugin-imp-2.4.0.tgz#de09a0947d787ea1927d67288047698c3f8127cc" - integrity sha512-L/6/nvOw+MyNh4UxAlCZHsmKd5MitmHamqqAWB15sbUgVIEz/OQ8jpKr6kkQU0eA/AIe8fkCVbQBlP81ajrqWg== - dependencies: - "@babel/core" "^7.12.10" - "@babel/generator" "^7.12.11" - "@babel/parser" "^7.12.11" - "@babel/traverse" "^7.12.12" - chalk "^4.1.0" - param-case "^3.0.4" - pascal-case "^3.1.2" - -vite@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.1.tgz#294e39b199d669981efc7e0261b14f78ec80819e" - integrity sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg== +vite@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.3.tgz#dd072653a80225702265550a4700561740dfde55" + integrity sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew== dependencies: esbuild "^0.19.3" postcss "^8.4.35" @@ -6625,6 +7467,17 @@ vt-pbf@^3.1.3: "@mapbox/vector-tile" "^1.3.1" pbf "^3.2.1" +wait-on@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/wait-on/-/wait-on-7.2.0.tgz#d76b20ed3fc1e2bebc051fae5c1ff93be7892928" + integrity sha512-wCQcHkRazgjG5XoAq9jbTMLpNIjoSlZslrJ2+N9MxDsGEv1HnFoVjOCexL0ESva7Y9cu350j+DWADdk54s4AFQ== + dependencies: + axios "^1.6.1" + joi "^17.11.0" + lodash "^4.17.21" + minimist "^1.2.8" + rxjs "^7.8.1" + warning@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" @@ -6696,6 +7549,24 @@ which@^2.0.1: dependencies: isexe "^2.0.0" +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^8.1.0: + version "8.1.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" + integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ== + dependencies: + ansi-styles "^6.1.0" + string-width "^5.0.1" + strip-ansi "^7.0.1" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -6706,15 +7577,51 @@ ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== +xmlbuilder@>=11.0.1, xmlbuilder@^15.1.1: + version "15.1.1" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-15.1.1.tgz#9dcdce49eea66d8d10b42cae94a79c3c8d0c2ec5" + integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== + xmlhttprequest-ssl@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67" integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A== -yallist@^3.0.2: - version "3.1.1" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" - integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== +y18n@^5.0.5: + version "5.0.8" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" + integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + +yargs@^17.6.2, yargs@^17.7.2: + version "17.7.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + +yauzl@^2.10.0: + version "2.10.0" + resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" + integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== + dependencies: + buffer-crc32 "~0.2.3" + fd-slicer "~1.1.0" yocto-queue@^0.1.0: version "0.1.0" From 16806a588081d46633f718b26fc07b851f6eaed4 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:32:17 +0100 Subject: [PATCH 072/126] Remove empty anchor tags --- src/components/Dashboard/Modals.jsx | 79 +++++++++++++---------------- 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/src/components/Dashboard/Modals.jsx b/src/components/Dashboard/Modals.jsx index 1082548..3a32758 100644 --- a/src/components/Dashboard/Modals.jsx +++ b/src/components/Dashboard/Modals.jsx @@ -110,7 +110,7 @@ const DashForm = Form.create()(({ form }) => { Grid 4
 - + , )} @@ -184,27 +184,29 @@ export const ModalDuplicateDashboard = ({ ); }; -const DashDuplicateForm = Form.create()( - ({ form, dashIndex, dashboardNames }) => { - const { getFieldDecorator } = form; - - return ( -
- - {getFieldDecorator('name', { - initialValue: `${dashboardNames[dashIndex]}(Copy)`, - rules: [{ required: true }], - })()} - - - ); - } -); +const DashDuplicateForm = Form.create()(({ + form, + dashIndex, + dashboardNames, +}) => { + const { getFieldDecorator } = form; + + return ( +
+ + {getFieldDecorator('name', { + initialValue: `${dashboardNames[dashIndex]}(Copy)`, + rules: [{ required: true }], + })()} + + + ); +}); export const ModalSetScenario = ({ fetchDashboards, dashIndex }) => { const [scenarios, setScenarios] = useState(null); @@ -220,7 +222,7 @@ export const ModalSetScenario = ({ fetchDashboards, dashIndex }) => { axios .patch( `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}`, - values + values, ) .then((response) => { if (response) { @@ -356,7 +358,7 @@ const ModalAddPlotTemplate = ({ `${import.meta.env.VITE_CEA_URL}/api/dashboards/plot-categories/${ category.category }/plots/${category.plot_id}/parameters`, - scenario ? { params: { scenario } } : {} + scenario ? { params: { scenario } } : {}, ); console.log(params.data); setParameters(params.data); @@ -375,7 +377,7 @@ const ModalAddPlotTemplate = ({ `${ import.meta.env.VITE_CEA_URL }/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, - { ...category, parameters: values } + { ...category, parameters: values }, ) .then((response) => { if (response) { @@ -555,7 +557,7 @@ export const ModalEditParameters = ({ `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ activePlotRef.current }/parameters`, - scenario ? { params: { scenario } } : {} + scenario ? { params: { scenario } } : {}, ); console.log(params.data); setParameters(params.data); @@ -574,7 +576,7 @@ export const ModalEditParameters = ({ `${ import.meta.env.VITE_CEA_URL }/api/dashboards/${dashIndex}/plots/${activePlotRef.current}`, - { parameters: values } + { parameters: values }, ) .then((response) => { if (response) { @@ -662,7 +664,7 @@ export const ModalDeletePlot = ({ .delete( `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ activePlotRef.current - }` + }`, ) .then((response) => { if (response) { @@ -710,28 +712,15 @@ const groupFilesOnParent = async (fileList) => { }; const FileList = ({ folderPath, filePaths }) => { - // TODO: Find way to open file when anchor tags are clicked - const fileList = filePaths.map((file) => ( -
  • - {file} -
    • - )); + const fileList = filePaths.map((file) =>
  • {file}
    • ); return (
    {folderPath} - Open Folder - {filePaths.length > 3 ? ( -
    - Show files -
    -
      {fileList}
    -
    -
    - ) : ( +
      {fileList}
    - )} +
    ); }; @@ -782,7 +771,7 @@ export const ModalPlotFiles = ({ dashIndex, activePlotRef }) => { const { data } = await axios.get( `${import.meta.env.VITE_CEA_URL}/api/dashboards/${dashIndex}/plots/${ activePlotRef.current - }/input-files` + }/input-files`, ); setFileLocations({ inputs: await groupFilesOnParent(data.inputs), From 86874311d28cd3b48b6e5130938a351a2421a7c9 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:32:31 +0100 Subject: [PATCH 073/126] Fix glossary bar style --- src/components/HomePage/SearchBar/SearchBar.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/HomePage/SearchBar/SearchBar.css b/src/components/HomePage/SearchBar/SearchBar.css index 808ca31..658585e 100644 --- a/src/components/HomePage/SearchBar/SearchBar.css +++ b/src/components/HomePage/SearchBar/SearchBar.css @@ -5,6 +5,11 @@ background-color: white; box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); overflow: auto; + position: absolute; + top: 60px; + right: 25px; + max-width: 400px; + min-width: 280px; } .cea-search-category-title { From d94d82b85e4c07ff70363c253e2dbf81713365f8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 17 Feb 2024 00:18:15 +0100 Subject: [PATCH 074/126] Add open dialog function for electron --- electron/main.js | 15 ++++- electron/preload.js | 14 +++-- package.json | 5 +- .../DatabaseEditor/ExportDatabaseModal.jsx | 8 +-- src/components/Project/NewProjectModal.jsx | 10 ++-- src/components/Project/OpenProjectModal.jsx | 6 +- src/components/Tools/Parameter.jsx | 57 +++++++++---------- src/utils/electron.js | 16 ++++++ src/utils/index.jsx | 5 -- 9 files changed, 81 insertions(+), 55 deletions(-) create mode 100644 src/utils/electron.js diff --git a/electron/main.js b/electron/main.js index c5a1c09..e8458cc 100644 --- a/electron/main.js +++ b/electron/main.js @@ -1,7 +1,13 @@ -const { app, BrowserWindow, screen: electronScreen } = require('electron'); +const { + app, + BrowserWindow, + screen: electronScreen, + ipcMain, + dialog, +} = require('electron'); const path = require('path'); -const isDev = process.env.NODE_ENV === 'development'; +const isDev = !app.isPackaged; const createMainWindow = () => { let mainWindow = new BrowserWindow({ @@ -35,6 +41,11 @@ const createMainWindow = () => { event.preventDefault(); mainWindow.loadURL(url); }); + + ipcMain.handle('open-dialog', async (_, arg) => { + const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); + return filePaths; + }); }; app.whenReady().then(() => { diff --git a/electron/preload.js b/electron/preload.js index e0dbdce..0e89055 100644 --- a/electron/preload.js +++ b/electron/preload.js @@ -1,7 +1,11 @@ -const { contextBridge } = require('electron'); +const { contextBridge, ipcRenderer } = require('electron'); -contextBridge.exposeInMainWorld('versions', { - node: () => process.versions.node, - chrome: () => process.versions.chrome, - electron: () => process.versions.electron, +contextBridge.exposeInMainWorld('api', { + send: async (channel, data) => { + try { + return await ipcRenderer.invoke(channel, data); + } catch (e) { + console.log(e); + } + }, }); diff --git a/package.json b/package.json index 83bdac3..a3f82e2 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,12 @@ "scripts": { "dev": "vite", "build": "vite build", + "dev-electron": "vite --mode electron", "build-electron": "vite build --mode electron", "preview": "vite preview", "lint:fix": "eslint ./src --ext .jsx,.js,.ts,.tsx --quiet --fix --ignore-path ./.gitignore", - "lint:format": "prettier --loglevel warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ", - "electron:start": "concurrently \"yarn dev\" \"wait-on http://localhost:5173 && electron .\"", + "lint:format": "prettier --loglevel warn --write \"./**/*.{js,jsx,ts,tsx,css,md,json}\" ", + "electron:dev": "concurrently \"yarn dev-electron\" \"wait-on http://localhost:5173 && electron .\"", "electron:build": "yarn build-electron && electron-builder build --publish never" }, "keywords": [], diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index 3883670..b26e4ba 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -2,7 +2,7 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; import { Modal, message, Alert, Input } from 'antd'; import axios from 'axios'; -import { FormItemWrapper } from '../Tools/Parameter'; +import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useSelector } from 'react-redux'; import { checkExist, joinPath } from '../../utils/file'; @@ -19,7 +19,7 @@ const ExportDatabaseModal = ({ visible, setVisible }) => { try { axios.put( `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/copy`, - values + values, ); setConfirmLoading(false); setVisible(false); @@ -88,7 +88,7 @@ const ExportForm = Form.create()(({ form }) => { const pathExists = await checkExist( '', 'directory', - contentPath + contentPath, ); if (pathExists) callback('Folder with name already exists in path'); @@ -105,7 +105,7 @@ const ExportForm = Form.create()(({ form }) => { initialValue="" help="Path to export Database" required={true} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index 06138ed..2d910fa 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -1,8 +1,8 @@ import { useState, useRef, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal, Input } from 'antd'; +import { Modal } from 'antd'; import axios from 'axios'; -import { FormItemWrapper } from '../Tools/Parameter'; +import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; import { checkExist, dirname, joinPath } from '../../utils/file'; @@ -27,7 +27,7 @@ const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { try { const resp = await axios.post( `${import.meta.env.VITE_CEA_URL}/api/project/`, - values + values, ); const { project } = resp.data; fetchProject(project).then(() => { @@ -80,7 +80,7 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { validator: async (rule, value, callback) => { const contentPath = joinPath( form.getFieldValue('project_root'), - value + value, ); const pathExists = await checkExist('', 'directory', contentPath); if (value.length != 0 && pathExists) { @@ -108,7 +108,7 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index 41eadc2..6fb83dd 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -1,7 +1,7 @@ import { useRef, useState, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal, Input } from 'antd'; -import { FormItemWrapper } from '../Tools/Parameter'; +import { Modal } from 'antd'; +import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; import { checkExist } from '../../utils/file'; @@ -73,7 +73,7 @@ const OpenProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index b768e04..e6157d0 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -1,7 +1,10 @@ import { Form } from '@ant-design/compatible'; -import { PlusOutlined } from '@ant-design/icons'; -import { Input, Switch, Select, Divider, Button } from 'antd'; +import { FileSearchOutlined, PlusOutlined } from '@ant-design/icons'; +import { Input, Switch, Select, Divider, Button, Space } from 'antd'; import { checkExist } from '../../utils/file'; +import { forwardRef } from 'react'; + +import { isElectron, openDialog } from '../../utils/electron'; const Parameter = ({ parameter, form }) => { const { name, type, value, choices, help } = parameter; @@ -59,7 +62,7 @@ const Parameter = ({ parameter, form }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); } @@ -130,7 +133,7 @@ const Parameter = ({ parameter, form }) => { { validator: (rule, value, callback) => { const invalidChoices = value.filter( - (choice) => !choices.includes(choice) + (choice) => !choices.includes(choice), ); if (invalidChoices.length) { callback( @@ -138,7 +141,7 @@ const Parameter = ({ parameter, form }) => { invalidChoices.length > 1 ? 'are not valid choices' : 'is not a valid choice' - }` + }`, ); } else { callback(); @@ -302,29 +305,25 @@ export const FormItemWrapper = ({ ); }; -// export const OpenDialogInput = forwardRef((props, ref) => { -// const { form, type, id, ...rest } = props; -// const [open, setOpen] = useState(false); -// const onSuccess = (contentPath) => { -// form.setFieldsValue({ [id]: contentPath }); -// }; -// return ( -// <> -// -// -// -// -// -// -// ); -// }); -// OpenDialogInput.displayName = 'OpenDialogInput'; +export const OpenDialogInput = forwardRef((props, ref) => { + const { form, type, id, ...rest } = props; + + if (!isElectron()) return ; + + return ( + + + + + ); +}); +OpenDialogInput.displayName = 'OpenDialogInput'; export default Parameter; diff --git a/src/utils/electron.js b/src/utils/electron.js new file mode 100644 index 0000000..100d5f5 --- /dev/null +++ b/src/utils/electron.js @@ -0,0 +1,16 @@ +export const isElectron = () => { + const userAgent = navigator.userAgent.toLowerCase(); + return userAgent.indexOf(' electron/') !== -1; +}; + +export const openDialog = async (form, type, name) => { + const options = + type === 'PathParameter' + ? { properties: ['openDirectory'] } + : { properties: ['openFile'] }; + + const paths = await window.api.send('open-dialog', options); + if (paths && paths.length) { + form.setFieldsValue({ [name]: paths[0] }); + } +}; diff --git a/src/utils/index.jsx b/src/utils/index.jsx index dd0cf78..678a5b9 100644 --- a/src/utils/index.jsx +++ b/src/utils/index.jsx @@ -70,8 +70,3 @@ export const AsyncError = ({ title = 'Something went wrong', error }) => { ); }; - -export const isElectron = () => { - const userAgent = navigator.userAgent.toLowerCase(); - return userAgent.indexOf(' electron/') !== -1; -}; From 9c69f6831e52f9a4a6e5900a8ed6800f5b9bc727 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 17 Feb 2024 00:42:55 +0100 Subject: [PATCH 075/126] Fix open external for electron --- electron/main.js | 5 ++ src/components/HomePage/SideNav.jsx | 74 ++++++++--------------------- src/utils/electron.js | 18 +++++-- 3 files changed, 41 insertions(+), 56 deletions(-) diff --git a/electron/main.js b/electron/main.js index e8458cc..1e18d92 100644 --- a/electron/main.js +++ b/electron/main.js @@ -4,6 +4,7 @@ const { screen: electronScreen, ipcMain, dialog, + shell, } = require('electron'); const path = require('path'); @@ -46,6 +47,10 @@ const createMainWindow = () => { const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); return filePaths; }); + + ipcMain.handle('open-external', async (_, { url }) => { + shell.openExternal(url); + }); }; app.whenReady().then(() => { diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index dc6c75b..c882d52 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -19,6 +19,7 @@ import routes from '../../constants/routes'; import ceaLogo from '../../assets/cea-logo.png'; import { LayoutContext } from '../../containers/HomePage'; import { fetchToolList } from '../../actions/tools'; +import { isElectron, openExternal } from '../../utils/electron'; const { Sider } = Layout; @@ -35,7 +36,7 @@ const useFetchTools = () => { const SideNav = () => { const { pathname: selectedKey } = useSelector( - (state) => state.router.location + (state) => state.router.location, ); const scenarioName = useSelector((state) => state.project.info.scenario_name); @@ -101,6 +102,11 @@ const SideNav = () => { mode="vertical" selectedKeys={[]} items={helpMenuItems()} + onClick={({ key }) => { + const url = helpMenuUrls[key]; + if (isElectron()) openExternal(url); + else window.open(url, '_blank', 'noreferrer'); + }} />
    @@ -195,6 +201,16 @@ const toolMenuItems = (status, tools) => { }; }; +const helpMenuUrls = { + 'blog-tutorials': 'https://www.cityenergyanalyst.com/blog', + documentation: 'http://city-energy-analyst.readthedocs.io/en/latest/', + 'report-issue': + 'https://github.com/architecture-building-systems/cityenergyanalyst/issues/new', + + 'known-issue': + 'https://github.com/architecture-building-systems/CityEnergyAnalyst/issues?utf8=%E2%9C%93&q=is%3Aopen%26closed+label%3A%22known+issue%22+', +}; + const helpMenuItems = () => { return [ { @@ -203,70 +219,22 @@ const helpMenuItems = () => { icon: , children: [ { - label: ( - - window.open( - 'https://www.cityenergyanalyst.com/blog', - '_blank', - 'noreferrer' - ) - } - > - Blog Tutorials - - ), + label: 'Blog Tutorials', key: 'blog-tutorials', icon: , }, { - label: ( - - window.open( - 'http://city-energy-analyst.readthedocs.io/en/latest/', - '_blank', - 'noreferrer' - ) - } - > - Documentation - - ), + label: 'Documentation', key: 'documentation', icon: , }, { - label: ( - - window.open( - 'https://github.com/architecture-building-systems/cityenergyanalyst/issues/new', - '_blank', - 'noreferrer' - ) - } - > - Report an Issue - - ), + label: 'Report an Issue', key: 'report-issue', icon: , }, { - label: ( - - window.open( - 'https://github.com/architecture-building-systems/CityEnergyAnalyst/issues?utf8=%E2%9C%93&q=is%3Aopen%26closed+label%3A%22known+issue%22+', - '_blank', - 'noreferrer' - ) - } - > - Known Issues - - ), + label: 'Known Issues', key: 'known-issue', icon: , }, diff --git a/src/utils/electron.js b/src/utils/electron.js index 100d5f5..8232365 100644 --- a/src/utils/electron.js +++ b/src/utils/electron.js @@ -9,8 +9,20 @@ export const openDialog = async (form, type, name) => { ? { properties: ['openDirectory'] } : { properties: ['openFile'] }; - const paths = await window.api.send('open-dialog', options); - if (paths && paths.length) { - form.setFieldsValue({ [name]: paths[0] }); + try { + const paths = await window.api.send('open-dialog', options); + if (paths && paths.length) { + form.setFieldsValue({ [name]: paths[0] }); + } + } catch (e) { + console.error(e); + } +}; + +export const openExternal = async (url) => { + try { + await window.api.send('open-external', { url }); + } catch (e) { + console.error(e); } }; From ecd520bbccae8896b035e240ddddd898cfb51eee Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 17 Feb 2024 01:47:12 +0100 Subject: [PATCH 076/126] Check if path is nullable or if file exists --- src/components/Tools/Parameter.jsx | 19 +++++++++++++++---- src/utils/file.js | 18 +++++++++++++++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index e6157d0..e207563 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -1,13 +1,13 @@ import { Form } from '@ant-design/compatible'; import { FileSearchOutlined, PlusOutlined } from '@ant-design/icons'; import { Input, Switch, Select, Divider, Button, Space } from 'antd'; -import { checkExist } from '../../utils/file'; +import { basename, checkExist, dirname } from '../../utils/file'; import { forwardRef } from 'react'; import { isElectron, openDialog } from '../../utils/electron'; const Parameter = ({ parameter, form }) => { - const { name, type, value, choices, help } = parameter; + const { name, type, value, choices, nullable, help } = parameter; const { setFieldsValue } = form; switch (type) { @@ -51,11 +51,22 @@ const Parameter = ({ parameter, form }) => { rules={[ { validator: async (rule, value, callback) => { + console.log({ parameter }); + if (value == '' && nullable) return callback(); + const contentType = type == 'PathParameter' ? 'directory' : 'file'; - const pathExists = await checkExist('', contentType, value); + + const pathExists = + contentType == 'directory' + ? await checkExist('', contentType, value) + : await checkExist( + basename(value), + contentType, + dirname(value), + ); if (!pathExists) { - callback('Path does not exist'); + callback('Path entered is invalid'); } else { callback(); } diff --git a/src/utils/file.js b/src/utils/file.js index fa83c27..cb05ce8 100644 --- a/src/utils/file.js +++ b/src/utils/file.js @@ -8,10 +8,17 @@ class FileNotFoundError extends Error { } } +class InvalidContentType extends Error { + constructor(message, options) { + // Need to pass `options` as the second parameter to install the "cause" property. + super(message, options); + } +} + export const getContentInfo = async ( content_path = '', content_type = 'directory', - root_path = null + root_path = null, ) => { try { const url = `${import.meta.env.VITE_CEA_URL}/api/contents/${content_path}`; @@ -21,6 +28,7 @@ export const getContentInfo = async ( return data; } catch (error) { if (error.response.status == 404) throw new FileNotFoundError(); + if (error.response.status == 400) throw new InvalidContentType(); else throw error; } }; @@ -28,13 +36,17 @@ export const getContentInfo = async ( export const checkExist = async ( content_path, content_type, - root_path = null + root_path = null, ) => { try { await getContentInfo(content_path, content_type, root_path); return true; } catch (error) { - if (error instanceof FileNotFoundError) return false; + if ( + error instanceof FileNotFoundError || + error instanceof InvalidContentType + ) + return false; else throw error; } }; From 5af6f4462aaa96a9ea4e3ffd311fa5ec0c2e578d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 17 Feb 2024 19:15:17 +0100 Subject: [PATCH 077/126] Add app icon --- package.json | 8 +++++++- public/cea.icns | Bin 0 -> 66054 bytes 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 public/cea.icns diff --git a/package.json b/package.json index a3f82e2..4561663 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,12 @@ "files": [ "dist/**/*", "electron/**" - ] + ], + "mac": { + "icon": "public/cea.icns", + "target": [ + "dmg" + ] + } } } \ No newline at end of file diff --git a/public/cea.icns b/public/cea.icns new file mode 100644 index 0000000000000000000000000000000000000000..9823bb4e94c7b8c6fe2d23f7b4146d09414dfb1b GIT binary patch literal 66054 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 literal 0 HcmV?d00001 From 8fd76bb931b071f279e330052ba06a993140758a Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sun, 18 Feb 2024 21:09:27 +0100 Subject: [PATCH 078/126] Fix ipchandler beng created twice --- electron/main.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/electron/main.js b/electron/main.js index 1e18d92..e65018d 100644 --- a/electron/main.js +++ b/electron/main.js @@ -43,6 +43,12 @@ const createMainWindow = () => { mainWindow.loadURL(url); }); + return mainWindow; +}; + +app.whenReady().then(() => { + const mainWindow = createMainWindow(); + ipcMain.handle('open-dialog', async (_, arg) => { const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); return filePaths; @@ -51,10 +57,6 @@ const createMainWindow = () => { ipcMain.handle('open-external', async (_, { url }) => { shell.openExternal(url); }); -}; - -app.whenReady().then(() => { - createMainWindow(); app.on('activate', () => { if (!BrowserWindow.getAllWindows().length) { From b83823f60f69a0b056da0d9f808b75c50ab1efb1 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 13:48:33 +0100 Subject: [PATCH 079/126] Add cea process functions --- electron/ceaProcess.mjs | 137 ++++++++++++++++++++++++++++++++++++++++ electron/main.js | 72 --------------------- electron/main.mjs | 107 +++++++++++++++++++++++++++++++ package.json | 16 ++++- 4 files changed, 258 insertions(+), 74 deletions(-) create mode 100644 electron/ceaProcess.mjs delete mode 100644 electron/main.js create mode 100644 electron/main.mjs diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs new file mode 100644 index 0000000..2a83fde --- /dev/null +++ b/electron/ceaProcess.mjs @@ -0,0 +1,137 @@ +import axios from 'axios'; +import { app, dialog } from 'electron'; +import fs from 'fs'; +import path, { dirname } from 'path'; +import { fileURLToPath } from 'url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +let cea; +let timeout; +let interval; +let startupError = ''; + +export function createCEAProcess(url, callback) { + console.log(`createCEAProcess(${url})`); + let cea; + + switch (process.platform) { + case 'win32': { + let scriptPath = path.join( + path.dirname(process.execPath), + '/../', + 'dashboard.bat', + ); + + // Fallback to default install path + if (!fs.existsSync(scriptPath)) + scriptPath = path.join( + process.env.USERPROFILE, + 'Documents', + 'CityEnergyAnalyst', + 'dashboard.bat', + ); + console.log(scriptPath); + cea = require('child_process').spawn('cmd.exe', ['/c', scriptPath]); + break; + } + case 'darwin': { + break; + } + default: + break; + } + + if (cea) { + // Attach cea output to console + cea.stdout.on('data', function (data) { + console.log(data.toString('utf8').trim()); + }); + + cea.stderr.on('data', function (data) { + console.error(data.toString('utf8').trim()); + }); + + // Show Error message box when CEA encounters any error on startup + cea.stderr.on('data', saveStartupError); + cea.on('exit', showStartupError); + } + + function saveStartupError(message) { + startupError += message.toString('utf8'); + } + + function showStartupError() { + dialog.showMessageBoxSync({ + type: 'error', + title: 'CEA Error', + message: 'CEA has encountered an error on startup', + detail: startupError, + buttons: ['Exit CEA'], + }); + app.exit(); + } + + // Remove Error message box listener after successful startup + checkCEAStarted(url, () => { + if (cea) { + cea.stderr.removeListener('data', saveStartupError); + cea.removeListener('exit', showStartupError); + } + callback(); + }); + + return cea; +} + +// Kill process and stop all timed events +export function killCEAProcess() { + if (cea) { + cea.removeAllListeners('exit'); + process.kill(cea.pid); + } + interval && clearInterval(interval); + timeout && clearTimeout(timeout); +} + +export async function isCEAAlive(url) { + console.debug(`isCEAAlive(${url})`); + try { + const resp = await axios.get(`${url}/server/alive`); + return resp.status == 200; + } catch (error) { + console.error(error.response || 'No Response'); + return false; + } +} + +function checkCEAStarted(url, callback) { + console.debug(`checkCEAStarted(${url})`); + const runCallbackOnce = (() => { + let executed = false; + return () => { + if (!executed) { + executed = true; + callback(); + } + }; + })(); + + // Check every 1 seconds + var bound_url = url; + console.debug(`checkCEAStarted(bound_url=${bound_url})`); + interval = setInterval(async () => { + const alive = await isCEAAlive(bound_url); + if (alive) { + clearInterval(interval); + timeout && clearTimeout(timeout); + runCallbackOnce(); + } + }, 1000); + + // Stop checking after 1 min + timeout = setTimeout(() => { + clearInterval(interval); + }, 60000); +} diff --git a/electron/main.js b/electron/main.js deleted file mode 100644 index e65018d..0000000 --- a/electron/main.js +++ /dev/null @@ -1,72 +0,0 @@ -const { - app, - BrowserWindow, - screen: electronScreen, - ipcMain, - dialog, - shell, -} = require('electron'); -const path = require('path'); - -const isDev = !app.isPackaged; - -const createMainWindow = () => { - let mainWindow = new BrowserWindow({ - width: electronScreen.getPrimaryDisplay().workArea.width, - height: electronScreen.getPrimaryDisplay().workArea.height, - show: false, - backgroundColor: 'white', - webPreferences: { - preload: path.join(__dirname, './preload.js'), - nodeIntegration: false, - contextIsolation: true, - enableRemoteModule: true, - devTools: isDev, - }, - }); - - if (isDev) { - mainWindow.loadURL('http://localhost:5173'); - mainWindow.openDevTools(); - } else { - mainWindow.loadFile(path.join(__dirname, '../dist/index.html')); - } - - mainWindow.once('ready-to-show', () => mainWindow.show()); - - mainWindow.on('closed', () => { - mainWindow = null; - }); - - mainWindow.webContents.on('new-window', (event, url) => { - event.preventDefault(); - mainWindow.loadURL(url); - }); - - return mainWindow; -}; - -app.whenReady().then(() => { - const mainWindow = createMainWindow(); - - ipcMain.handle('open-dialog', async (_, arg) => { - const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); - return filePaths; - }); - - ipcMain.handle('open-external', async (_, { url }) => { - shell.openExternal(url); - }); - - app.on('activate', () => { - if (!BrowserWindow.getAllWindows().length) { - createMainWindow(); - } - }); -}); - -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit(); - } -}); diff --git a/electron/main.mjs b/electron/main.mjs new file mode 100644 index 0000000..f79de72 --- /dev/null +++ b/electron/main.mjs @@ -0,0 +1,107 @@ +import axios from 'axios'; +import { app, BrowserWindow, screen, ipcMain, dialog, shell } from 'electron'; +import path, { dirname } from 'path'; + +import { isCEAAlive, createCEAProcess } from './ceaProcess.mjs'; +import { fileURLToPath } from 'url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +const isDev = !app.isPackaged; +const CEA_HOST = '127.0.0.1'; +const CEA_PORT = '5050'; +const CEA_URL = `http://${CEA_HOST}:${CEA_PORT}`; + +// global reference to mainWindow (necessary to prevent window from being garbage collected) +let mainWindow; + +const createMainWindow = () => { + mainWindow = new BrowserWindow({ + width: screen.getPrimaryDisplay().workArea.width, + height: screen.getPrimaryDisplay().workArea.height, + show: false, + backgroundColor: 'white', + webPreferences: { + preload: path.join(__dirname, './preload.js'), + nodeIntegration: false, + contextIsolation: true, + enableRemoteModule: true, + devTools: isDev, + }, + }); + + if (isDev) { + mainWindow.loadURL('http://localhost:5173'); + mainWindow.openDevTools(); + } else { + mainWindow.loadFile(path.join(__dirname, '../dist/index.html')); + } + + mainWindow.once('ready-to-show', () => { + mainWindow.show(); + }); + + mainWindow.on('closed', () => { + mainWindow = null; + }); + + mainWindow.webContents.on('new-window', (event, url) => { + event.preventDefault(); + mainWindow.loadURL(url); + }); +}; + +app.whenReady().then(() => { + createMainWindow(); + + ipcMain.handle('open-dialog', async (_, arg) => { + const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); + return filePaths; + }); + + ipcMain.handle('open-external', async (_, { url }) => { + shell.openExternal(url); + }); + + app.on('activate', () => { + if (!BrowserWindow.getAllWindows().length) { + createMainWindow(); + } + }); +}); + +app.on('ready', () => { + const url = CEA_URL; + // Check if CEA server is already running, only start if not + isCEAAlive(url).then((alive) => { + if (alive) { + console.log('cea dashboard already running...'); + } else { + console.log('cea dashboard not running, starting...'); + createCEAProcess(url, () => { + console.log('cea dashboard process created...'); + }); + } + }); +}); + +app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { + app.quit(); + } +}); + +app.on('will-quit', (event) => { + event.preventDefault(); + const shutdown = async () => { + try { + const resp = await axios.post(`${CEA_URL}/server/shutdown`); + console.log(resp?.data); + } catch (error) { + console.error(error); + } + app.exit(); + }; + shutdown(); +}); diff --git a/package.json b/package.json index 4561663..fd50d34 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "socket.io-client": "^4.5.3", "tabulator-tables": "^4.4.1" }, - "main": "electron/main.js", + "main": "electron/main.mjs", "build": { "appId": "CityEnergyAnalyst", "productName": "CityEnergyAnalyst", @@ -87,7 +87,19 @@ "icon": "public/cea.icns", "target": [ "dmg" - ] + ], + "extraResources": [ + { + "from": "micromamba", + "to": "." + } + ], + "win": { + "icon": "public/cea.ico", + "target": [ + "dir" + ] + } } } } \ No newline at end of file From 8379a26fb96b3274dfbe6d4658c7bdf432a73ef6 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:15:24 +0100 Subject: [PATCH 080/126] Upgrade icons --- package.json | 4 ++-- yarn.lock | 25 +++---------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index fd50d34..5a8ef2d 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@ant-design/compatible": "^5.1.2", - "@ant-design/icons": "^4.8.0", + "@ant-design/icons": "^5.3.0", "@babel/polyfill": "^7.12.1", "@handsontable/react": "^3.1.2", "@turf/turf": "^6.5.0", @@ -102,4 +102,4 @@ } } } -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 18c190c..5d169f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,13 +12,6 @@ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf" integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== -"@ant-design/colors@^6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-6.0.0.tgz#9b9366257cffcc47db42b9d0203bb592c13c0298" - integrity sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ== - dependencies: - "@ctrl/tinycolor" "^3.4.0" - "@ant-design/colors@^7.0.0", "@ant-design/colors@^7.0.2": version "7.0.2" resolved "https://registry.yarnpkg.com/@ant-design/colors/-/colors-7.0.2.tgz#c5c753a467ce8d86ba7ca4736d2c01f599bb5492" @@ -57,23 +50,11 @@ rc-util "^5.35.0" stylis "^4.0.13" -"@ant-design/icons-svg@^4.3.0", "@ant-design/icons-svg@^4.4.0": +"@ant-design/icons-svg@^4.4.0": version "4.4.2" resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6" integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA== -"@ant-design/icons@^4.8.0": - version "4.8.1" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-4.8.1.tgz#44f6c81f609811d68d48a123eb5dcc477f8fbcb7" - integrity sha512-JRAuiqllnMsiZIO8OvBOeFconprC3cnMpJ9MvXrHh+H5co9rlg8/aSHQfLf5jKKe18lUgRaIwC2pz8YxH9VuCA== - dependencies: - "@ant-design/colors" "^6.0.0" - "@ant-design/icons-svg" "^4.3.0" - "@babel/runtime" "^7.11.2" - classnames "^2.2.6" - lodash "^4.17.15" - rc-util "^5.9.4" - "@ant-design/icons@^5.3.0": version "5.3.0" resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.3.0.tgz#b4b57908eb4f4c31777424f10d341f6823a77d2b" @@ -111,7 +92,7 @@ dependencies: regenerator-runtime "^0.14.0" -"@ctrl/tinycolor@^3.4.0", "@ctrl/tinycolor@^3.6.1": +"@ctrl/tinycolor@^3.6.1": version "3.6.1" resolved "https://registry.yarnpkg.com/@ctrl/tinycolor/-/tinycolor-3.6.1.tgz#b6c75a56a1947cc916ea058772d666a2c8932f31" integrity sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA== @@ -6432,7 +6413,7 @@ rc-util@^4.15.3: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc-util@^5.0.1, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.24.4, rc-util@^5.24.5, rc-util@^5.25.2, rc-util@^5.27.0, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.2, rc-util@^5.34.1, rc-util@^5.35.0, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.38.1, rc-util@^5.9.4: +rc-util@^5.0.1, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.24.4, rc-util@^5.24.5, rc-util@^5.25.2, rc-util@^5.27.0, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.2, rc-util@^5.34.1, rc-util@^5.35.0, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.38.1: version "5.38.1" resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.38.1.tgz#4915503b89855f5c5cd9afd4c72a7a17568777bb" integrity sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng== From 83f2015ee1123bbe55052b1812522ed853ddc63c Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 14:18:46 +0100 Subject: [PATCH 081/126] Fix electron build config --- package.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 5a8ef2d..43f7977 100644 --- a/package.json +++ b/package.json @@ -93,13 +93,13 @@ "from": "micromamba", "to": "." } - ], - "win": { - "icon": "public/cea.ico", - "target": [ - "dir" - ] - } + ] + }, + "win": { + "icon": "public/cea.ico", + "target": [ + "dir" + ] } } -} +} \ No newline at end of file From d8946ffbc29f020f7a3a326325060f67bdfe738d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 23:39:10 +0800 Subject: [PATCH 082/126] Rename inputEditor.css to InputEditor.css --- src/components/InputEditor/{inputEditor.css => InputEditor.css} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/components/InputEditor/{inputEditor.css => InputEditor.css} (100%) diff --git a/src/components/InputEditor/inputEditor.css b/src/components/InputEditor/InputEditor.css similarity index 100% rename from src/components/InputEditor/inputEditor.css rename to src/components/InputEditor/InputEditor.css From 1d07fbd1cf9e098ec8714f65de03848a23e9c04c Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 16:45:03 +0100 Subject: [PATCH 083/126] Convert require to import module --- electron/ceaProcess.mjs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index 2a83fde..269634e 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -4,6 +4,8 @@ import fs from 'fs'; import path, { dirname } from 'path'; import { fileURLToPath } from 'url'; +import { spawn } from 'child_process'; + const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -33,7 +35,7 @@ export function createCEAProcess(url, callback) { 'dashboard.bat', ); console.log(scriptPath); - cea = require('child_process').spawn('cmd.exe', ['/c', scriptPath]); + cea = spawn('cmd.exe', ['/c', scriptPath]); break; } case 'darwin': { From 8c49022ea592f5d94f64859acaa57520b6dbbc52 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 19 Feb 2024 22:52:23 +0100 Subject: [PATCH 084/126] Update react-spring --- package.json | 4 +-- src/components/Splash/Splash.jsx | 2 +- yarn.lock | 54 +------------------------------- 3 files changed, 4 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 43f7977..ae655df 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "@ant-design/icons": "^5.3.0", "@babel/polyfill": "^7.12.1", "@handsontable/react": "^3.1.2", + "@react-spring/web": "^9.7.3", "@turf/turf": "^6.5.0", "antd": "^5.14.1", "axios": "^1.6.7", @@ -66,7 +67,6 @@ "react-redux": "^8.0.5", "react-router": "^5.0.1", "react-router-dom": "^5.0.1", - "react-spring": "^9.2.5", "redux": "^4.2.0", "redux-thunk": "^2.4.2", "socket.io-client": "^4.5.3", @@ -102,4 +102,4 @@ ] } } -} \ No newline at end of file +} diff --git a/src/components/Splash/Splash.jsx b/src/components/Splash/Splash.jsx index ee3ec58..43e5a5c 100644 --- a/src/components/Splash/Splash.jsx +++ b/src/components/Splash/Splash.jsx @@ -1,5 +1,5 @@ import { useEffect, useState } from 'react'; -import { useSpring, animated } from 'react-spring'; +import { useSpring, animated } from '@react-spring/web'; import ceaLogo from '../../assets/cea-logo.png'; const useLoadingMessages = () => { diff --git a/yarn.lock b/yarn.lock index 5d169f9..384ca78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1132,26 +1132,6 @@ "@react-spring/shared" "~9.7.3" "@react-spring/types" "~9.7.3" -"@react-spring/konva@~9.7.3": - version "9.7.3" - resolved "https://registry.yarnpkg.com/@react-spring/konva/-/konva-9.7.3.tgz#16bd29dd4860a99e960a72987c8bcfc828b22119" - integrity sha512-R9sY6SiPGYqz1383P5qppg5z57YfChVknOC1UxxaGxpw+WiZa8fZ4zmZobslrw+os3/+HAXZv8O+EvU/nQpf7g== - dependencies: - "@react-spring/animated" "~9.7.3" - "@react-spring/core" "~9.7.3" - "@react-spring/shared" "~9.7.3" - "@react-spring/types" "~9.7.3" - -"@react-spring/native@~9.7.3": - version "9.7.3" - resolved "https://registry.yarnpkg.com/@react-spring/native/-/native-9.7.3.tgz#ee38d7c23482cfb4916c9b3c021de2995a4f553a" - integrity sha512-4mpxX3FuEBCUT6ae2fjhxcJW6bhr2FBwFf274eXB7n+U30Gdg8Wo2qYwcUnmiAA0S3dvP8vLTazx3+CYWFShnA== - dependencies: - "@react-spring/animated" "~9.7.3" - "@react-spring/core" "~9.7.3" - "@react-spring/shared" "~9.7.3" - "@react-spring/types" "~9.7.3" - "@react-spring/shared@~9.7.3": version "9.7.3" resolved "https://registry.yarnpkg.com/@react-spring/shared/-/shared-9.7.3.tgz#4cf29797847c689912aec4e62e34c99a4d5d9e53" @@ -1159,22 +1139,12 @@ dependencies: "@react-spring/types" "~9.7.3" -"@react-spring/three@~9.7.3": - version "9.7.3" - resolved "https://registry.yarnpkg.com/@react-spring/three/-/three-9.7.3.tgz#4358a0c4640efe2972c4f7d0f7cd4efe927471c1" - integrity sha512-Q1p512CqUlmMK8UMBF/Rj79qndhOWq4XUTayxMP9S892jiXzWQuj+xC3Xvm59DP/D4JXusXpxxqfgoH+hmOktA== - dependencies: - "@react-spring/animated" "~9.7.3" - "@react-spring/core" "~9.7.3" - "@react-spring/shared" "~9.7.3" - "@react-spring/types" "~9.7.3" - "@react-spring/types@~9.7.3": version "9.7.3" resolved "https://registry.yarnpkg.com/@react-spring/types/-/types-9.7.3.tgz#ea78fd447cbc2612c1f5d55852e3c331e8172a0b" integrity sha512-Kpx/fQ/ZFX31OtlqVEFfgaD1ACzul4NksrvIgYfIFq9JpDHFwQkMVZ10tbo0FU/grje4rcL4EIrjekl3kYwgWw== -"@react-spring/web@~9.7.3": +"@react-spring/web@^9.7.3": version "9.7.3" resolved "https://registry.yarnpkg.com/@react-spring/web/-/web-9.7.3.tgz#d9f4e17fec259f1d65495a19502ada4f5b57fa3d" integrity sha512-BXt6BpS9aJL/QdVqEIX9YoUy8CE6TJrU0mNCqSoxdXlIeNcEBWOfIyE6B14ENNsyQKS3wOWkiJfco0tCr/9tUg== @@ -1184,16 +1154,6 @@ "@react-spring/shared" "~9.7.3" "@react-spring/types" "~9.7.3" -"@react-spring/zdog@~9.7.3": - version "9.7.3" - resolved "https://registry.yarnpkg.com/@react-spring/zdog/-/zdog-9.7.3.tgz#8ccc7316f6d3460ed244d9e3f60de9b4c4a848ac" - integrity sha512-L+yK/1PvNi9n8cldiJ309k4LdxcPkeWE0W18l1zrP1IBIyd5NB5EPA8DMsGr9gtNnnIujtEzZk+4JIOjT8u/tw== - dependencies: - "@react-spring/animated" "~9.7.3" - "@react-spring/core" "~9.7.3" - "@react-spring/shared" "~9.7.3" - "@react-spring/types" "~9.7.3" - "@rollup/rollup-android-arm-eabi@4.10.0": version "4.10.0" resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.10.0.tgz#786eaf6372be2fc209cc957c14aa9d3ff8fefe6a" @@ -6507,18 +6467,6 @@ react-router@5.3.4, react-router@^5.0.1: tiny-invariant "^1.0.2" tiny-warning "^1.0.0" -react-spring@^9.2.5: - version "9.7.3" - resolved "https://registry.yarnpkg.com/react-spring/-/react-spring-9.7.3.tgz#3211dea4c4d7c5b541260af5100261b87becb5d5" - integrity sha512-oTxDpFV5gzq7jQX6+bU0SVq+vX8VnuuT5c8Zwn6CpDErOPvCmV+DRkPiEBtaL3Ozgzwiy5yFx83N0h303j/r3A== - dependencies: - "@react-spring/core" "~9.7.3" - "@react-spring/konva" "~9.7.3" - "@react-spring/native" "~9.7.3" - "@react-spring/three" "~9.7.3" - "@react-spring/web" "~9.7.3" - "@react-spring/zdog" "~9.7.3" - react@^18.2.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" From 76472022734b35c1f3ae6a3ff7df682381610996 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:20:26 +0100 Subject: [PATCH 085/126] Add splash window --- electron/ceaProcess.mjs | 5 +- electron/main.mjs | 98 +++++++++++++++++++++++--------- src/components/Splash/Splash.jsx | 27 +++++---- 3 files changed, 88 insertions(+), 42 deletions(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index 269634e..adc6b4f 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -39,10 +39,11 @@ export function createCEAProcess(url, callback) { break; } case 'darwin': { + checkCEAStarted(url); break; } default: - break; + throw new Error('Start CEA dashboard server manually.'); } if (cea) { @@ -108,7 +109,7 @@ export async function isCEAAlive(url) { } } -function checkCEAStarted(url, callback) { +function checkCEAStarted(url, callback = () => {}) { console.debug(`checkCEAStarted(${url})`); const runCallbackOnce = (() => { let executed = false; diff --git a/electron/main.mjs b/electron/main.mjs index f79de72..e6d3d9f 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -2,7 +2,7 @@ import axios from 'axios'; import { app, BrowserWindow, screen, ipcMain, dialog, shell } from 'electron'; import path, { dirname } from 'path'; -import { isCEAAlive, createCEAProcess } from './ceaProcess.mjs'; +import { isCEAAlive, createCEAProcess, killCEAProcess } from './ceaProcess.mjs'; import { fileURLToPath } from 'url'; const __filename = fileURLToPath(import.meta.url); @@ -15,6 +15,7 @@ const CEA_URL = `http://${CEA_HOST}:${CEA_PORT}`; // global reference to mainWindow (necessary to prevent window from being garbage collected) let mainWindow; +let splashWindow; const createMainWindow = () => { mainWindow = new BrowserWindow({ @@ -22,6 +23,7 @@ const createMainWindow = () => { height: screen.getPrimaryDisplay().workArea.height, show: false, backgroundColor: 'white', + autoHideMenuBar: true, webPreferences: { preload: path.join(__dirname, './preload.js'), nodeIntegration: false, @@ -52,38 +54,73 @@ const createMainWindow = () => { }); }; -app.whenReady().then(() => { - createMainWindow(); - - ipcMain.handle('open-dialog', async (_, arg) => { - const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); - return filePaths; +function createSplashWindow(url) { + splashWindow = new BrowserWindow({ + height: 300, + width: 500, + resizable: false, + maximizable: false, + show: false, + frame: false, + backgroundColor: '#2e2c29', + titleBarStyle: 'hidden', + webPreferences: { + nodeIntegration: false, + contextIsolation: true, + devTools: false, + }, }); - ipcMain.handle('open-external', async (_, { url }) => { - shell.openExternal(url); + // hides the traffic lights for macOS + splashWindow.setWindowButtonVisibility(false); + + if (isDev) { + splashWindow.loadURL('http://localhost:5173/splash'); + splashWindow.openDevTools(); + } else { + splashWindow.loadURL( + `file://${path.join(__dirname, '../dist/index.html#splash')}`, + ); + } + + splashWindow.once('ready-to-show', () => { + splashWindow.show(); + + // Check if CEA server is already running, only start if not + isCEAAlive(url) + .then((alive) => { + if (alive) { + console.log('cea dashboard already running...'); + splashWindow && splashWindow.close(); + createMainWindow(); + } else { + console.log('cea dashboard not running, starting...'); + createCEAProcess(url, () => { + console.log('cea dashboard process created...'); + splashWindow && splashWindow.close(); + createMainWindow(); + }); + } + }) + .then(() => { + console.log('closing splash'); + }); }); - app.on('activate', () => { - if (!BrowserWindow.getAllWindows().length) { - createMainWindow(); - } + splashWindow.on('closed', () => { + !mainWindow && killCEAProcess(); + splashWindow = null; }); -}); +} app.on('ready', () => { - const url = CEA_URL; - // Check if CEA server is already running, only start if not - isCEAAlive(url).then((alive) => { - if (alive) { - console.log('cea dashboard already running...'); - } else { - console.log('cea dashboard not running, starting...'); - createCEAProcess(url, () => { - console.log('cea dashboard process created...'); - }); - } - }); + createSplashWindow(CEA_URL); +}); + +app.on('activate', () => { + if (!BrowserWindow.getAllWindows().length) { + createMainWindow(); + } }); app.on('window-all-closed', () => { @@ -105,3 +142,12 @@ app.on('will-quit', (event) => { }; shutdown(); }); + +ipcMain.handle('open-dialog', async (_, arg) => { + const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); + return filePaths; +}); + +ipcMain.handle('open-external', async (_, { url }) => { + shell.openExternal(url); +}); diff --git a/src/components/Splash/Splash.jsx b/src/components/Splash/Splash.jsx index 43e5a5c..8e8b472 100644 --- a/src/components/Splash/Splash.jsx +++ b/src/components/Splash/Splash.jsx @@ -10,24 +10,21 @@ const useLoadingMessages = () => { return message; }; -const usePulse = () => { - const [pulse, setPulse] = useState(true); - useEffect(() => { - setInterval(() => setPulse((oldValue) => !oldValue), 800); - }, []); - return pulse; -}; - const Splash = () => { const message = useLoadingMessages(); - const pulse = usePulse(); - const props = useSpring({ scale: pulse ? 1 : 1.1 }); + const springs = useSpring({ + from: { scale: 1 }, + to: [{ scale: 1.1 }, { scale: 1 }], + loop: true, + config: { + duration: 800, + }, + }); return (
    { `scale(${x})`), + ...springs, }} > { draggable="false" /> -

    City Energy Analyst

    +

    + City Energy Analyst +

    {message}
    ); From 85312110f555e79b5284819de2e177bbca231ef8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:05:26 +0100 Subject: [PATCH 086/126] Fix error for Windows build --- electron/main.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/electron/main.mjs b/electron/main.mjs index e6d3d9f..7d72cde 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -72,7 +72,8 @@ function createSplashWindow(url) { }); // hides the traffic lights for macOS - splashWindow.setWindowButtonVisibility(false); + if (process.platform == 'darwin') + splashWindow.setWindowButtonVisibility(false); if (isDev) { splashWindow.loadURL('http://localhost:5173/splash'); From 09b05d1bb05a2aefb5f58b9de85be73618cdd6c4 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:05:33 +0100 Subject: [PATCH 087/126] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index ae655df..457cf12 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "productName": "CityEnergyAnalyst-GUI", "version": "3.32.0", "description": "Official GUI of the City Energy Analyst tool", + "homepage": "http://www.cityenergyanalyst.com", "repository": "github:architecture-building-systems/CityEnergyAnalyst-GUI", "scripts": { "dev": "vite", @@ -75,7 +76,6 @@ "main": "electron/main.mjs", "build": { "appId": "CityEnergyAnalyst", - "productName": "CityEnergyAnalyst", "directories": { "output": "out" }, @@ -102,4 +102,4 @@ ] } } -} +} \ No newline at end of file From 16e492af56e51a8d3ef6a3b1cb1b11be384149a8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 11:14:36 +0100 Subject: [PATCH 088/126] Update author and maintainer property --- package.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 457cf12..f31ad29 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,15 @@ }, "keywords": [], "author": { - "name": "Reynold Mok", - "email": "reynold.mok@arch.ethz.ch" + "name": "Architecture and Building Systems", + "email": "cea@arch.ethz.ch" }, + "maintainers": [ + { + "name": "Reynold Mok", + "email": "reynold.mok@arch.ethz.ch" + } + ], "license": "MIT", "devDependencies": { "@types/react": "^18.0.26", @@ -75,7 +81,7 @@ }, "main": "electron/main.mjs", "build": { - "appId": "CityEnergyAnalyst", + "appId": "CityEnergyAnalyst-GUI", "directories": { "output": "out" }, From 8a9d15dabf876c0be6a1df3cdb0cfacda3a50fc9 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:21:41 +0100 Subject: [PATCH 089/126] Ignore node_modules --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index f31ad29..4647a8d 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,8 @@ }, "files": [ "dist/**/*", - "electron/**" + "electron/**", + "!node_modules/**/*" ], "mac": { "icon": "public/cea.icns", From 3dc9f668c9d958e388efe48c69922bdc39360dad Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 15:51:05 +0100 Subject: [PATCH 090/126] Close splash window only when main window is ready --- electron/main.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/electron/main.mjs b/electron/main.mjs index 7d72cde..e96f620 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -41,6 +41,7 @@ const createMainWindow = () => { } mainWindow.once('ready-to-show', () => { + splashWindow && splashWindow.close(); mainWindow.show(); }); @@ -92,13 +93,11 @@ function createSplashWindow(url) { .then((alive) => { if (alive) { console.log('cea dashboard already running...'); - splashWindow && splashWindow.close(); createMainWindow(); } else { console.log('cea dashboard not running, starting...'); createCEAProcess(url, () => { console.log('cea dashboard process created...'); - splashWindow && splashWindow.close(); createMainWindow(); }); } From e6b56197433131106d515bb2cc11309efdee3886 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:18:38 +0100 Subject: [PATCH 091/126] Move intervals and timeouts to global scope --- electron/ceaProcess.mjs | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index adc6b4f..961cda2 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -10,10 +10,11 @@ const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); let cea; -let timeout; -let interval; let startupError = ''; +let intervals = []; +let timeouts = []; + export function createCEAProcess(url, callback) { console.log(`createCEAProcess(${url})`); let cea; @@ -94,8 +95,10 @@ export function killCEAProcess() { cea.removeAllListeners('exit'); process.kill(cea.pid); } - interval && clearInterval(interval); - timeout && clearTimeout(timeout); + + // Clear all intervals and timeouts + intervals.forEach((interval) => clearInterval(interval)); + timeouts.forEach((timeout) => clearTimeout(timeout)); } export async function isCEAAlive(url) { @@ -110,12 +113,16 @@ export async function isCEAAlive(url) { } function checkCEAStarted(url, callback = () => {}) { + let interval; + let timeout; + console.debug(`checkCEAStarted(${url})`); const runCallbackOnce = (() => { let executed = false; return () => { if (!executed) { executed = true; + console.debug('Running callback'); callback(); } }; @@ -137,4 +144,8 @@ function checkCEAStarted(url, callback = () => {}) { timeout = setTimeout(() => { clearInterval(interval); }, 60000); + + // Store references to global scope + intervals.push(interval); + timeouts.push(timeouts); } From b3c5ddde3032184c47a16b7de21a42b36c892fa7 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:42:33 +0100 Subject: [PATCH 092/126] Use fetch instead of axios --- electron/ceaProcess.mjs | 3 +-- electron/main.mjs | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index 961cda2..a26a919 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -1,4 +1,3 @@ -import axios from 'axios'; import { app, dialog } from 'electron'; import fs from 'fs'; import path, { dirname } from 'path'; @@ -104,7 +103,7 @@ export function killCEAProcess() { export async function isCEAAlive(url) { console.debug(`isCEAAlive(${url})`); try { - const resp = await axios.get(`${url}/server/alive`); + const resp = await fetch(`${url}/server/alive`); return resp.status == 200; } catch (error) { console.error(error.response || 'No Response'); diff --git a/electron/main.mjs b/electron/main.mjs index e96f620..98e1e4b 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -1,4 +1,3 @@ -import axios from 'axios'; import { app, BrowserWindow, screen, ipcMain, dialog, shell } from 'electron'; import path, { dirname } from 'path'; @@ -133,10 +132,16 @@ app.on('will-quit', (event) => { event.preventDefault(); const shutdown = async () => { try { - const resp = await axios.post(`${CEA_URL}/server/shutdown`); - console.log(resp?.data); + const resp = await fetch(`${CEA_URL}/server/shutdown`, { + method: 'POST', + }); + const content = await resp.json(); + console.log(content); } catch (error) { console.error(error); + } finally { + // Make sure CEA process is killed + killCEAProcess(); } app.exit(); }; From af90facc8bac9365fdca45ced71882ac29a39df8 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 21 Feb 2024 10:30:02 +0100 Subject: [PATCH 093/126] Remove unused "open new window" button --- src/components/Dashboard/Plot.jsx | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/components/Dashboard/Plot.jsx b/src/components/Dashboard/Plot.jsx index 3dddc41..eb5df63 100644 --- a/src/components/Dashboard/Plot.jsx +++ b/src/components/Dashboard/Plot.jsx @@ -32,7 +32,7 @@ const useFetchPlotDiv = (dashIndex, index, hash) => { `${import.meta.env.VITE_CEA_URL}/plots/div/${dashIndex}/${index}`, { cancelToken: source.token, - } + }, ); if (mounted) setDiv(() => { @@ -60,7 +60,7 @@ const useFetchPlotDiv = (dashIndex, index, hash) => { // Clean up script node if it is mounted let script = document.querySelector( - `script[data-id=script-cea-react-${hash}]` + `script[data-id=script-cea-react-${hash}]`, ); if (script) script.remove(); }; @@ -92,14 +92,6 @@ export const Plot = ({ index, dashIndex, data, style, activePlotRef = 0 }) => { <> - {data.parameters['scenario-name']} - {div && div.content && ( - - )} )}
    From 1e457209e9c360a9203113551f5ded6da1171a87 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 23 Feb 2024 16:20:49 +0100 Subject: [PATCH 094/126] Update dependencies directory --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4647a8d..da9e7b0 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ ], "extraResources": [ { - "from": "micromamba", + "from": "dependencies", "to": "." } ] From 09d642c3c9b32c826b3f88c38366d6723fec6b66 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Fri, 23 Feb 2024 18:08:57 +0100 Subject: [PATCH 095/126] Run packaged cea environment for mac --- electron/ceaProcess.mjs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index a26a919..adef162 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -39,7 +39,14 @@ export function createCEAProcess(url, callback) { break; } case 'darwin': { - checkCEAStarted(url); + if (app.isPackaged) { + // micromamba located in Contents/Resources/micromamba + cea = spawn( + 'micromamba', + ['-r', 'micromamba-root', '-n', 'cea', 'run', 'cea', 'dashboard'], + { cwd: process.resourcesPath }, + ); + } else checkCEAStarted(url); break; } default: From 7965abc76a14a517e58bd3164edc16a6aab3f3f2 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 24 Feb 2024 00:15:53 +0100 Subject: [PATCH 096/126] Add current directory in path --- electron/ceaProcess.mjs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index adef162..e7ed07e 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -42,8 +42,8 @@ export function createCEAProcess(url, callback) { if (app.isPackaged) { // micromamba located in Contents/Resources/micromamba cea = spawn( - 'micromamba', - ['-r', 'micromamba-root', '-n', 'cea', 'run', 'cea', 'dashboard'], + './micromamba', + ['-r', './micromamba-root', '-n', 'cea', 'run', 'cea', 'dashboard'], { cwd: process.resourcesPath }, ); } else checkCEAStarted(url); From 9ec5451324e0494fe78e15fe488cefa56fe2b530 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:33:50 +0100 Subject: [PATCH 097/126] Ensure single instance of app --- electron/main.mjs | 78 +++++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 36 deletions(-) diff --git a/electron/main.mjs b/electron/main.mjs index 98e1e4b..4a20571 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -16,6 +16,48 @@ const CEA_URL = `http://${CEA_HOST}:${CEA_PORT}`; let mainWindow; let splashWindow; +const gotTheLock = app.requestSingleInstanceLock(); + +if (!gotTheLock) { + app.quit(); +} else { + app.on('ready', () => { + createSplashWindow(CEA_URL); + }); + + app.on('activate', () => { + if (!BrowserWindow.getAllWindows().length) { + createMainWindow(); + } + }); + + app.on('window-all-closed', () => { + if (process.platform !== 'darwin') { + app.quit(); + } + }); + + app.on('will-quit', (event) => { + event.preventDefault(); + const shutdown = async () => { + try { + const resp = await fetch(`${CEA_URL}/server/shutdown`, { + method: 'POST', + }); + const content = await resp.json(); + console.log(content); + } catch (error) { + console.error(error); + } finally { + // Make sure CEA process is killed + killCEAProcess(); + } + app.exit(); + }; + shutdown(); + }); +} + const createMainWindow = () => { mainWindow = new BrowserWindow({ width: screen.getPrimaryDisplay().workArea.width, @@ -112,42 +154,6 @@ function createSplashWindow(url) { }); } -app.on('ready', () => { - createSplashWindow(CEA_URL); -}); - -app.on('activate', () => { - if (!BrowserWindow.getAllWindows().length) { - createMainWindow(); - } -}); - -app.on('window-all-closed', () => { - if (process.platform !== 'darwin') { - app.quit(); - } -}); - -app.on('will-quit', (event) => { - event.preventDefault(); - const shutdown = async () => { - try { - const resp = await fetch(`${CEA_URL}/server/shutdown`, { - method: 'POST', - }); - const content = await resp.json(); - console.log(content); - } catch (error) { - console.error(error); - } finally { - // Make sure CEA process is killed - killCEAProcess(); - } - app.exit(); - }; - shutdown(); -}); - ipcMain.handle('open-dialog', async (_, arg) => { const { filePaths } = await dialog.showOpenDialog(mainWindow, arg); return filePaths; From fc6bc5b21ade8e633900d79f382c86153fa791d9 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:45:01 +0100 Subject: [PATCH 098/126] Run cea dashboard module directly --- electron/ceaProcess.mjs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index e7ed07e..849b894 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -43,7 +43,16 @@ export function createCEAProcess(url, callback) { // micromamba located in Contents/Resources/micromamba cea = spawn( './micromamba', - ['-r', './micromamba-root', '-n', 'cea', 'run', 'cea', 'dashboard'], + [ + '-r', + './micromamba-root', + '-n', + 'cea', + 'run', + 'python', + 'm', + 'cea.interfaces.dashboard.dashboard', + ], { cwd: process.resourcesPath }, ); } else checkCEAStarted(url); From cf8805a75eaaeddeae1a953545202a3c956dea6b Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sat, 24 Feb 2024 14:43:01 +0100 Subject: [PATCH 099/126] Fix missing flag symbol --- electron/ceaProcess.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index 849b894..127d309 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -50,7 +50,7 @@ export function createCEAProcess(url, callback) { 'cea', 'run', 'python', - 'm', + '-m', 'cea.interfaces.dashboard.dashboard', ], { cwd: process.resourcesPath }, From ebea25925ad11d0701f83bda02790427b79f3302 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sun, 25 Feb 2024 13:20:00 +0100 Subject: [PATCH 100/126] Remove screen --- electron/main.mjs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/electron/main.mjs b/electron/main.mjs index 4a20571..e63f775 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -1,4 +1,4 @@ -import { app, BrowserWindow, screen, ipcMain, dialog, shell } from 'electron'; +import { app, BrowserWindow, ipcMain, dialog, shell } from 'electron'; import path, { dirname } from 'path'; import { isCEAAlive, createCEAProcess, killCEAProcess } from './ceaProcess.mjs'; @@ -60,8 +60,6 @@ if (!gotTheLock) { const createMainWindow = () => { mainWindow = new BrowserWindow({ - width: screen.getPrimaryDisplay().workArea.width, - height: screen.getPrimaryDisplay().workArea.height, show: false, backgroundColor: 'white', autoHideMenuBar: true, From b2036925126ab71ab08424da93109abd05888f4d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Sun, 25 Feb 2024 13:20:24 +0100 Subject: [PATCH 101/126] Change functions to async --- electron/main.mjs | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/electron/main.mjs b/electron/main.mjs index e63f775..3beef06 100644 --- a/electron/main.mjs +++ b/electron/main.mjs @@ -37,8 +37,12 @@ if (!gotTheLock) { } }); - app.on('will-quit', (event) => { + app.on('will-quit', async (event) => { event.preventDefault(); + + mainWindow && mainWindow.close(); + splashWindow && splashWindow.close(); + const shutdown = async () => { try { const resp = await fetch(`${CEA_URL}/server/shutdown`, { @@ -52,9 +56,10 @@ if (!gotTheLock) { // Make sure CEA process is killed killCEAProcess(); } - app.exit(); }; - shutdown(); + + await shutdown(); + app.exit(); }); } @@ -124,26 +129,25 @@ function createSplashWindow(url) { ); } - splashWindow.once('ready-to-show', () => { + splashWindow.once('ready-to-show', async () => { splashWindow.show(); // Check if CEA server is already running, only start if not - isCEAAlive(url) - .then((alive) => { - if (alive) { - console.log('cea dashboard already running...'); + try { + const alive = await isCEAAlive(url); + if (alive) { + console.log('cea dashboard already running...'); + createMainWindow(); + } else { + console.log('cea dashboard not running, starting...'); + createCEAProcess(url, () => { + console.log('cea dashboard process created...'); createMainWindow(); - } else { - console.log('cea dashboard not running, starting...'); - createCEAProcess(url, () => { - console.log('cea dashboard process created...'); - createMainWindow(); - }); - } - }) - .then(() => { - console.log('closing splash'); - }); + }); + } + } catch (error) { + console.log(error); + } }); splashWindow.on('closed', () => { From e0129b0c3baa6f496a3149f237d038cc9d73251d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 27 Feb 2024 16:09:06 +0100 Subject: [PATCH 102/126] Fix weather and database path dialog --- src/components/Tools/Parameter.jsx | 40 +++++++++++++++++++----------- src/utils/electron.js | 2 +- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index e207563..bf7c61f 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -211,13 +211,10 @@ const Parameter = ({ parameter, form }) => {
    {menu} -
    - Browse for databases path -
    + + + Browse for databases path +
    )} > @@ -248,13 +245,10 @@ const Parameter = ({ parameter, form }) => {
    {menu} -
    - Browse for weather file -
    + + + Browse for weather file +
    )} > @@ -337,4 +331,22 @@ export const OpenDialogInput = forwardRef((props, ref) => { }); OpenDialogInput.displayName = 'OpenDialogInput'; +export const OpenDialogButton = (props) => { + const { form, type, id, children } = props; + + // ignore if not electron for now + if (!isElectron()) return null; + + return ( + + ); +}; + export default Parameter; diff --git a/src/utils/electron.js b/src/utils/electron.js index 8232365..33cdc1e 100644 --- a/src/utils/electron.js +++ b/src/utils/electron.js @@ -5,7 +5,7 @@ export const isElectron = () => { export const openDialog = async (form, type, name) => { const options = - type === 'PathParameter' + type === 'directory' ? { properties: ['openDirectory'] } : { properties: ['openFile'] }; From b0a33c50c7be3244b66cd23c091e07e413728a5d Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 29 Feb 2024 15:06:11 +0100 Subject: [PATCH 103/126] Get resource folder using app.getAppPath --- electron/ceaProcess.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/electron/ceaProcess.mjs b/electron/ceaProcess.mjs index 127d309..d3f67ca 100644 --- a/electron/ceaProcess.mjs +++ b/electron/ceaProcess.mjs @@ -53,7 +53,7 @@ export function createCEAProcess(url, callback) { '-m', 'cea.interfaces.dashboard.dashboard', ], - { cwd: process.resourcesPath }, + { cwd: dirname(app.getAppPath()) }, ); } else checkCEAStarted(url); break; From 295af8732ce9bbbc21a79defec593acf2ec37940 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:20:21 +0100 Subject: [PATCH 104/126] Implement dynamic import for App root --- src/containers/App.jsx | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/containers/App.jsx b/src/containers/App.jsx index 85cb32a..815fceb 100644 --- a/src/containers/App.jsx +++ b/src/containers/App.jsx @@ -1,11 +1,12 @@ -import { Component } from 'react'; +import { Component, Suspense, lazy } from 'react'; import { Provider } from 'react-redux'; import { Switch, Route } from 'react-router'; import { ConnectedRouter } from 'connected-react-router'; -import routes from '../constants/routes'; -import HomePage from './HomePage'; -import Splash from '../components/Splash/Splash'; +import routes from '../constants/routes.json'; + +const HomePage = lazy(() => import('./HomePage')); +const Splash = lazy(() => import('../components/Splash/Splash')); class App extends Component { render() { @@ -14,9 +15,15 @@ class App extends Component { - + + + + + - + + + From d85281cefc0d8c9653b509972d040ee9d0d9976a Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Mon, 4 Mar 2024 18:20:33 +0100 Subject: [PATCH 105/126] Implement dynamic import for HomePage --- src/containers/HomePage.jsx | 48 +++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/src/containers/HomePage.jsx b/src/containers/HomePage.jsx index 78758aa..7d414f9 100644 --- a/src/containers/HomePage.jsx +++ b/src/containers/HomePage.jsx @@ -1,15 +1,11 @@ -import { createContext, useEffect, useState } from 'react'; +import { Suspense, createContext, lazy, useEffect, useState } from 'react'; import { Route, Switch } from 'react-router-dom'; import SideNav from '../components/HomePage/SideNav'; import Header from '../components/HomePage/Header'; import { ToolRoute } from '../components/Tools/Tool'; -import InputEditor from '../components/InputEditor/InputEditor'; -import Dashboard from '../components/Dashboard/Dashboard'; -import Project, { useFetchProject } from '../components/Project/Project'; -import Landing from '../components/Landing/Landing'; -import DatabaseEditor from '../components/DatabaseEditor/DatabaseEditor'; +import { useFetchProject } from '../components/Project/Project'; -import routes from '../constants/routes'; +import routes from '../constants/routes.json'; import { useDispatch, useSelector } from 'react-redux'; import { updateScenario } from '../actions/project'; import StatusBar from '../components/HomePage/StatusBar/StatusBar'; @@ -27,6 +23,14 @@ const ContextProvider = ({ children }) => { ); }; +const Project = lazy(() => import('../components/Project/Project')); +const InputEditor = lazy(() => import('../components/InputEditor/InputEditor')); +const Dashboard = lazy(() => import('../components/Dashboard/Dashboard')); +const DatabaseEditor = lazy( + () => import('../components/DatabaseEditor/DatabaseEditor'), +); +const Landing = lazy(() => import('../components/Landing/Landing')); + const HomePage = () => { const fetchProject = useFetchProject(); const dispatch = useDispatch(); @@ -57,12 +61,32 @@ const HomePage = () => {
    - - + + + + + + + + + + - - - + + + + + + + + + + + + + + +
    From eb7c1c47bec095349ce57c73e6adac4ef0d9c136 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:33:20 +0100 Subject: [PATCH 106/126] Move shared project hooks --- .../DatabaseEditor/DatabaseEditor.jsx | 12 +++---- .../DatabaseEditor/SavingDatabaseModal.jsx | 4 +-- .../DatabaseEditor/UseTypesDatabase.jsx | 10 +++--- src/components/Project/NewProjectModal.jsx | 3 +- src/components/Project/OpenProjectModal.jsx | 3 +- src/components/Project/Project.jsx | 33 +++++++------------ .../Project/RenameScenarioModal.jsx | 4 +-- src/components/Project/ScenarioCard.jsx | 19 +++-------- src/containers/HomePage.jsx | 2 +- src/utils/hooks.jsx | 15 ++++++++- 10 files changed, 50 insertions(+), 55 deletions(-) diff --git a/src/components/DatabaseEditor/DatabaseEditor.jsx b/src/components/DatabaseEditor/DatabaseEditor.jsx index ce14708..ff80f9a 100644 --- a/src/components/DatabaseEditor/DatabaseEditor.jsx +++ b/src/components/DatabaseEditor/DatabaseEditor.jsx @@ -17,13 +17,13 @@ import { resetDatabaseChanges, } from '../../actions/databaseEditor'; import { AsyncError } from '../../utils'; -import routes from '../../constants/routes'; -import { useChangeRoute } from '../Project/Project'; +import routes from '../../constants/routes.json'; import SavingDatabaseModal from './SavingDatabaseModal'; import DatabaseTopMenu from './DatabaseTopMenu'; import Database from './Database'; import UseTypesDatabase from './UseTypesDatabase'; import ValidationErrors from './ValidationErrors'; +import { useChangeRoute } from '../../utils/hooks'; const useValidateDatabasePath = () => { const [valid, setValid] = useState(null); @@ -34,7 +34,7 @@ const useValidateDatabasePath = () => { setValid(null); setError(null); await axios.get( - `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/check` + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases/check`, ); setValid(true); } catch (err) { @@ -139,7 +139,7 @@ const DatabaseContent = () => { export const ExportDatabaseButton = () => { const { status } = useSelector((state) => state.databaseEditor.status); const databaseValidation = useSelector( - (state) => state.databaseEditor.validation + (state) => state.databaseEditor.validation, ); const [modalVisible, setModalVisible] = useState(false); @@ -167,7 +167,7 @@ export const ExportDatabaseButton = () => { const SaveDatabaseButton = () => { const databasesData = useSelector((state) => state.databaseEditor.data); const databaseValidation = useSelector( - (state) => state.databaseEditor.validation + (state) => state.databaseEditor.validation, ); const databaseChanges = useSelector((state) => state.databaseEditor.changes); const dispatch = useDispatch(); @@ -187,7 +187,7 @@ const SaveDatabaseButton = () => { console.log(databasesData); await axios.put( `${import.meta.env.VITE_CEA_URL}/api/inputs/databases`, - databasesData + databasesData, ); setSuccess(true); dispatch(resetDatabaseChanges()); diff --git a/src/components/DatabaseEditor/SavingDatabaseModal.jsx b/src/components/DatabaseEditor/SavingDatabaseModal.jsx index 5a4e445..c196d98 100644 --- a/src/components/DatabaseEditor/SavingDatabaseModal.jsx +++ b/src/components/DatabaseEditor/SavingDatabaseModal.jsx @@ -3,8 +3,8 @@ import { Button, Modal } from 'antd'; import { ExportDatabaseButton } from './DatabaseEditor'; import './DatabaseEditor.css'; import { AsyncError } from '../../utils'; -import routes from '../../constants/routes'; -import { useChangeRoute } from '../Project/Project'; +import routes from '../../constants/routes.json'; +import { useChangeRoute } from '../../utils/hooks'; const SavingDatabaseModal = ({ visible, hideModal, error, success }) => { const goToScript = useChangeRoute(`${routes.TOOLS}/archetypes-mapper`); diff --git a/src/components/DatabaseEditor/UseTypesDatabase.jsx b/src/components/DatabaseEditor/UseTypesDatabase.jsx index f38ae0e..b69a2a1 100644 --- a/src/components/DatabaseEditor/UseTypesDatabase.jsx +++ b/src/components/DatabaseEditor/UseTypesDatabase.jsx @@ -3,9 +3,9 @@ import { Tabs, Button, Select } from 'antd'; import { withErrorBoundary } from '../../utils/ErrorBoundary'; import './DatabaseEditor.css'; import Table from './Table'; -import { useChangeRoute } from '../Project/Project'; -import routes from '../../constants/routes'; +import routes from '../../constants/routes.json'; import { getTableSchema } from './Database'; +import { useChangeRoute } from '../../utils/hooks'; const UseTypesDatabase = ({ name, data, schema }) => { const useTypes = Object.keys(data['SCHEDULES']); @@ -88,7 +88,7 @@ const UseTypePropertyTable = ({ sheetName, tableData, null, - Object.keys(tableData[0]).filter((row) => row !== 'code') + Object.keys(tableData[0]).filter((row) => row !== 'code'), ); // Revalidate cells on sheet change @@ -151,7 +151,7 @@ const SchedulesYearTable = ({ databaseName, sheetName, yearData, schema }) => { schema, sheetName, yearData, - null + null, ); // Revalidate cells on sheet change @@ -191,7 +191,7 @@ const SchedulesDataTable = ({ sheetName, data, null, - Object.keys(data[0]).filter((col) => col !== 'DAY') + Object.keys(data[0]).filter((col) => col !== 'DAY'), ); // Revalidate cells on sheet and type change diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index 2d910fa..7e8e41d 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -3,8 +3,9 @@ import { Form } from '@ant-design/compatible'; import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; -import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; +import { useFetchConfigProjectInfo } from '../Project/Project'; import { checkExist, dirname, joinPath } from '../../utils/file'; +import { useFetchProject } from '../../utils/hooks'; const NewProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { const [confirmLoading, setConfirmLoading] = useState(false); diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index 6fb83dd..2289f9b 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -2,8 +2,9 @@ import { useRef, useState, useEffect } from 'react'; import { Form } from '@ant-design/compatible'; import { Modal } from 'antd'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; -import { useFetchConfigProjectInfo, useFetchProject } from '../Project/Project'; +import { useFetchConfigProjectInfo } from '../Project/Project'; import { checkExist } from '../../utils/file'; +import { useFetchProject } from '../../utils/hooks'; const OpenProjectModal = ({ visible, setVisible, onSuccess = () => {} }) => { const [confirmLoading, setConfirmLoading] = useState(false); diff --git a/src/components/Project/Project.jsx b/src/components/Project/Project.jsx index 9b51a2e..5746456 100644 --- a/src/components/Project/Project.jsx +++ b/src/components/Project/Project.jsx @@ -1,20 +1,20 @@ import { useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; -import { push } from 'connected-react-router'; import { FolderOpenOutlined, PlusOutlined, SyncOutlined, } from '@ant-design/icons'; import { Card, Button, message } from 'antd'; -import { getProject, updateScenario } from '../../actions/project'; +import { updateScenario } from '../../actions/project'; import axios from 'axios'; import NewProjectModal from './NewProjectModal'; import OpenProjectModal from './OpenProjectModal'; import NewScenarioModal from './NewScenarioModal'; import ScenarioCard from './ScenarioCard'; -import routes from '../../constants/routes'; +import routes from '../../constants/routes.json'; import './Project.css'; +import { useChangeRoute, useFetchProject } from '../../utils/hooks'; const Project = () => { const { isFetching, error, info } = useSelector((state) => state.project); @@ -171,7 +171,7 @@ const updateConfigProjectInfo = async (project, scenarioName) => { { project, scenario_name: scenarioName, - } + }, ); console.log(resp.data); return resp.data; @@ -183,7 +183,7 @@ const updateConfigProjectInfo = async (project, scenarioName) => { export const deleteScenario = async ( scenario, project, - onSuccess = () => {} + onSuccess = () => {}, ) => { try { console.log(`About to delete scenario ${scenario}`); @@ -192,7 +192,7 @@ export const deleteScenario = async ( { // apparently we can send a payload here: https://stackoverflow.com/a/58234086/2260 data: { project: project }, - } + }, ); console.log(resp.data); onSuccess(); @@ -207,9 +207,8 @@ export const useOpenScenario = (route = routes.INPUT_EDITOR) => { const changeRoute = useChangeRoute(route); return async (project, scenarioName) => { // Fetch project info first before going to route - const { scenarios_list: scenariosList } = await fetchProjectDetails( - project - ); + const { scenarios_list: scenariosList } = + await fetchProjectDetails(project); // Check if scenario still exist if (scenariosList.includes(scenarioName)) { await updateConfigProjectInfo(project, scenarioName); @@ -222,32 +221,22 @@ export const useOpenScenario = (route = routes.INPUT_EDITOR) => { message.error( Scenario: {scenarioName} could not be found. - + , ); }); } }; }; -export const useChangeRoute = (route) => { - const dispatch = useDispatch(); - return () => dispatch(push(route)); -}; - -export const useFetchProject = () => { - const dispatch = useDispatch(); - return (project) => dispatch(getProject(project)); -}; - const fetchProjectDetails = async (project = null) => { console.log( - `fetchProjectDetails: ${project} - url: ${import.meta.env.VITE_CEA_URL}` + `fetchProjectDetails: ${project} - url: ${import.meta.env.VITE_CEA_URL}`, ); const config = project ? { params: { project } } : {}; try { const resp = await axios.get( `${import.meta.env.VITE_CEA_URL}/api/project/`, - config + config, ); console.log(`fetchProjectDetails: resp.data=${resp.data}`); return resp.data; diff --git a/src/components/Project/RenameScenarioModal.jsx b/src/components/Project/RenameScenarioModal.jsx index 67803f8..df18d06 100644 --- a/src/components/Project/RenameScenarioModal.jsx +++ b/src/components/Project/RenameScenarioModal.jsx @@ -3,8 +3,8 @@ import { Form } from '@ant-design/compatible'; import { Modal } from 'antd'; import axios from 'axios'; import { FormItemWrapper } from '../Tools/Parameter'; -import { useFetchProject } from './Project'; import { checkExist, joinPath } from '../../utils/file'; +import { useFetchProject } from '../../utils/hooks'; const RenameScenarioModal = ({ scenarioName, @@ -26,7 +26,7 @@ const RenameScenarioModal = ({ `${ import.meta.env.VITE_CEA_URL }/api/project/scenario/${scenarioName}`, - values + values, ); console.log(resp.data); fetchProject(); diff --git a/src/components/Project/ScenarioCard.jsx b/src/components/Project/ScenarioCard.jsx index 75d82ee..2616954 100644 --- a/src/components/Project/ScenarioCard.jsx +++ b/src/components/Project/ScenarioCard.jsx @@ -1,19 +1,10 @@ import { useState, useEffect } from 'react'; import { DownOutlined } from '@ant-design/icons'; -import { - Card, - Row, - Col, - Button, - Modal, - Tag, - Dropdown, - Menu, - Space, -} from 'antd'; +import { Card, Row, Col, Button, Modal, Tag, Dropdown, Space } from 'antd'; import axios from 'axios'; -import { deleteScenario, useOpenScenario, useFetchProject } from './Project'; +import { deleteScenario, useOpenScenario } from './Project'; import RenameScenarioModal from './RenameScenarioModal'; +import { useFetchProject } from '../../utils/hooks'; const ScenarioCard = ({ scenarioName, project, active }) => { const openScenario = useOpenScenario(); @@ -54,7 +45,7 @@ const ScenarioCard = ({ scenarioName, project, active }) => { const ScenarioImage = ({ project, scenarioName, onClick = () => {} }) => { const [image, isLoading, error] = useGenerateScenarioImage( project, - scenarioName + scenarioName, ); return ( @@ -96,7 +87,7 @@ const useGenerateScenarioImage = (project, scenarioName) => { `${ import.meta.env.VITE_CEA_URL }/api/project/scenario/${scenarioName}/image`, - { params: { project } } + { params: { project } }, ); setData(resp.data); } catch (err) { diff --git a/src/containers/HomePage.jsx b/src/containers/HomePage.jsx index 7d414f9..918a6da 100644 --- a/src/containers/HomePage.jsx +++ b/src/containers/HomePage.jsx @@ -3,7 +3,6 @@ import { Route, Switch } from 'react-router-dom'; import SideNav from '../components/HomePage/SideNav'; import Header from '../components/HomePage/Header'; import { ToolRoute } from '../components/Tools/Tool'; -import { useFetchProject } from '../components/Project/Project'; import routes from '../constants/routes.json'; import { useDispatch, useSelector } from 'react-redux'; @@ -11,6 +10,7 @@ import { updateScenario } from '../actions/project'; import StatusBar from '../components/HomePage/StatusBar/StatusBar'; import './HomePage.css'; +import { useFetchProject } from '../utils/hooks'; export const LayoutContext = createContext(); diff --git a/src/utils/hooks.jsx b/src/utils/hooks.jsx index ec1cb55..56573c1 100644 --- a/src/utils/hooks.jsx +++ b/src/utils/hooks.jsx @@ -1,10 +1,13 @@ import { useState, useEffect, useRef } from 'react'; import axios from 'axios'; +import { useDispatch } from 'react-redux'; +import { push } from 'connected-react-router'; +import { getProject } from '../actions/project'; export const useAsyncData = ( url = '', initialState = null, - dependecies = [] + dependecies = [], ) => { const [data, setData] = useState(initialState); const [isLoading, setLoading] = useState(true); @@ -51,3 +54,13 @@ export const useEventListener = (eventName, handler, element = window) => { }; }, [eventName, element]); }; + +export const useChangeRoute = (route) => { + const dispatch = useDispatch(); + return () => dispatch(push(route)); +}; + +export const useFetchProject = () => { + const dispatch = useDispatch(); + return (project) => dispatch(getProject(project)); +}; From 1593d0af2417f265e21fc693c41ea714ee70e188 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 11:37:58 +0100 Subject: [PATCH 107/126] Lazy load project modals --- src/components/Project/Project.jsx | 45 +++++++++++++++++------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/components/Project/Project.jsx b/src/components/Project/Project.jsx index 5746456..26d3d7b 100644 --- a/src/components/Project/Project.jsx +++ b/src/components/Project/Project.jsx @@ -1,4 +1,4 @@ -import { useState } from 'react'; +import { Suspense, lazy, useState } from 'react'; import { useSelector, useDispatch } from 'react-redux'; import { FolderOpenOutlined, @@ -8,14 +8,15 @@ import { import { Card, Button, message } from 'antd'; import { updateScenario } from '../../actions/project'; import axios from 'axios'; -import NewProjectModal from './NewProjectModal'; -import OpenProjectModal from './OpenProjectModal'; -import NewScenarioModal from './NewScenarioModal'; import ScenarioCard from './ScenarioCard'; import routes from '../../constants/routes.json'; import './Project.css'; import { useChangeRoute, useFetchProject } from '../../utils/hooks'; +const NewProjectModal = lazy(() => import('./NewProjectModal')); +const OpenProjectModal = lazy(() => import('./OpenProjectModal')); +const NewScenarioModal = lazy(() => import('./NewScenarioModal')); + const Project = () => { const { isFetching, error, info } = useSelector((state) => state.project); @@ -86,11 +87,13 @@ const NewProjectButton = ({ onSuccess }) => { > Create Project - + + + ); }; @@ -107,11 +110,13 @@ const OpenProjectButton = ({ onSuccess = () => {} }) => { > Open Project - + + + ); }; @@ -155,11 +160,13 @@ const NewScenarioButton = ({ project }) => { > + Create New Scenario - + + + ); }; From 88d3f9655949031bfad06cf1e8e6a46edfa6d693 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 12:00:26 +0100 Subject: [PATCH 108/126] Move function to allow dynamic import --- src/components/Map/EditableMap.jsx | 18 +++------- src/components/Map/utils.js | 11 +++++++ .../Project/ScenarioGenerateDataForm.jsx | 33 ++++++++++--------- 3 files changed, 33 insertions(+), 29 deletions(-) create mode 100644 src/components/Map/utils.js diff --git a/src/components/Map/EditableMap.jsx b/src/components/Map/EditableMap.jsx index 2845d95..9c6de15 100644 --- a/src/components/Map/EditableMap.jsx +++ b/src/components/Map/EditableMap.jsx @@ -1,7 +1,7 @@ import { useState, useEffect } from 'react'; import Map from 'react-map-gl/maplibre'; import 'maplibre-gl/dist/maplibre-gl.css'; -import mapStyles from '../../constants/mapStyles'; +import mapStyles from '../../constants/mapStyles.json'; import { DrawPolygonMode, EditableGeoJsonLayer, @@ -10,8 +10,8 @@ import { } from 'nebula.gl'; import { Button } from 'antd'; import './EditableMap.css'; -import { area as calcArea, polygon } from '@turf/turf'; import { DeckGL } from 'deck.gl'; +import { calcPolyArea } from './utils'; const defaultViewState = { longitude: 0, @@ -26,16 +26,6 @@ const EMPTY_FEATURE = { features: [], }; -export const calcPolyArea = (geojson) => { - const poly = geojson.features[0]?.geometry?.coordinates; - if (typeof poly === 'undefined') return 0; - const site = polygon(geojson.features[0].geometry.coordinates); - // convert area from m^2 to km^2 - const area = (calcArea(site) / 1000000).toFixed(2); - - return area; -}; - const EditableMap = ({ location = defaultViewState, geojson = EMPTY_FEATURE, @@ -54,8 +44,8 @@ const EditableMap = ({ mode === 'draw' ? DrawPolygonMode : mode === 'edit' - ? ModifyMode - : ViewMode, + ? ModifyMode + : ViewMode, selectedFeatureIndexes: selectedFeatureIndexes, onEdit: (e) => { diff --git a/src/components/Map/utils.js b/src/components/Map/utils.js new file mode 100644 index 0000000..e3f0dd8 --- /dev/null +++ b/src/components/Map/utils.js @@ -0,0 +1,11 @@ +import { area as calcArea, polygon } from '@turf/turf'; + +export const calcPolyArea = (geojson) => { + const poly = geojson.features[0]?.geometry?.coordinates; + if (typeof poly === 'undefined') return 0; + const site = polygon(geojson.features[0].geometry.coordinates); + // convert area from m^2 to km^2 + const area = (calcArea(site) / 1000000).toFixed(2); + + return area; +}; diff --git a/src/components/Project/ScenarioGenerateDataForm.jsx b/src/components/Project/ScenarioGenerateDataForm.jsx index e7a4020..021e83b 100644 --- a/src/components/Project/ScenarioGenerateDataForm.jsx +++ b/src/components/Project/ScenarioGenerateDataForm.jsx @@ -1,11 +1,12 @@ -import { forwardRef, useState } from 'react'; +import { Suspense, forwardRef, lazy, useState } from 'react'; import { SettingOutlined } from '@ant-design/icons'; import { Form } from '@ant-design/compatible'; import { Checkbox, Row, Card, Input, Col } from 'antd'; import axios from 'axios'; -import EditableMap from '../Map/EditableMap'; import ToolModal from './ToolModal'; -import { calcPolyArea } from '../Map/EditableMap'; +import { calcPolyArea } from '../Map/utils'; + +const EditableMap = lazy(() => import('../Map/EditableMap')); const MAX_AREA_SIZE = 100; @@ -26,7 +27,7 @@ const ScenarioGenerateDataForm = ({ form, visible }) => { setTimeout(() => { form.setFieldsValue({ tools: checkedValue.filter( - (element) => element === 'weather' || element === 'zone' + (element) => element === 'weather' || element === 'zone', ), }); }, 0); @@ -147,7 +148,7 @@ const ScenarioGenerateDataForm = ({ form, visible }) => {
    - + , )}
    { callback('Create a polygon by selecting an area in the map.'); else if (calcPolyArea(value) > MAX_AREA_SIZE) { callback( - `Area selected is above ${MAX_AREA_SIZE} km2. CEA would not be able to extract information from that size due to the bandwidth limitation of Open Street Maps API. Try selecting a smaller area.` + `Area selected is above ${MAX_AREA_SIZE} km2. CEA would not be able to extract information from that size due to the bandwidth limitation of Open Street Maps API. Try selecting a smaller area.`, ); } else { callback(); @@ -198,7 +199,7 @@ const ScenarioMap = ({ form }) => { const address = form.getFieldValue('location'); try { const resp = await axios.get( - `https://nominatim.openstreetmap.org/?format=json&q=${address}&limit=1` + `https://nominatim.openstreetmap.org/?format=json&q=${address}&limit=1`, ); if (resp.data) { form.setFieldsValue( @@ -208,7 +209,7 @@ const ScenarioMap = ({ form }) => { long: resp.data[0].lon, }, }, - goToLocation + goToLocation, ); } } catch (err) { @@ -248,7 +249,7 @@ const ScenarioMap = ({ form }) => { allowClear enterButton="Search" onSearch={getLatLong} - /> + />, )} @@ -274,11 +275,13 @@ const ScenarioMap = ({ form }) => { {form.getFieldValue('tools').includes('zone') && (
    - + + +
    )} @@ -319,7 +322,7 @@ const LatLongInput = forwardRef( ); - } + }, ); LatLongInput.displayName = 'LatLongInput'; From 52e3a885eb6ce8c11d2ec6313b7d786e2f45e40f Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 19:04:10 +0800 Subject: [PATCH 109/126] Vite docker (#79) * Create Dockerfile * Use yarn instead of npm * Listen to all addresses * Add trailing slashes to url --- Dockerfile | 12 ++++++++++++ src/actions/databaseEditor.js | 6 +++--- src/actions/project.js | 2 +- src/components/HomePage/SearchBar/SearchBar.jsx | 8 ++++---- src/main.jsx | 2 +- 5 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..83abc45 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM node:current-alpine + +WORKDIR /app +COPY package.json . + +RUN yarn +COPY . . + +RUN yarn build +EXPOSE 4173 + +CMD [ "yarn", "preview", "--host" ] \ No newline at end of file diff --git a/src/actions/databaseEditor.js b/src/actions/databaseEditor.js index 43c8eef..a0d0880 100644 --- a/src/actions/databaseEditor.js +++ b/src/actions/databaseEditor.js @@ -23,7 +23,7 @@ export const fetchDatabaseData = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_DATA }); const { data } = await axios.get( - `${import.meta.env.VITE_CEA_URL}/api/inputs/databases` + `${import.meta.env.VITE_CEA_URL}/api/inputs/databases`, ); return dispatch({ type: FETCH_DATABASE_DATA_SUCCESS, @@ -44,7 +44,7 @@ export const fetchDatabaseSchema = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_SCHEMA }); const { data } = await axios.get( - `${import.meta.env.VITE_CEA_URL}/api/databases/schema` + `${import.meta.env.VITE_CEA_URL}/api/databases/schema`, ); return dispatch({ type: FETCH_DATABASE_SCHEMA_SUCCESS, @@ -67,7 +67,7 @@ export const fetchDatabaseGlossary = () => async (dispatch) => { try { dispatch({ type: FETCH_DATABASE_GLOSSARY }); const { data } = await axios.get( - `${import.meta.env.VITE_CEA_URL}/api/glossary` + `${import.meta.env.VITE_CEA_URL}/api/glossary/`, ); return dispatch({ type: FETCH_DATABASE_GLOSSARY_SUCCESS, diff --git a/src/actions/project.js b/src/actions/project.js index 5b62039..bb5bee5 100644 --- a/src/actions/project.js +++ b/src/actions/project.js @@ -12,7 +12,7 @@ export const getProject = (project = null) => { }); const config = project ? { params: { project } } : {}; return axios - .get(`${import.meta.env.VITE_CEA_URL}/api/project`, config) + .get(`${import.meta.env.VITE_CEA_URL}/api/project/`, config) .then((response) => { dispatch({ type: GET_PROJECT_SUCCESS, diff --git a/src/components/HomePage/SearchBar/SearchBar.jsx b/src/components/HomePage/SearchBar/SearchBar.jsx index 5215b52..e85bd69 100644 --- a/src/components/HomePage/SearchBar/SearchBar.jsx +++ b/src/components/HomePage/SearchBar/SearchBar.jsx @@ -13,7 +13,7 @@ const useGlossaryData = () => { const getSearchResults = async () => { try { const result = await axios.get( - `${import.meta.env.VITE_CEA_URL}/api/glossary` + `${import.meta.env.VITE_CEA_URL}/api/glossary/`, ); setData(result.data); } catch (error) { @@ -82,7 +82,7 @@ const SearchResults = ({ data, input, setValue }) => { const variables = category.variables.filter( (variable) => variable.VARIABLE.length != 0 && - variable.VARIABLE.toLowerCase().indexOf(input.toLowerCase()) == 0 + variable.VARIABLE.toLowerCase().indexOf(input.toLowerCase()) == 0, ); if (!variables.length) return null; return ( @@ -124,10 +124,10 @@ const SearchItem = ({ category, item, setValue }) => { `${DOCS_URL}${ category === 'inputs' ? 'input' : 'output' }_methods.html?highlight=${VARIABLE}#${LOCATOR_METHOD.split('_').join( - '-' + '-', )}`, '_blank', - 'noreferrer' + 'noreferrer', ); setValue(VARIABLE); }; diff --git a/src/main.jsx b/src/main.jsx index 66c16e0..e87c237 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -9,5 +9,5 @@ const store = configureStore(); ReactDOM.createRoot(document.getElementById('root')).render( - + , ); From aba36e86b61ddbe19253580a709a7292d516bece Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:12:55 +0100 Subject: [PATCH 110/126] Update axios cancel request --- src/components/Dashboard/Plot.jsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Dashboard/Plot.jsx b/src/components/Dashboard/Plot.jsx index eb5df63..5472ac8 100644 --- a/src/components/Dashboard/Plot.jsx +++ b/src/components/Dashboard/Plot.jsx @@ -7,7 +7,7 @@ import Icon, { PlusOutlined, UnorderedListOutlined, } from '@ant-design/icons'; -import { Button, Card, Menu, Tooltip, Spin, Empty, Dropdown } from 'antd'; +import { Button, Card, Tooltip, Spin, Empty, Dropdown } from 'antd'; import parser from 'html-react-parser'; import axios from 'axios'; import { ModalContext } from '../../utils/ModalManager'; @@ -25,13 +25,13 @@ const useFetchPlotDiv = (dashIndex, index, hash) => { // Get plot div useEffect(() => { let mounted = true; - const source = axios.CancelToken.source(); + const controller = new AbortController(); const fetch = async () => { try { const response = await axios.get( `${import.meta.env.VITE_CEA_URL}/plots/div/${dashIndex}/${index}`, { - cancelToken: source.token, + signal: controller.signal, }, ); if (mounted) @@ -56,7 +56,7 @@ const useFetchPlotDiv = (dashIndex, index, hash) => { return () => { // Cancel the request if it is not completed mounted = false; - source.cancel(); + controller.abort(); // Clean up script node if it is mounted let script = document.querySelector( From def6c2f86fbab988e74e8fac6c32d240dfe4c781 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:35:10 +0100 Subject: [PATCH 111/126] Apply styles to card body --- src/components/Dashboard/Plot.jsx | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/Dashboard/Plot.jsx b/src/components/Dashboard/Plot.jsx index 5472ac8..a0ce992 100644 --- a/src/components/Dashboard/Plot.jsx +++ b/src/components/Dashboard/Plot.jsx @@ -109,8 +109,10 @@ export const Plot = ({ index, dashIndex, data, style, activePlotRef = 0 }) => { } style={{ ...plotStyle, height: '', minHeight: '' }} styles={{ - height: plotStyle.height, - minHeight: plotStyle.minHeight, + body: { + height: plotStyle.height, + minHeight: plotStyle.minHeight, + }, }} size="small" > @@ -299,7 +301,9 @@ export const EmptyPlot = ({ style, index, activePlotRef }) => { From 117c9a8052c67ab15a1633de7c864ac6fce6879f Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:05:04 +0100 Subject: [PATCH 112/126] Remove dark map --- src/components/Map/Map.jsx | 33 +- src/constants/mapStyles/positron.json | 3150 +++++++++++++++++ src/constants/mapStyles/positron_nolabel.json | 2040 +++++++++++ 3 files changed, 5208 insertions(+), 15 deletions(-) create mode 100644 src/constants/mapStyles/positron.json create mode 100644 src/constants/mapStyles/positron_nolabel.json diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index 594c23b..3220a65 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -4,7 +4,9 @@ import { useSelector, useDispatch } from 'react-redux'; import { DeckGL } from 'deck.gl'; import { GeoJsonLayer } from '@deck.gl/layers/typed'; -import mapStyles from '../../constants/mapStyles'; +import positron from '../../constants/mapStyles/positron.json'; +import no_label from '../../constants/mapStyles/positron_nolabel.json'; + import { area as calcArea, length as calcLength } from '@turf/turf'; import { setSelected } from '../../actions/inputEditor'; import './Map.css'; @@ -31,7 +33,7 @@ const DeckGLMap = ({ data, colors }) => { const dispatch = useDispatch(); const selected = useSelector((state) => state.inputData.selected); const connectedBuildings = useSelector( - (state) => state.inputData.connected_buildings + (state) => state.inputData.connected_buildings, ); const [layers, setLayers] = useState([]); const [viewState, setViewState] = useState(defaultViewState); @@ -45,7 +47,7 @@ const DeckGLMap = ({ data, colors }) => { network: true, }); - const [mapStyle, setMapStyle] = useState('LIGHT_MAP'); + const [mapStyle, setMapStyle] = useState('labels'); const onMapLoad = useCallback(() => { console.debug('Map loaded.'); @@ -90,7 +92,7 @@ const DeckGLMap = ({ data, colors }) => { colors, connectedBuildings[network_type], selected, - network_type + network_type, ), updateTriggers: { getFillColor: [selected, visibility.dc], @@ -102,7 +104,7 @@ const DeckGLMap = ({ data, colors }) => { onHover: updateTooltip, onClick: onClick, - }) + }), ); } if (data.surroundings) { @@ -124,7 +126,7 @@ const DeckGLMap = ({ data, colors }) => { colors, connectedBuildings[network_type], selected, - network_type + network_type, ), updateTriggers: { getFillColor: selected, @@ -136,7 +138,7 @@ const DeckGLMap = ({ data, colors }) => { onHover: updateTooltip, onClick: onClick, - }) + }), ); } if (data.streets) { @@ -152,7 +154,7 @@ const DeckGLMap = ({ data, colors }) => { autoHighlight: true, onHover: updateTooltip, - }) + }), ); } if (data.dc) { @@ -174,7 +176,7 @@ const DeckGLMap = ({ data, colors }) => { autoHighlight: true, onHover: updateTooltip, - }) + }), ); } if (data.dh) { @@ -196,7 +198,7 @@ const DeckGLMap = ({ data, colors }) => { autoHighlight: true, onHover: updateTooltip, - }) + }), ); } return _layers; @@ -260,7 +262,7 @@ const DeckGLMap = ({ data, colors }) => { > @@ -276,12 +278,13 @@ const DeckGLMap = ({ data, colors }) => {
    - Dark Mode: + Show labels: { - setMapStyle(checked ? 'DARK_MAP' : 'LIGHT_MAP'); + setMapStyle(checked ? 'labels' : 'no_labels'); }} />
    @@ -356,7 +359,7 @@ function updateTooltip({ x, y, object, layer }) { if (layer.id === 'zone') innerHTML += `
    GFA: ${ Math.round( - (properties['floors_ag'] + properties['floors_bg']) * area * 1000 + (properties['floors_ag'] + properties['floors_bg']) * area * 1000, ) / 1000 }m2
    `; } else if (layer.id === 'dc' || layer.id === 'dh') { @@ -398,7 +401,7 @@ const buildingColor = ( colors, connectedBuildings, selected, - network_type + network_type, ) => { if (selected.includes(buildingName)) { return [255, 255, 0, 255]; diff --git a/src/constants/mapStyles/positron.json b/src/constants/mapStyles/positron.json new file mode 100644 index 0000000..4f41d45 --- /dev/null +++ b/src/constants/mapStyles/positron.json @@ -0,0 +1,3150 @@ +{ + "version": 8, + "name": "Positron", + "metadata": {}, + "sources": { + "carto": { + "type": "vector", + "url": "https://tiles.basemaps.cartocdn.com/vector/carto.streets/v1/tiles.json" + } + }, + "sprite": "https://tiles.basemaps.cartocdn.com/gl/positron-gl-style/sprite", + "glyphs": "https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf", + "layers": [ + { + "id": "background", + "type": "background", + "layout": { + "visibility": "visible" + }, + "paint": { + "background-color": "#fafaf8", + "background-opacity": 1 + } + }, + { + "id": "landcover", + "type": "fill", + "source": "carto", + "source-layer": "landcover", + "filter": [ + "any", + ["==", "class", "wood"], + ["==", "class", "grass"], + ["==", "subclass", "recreation_ground"] + ], + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-opacity": 1 + } + }, + { + "id": "park_national_park", + "type": "fill", + "source": "carto", + "source-layer": "park", + "minzoom": 9, + "filter": ["all", ["==", "class", "national_park"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-opacity": 1, + "fill-translate-anchor": "map" + } + }, + { + "id": "park_nature_reserve", + "type": "fill", + "source": "carto", + "source-layer": "park", + "minzoom": 0, + "filter": ["all", ["==", "class", "nature_reserve"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-antialias": true, + "fill-opacity": { + "stops": [ + [6, 0.7], + [9, 0.9] + ] + } + } + }, + { + "id": "landuse_residential", + "type": "fill", + "source": "carto", + "source-layer": "landuse", + "minzoom": 6, + "filter": ["any", ["==", "class", "residential"]], + "paint": { + "fill-color": { + "stops": [ + [5, "rgba(237, 237, 237, 0.5)"], + [8, "rgba(237, 237, 237, 0.45)"], + [9, "rgba(237, 237, 237, 0.4)"], + [11, "rgba(237, 237, 237, 0.35)"], + [13, "rgba(237, 237, 237, 0.3)"], + [15, "rgba(237, 237, 237, 0.25)"], + [16, "rgba(237, 237, 237, 0.25)"] + ] + }, + "fill-opacity": { + "stops": [ + [6, 0.6], + [9, 1] + ] + } + } + }, + { + "id": "landuse", + "type": "fill", + "source": "carto", + "source-layer": "landuse", + "filter": [ + "any", + ["==", "class", "cemetery"], + ["==", "class", "stadium"] + ], + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + } + } + }, + { + "id": "waterway", + "type": "line", + "source": "carto", + "source-layer": "waterway", + "paint": { + "line-color": "#d1dbdf", + "line-width": { + "stops": [ + [8, 0.5], + [9, 1], + [15, 2], + [16, 3] + ] + } + } + }, + { + "id": "boundary_county", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 9, + "maxzoom": 24, + "filter": ["all", ["==", "admin_level", 6], ["==", "maritime", 0]], + "paint": { + "line-color": { + "stops": [ + [4, "#ead5d7"], + [5, "#ead5d7"], + [6, "#e1c5c7"] + ] + }, + "line-width": { + "stops": [ + [4, 0.5], + [7, 1] + ] + }, + "line-dasharray": { + "stops": [ + [6, [1]], + [7, [2, 2]] + ] + } + } + }, + { + "id": "boundary_state", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 4, + "filter": ["all", ["==", "admin_level", 4], ["==", "maritime", 0]], + "paint": { + "line-color": { + "stops": [ + [4, "#ead5d7"], + [5, "#ead5d7"], + [6, "#e1c5c7"] + ] + }, + "line-width": { + "stops": [ + [4, 0.5], + [7, 1], + [8, 1], + [9, 1.2] + ] + }, + "line-dasharray": { + "stops": [ + [6, [1]], + [7, [2, 2]] + ] + } + } + }, + { + "id": "water", + "type": "fill", + "source": "carto", + "source-layer": "water", + "minzoom": 0, + "maxzoom": 24, + "filter": ["all", ["==", "$type", "Polygon"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "#d4dadc", + "fill-antialias": true, + "fill-translate-anchor": "map", + "fill-opacity": 1 + } + }, + { + "id": "water_shadow", + "type": "fill", + "source": "carto", + "source-layer": "water", + "minzoom": 0, + "filter": ["all", ["==", "$type", "Polygon"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "transparent", + "fill-antialias": true, + "fill-translate-anchor": "map", + "fill-opacity": 1, + "fill-translate": { + "stops": [ + [0, [0, 2]], + [6, [0, 1]], + [14, [0, 1]], + [17, [0, 2]] + ] + } + } + }, + { + "id": "aeroway-runway", + "type": "line", + "source": "carto", + "source-layer": "aeroway", + "minzoom": 12, + "filter": ["all", ["==", "class", "runway"]], + "layout": { + "line-cap": "square" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 4], + [14, 6], + [15, 8], + [16, 10] + ] + }, + "line-color": "#e8e8e8" + } + }, + { + "id": "aeroway-taxiway", + "type": "line", + "source": "carto", + "source-layer": "aeroway", + "minzoom": 13, + "filter": ["all", ["==", "class", "taxiway"]], + "paint": { + "line-color": "#e8e8e8", + "line-width": { + "stops": [ + [13, 0.5], + [14, 1], + [15, 2], + [16, 4] + ] + } + } + }, + { + "id": "waterway_label", + "type": "symbol", + "source": "carto", + "source-layer": "waterway", + "filter": ["all", ["has", "name"], ["==", "class", "river"]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Regular Italic", + "Open Sans Italic", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "symbol-placement": "line", + "symbol-spacing": 300, + "symbol-avoid-edges": false, + "text-size": { + "stops": [ + [9, 8], + [10, 9] + ] + }, + "text-padding": 2, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-offset": { + "stops": [ + [6, [0, -0.2]], + [11, [0, -0.4]], + [12, [0, -0.6]] + ] + }, + "text-letter-spacing": 0, + "text-keep-upright": true + }, + "paint": { + "text-color": "#7a96a0", + "text-halo-color": "#f5f5f3", + "text-halo-width": 1 + } + }, + { + "id": "tunnel_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_sec_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1], + [13, 2], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_pri_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 8, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_trunk_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_mot_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "path"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "tunnel_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "rgba(238, 238, 238, 1)" + } + }, + { + "id": "tunnel_sec_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_pri_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_trunk_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_mot_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_rail", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#dddddd", + "line-width": { + "base": 1.3, + "stops": [ + [13, 0.5], + [14, 1], + [15, 1], + [16, 3], + [21, 7] + ] + }, + "line-opacity": 0.5 + } + }, + { + "id": "tunnel_rail_dash", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#ffffff", + "line-width": { + "base": 1.3, + "stops": [ + [15, 0.5], + [16, 1], + [20, 5] + ] + }, + "line-dasharray": { + "stops": [ + [15, [5, 5]], + [16, [6, 6]] + ] + }, + "line-opacity": 0.5 + } + }, + { + "id": "road_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "service"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "road_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 3], + [16, 4.3], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-opacity": 1, + "line-color": { + "stops": [ + [13, "#e6e6e6"], + [15.7, "#e6e6e6"], + [16, "#ddd"] + ] + } + } + }, + { + "id": "road_pri_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "primary"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "road_trunk_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "trunk"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [12, "#e6e6e6"], + [14, "#ddd"] + ] + } + } + }, + { + "id": "road_mot_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "motorway"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [12, "#e6e6e6"], + [14, "#ddd"] + ] + } + } + }, + { + "id": "road_sec_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1.5], + [13, 3], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [11, "#e6e6e6"], + [12.99, "#e6e6e6"], + [13, "#ddd"] + ] + } + } + }, + { + "id": "road_pri_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 7, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [7, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_trunk_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_mot_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.7], + [8, 0.8], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["in", "class", "path", "track"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "road_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "service"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "road_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "road_pri_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "primary"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_trunk_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "trunk"], ["==", "ramp", 1]], + "layout": { + "line-cap": "square", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_mot_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "motorway"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_sec_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_pri_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 0.3], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_trunk_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_mot_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "rail", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "filter": ["all", ["==", "class", "rail"], ["!=", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#dddddd", + "line-width": { + "base": 1.3, + "stops": [ + [13, 0.5], + [14, 1], + [15, 1], + [16, 3], + [21, 7] + ] + } + } + }, + { + "id": "rail_dash", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "filter": ["all", ["==", "class", "rail"], ["!=", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#ffffff", + "line-width": { + "base": 1.3, + "stops": [ + [15, 0.5], + [16, 1], + [20, 5] + ] + }, + "line-dasharray": { + "stops": [ + [15, [5, 5]], + [16, [6, 6]] + ] + } + } + }, + { + "id": "bridge_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "bridge_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 3], + [16, 4.3], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-opacity": 1, + "line-color": { + "stops": [ + [13, "#e6e6e6"], + [15.7, "#e6e6e6"], + [16, "#ddd"] + ] + } + } + }, + { + "id": "bridge_sec_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1.5], + [13, 3], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [11, "#e6e6e6"], + [12.99, "#e6e6e6"], + [13, "#ddd"] + ] + } + } + }, + { + "id": "bridge_pri_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 8, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [8, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "bridge_trunk_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "bridge_mot_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [10, "#ddd"] + ] + } + } + }, + { + "id": "bridge_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "path"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "bridge_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "bridge_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "bridge_sec_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_pri_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_trunk_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_mot_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "building", + "type": "fill", + "source": "carto", + "source-layer": "building", + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "base": 1, + "stops": [ + [15.5, "#dfdfdf"], + [16, "#dfdfdf"] + ] + }, + "fill-antialias": true + } + }, + { + "id": "building-top", + "type": "fill", + "source": "carto", + "source-layer": "building", + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-translate": { + "base": 1, + "stops": [ + [14, [0, 0]], + [16, [-2, -2]] + ] + }, + "fill-outline-color": "#dfdfdf", + "fill-color": "#ededed", + "fill-opacity": { + "base": 1, + "stops": [ + [13, 0], + [16, 1] + ] + } + } + }, + { + "id": "boundary_country_outline", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 6, + "maxzoom": 24, + "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-color": "#f3efed", + "line-opacity": 0.5, + "line-width": 8, + "line-offset": 0 + } + }, + { + "id": "boundary_country_inner", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 0, + "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-color": { + "stops": [ + [4, "#f2e6e7"], + [5, "#ebd6d8"], + [6, "#ebd6d8"] + ] + }, + "line-opacity": 1, + "line-width": { + "stops": [ + [3, 1], + [6, 1.5] + ] + }, + "line-offset": 0 + } + }, + { + "id": "watername_ocean", + "type": "symbol", + "source": "carto", + "source-layer": "water_name", + "minzoom": 0, + "maxzoom": 5, + "filter": [ + "all", + ["has", "name"], + ["==", "$type", "Point"], + ["==", "class", "ocean"] + ], + "layout": { + "text-field": "{name}", + "symbol-placement": "point", + "text-size": { + "stops": [ + [0, 13], + [2, 14], + [4, 18] + ] + }, + "text-font": [ + "Montserrat Medium Italic", + "Open Sans Italic", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-line-height": 1.2, + "text-padding": 2, + "text-allow-overlap": false, + "text-ignore-placement": false, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-max-width": 6, + "text-letter-spacing": 0.1 + }, + "paint": { + "text-color": "#abb6be", + "text-halo-color": "#d4dadc", + "text-halo-width": 1, + "text-halo-blur": 0 + } + }, + { + "id": "watername_sea", + "type": "symbol", + "source": "carto", + "source-layer": "water_name", + "minzoom": 5, + "filter": [ + "all", + ["has", "name"], + ["==", "$type", "Point"], + ["==", "class", "sea"] + ], + "layout": { + "text-field": "{name}", + "symbol-placement": "point", + "text-size": 12, + "text-font": [ + "Montserrat Medium Italic", + "Open Sans Italic", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-line-height": 1.2, + "text-padding": 2, + "text-allow-overlap": false, + "text-ignore-placement": false, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-max-width": 6, + "text-letter-spacing": 0.1 + }, + "paint": { + "text-color": "#abb6be", + "text-halo-color": "#d4dadc", + "text-halo-width": 1, + "text-halo-blur": 0 + } + }, + { + "id": "watername_lake", + "type": "symbol", + "source": "carto", + "source-layer": "water_name", + "minzoom": 4, + "filter": [ + "all", + ["has", "name"], + ["==", "$type", "Point"], + ["==", "class", "lake"] + ], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "symbol-placement": "point", + "text-size": { + "stops": [ + [13, 9], + [14, 10], + [15, 11], + [16, 12], + [17, 13] + ] + }, + "text-font": [ + "Montserrat Regular Italic", + "Open Sans Italic", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-line-height": 1.2, + "text-padding": 2, + "text-allow-overlap": false, + "text-ignore-placement": false, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto" + }, + "paint": { + "text-color": "#7a96a0", + "text-halo-color": "#f5f5f3", + "text-halo-width": 1, + "text-halo-blur": 1 + } + }, + { + "id": "watername_lake_line", + "type": "symbol", + "source": "carto", + "source-layer": "water_name", + "filter": ["all", ["has", "name"], ["==", "$type", "LineString"]], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "symbol-placement": "line", + "text-size": { + "stops": [ + [13, 9], + [14, 10], + [15, 11], + [16, 12], + [17, 13] + ] + }, + "text-font": [ + "Montserrat Regular Italic", + "Open Sans Italic", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "symbol-spacing": 350, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-line-height": 1.2 + }, + "paint": { + "text-color": "#7a96a0", + "text-halo-color": "#f5f5f3", + "text-halo-width": 1, + "text-halo-blur": 1 + } + }, + { + "id": "place_hamlet", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 12, + "maxzoom": 16, + "filter": [ + "any", + ["==", "class", "neighbourhood"], + ["==", "class", "hamlet"] + ], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [14, "{name}"] + ] + }, + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [13, 8], + [14, 10], + [16, 11] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": { + "stops": [ + [12, "none"], + [14, "uppercase"] + ] + } + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_suburbs", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 12, + "maxzoom": 16, + "filter": ["all", ["==", "class", "suburb"]], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [12, 9], + [13, 10], + [14, 11], + [15, 12], + [16, 13] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": { + "stops": [ + [8, "none"], + [12, "uppercase"] + ] + } + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_villages", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 10, + "maxzoom": 16, + "filter": ["all", ["==", "class", "village"]], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [10, 9], + [12, 10], + [13, 11], + [14, 12], + [16, 13] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": "none" + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_town", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 8, + "maxzoom": 14, + "filter": ["all", ["==", "class", "town"]], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [8, 10], + [9, 10], + [10, 11], + [13, 14], + [14, 15] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": "none" + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_country_2", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 3, + "maxzoom": 10, + "filter": [ + "all", + ["==", "class", "country"], + [">=", "rank", 3], + ["has", "iso_a2"] + ], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [3, 10], + [5, 11], + [6, 12], + [7, 13], + [8, 14] + ] + }, + "text-transform": "uppercase" + }, + "paint": { + "text-color": { + "stops": [ + [3, "#8a99a4"], + [5, "#a1adb6"], + [6, "#b9c2c9"] + ] + }, + "text-halo-color": "#fafaf8", + "text-halo-width": 1 + } + }, + { + "id": "place_country_1", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 2, + "maxzoom": 7, + "filter": ["all", ["==", "class", "country"], ["<=", "rank", 2]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [3, 11], + [4, 12], + [5, 13], + [6, 14] + ] + }, + "text-transform": "uppercase", + "text-max-width": { + "stops": [ + [2, 6], + [3, 6], + [4, 9], + [5, 12] + ] + } + }, + "paint": { + "text-color": { + "stops": [ + [3, "#8a99a4"], + [5, "#a1adb6"], + [6, "#b9c2c9"] + ] + }, + "text-halo-color": "#fafaf8", + "text-halo-width": 1 + } + }, + { + "id": "place_state", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 5, + "maxzoom": 10, + "filter": ["all", ["==", "class", "state"], ["<=", "rank", 4]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [5, 12], + [7, 14] + ] + }, + "text-transform": "uppercase", + "text-max-width": 9 + }, + "paint": { + "text-color": "#97a4ae", + "text-halo-color": "#fafaf8", + "text-halo-width": 0 + } + }, + { + "id": "place_continent", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 0, + "maxzoom": 2, + "filter": ["all", ["==", "class", "continent"]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-transform": "uppercase", + "text-size": 14, + "text-letter-spacing": 0.1, + "text-max-width": 9, + "text-justify": "center", + "text-keep-upright": false + }, + "paint": { + "text-color": "#697b89", + "text-halo-color": "#fafaf8", + "text-halo-width": 1 + } + }, + { + "id": "place_city_r6", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 8, + "maxzoom": 15, + "filter": ["all", ["==", "class", "city"], [">=", "rank", 6]], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [8, 12], + [9, 13], + [10, 14], + [13, 17], + [14, 20] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": "uppercase" + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_city_r5", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 8, + "maxzoom": 15, + "filter": [ + "all", + ["==", "class", "city"], + [">=", "rank", 0], + ["<=", "rank", 5] + ], + "layout": { + "text-field": { + "stops": [ + [8, "{name_en}"], + [13, "{name}"] + ] + }, + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [8, 14], + [10, 16], + [13, 19], + [14, 22] + ] + }, + "icon-image": "", + "icon-offset": [16, 0], + "text-anchor": "center", + "icon-size": 1, + "text-max-width": 10, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": "uppercase" + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_city_dot_r7", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 6, + "maxzoom": 7, + "filter": ["all", ["==", "class", "city"], ["<=", "rank", 7]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 12, + "icon-image": "circle-11", + "icon-offset": [16, 5], + "text-anchor": "right", + "icon-size": 0.4, + "text-max-width": 8, + "text-keep-upright": true, + "text-offset": [0.2, 0.2] + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_city_dot_r4", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 5, + "maxzoom": 7, + "filter": ["all", ["==", "class", "city"], ["<=", "rank", 4]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 12, + "icon-image": "circle-11", + "icon-offset": [16, 5], + "text-anchor": "right", + "icon-size": 0.4, + "text-max-width": 8, + "text-keep-upright": true, + "text-offset": [0.2, 0.2] + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_city_dot_r2", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 4, + "maxzoom": 7, + "filter": ["all", ["==", "class", "city"], ["<=", "rank", 2]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 12, + "icon-image": "circle-11", + "icon-offset": [16, 5], + "text-anchor": "right", + "icon-size": 0.4, + "text-max-width": 8, + "text-keep-upright": true, + "text-offset": [0.2, 0.2] + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_city_dot_z7", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 7, + "maxzoom": 8, + "filter": [ + "all", + ["!has", "capital"], + ["!in", "class", "country", "state"] + ], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 12, + "icon-image": "circle-11", + "icon-offset": [16, 5], + "text-anchor": "right", + "icon-size": 0.4, + "text-max-width": 8, + "text-keep-upright": true, + "text-offset": [0.2, 0.2] + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "place_capital_dot_z7", + "type": "symbol", + "source": "carto", + "source-layer": "place", + "minzoom": 7, + "maxzoom": 8, + "filter": ["all", [">", "capital", 0]], + "layout": { + "text-field": "{name_en}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 12, + "icon-image": "circle-11", + "icon-offset": [16, 5], + "text-anchor": "right", + "icon-size": 0.4, + "text-max-width": 8, + "text-keep-upright": true, + "text-offset": [0.2, 0.2], + "text-transform": "uppercase" + }, + "paint": { + "text-color": "#697b89", + "icon-color": "#697b89", + "icon-translate-anchor": "map", + "text-halo-color": "rgba(255,255,255,0.5)", + "text-halo-width": 1 + } + }, + { + "id": "poi_stadium", + "type": "symbol", + "source": "carto", + "source-layer": "poi", + "minzoom": 15, + "filter": [ + "all", + ["in", "class", "stadium", "cemetery", "attraction"], + ["<=", "rank", 3] + ], + "layout": { + "text-field": "{name}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [15, 8], + [17, 9], + [18, 10] + ] + }, + "text-transform": "uppercase" + }, + "paint": { + "text-color": "#7d9c83", + "text-halo-color": "#f5f5f3", + "text-halo-width": 1 + } + }, + { + "id": "poi_park", + "type": "symbol", + "source": "carto", + "source-layer": "poi", + "minzoom": 15, + "filter": ["all", ["==", "class", "park"]], + "layout": { + "text-field": "{name}", + "text-font": [ + "Montserrat Medium", + "Open Sans Bold", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [15, 8], + [17, 9], + [18, 10] + ] + }, + "text-transform": "uppercase" + }, + "paint": { + "text-color": "#7d9c83", + "text-halo-color": "#f5f5f3", + "text-halo-width": 1 + } + }, + { + "id": "roadname_minor", + "type": "symbol", + "source": "carto", + "source-layer": "transportation_name", + "minzoom": 16, + "filter": ["all", ["in", "class", "minor", "service"]], + "layout": { + "symbol-placement": "line", + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": 9, + "text-field": "{name}", + "symbol-avoid-edges": false, + "symbol-spacing": 200, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-justify": "center" + }, + "paint": { + "text-color": "#838383", + "text-halo-color": "#fff", + "text-halo-width": 1 + } + }, + { + "id": "roadname_sec", + "type": "symbol", + "source": "carto", + "source-layer": "transportation_name", + "minzoom": 15, + "filter": ["all", ["in", "class", "secondary", "tertiary"]], + "layout": { + "symbol-placement": "line", + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [15, 9], + [16, 11], + [18, 12] + ] + }, + "text-field": "{name}", + "symbol-avoid-edges": false, + "symbol-spacing": 200, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-justify": "center" + }, + "paint": { + "text-color": "#838383", + "text-halo-color": "#fff", + "text-halo-width": 1 + } + }, + { + "id": "roadname_pri", + "type": "symbol", + "source": "carto", + "source-layer": "transportation_name", + "minzoom": 14, + "filter": ["all", ["in", "class", "primary"]], + "layout": { + "symbol-placement": "line", + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [14, 10], + [15, 10], + [16, 11], + [18, 12] + ] + }, + "text-field": "{name}", + "symbol-avoid-edges": false, + "symbol-spacing": { + "stops": [ + [6, 200], + [16, 250] + ] + }, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-justify": "center", + "text-letter-spacing": { + "stops": [ + [14, 0], + [16, 0.2] + ] + } + }, + "paint": { + "text-color": "#838383", + "text-halo-color": "#fff", + "text-halo-width": 1 + } + }, + { + "id": "roadname_major", + "type": "symbol", + "source": "carto", + "source-layer": "transportation_name", + "minzoom": 13, + "filter": ["all", ["in", "class", "trunk", "motorway"]], + "layout": { + "symbol-placement": "line", + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ], + "text-size": { + "stops": [ + [14, 10], + [15, 10], + [16, 11], + [18, 12] + ] + }, + "text-field": "{name}", + "symbol-avoid-edges": false, + "symbol-spacing": { + "stops": [ + [6, 200], + [16, 250] + ] + }, + "text-pitch-alignment": "auto", + "text-rotation-alignment": "auto", + "text-justify": "center", + "text-letter-spacing": { + "stops": [ + [13, 0], + [16, 0.2] + ] + } + }, + "paint": { + "text-color": "#838383", + "text-halo-color": "#fff", + "text-halo-width": 1 + } + }, + { + "id": "housenumber", + "type": "symbol", + "source": "carto", + "source-layer": "housenumber", + "minzoom": 17, + "maxzoom": 24, + "layout": { + "text-field": "{housenumber}", + "text-size": { + "stops": [ + [17, 9], + [18, 11] + ] + }, + "text-font": [ + "Montserrat Regular", + "Open Sans Regular", + "Noto Sans Regular", + "HanWangHeiLight Regular", + "NanumBarunGothic Regular" + ] + }, + "paint": { + "text-halo-color": "transparent", + "text-color": "transparent", + "text-halo-width": 0.75 + } + } + ], + "id": "voyager", + "owner": "Carto" +} diff --git a/src/constants/mapStyles/positron_nolabel.json b/src/constants/mapStyles/positron_nolabel.json new file mode 100644 index 0000000..1edb82f --- /dev/null +++ b/src/constants/mapStyles/positron_nolabel.json @@ -0,0 +1,2040 @@ +{ + "version": 8, + "name": "Positron without labels", + "metadata": {}, + "sources": { + "carto": { + "type": "vector", + "url": "https://tiles.basemaps.cartocdn.com/vector/carto.streets/v1/tiles.json" + } + }, + "sprite": "https://tiles.basemaps.cartocdn.com/gl/positron-gl-style/sprite", + "glyphs": "https://tiles.basemaps.cartocdn.com/fonts/{fontstack}/{range}.pbf", + "layers": [ + { + "id": "background", + "type": "background", + "layout": { + "visibility": "visible" + }, + "paint": { + "background-color": "#fafaf8", + "background-opacity": 1 + } + }, + { + "id": "landcover", + "type": "fill", + "source": "carto", + "source-layer": "landcover", + "filter": [ + "any", + ["==", "class", "wood"], + ["==", "class", "grass"], + ["==", "subclass", "recreation_ground"] + ], + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-opacity": 1 + } + }, + { + "id": "park_national_park", + "type": "fill", + "source": "carto", + "source-layer": "park", + "minzoom": 9, + "filter": ["all", ["==", "class", "national_park"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-opacity": 1, + "fill-translate-anchor": "map" + } + }, + { + "id": "park_nature_reserve", + "type": "fill", + "source": "carto", + "source-layer": "park", + "minzoom": 0, + "filter": ["all", ["==", "class", "nature_reserve"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + }, + "fill-antialias": true, + "fill-opacity": { + "stops": [ + [6, 0.7], + [9, 0.9] + ] + } + } + }, + { + "id": "landuse_residential", + "type": "fill", + "source": "carto", + "source-layer": "landuse", + "minzoom": 6, + "filter": ["any", ["==", "class", "residential"]], + "paint": { + "fill-color": { + "stops": [ + [5, "rgba(237, 237, 237, 0.5)"], + [8, "rgba(237, 237, 237, 0.45)"], + [9, "rgba(237, 237, 237, 0.4)"], + [11, "rgba(237, 237, 237, 0.35)"], + [13, "rgba(237, 237, 237, 0.3)"], + [15, "rgba(237, 237, 237, 0.25)"], + [16, "rgba(237, 237, 237, 0.25)"] + ] + }, + "fill-opacity": { + "stops": [ + [6, 0.6], + [9, 1] + ] + } + } + }, + { + "id": "landuse", + "type": "fill", + "source": "carto", + "source-layer": "landuse", + "filter": [ + "any", + ["==", "class", "cemetery"], + ["==", "class", "stadium"] + ], + "paint": { + "fill-color": { + "stops": [ + [8, "rgba(234, 241, 233, 0.5)"], + [9, "rgba(234, 241, 233, 0.5)"], + [11, "rgba(234, 241, 233, 0.5)"], + [13, "rgba(234, 241, 233, 0.5)"], + [15, "rgba(234, 241, 233, 0.5)"] + ] + } + } + }, + { + "id": "waterway", + "type": "line", + "source": "carto", + "source-layer": "waterway", + "paint": { + "line-color": "#d1dbdf", + "line-width": { + "stops": [ + [8, 0.5], + [9, 1], + [15, 2], + [16, 3] + ] + } + } + }, + { + "id": "boundary_county", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 9, + "maxzoom": 24, + "filter": ["all", ["==", "admin_level", 6], ["==", "maritime", 0]], + "paint": { + "line-color": { + "stops": [ + [4, "#ead5d7"], + [5, "#ead5d7"], + [6, "#e1c5c7"] + ] + }, + "line-width": { + "stops": [ + [4, 0.5], + [7, 1] + ] + }, + "line-dasharray": { + "stops": [ + [6, [1]], + [7, [2, 2]] + ] + } + } + }, + { + "id": "boundary_state", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 4, + "filter": ["all", ["==", "admin_level", 4], ["==", "maritime", 0]], + "paint": { + "line-color": { + "stops": [ + [4, "#ead5d7"], + [5, "#ead5d7"], + [6, "#e1c5c7"] + ] + }, + "line-width": { + "stops": [ + [4, 0.5], + [7, 1], + [8, 1], + [9, 1.2] + ] + }, + "line-dasharray": { + "stops": [ + [6, [1]], + [7, [2, 2]] + ] + } + } + }, + { + "id": "water", + "type": "fill", + "source": "carto", + "source-layer": "water", + "minzoom": 0, + "maxzoom": 24, + "filter": ["all", ["==", "$type", "Polygon"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "#d4dadc", + "fill-antialias": true, + "fill-translate-anchor": "map", + "fill-opacity": 1 + } + }, + { + "id": "water_shadow", + "type": "fill", + "source": "carto", + "source-layer": "water", + "minzoom": 0, + "filter": ["all", ["==", "$type", "Polygon"]], + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "transparent", + "fill-antialias": true, + "fill-translate-anchor": "map", + "fill-opacity": 1, + "fill-translate": { + "stops": [ + [0, [0, 2]], + [6, [0, 1]], + [14, [0, 1]], + [17, [0, 2]] + ] + } + } + }, + { + "id": "aeroway-runway", + "type": "line", + "source": "carto", + "source-layer": "aeroway", + "minzoom": 12, + "filter": ["all", ["==", "class", "runway"]], + "layout": { + "line-cap": "square" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 4], + [14, 6], + [15, 8], + [16, 10] + ] + }, + "line-color": "#e8e8e8" + } + }, + { + "id": "aeroway-taxiway", + "type": "line", + "source": "carto", + "source-layer": "aeroway", + "minzoom": 13, + "filter": ["all", ["==", "class", "taxiway"]], + "paint": { + "line-color": "#e8e8e8", + "line-width": { + "stops": [ + [13, 0.5], + [14, 1], + [15, 2], + [16, 4] + ] + } + } + }, + { + "id": "tunnel_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_sec_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1], + [13, 2], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_pri_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 8, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_trunk_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_mot_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "tunnel_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "path"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "tunnel_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "tunnel"]], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "rgba(238, 238, 238, 1)" + } + }, + { + "id": "tunnel_sec_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_pri_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_trunk_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_mot_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "tunnel"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#eee" + } + }, + { + "id": "tunnel_rail", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#dddddd", + "line-width": { + "base": 1.3, + "stops": [ + [13, 0.5], + [14, 1], + [15, 1], + [16, 3], + [21, 7] + ] + }, + "line-opacity": 0.5 + } + }, + { + "id": "tunnel_rail_dash", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#ffffff", + "line-width": { + "base": 1.3, + "stops": [ + [15, 0.5], + [16, 1], + [20, 5] + ] + }, + "line-dasharray": { + "stops": [ + [15, [5, 5]], + [16, [6, 6]] + ] + }, + "line-opacity": 0.5 + } + }, + { + "id": "road_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "service"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "road_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 3], + [16, 4.3], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-opacity": 1, + "line-color": { + "stops": [ + [13, "#e6e6e6"], + [15.7, "#e6e6e6"], + [16, "#ddd"] + ] + } + } + }, + { + "id": "road_pri_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "primary"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": "#ddd" + } + }, + { + "id": "road_trunk_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "trunk"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [12, "#e6e6e6"], + [14, "#ddd"] + ] + } + } + }, + { + "id": "road_mot_case_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "motorway"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 2], + [13, 3], + [14, 4], + [15, 5], + [16, 8], + [17, 10] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [12, "#e6e6e6"], + [14, "#ddd"] + ] + } + } + }, + { + "id": "road_sec_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1.5], + [13, 3], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [11, "#e6e6e6"], + [12.99, "#e6e6e6"], + [13, "#ddd"] + ] + } + } + }, + { + "id": "road_pri_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 7, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [7, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_trunk_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_mot_case_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.7], + [8, 0.8], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "road_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["in", "class", "path", "track"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "road_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "service"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "road_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["!has", "brunnel"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "road_pri_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "primary"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_trunk_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "trunk"], ["==", "ramp", 1]], + "layout": { + "line-cap": "square", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_mot_fill_ramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 12, + "maxzoom": 24, + "filter": ["all", ["==", "class", "motorway"], ["==", "ramp", 1]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [12, 1], + [13, 1.5], + [14, 2], + [15, 3], + [16, 6], + [17, 8] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_sec_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_pri_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 0.3], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_trunk_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "road_mot_fill_noramp", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["!has", "brunnel"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "rail", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "filter": ["all", ["==", "class", "rail"], ["!=", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#dddddd", + "line-width": { + "base": 1.3, + "stops": [ + [13, 0.5], + [14, 1], + [15, 1], + [16, 3], + [21, 7] + ] + } + } + }, + { + "id": "rail_dash", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "filter": ["all", ["==", "class", "rail"], ["!=", "brunnel", "tunnel"]], + "layout": { + "visibility": "visible", + "line-join": "round" + }, + "paint": { + "line-color": "#ffffff", + "line-width": { + "base": 1.3, + "stops": [ + [15, 0.5], + [16, 1], + [20, 5] + ] + }, + "line-dasharray": { + "stops": [ + [15, [5, 5]], + [16, [6, 6]] + ] + } + } + }, + { + "id": "bridge_service_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 1], + [16, 3], + [17, 6], + [18, 8] + ] + }, + "line-opacity": 1, + "line-color": "#ddd" + } + }, + { + "id": "bridge_minor_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 0.5], + [14, 2], + [15, 3], + [16, 4.3], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-opacity": 1, + "line-color": { + "stops": [ + [13, "#e6e6e6"], + [15.7, "#e6e6e6"], + [16, "#ddd"] + ] + } + } + }, + { + "id": "bridge_sec_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "miter" + }, + "paint": { + "line-width": { + "stops": [ + [11, 0.5], + [12, 1.5], + [13, 3], + [14, 5], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": { + "stops": [ + [11, "#e6e6e6"], + [12.99, "#e6e6e6"], + [13, "#ddd"] + ] + } + } + }, + { + "id": "bridge_pri_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 8, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [8, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "bridge_trunk_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [13, 4], + [14, 6], + [15, 8], + [16, 10], + [17, 14], + [18, 18] + ] + }, + "line-opacity": { + "stops": [ + [5, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [12, "#ddd"] + ] + } + } + }, + { + "id": "bridge_mot_case", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 5, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [6, 0.5], + [7, 0.8], + [8, 1], + [11, 3], + [12, 4], + [13, 5], + [14, 7], + [15, 9], + [16, 11], + [17, 13], + [18, 22] + ] + }, + "line-opacity": { + "stops": [ + [6, 0.5], + [7, 1] + ] + }, + "line-color": { + "stops": [ + [5, "#e6e6e6"], + [10, "#ddd"] + ] + } + } + }, + { + "id": "bridge_path", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "path"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 0.5], + [16, 1], + [18, 3] + ] + }, + "line-opacity": 1, + "line-color": "#d5d5d5", + "line-dasharray": { + "stops": [ + [15, [2, 2]], + [18, [3, 3]] + ] + } + } + }, + { + "id": "bridge_service_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "service"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 2], + [16, 2], + [17, 4], + [18, 6] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "bridge_minor_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 15, + "maxzoom": 24, + "filter": ["all", ["==", "class", "minor"], ["==", "brunnel", "bridge"]], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [15, 3], + [16, 4], + [17, 8], + [18, 12] + ] + }, + "line-opacity": 1, + "line-color": "#fdfdfd" + } + }, + { + "id": "bridge_sec_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 13, + "maxzoom": 24, + "filter": [ + "all", + ["in", "class", "secondary", "tertiary"], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 2], + [13, 2], + [14, 3], + [15, 4], + [16, 6], + [17, 10], + [18, 14] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_pri_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "primary"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_trunk_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 11, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "trunk"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-width": { + "stops": [ + [11, 1], + [13, 2], + [14, 4], + [15, 6], + [16, 8], + [17, 12], + [18, 16] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "bridge_mot_fill", + "type": "line", + "source": "carto", + "source-layer": "transportation", + "minzoom": 10, + "maxzoom": 24, + "filter": [ + "all", + ["==", "class", "motorway"], + ["!=", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": { + "line-cap": "butt", + "line-join": "round" + }, + "paint": { + "line-width": { + "stops": [ + [10, 1], + [12, 2], + [13, 3], + [14, 5], + [15, 7], + [16, 9], + [17, 11], + [18, 20] + ] + }, + "line-opacity": 1, + "line-color": "#fff" + } + }, + { + "id": "building", + "type": "fill", + "source": "carto", + "source-layer": "building", + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": { + "base": 1, + "stops": [ + [15.5, "#dfdfdf"], + [16, "#dfdfdf"] + ] + }, + "fill-antialias": true + } + }, + { + "id": "building-top", + "type": "fill", + "source": "carto", + "source-layer": "building", + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-translate": { + "base": 1, + "stops": [ + [14, [0, 0]], + [16, [-2, -2]] + ] + }, + "fill-outline-color": "#dfdfdf", + "fill-color": "#ededed", + "fill-opacity": { + "base": 1, + "stops": [ + [13, 0], + [16, 1] + ] + } + } + }, + { + "id": "boundary_country_outline", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 6, + "maxzoom": 24, + "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-color": "#f3efed", + "line-opacity": 0.5, + "line-width": 8, + "line-offset": 0 + } + }, + { + "id": "boundary_country_inner", + "type": "line", + "source": "carto", + "source-layer": "boundary", + "minzoom": 0, + "filter": ["all", ["==", "admin_level", 2], ["==", "maritime", 0]], + "layout": { + "line-cap": "round", + "line-join": "round" + }, + "paint": { + "line-color": { + "stops": [ + [4, "#f2e6e7"], + [5, "#ebd6d8"], + [6, "#ebd6d8"] + ] + }, + "line-opacity": 1, + "line-width": { + "stops": [ + [3, 1], + [6, 1.5] + ] + }, + "line-offset": 0 + } + } + ], + "id": "voyager", + "owner": "Carto" +} From 40d5783e0897d90207c2cc1c2a5a10505c0bca1e Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:05:13 +0100 Subject: [PATCH 113/126] Change street color --- src/components/Map/Map.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Map/Map.jsx b/src/components/Map/Map.jsx index 3220a65..3ce4dc2 100644 --- a/src/components/Map/Map.jsx +++ b/src/components/Map/Map.jsx @@ -146,7 +146,7 @@ const DeckGLMap = ({ data, colors }) => { new GeoJsonLayer({ id: 'streets', data: data.streets, - getLineColor: [0, 255, 0], + getLineColor: [171, 95, 127], getLineWidth: 1, visible: visibility.streets, From 4958e87717483edae8f877434fe79743bc0df18e Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:22:35 +0100 Subject: [PATCH 114/126] Update yarn.lock --- yarn.lock | 1312 +++++++++++++++++++++++++++-------------------------- 1 file changed, 666 insertions(+), 646 deletions(-) diff --git a/yarn.lock b/yarn.lock index 384ca78..8d2bf46 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,10 +55,10 @@ resolved "https://registry.yarnpkg.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz#ed2be7fb4d82ac7e1d45a54a5b06d6cecf8be6f6" integrity sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA== -"@ant-design/icons@^5.3.0": - version "5.3.0" - resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.3.0.tgz#b4b57908eb4f4c31777424f10d341f6823a77d2b" - integrity sha512-69FgBsIkeCjw72ZU3fJpqjhmLCPrzKGEllbrAZK7MUdt1BrKsyG6A8YDCBPKea27UQ0tRXi33PcjR4tp/tEXMg== +"@ant-design/icons@^5.3.0", "@ant-design/icons@^5.3.1": + version "5.3.1" + resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-5.3.1.tgz#908eda82cbd455b83b30d620947ab8fbf2f4c5da" + integrity sha512-85zROTJCCApQn0Ee6L9561+Vd7yVKtSWNm2TpmOsYMrumchbzaRK83x1WWHv2VG+Y1ZAaKkDwcnnSPS/eSwNHA== dependencies: "@ant-design/colors" "^7.0.0" "@ant-design/icons-svg" "^4.4.0" @@ -85,10 +85,10 @@ core-js "^2.6.5" regenerator-runtime "^0.13.4" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2": - version "7.23.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.9.tgz#47791a15e4603bb5f905bc0753801cf21d6345f7" - integrity sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw== +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.16.7", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.5", "@babel/runtime@^7.23.2", "@babel/runtime@^7.23.6", "@babel/runtime@^7.23.9", "@babel/runtime@^7.24.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.9.2": + version "7.24.0" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.0.tgz#584c450063ffda59697021430cb47101b085951e" + integrity sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw== dependencies: regenerator-runtime "^0.14.0" @@ -106,10 +106,10 @@ "@types/react" "*" indefinitely-typed "^1.1.0" -"@deck.gl/aggregation-layers@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.9.34.tgz#959aaedd0640b0c5501ea210b820208da71d4652" - integrity sha512-/JEDlj5MNFX8yHWPO5ljooGMdA2EPuZydbT6wrQD1WMydgp8dcEF+zVRLXTDWH1Mq+HLj6JHT1IhENHXN5TZFA== +"@deck.gl/aggregation-layers@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/aggregation-layers/-/aggregation-layers-8.9.35.tgz#b55f3a7a1b2e39c84cd9a2442d4804dcf1a9c442" + integrity sha512-OjJhHt/ZXLIP3cs8yD2xwa9KACBOjfvJpdMkly704y6SuM0k+qSj81VwkpdOA54DCvAhQQTAYCJ4rvnwmtcPQQ== dependencies: "@babel/runtime" "^7.0.0" "@luma.gl/constants" "^8.5.21" @@ -117,10 +117,10 @@ "@math.gl/web-mercator" "^3.6.2" d3-hexbin "^0.2.1" -"@deck.gl/carto@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.9.34.tgz#acf0194b2de5745042faf28870caa35da28b7201" - integrity sha512-LJe2Ipd8AKCL1GQiAHRmwa3ubVrlpHVaSAscwGUt5fnFM0J4gTIk5LysTwXBxg5owyCEd4yOgXK3m1PZ+CHu3w== +"@deck.gl/carto@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/carto/-/carto-8.9.35.tgz#a19c3e5d896b38e57e9e3e45feaff14a60c8ad23" + integrity sha512-Ln9yFQqagQ5Zpfl5SUJl/09lw0S9zkpSVeay976aSPnQt9U7L4ES5lxOZZBQvxHmKATmar5B5V36vXaW2bAezQ== dependencies: "@babel/runtime" "^7.0.0" "@loaders.gl/gis" "^3.4.13" @@ -139,10 +139,10 @@ pbf "^3.2.1" quadbin "^0.1.9" -"@deck.gl/core@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.9.34.tgz#eaf08295225d2a317acebd944306734fcb4f7169" - integrity sha512-VDne26NevBBvD9Xq6pIBuBt2ffZhzW1COU3IogqhJLhejECiC3RQhWtDRWQqUZpQYKTU2SlyKZcu+Nj7kaLBWA== +"@deck.gl/core@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/core/-/core-8.9.35.tgz#50b660a7e22b6001a4f838120a3b034517553d8a" + integrity sha512-xOASWScUCB5fpfuSjPaJrwas8pCJpbKXNIfwQElhvnfP3Yk8GGkAcRbPgiPNCfpkbEno7eDpAWJt6+6UJsSp9g== dependencies: "@babel/runtime" "^7.0.0" "@loaders.gl/core" "^3.4.13" @@ -160,18 +160,18 @@ math.gl "^3.6.2" mjolnir.js "^2.7.0" -"@deck.gl/extensions@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.9.34.tgz#9ad3aa38402763643037618b4fc1e27d0f3282a1" - integrity sha512-at2CSs1TXgOM035LWf+fk03r8yXMnokFBVd0QXlECj1izdBvehvhC7npgpqUJooKg0UMWmqUYkUH3uSrkfyIeA== +"@deck.gl/extensions@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/extensions/-/extensions-8.9.35.tgz#90cff4bb9163d8ccbf7e0adfef51496144fd09bb" + integrity sha512-qMZzeQpvtcw4zbh4HJJIF8Q73/u0Unwwe8aSC2r+apjuyUVPQInwlCil++LznBY3JA37M7SvW2TSK6IgCuaSyA== dependencies: "@babel/runtime" "^7.0.0" "@luma.gl/shadertools" "^8.5.21" -"@deck.gl/geo-layers@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.9.34.tgz#3da2db3e5927ca7f6db4d64c65582ff598a04621" - integrity sha512-oXOdNByo8QHNrqjREeIX0btVzsj3aFzJcplatBpdLg6vr/iV8ZdsbRv8WO4CJJI3N6oVKIug2gHWogdIjpxHTg== +"@deck.gl/geo-layers@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/geo-layers/-/geo-layers-8.9.35.tgz#3b76ba236c8ff145a64bcac317f8e908bf3670ca" + integrity sha512-7sczznSjC7GjpDxuXPvPN7/WbVgSYHnFNNyWr8hMGm/WlUMK4z9QpZo6UFvrHL5rQ5Uudd4vD56xB1fs3b2lMA== dependencies: "@babel/runtime" "^7.0.0" "@loaders.gl/3d-tiles" "^3.4.13" @@ -191,26 +191,26 @@ h3-js "^3.7.0" long "^3.2.0" -"@deck.gl/google-maps@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.9.34.tgz#64ecdfc5eac5918f87e32cfaf677173185b98e0b" - integrity sha512-w3MjIPHtEfV4/4TCa07mgqzxlZ7UV03xRRCdJE0iWiFTwIUcEFxFKZgyZV+4cinaf2gp53tVpcBZD6nHDPr33Q== +"@deck.gl/google-maps@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/google-maps/-/google-maps-8.9.35.tgz#396668aba9a02f6d48aa988eb6dceba6c8fbc882" + integrity sha512-btNCp3ZZngWq2Fsuapx6PL5BaGcLPXzaVDN65He/AkdkmU2cCnFK5oR1s33JgACnUejx28ttfoFuJgLKpmJ4Eg== dependencies: "@babel/runtime" "^7.0.0" -"@deck.gl/json@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/json/-/json-8.9.34.tgz#c5c39e767d342030adbf22ae3be67332edc17220" - integrity sha512-+Svypau/H5B7dOUVW5iDOCRowqRNKQMGHSDUoSVcTcEV9Ca0vex9LeWmWWVUwYc6o1RcpyPi38TTyZdRe14sKw== +"@deck.gl/json@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/json/-/json-8.9.35.tgz#1970cd50d48e0d41c6b0f0ebfcdcd571130145f1" + integrity sha512-0mp4ckb1n0kRGPPFqtx6Q13uGNRBYGrpYN/NuibQZSW1EMNqmxTqSJekoqzXrlI1W6u35Tu9E5+DHpw9WJiJkg== dependencies: "@babel/runtime" "^7.0.0" d3-dsv "^1.0.8" expression-eval "^2.0.0" -"@deck.gl/layers@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.9.34.tgz#4ba052c4ae9eef958a07fa1a42c32d65e3f9462f" - integrity sha512-kc9Wzk8Zf2XwdG/V0Md6dh6mlJjStkWHKCKQLJOwj9GDwP4KihzYY2xC98CMCgi2/H/lH03xYm3e5EHvwIENww== +"@deck.gl/layers@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/layers/-/layers-8.9.35.tgz#805684b3b6c4bd3303cbca59a0822bf9eedbbc3d" + integrity sha512-4amaGO+tGvaCNi2KZ90twmajGh5xUAaQzBIyh42dnM10GRj/62sOIYD9uT032oV/KpjKY+TfOstx5ooXBGKDjg== dependencies: "@babel/runtime" "^7.0.0" "@loaders.gl/images" "^3.4.13" @@ -222,18 +222,18 @@ "@math.gl/web-mercator" "^3.6.2" earcut "^2.2.4" -"@deck.gl/mapbox@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/mapbox/-/mapbox-8.9.34.tgz#fe6c2e66ba4d46ef741ab4b605ddb7474f1a904e" - integrity sha512-3s34yFRmTe1KUK8TDWGw+1jATHwOpxpTrMjSWSZpR9AMqZ6ykOAkCziAUD4T+KgpqzzP5QJn+twt0mxPBoQ3eg== +"@deck.gl/mapbox@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/mapbox/-/mapbox-8.9.35.tgz#8903841534dddd565f65b53c982e413c69a6fbae" + integrity sha512-3GKbYkB6OF+65Al/F2g0DlGhiQAPnA7/l/9Tl9cFSaaLBUfw2zT/U0kgZe3/4ZyfwQMzmoW6D3Ybb/FB4FKlmg== dependencies: "@babel/runtime" "^7.0.0" "@types/mapbox-gl" "^2.6.3" -"@deck.gl/mesh-layers@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.9.34.tgz#43bf49654b5ed04a69e8de431f673bf13160010f" - integrity sha512-BJClDfB86+zgWOyXjLNfVBgZ8BlaSXWDHWj0vS7UuV79h/6PAdwMBfi28/PNO9A89cCtUd94MkB73G0ni56iTA== +"@deck.gl/mesh-layers@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/mesh-layers/-/mesh-layers-8.9.35.tgz#4dee5429e15e7f61c187d7995446d2ab3b881c35" + integrity sha512-0l7+zi/6bkYVz7zZ0J4+WLoxOh+hFMPUQKCujTOcqYWbvJ2fEQze0Z1ZHCAG0RQOFJITEMamDigo9dN2BMxPBA== dependencies: "@babel/runtime" "^7.0.0" "@loaders.gl/gltf" "^3.4.13" @@ -241,10 +241,10 @@ "@luma.gl/experimental" "^8.5.21" "@luma.gl/shadertools" "^8.5.21" -"@deck.gl/react@8.9.34": - version "8.9.34" - resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.9.34.tgz#10001604f53968e546fbe23e7aeae189dfd2ea20" - integrity sha512-kelU3otxmEtNYQ7gVrVSLvju+StuqqSkDrcJU82igjNalOvjjPGst1H7blQTgk1lEbfHNeddusIYGipefyuImw== +"@deck.gl/react@8.9.35": + version "8.9.35" + resolved "https://registry.yarnpkg.com/@deck.gl/react/-/react-8.9.35.tgz#75ed69f78f15c37e6bc1ab6df22f3bc6cee54926" + integrity sha512-eDwYCeBBzHXIpgZbAxcAEnpjnAoMiWcec8rMgYot7VOB+RnBTPYUaO3GPPImlk1uiezNGQel0YK4OLI1f6cDHg== dependencies: "@babel/runtime" "^7.0.0" @@ -257,9 +257,9 @@ ajv-keywords "^3.4.1" "@electron/asar@^3.2.1": - version "3.2.8" - resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.8.tgz#2ea722f3452583dbd4ffdcc4b4f5dc903f1d8178" - integrity sha512-cmskk5M06ewHMZAplSiF4AlME3IrnnZhKnWbtwKVLRkdJkKyUVjMLhDIiPIx/+6zQWVlKX/LtmK9xDme7540Sg== + version "3.2.9" + resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.9.tgz#7b3a1fd677b485629f334dd80ced8c85353ba7e7" + integrity sha512-Vu2P3X2gcZ3MY9W7yH72X9+AMXwUQZEJBrsPIbX0JsdllLtoh62/Q8Wg370/DawIEVKOyfD6KtTLo645ezqxUA== dependencies: commander "^5.0.0" glob "^7.1.6" @@ -280,10 +280,10 @@ optionalDependencies: global-agent "^3.0.0" -"@electron/notarize@2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.1.0.tgz#76aaec10c8687225e8d0a427cc9df67611c46ff3" - integrity sha512-Q02xem1D0sg4v437xHgmBLxI2iz/fc0D4K7fiVWHa/AnW8o7D751xyKNXgziA6HrTOme9ul1JfWN5ark8WH1xA== +"@electron/notarize@2.2.1": + version "2.2.1" + resolved "https://registry.yarnpkg.com/@electron/notarize/-/notarize-2.2.1.tgz#d0aa6bc43cba830c41bfd840b85dbe0e273f59fe" + integrity sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg== dependencies: debug "^4.1.1" fs-extra "^9.0.1" @@ -301,10 +301,10 @@ minimist "^1.2.6" plist "^3.0.5" -"@electron/universal@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.4.1.tgz#3fbda2a5ed9ff9f3304c8e8316b94c1e3a7b3785" - integrity sha512-lE/U3UNw1YHuowNbTmKNs9UlS3En3cPgwM5MI+agIgr/B1hSze9NdOP0qn7boZaI9Lph8IDv3/24g9IxnJP7aQ== +"@electron/universal@1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@electron/universal/-/universal-1.5.1.tgz#f338bc5bcefef88573cf0ab1d5920fac10d06ee5" + integrity sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw== dependencies: "@electron/asar" "^3.2.1" "@malept/cross-spawn-promise" "^1.1.0" @@ -466,10 +466,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@handsontable/react@^3.1.2": version "3.1.3" @@ -488,7 +488,7 @@ dependencies: "@hapi/hoek" "^9.0.0" -"@humanwhocodes/config-array@^0.11.13": +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -520,170 +520,170 @@ wrap-ansi-cjs "npm:wrap-ansi@^7.0.0" "@loaders.gl/3d-tiles@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-3.4.14.tgz#c04781acf377e13c16b41eeaa14e46dfc96c90ca" - integrity sha512-cxStTSLIJgRZnkTBYTcp9FPVBQWQlJMzW1LRlaKWiwAHkOKBElszzApIIEvRvZGSrs8k8TUi6BJ1Y41iiANF7w== - dependencies: - "@loaders.gl/draco" "3.4.14" - "@loaders.gl/gltf" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/math" "3.4.14" - "@loaders.gl/tiles" "3.4.14" + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/3d-tiles/-/3d-tiles-3.4.15.tgz#453f3f8e52f9330ed2f2521679f38175fc14d09b" + integrity sha512-JR67bEfLrD7Lzb6pWyEIRg2L6W3n6y43DKcWofRLpwPqLA7qHuY7SlO7E72Lz7Tniye8VhawqY1wO8gCx8T72Q== + dependencies: + "@loaders.gl/draco" "3.4.15" + "@loaders.gl/gltf" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/math" "3.4.15" + "@loaders.gl/tiles" "3.4.15" "@math.gl/core" "^3.5.1" "@math.gl/geospatial" "^3.5.1" long "^5.2.1" "@loaders.gl/core@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-3.4.14.tgz#79e5c54112f5bfe398da1718dc4fb661ffa213fd" - integrity sha512-5PFcjv7xC8AYL17juDMrvo8n0Fcwg9s8F4BaM2YCNUsb9RCI2SmLuIFJMcx1GgHO5vL0WiTIKO+JT4n1FuNR6w== + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/core/-/core-3.4.15.tgz#668099beabb79cab0eaa25c36a6f66667a8bfc9a" + integrity sha512-rPOOTuusWlRRNMWg7hymZBoFmPCXWThsA5ZYRfqqXnsgVeQIi8hzcAhJ7zDUIFAd/OSR8ravtqb0SH+3k6MOFQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/worker-utils" "3.4.14" - "@probe.gl/log" "^4.0.1" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/worker-utils" "3.4.15" + "@probe.gl/log" "^3.5.0" -"@loaders.gl/draco@3.4.14": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-3.4.14.tgz#8555d9179db334faaded00d2902c318478a93b07" - integrity sha512-HwNFFt+dKZqFtzI0uVGvRkudFEZXxybJ+ZRsNkBbzAWoMM5L1TpuLs6DPsqPQUIT9HXNHzov18cZI0gK5bTJpg== +"@loaders.gl/draco@3.4.15": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/draco/-/draco-3.4.15.tgz#f53eba0745bf9a8b43837067ef55edc550ef2b58" + integrity sha512-SStmyP0ZnS4JbWZb2NhrfiHW65uy3pVTTzQDTgXfkR5cD9oDAEu4nCaHbQ8x38/m39FHliCPgS9b1xWvLKQo8w== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" - "@loaders.gl/worker-utils" "3.4.14" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" + "@loaders.gl/worker-utils" "3.4.15" draco3d "1.5.5" -"@loaders.gl/gis@3.4.14", "@loaders.gl/gis@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/gis/-/gis-3.4.14.tgz#a9b3eed45e2a4465a754e3404061222c51b1334a" - integrity sha512-5cmhIwioPpSkfNzFRM3PbFDecjpYIhtEOFbryu3rE37npKHLTD2tF4ocQxUPB+QVED6GLwWBdzJIs64UWGrqjw== +"@loaders.gl/gis@3.4.15", "@loaders.gl/gis@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/gis/-/gis-3.4.15.tgz#b6548bd867c4aec2d8edc63fe3ad43e43efc96c1" + integrity sha512-h+LJI35P6ze8DFPSUylTKuml0l4HIfHMczML6u+ZXG6E2w5tbdM3Eh5AzHjXGQPuwUnaYPn3Mq/2t2N1rz98pg== dependencies: - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" "@mapbox/vector-tile" "^1.3.1" "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" -"@loaders.gl/gltf@3.4.14", "@loaders.gl/gltf@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-3.4.14.tgz#8677d6793cf0827dee52711e55fbdc445e9f9bb8" - integrity sha512-jv+B5S/taiwzXAOu5D9nk1jjU9+JCCr/6/nGguCE2Ya3IX7CI1Nlnp20eKKhW8ZCEokZavMNT0bNbiJ5ahEFjA== +"@loaders.gl/gltf@3.4.15", "@loaders.gl/gltf@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/gltf/-/gltf-3.4.15.tgz#9743adac8914dd9359e97eb2a3f4603f61137bba" + integrity sha512-Y6kMNPLiHQPr6aWQw/4BMTxgPHWx3fcib4LPpZCbhyfM8PRn6pOqATVngUXdoOf5XY0QtdKVld6N1kxlr4pJtw== dependencies: - "@loaders.gl/draco" "3.4.14" - "@loaders.gl/images" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/textures" "3.4.14" + "@loaders.gl/draco" "3.4.15" + "@loaders.gl/images" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/textures" "3.4.15" "@math.gl/core" "^3.5.1" -"@loaders.gl/images@3.4.14", "@loaders.gl/images@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-3.4.14.tgz#d7a4950f11b48d028cf3719cf6498945f4a05c14" - integrity sha512-tL447hTWhOKBOB87SE4hvlC8OkbRT0mEaW1a/wIS9f4HnYDa/ycRLMV+nvdvYMZur4isNPam44oiRqi7GcILkg== +"@loaders.gl/images@3.4.15", "@loaders.gl/images@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/images/-/images-3.4.15.tgz#7a0eafc537df38fee0d021d630086f374aad957b" + integrity sha512-QpjYhEetHabY/z9mWZYJXZZp4XJAxa38f9Ii/DjPlnJErepzY5GLBUTDHMu4oZ6n99gGImtuGFicDnFV6mb60g== dependencies: - "@loaders.gl/loader-utils" "3.4.14" + "@loaders.gl/loader-utils" "3.4.15" -"@loaders.gl/loader-utils@3.4.14", "@loaders.gl/loader-utils@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-3.4.14.tgz#d94decc279fd2304b8762c87d8d9626058d91f21" - integrity sha512-HCTY2/F83RLbZWcTvWLVJ1vke3dl6Bye20HU1AqkA37J2vzHwOZ8kj6eee8eeSkIkf7VIFwjyhVJxe0flQE/Bw== +"@loaders.gl/loader-utils@3.4.15", "@loaders.gl/loader-utils@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/loader-utils/-/loader-utils-3.4.15.tgz#5bee08aa6cbaa327722eb603d9b9e9bb4fe67340" + integrity sha512-uUx6tCaky6QgCRkqCNuuXiUfpTzKV+ZlJOf6C9bKp62lpvFOv9AwqoXmL23j8nfsENdlzsX3vPhc3en6QQyksA== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "3.4.14" - "@probe.gl/stats" "^4.0.1" + "@loaders.gl/worker-utils" "3.4.15" + "@probe.gl/stats" "^3.5.0" -"@loaders.gl/math@3.4.14": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-3.4.14.tgz#c27993f0dbe5a88f3ffa07e5240ce27ea5e92392" - integrity sha512-OBEVX6Q5pMipbCAiZyX2+q1zRd0nw8M2dclpny05on8700OaKMwfs47wEUnbfCU3iyHad3sgsAxN3EIh+kuo9Q== +"@loaders.gl/math@3.4.15": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/math/-/math-3.4.15.tgz#bc8c4990775788f3f2ea9cf418df4c4f5acf6d92" + integrity sha512-zTN8BUU/1fcppyVc8WzvdZcCyNGVYmNinxcn/A+a7mi1ug4OBGwEsZOj09Wjg0/s52c/cAL3h9ylPIZdjntscQ== dependencies: - "@loaders.gl/images" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" + "@loaders.gl/images" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" "@math.gl/core" "^3.5.1" "@loaders.gl/mvt@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/mvt/-/mvt-3.4.14.tgz#fee16db321301e94b329c6be9db9420db0be17c8" - integrity sha512-tozGmWvsJacjaLavjX4S/5yNDV9S4wJb7+vPG/nXWX2gTtgZ1mxcFQAtAJjokqpy37d1ZhLt+TXh0HrLoTmRgw== + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/mvt/-/mvt-3.4.15.tgz#bde73029fa63a0f66cbc8b6d008a0ef3e043af02" + integrity sha512-Q8e1ZyfNkJtPF/C4WSZ2qhWDEbzOvquP7OyG1NzQ2cp8R6eUfbexu48IgcnL/oAu8VPql3zIxQ+bQUyDReyN5g== dependencies: - "@loaders.gl/gis" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" + "@loaders.gl/gis" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" -"@loaders.gl/schema@3.4.14", "@loaders.gl/schema@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-3.4.14.tgz#6f145065a2abaf402aa419cfa25ec7f1fdeed487" - integrity sha512-r6BEDfUvbvzgUnh/MtkR5RzrkIwo1x1jtPFRTSJVsIZO7arXXlu3blffuv5ppEkKpNZ1Xzd9WtHp/JIkuctsmw== +"@loaders.gl/schema@3.4.15", "@loaders.gl/schema@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/schema/-/schema-3.4.15.tgz#316565b4fcbffb135b52e25e96cee4ac5c541713" + integrity sha512-8oRtstz0IsqES7eZd2jQbmCnmExCMtL8T6jWd1+BfmnuyZnQ0B6TNccy++NHtffHdYuzEoQgSELwcdmhSApYew== dependencies: "@types/geojson" "^7946.0.7" "@loaders.gl/terrain@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/terrain/-/terrain-3.4.14.tgz#8cd469b356b94c0d31ffc987c9166ccd33fe1d86" - integrity sha512-vhchEVkPaWXnqd2ofujG2AEnBsk4hEw6LWSaFY7E3VMzNhI9l2EHvyU3+Hs03jYbXM4oLlQPGqd/T7x+5IMtig== + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/terrain/-/terrain-3.4.15.tgz#cde45a693d26b0458de74cfe36c3ae4ce8787832" + integrity sha512-ouv41J84uOnLEtXLM+iPEPFfeq7aRgIOls6esdvhBx2/dXJRNkt8Mx0wShXAi8VNHz77D+gZFrKARa7wqjmftg== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/images" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" + "@loaders.gl/images" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" "@mapbox/martini" "^0.2.0" -"@loaders.gl/textures@3.4.14": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-3.4.14.tgz#a229ff70592b7a90af96fdd361cda48b9c95bec9" - integrity sha512-iKDHL2ZlOUud4/e3g0p0SyvkukznopYy6La3O6I9vDfKp8peuKMRRcTfFfd/zH0OqQC0hIhCXNz46vRLu7h6ng== +"@loaders.gl/textures@3.4.15": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/textures/-/textures-3.4.15.tgz#1729271e602df41661db767262116cc449e358b9" + integrity sha512-QHnmxBYtLvTdG1uMz2KWcxVY8KPb1+XyPJUoZV9GMcQkulz+CwFB8BaX8nROfMDz9KKYoPfksCzjig0LZ0WBJQ== dependencies: - "@loaders.gl/images" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" - "@loaders.gl/worker-utils" "3.4.14" + "@loaders.gl/images" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" + "@loaders.gl/worker-utils" "3.4.15" ktx-parse "^0.0.4" texture-compressor "^1.0.2" -"@loaders.gl/tiles@3.4.14", "@loaders.gl/tiles@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-3.4.14.tgz#8513426ae4965a9c6200f9d61902ce7af4f276cf" - integrity sha512-an3scxl65r74LW4WoIGgluBmQpMY9eb381y9mZmREphTP6bWEj96fL/tiR+G6TiE6HJqTv8O3PH6xwI9OQmEJg== +"@loaders.gl/tiles@3.4.15", "@loaders.gl/tiles@^3.4.13": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/tiles/-/tiles-3.4.15.tgz#3be32c74996095e4fa571506e9bdc0e337a4c9b2" + integrity sha512-o85aRSXq+YeVSK2ndW9aBwTMi5FhEsQ7k18J4DG+T5Oc+zz3tKui5X1SuBDiKbQN+kYtFpj0oYO1QG3ndNI6jg== dependencies: - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/math" "3.4.14" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/math" "3.4.15" "@math.gl/core" "^3.5.1" "@math.gl/culling" "^3.5.1" "@math.gl/geospatial" "^3.5.1" "@math.gl/web-mercator" "^3.5.1" - "@probe.gl/stats" "^4.0.1" + "@probe.gl/stats" "^3.5.0" "@loaders.gl/wms@^3.4.13": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/wms/-/wms-3.4.14.tgz#1bfde56078409fb41a749c1ef9e22a870fa59e3e" - integrity sha512-D1pObPSUj885zGPyHIb7GtcwpHQNk0T8nK/4EHb0SHLe0y1b4qwqSOswdS9geXT9Q61hyhl/L0zqyTgwjiMStg== + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/wms/-/wms-3.4.15.tgz#2b60c273f08840be6c7b17411c61542fc91af9f0" + integrity sha512-zY++Oxx+cNGF9ptuSTFxCmEnpRbR5VZYjvyLraylaRbuynZv+JiWrehymFzEfq3hJcQ/cGvIjaG6rSVtPuqCIA== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/images" "3.4.14" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" - "@loaders.gl/xml" "3.4.14" + "@loaders.gl/images" "3.4.15" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" + "@loaders.gl/xml" "3.4.15" "@turf/rewind" "^5.1.5" deep-strict-equal "^0.2.0" lerc "^4.0.1" -"@loaders.gl/worker-utils@3.4.14": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-3.4.14.tgz#5391a416a3d60e03b9edcedb285af44312d40d2e" - integrity sha512-PUSwxoAYbskisXd0KfYEQ902b0igBA2UAWdP6PzPvY+tJmobfh74dTNwrrBQ1rGXQxxmGx6zc6/ksX6mlIzIrg== +"@loaders.gl/worker-utils@3.4.15": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/worker-utils/-/worker-utils-3.4.15.tgz#28dc1dcc526648fd68e317d8a8b7aa482d9e8198" + integrity sha512-zUUepOYRYmcYIcr/c4Mchox9h5fBFNkD81rsGnLlZyq19QvyHzN+93SVxrLc078gw93t2RKrVcOOZY13zT3t1w== dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/xml@3.4.14": - version "3.4.14" - resolved "https://registry.yarnpkg.com/@loaders.gl/xml/-/xml-3.4.14.tgz#8bfdbed0440cabdc891f152c80b05128cb019d24" - integrity sha512-SNMGOHz4p8Cw+M6kxXhFEjXdNddJPOZY1rzNmRq7NYdGQlQYYeJdqV5HWzHx9BkoQYyrDXkrweGN0mY9QxCfeA== +"@loaders.gl/xml@3.4.15": + version "3.4.15" + resolved "https://registry.yarnpkg.com/@loaders.gl/xml/-/xml-3.4.15.tgz#83c53d7bdc623a057856b39c36a4fbac9f0ea3d0" + integrity sha512-iMWHaDzYSe8JoS8W5k9IbxQ6S3VHPr7M+UBejIVeYGCp1jzWF0ri498olwJWWDRvg4kqAWolrkj8Pcgkg8Jf8A== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.4.14" - "@loaders.gl/schema" "3.4.14" + "@loaders.gl/loader-utils" "3.4.15" + "@loaders.gl/schema" "3.4.15" fast-xml-parser "^4.2.5" "@luma.gl/constants@8.5.21", "@luma.gl/constants@^8.5.10", "@luma.gl/constants@^8.5.21": @@ -838,7 +838,7 @@ rw "^1.3.3" sort-object "^3.0.3" -"@maplibre/maplibre-gl-style-spec@^20.1.0": +"@maplibre/maplibre-gl-style-spec@^20.1.1": version "20.1.1" resolved "https://registry.yarnpkg.com/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz#94b644493723776c34813bd62a223e748390099b" integrity sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ== @@ -1012,13 +1012,6 @@ dependencies: "@babel/runtime" "^7.0.0" -"@probe.gl/env@4.0.5": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@probe.gl/env/-/env-4.0.5.tgz#3e6e7080d3dd38764f90acdf112dfd38eab5273c" - integrity sha512-B9urUsFaXWl0OlSLXOoSI03b84sdgtYCOwtohNoyg6DaNMK9Hlfau6b0c0msTMu0TiA/kM/rX7MnAHv6FCcKEA== - dependencies: - "@babel/runtime" "^7.0.0" - "@probe.gl/log@^3.5.0": version "3.6.0" resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-3.6.0.tgz#c645bfd22b4769dc65161caa17f13bd2b231e413" @@ -1027,14 +1020,6 @@ "@babel/runtime" "^7.0.0" "@probe.gl/env" "3.6.0" -"@probe.gl/log@^4.0.1": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@probe.gl/log/-/log-4.0.5.tgz#66ccce92e1ad74caf6c39ad101f1e731f407f750" - integrity sha512-5otC74VzKljMnrkFFeZYJRYth/UzDH+UCZOVi1kTkAMquglLnKNC4SuprsO2mFv1Ycl3O8G/6wZkjx8izn7gaQ== - dependencies: - "@babel/runtime" "^7.0.0" - "@probe.gl/env" "4.0.5" - "@probe.gl/stats@^3.5.0": version "3.6.0" resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-3.6.0.tgz#a1bb12860fa6f40b9c028f9eb575d7ada0b4dbdd" @@ -1042,17 +1027,10 @@ dependencies: "@babel/runtime" "^7.0.0" -"@probe.gl/stats@^4.0.1": - version "4.0.5" - resolved "https://registry.yarnpkg.com/@probe.gl/stats/-/stats-4.0.5.tgz#5dacb3764dc0d3303bc0313d5e47749928c20657" - integrity sha512-Zw3lsfIboalkpzoRbALGz/sH5BkR8oYqY403MFxHeDmojKOafohNjvGAnKip4goQ97wvzgyyMHy5X+flhruKCA== - dependencies: - "@babel/runtime" "^7.0.0" - -"@rc-component/color-picker@~1.5.1": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@rc-component/color-picker/-/color-picker-1.5.1.tgz#5d41a10f96aab8eb020999bd397fb4419431814c" - integrity sha512-onyAFhWKXuG4P162xE+7IgaJkPkwM94XlOYnQuu69XdXWMfxpeFi6tpJBsieIMV7EnyLV5J3lDzdLiFeK0iEBA== +"@rc-component/color-picker@~1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@rc-component/color-picker/-/color-picker-1.5.2.tgz#3c687112f540925abd013833a81705393dac4bfb" + integrity sha512-YJXujYzYFAEtlXJXy0yJUhwzUWPTcniBZto+wZ/vnACmFnUTNR7dH+NOeqSwMMsssh74e9H5Jfpr5LAH2PYqUw== dependencies: "@babel/runtime" "^7.23.6" "@ctrl/tinycolor" "^3.6.1" @@ -1154,70 +1132,70 @@ "@react-spring/shared" "~9.7.3" "@react-spring/types" "~9.7.3" -"@rollup/rollup-android-arm-eabi@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.10.0.tgz#786eaf6372be2fc209cc957c14aa9d3ff8fefe6a" - integrity sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A== - -"@rollup/rollup-android-arm64@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.10.0.tgz#0114a042fd6396f4f3233e6171fd5b61a36ed539" - integrity sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ== - -"@rollup/rollup-darwin-arm64@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.10.0.tgz#944d007c1dc71a8c9174d11671c0c34bd74a2c81" - integrity sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg== - -"@rollup/rollup-darwin-x64@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.10.0.tgz#1d08cb4521a058d7736ab1c7fe988daf034a2598" - integrity sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q== - -"@rollup/rollup-linux-arm-gnueabihf@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.10.0.tgz#4763eec1591bf0e99a54ad3d1ef39cb268ed7b19" - integrity sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw== - -"@rollup/rollup-linux-arm64-gnu@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.10.0.tgz#e6dae70c53ace836973526c41803b877cffc6f7b" - integrity sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q== - -"@rollup/rollup-linux-arm64-musl@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.10.0.tgz#5692e1a0feba0cc4a933864961afc3211177d242" - integrity sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ== - -"@rollup/rollup-linux-riscv64-gnu@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.10.0.tgz#fbe3d80f7a7ac54a8847f5bddd1bc6f7b9ccb65f" - integrity sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA== - -"@rollup/rollup-linux-x64-gnu@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.10.0.tgz#3f06b55ccf173446d390d0306643dff62ec99807" - integrity sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw== - -"@rollup/rollup-linux-x64-musl@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.10.0.tgz#e4ac9b27041c83d7faab6205f62763103eb317ba" - integrity sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw== - -"@rollup/rollup-win32-arm64-msvc@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.10.0.tgz#6ad0d4fb0066f240778ee3f61eecf7aa0357f883" - integrity sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ== - -"@rollup/rollup-win32-ia32-msvc@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.10.0.tgz#29d50292381311cc8d3623e73b427b7e2e40a653" - integrity sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg== - -"@rollup/rollup-win32-x64-msvc@4.10.0": - version "4.10.0" - resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.10.0.tgz#4eedd01af3a82c1acb0fe6d837ebf339c4cbf839" - integrity sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ== +"@rollup/rollup-android-arm-eabi@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz#11aaa02a933864b87f0b31cf2b755734e1f22787" + integrity sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ== + +"@rollup/rollup-android-arm64@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz#b1e606fb4b46b38dc32bf010d513449462d669e9" + integrity sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg== + +"@rollup/rollup-darwin-arm64@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz#dc21df1be9402671a8b6b15a93dd5953c68ec114" + integrity sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg== + +"@rollup/rollup-darwin-x64@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz#397dcc4427d774f29b9954676893574ac563bf0b" + integrity sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw== + +"@rollup/rollup-linux-arm-gnueabihf@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz#d851fd49d617e7792e7cde8e5a95ca51ea520fe5" + integrity sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ== + +"@rollup/rollup-linux-arm64-gnu@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz#e41a271ae51f79ffee6fb2b5597cc81b4ef66ad9" + integrity sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ== + +"@rollup/rollup-linux-arm64-musl@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz#d3b4cd6ef18d0aa7103129755e0c535701624fac" + integrity sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ== + +"@rollup/rollup-linux-riscv64-gnu@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz#215101b2bb768cce2f2227145b8dd5c3c716c259" + integrity sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg== + +"@rollup/rollup-linux-x64-gnu@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz#34a12fa305e167105eab70dbf577cd41e5199709" + integrity sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ== + +"@rollup/rollup-linux-x64-musl@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz#3f000b5a92a32b844e385e1166979c87882930a3" + integrity sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ== + +"@rollup/rollup-win32-arm64-msvc@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz#27977d91f5059645ebb3b7fbf4429982de2278d3" + integrity sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw== + +"@rollup/rollup-win32-ia32-msvc@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz#0d252acd5af0274209c74374867ee8b949843d75" + integrity sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA== + +"@rollup/rollup-win32-x64-msvc@4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz#cd8d175e001c212d5ac71c7827ef1d5c5e14494c" + integrity sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q== "@sideway/address@^4.1.5": version "4.1.5" @@ -1246,74 +1224,74 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@swc/core-darwin-arm64@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.1.tgz#aa66ec80d9c43586888a79b2f80264aa2a96fdf3" - integrity sha512-ePyfx0348UbR4DOAW24TedeJbafnzha8liXFGuQ4bdXtEVXhLfPngprrxKrAddCuv42F9aTxydlF6+adD3FBhA== - -"@swc/core-darwin-x64@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.1.tgz#de4037efab46f2d17609b2fea0d0e05ac9f076b5" - integrity sha512-eLf4JSe6VkCMdDowjM8XNC5rO+BrgfbluEzAVtKR8L2HacNYukieumN7EzpYCi0uF1BYwu1ku6tLyG2r0VcGxA== - -"@swc/core-linux-arm-gnueabihf@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.1.tgz#20cf68d591161e84c0b6158af9b749b5ead78800" - integrity sha512-K8VtTLWMw+rkN/jDC9o/Q9SMmzdiHwYo2CfgkwVT29NsGccwmNhCQx6XoYiPKyKGIFKt4tdQnJHKUFzxUqQVtQ== - -"@swc/core-linux-arm64-gnu@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.1.tgz#44dc497e127c0f5651ca74f2e4977743bde3f8e7" - integrity sha512-0e8p4g0Bfkt8lkiWgcdiENH3RzkcqKtpRXIVNGOmVc0OBkvc2tpm2WTx/eoCnes2HpTT4CTtR3Zljj4knQ4Fvw== - -"@swc/core-linux-arm64-musl@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.1.tgz#0e21470421531e560ce0b80bde87ba08e19207fd" - integrity sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA== - -"@swc/core-linux-x64-gnu@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.1.tgz#b008be683e24aa4a7b13123b6dd70580e87b4167" - integrity sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ== - -"@swc/core-linux-x64-musl@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.1.tgz#288b5742578beb9a0c94b5e885634e61eb797583" - integrity sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg== - -"@swc/core-win32-arm64-msvc@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.1.tgz#e40a4273aab1509d85e2a561a818f6e705718305" - integrity sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA== - -"@swc/core-win32-ia32-msvc@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.1.tgz#726731b618d0f99c5cdc8bab004df3dae14658a9" - integrity sha512-MBuc3/QfKX9FnLOU7iGN+6yHRTQaPQ9WskiC8s8JFiKQ+7I2p25tay2RplR9dIEEGgVAu6L7auv96LbNTh+FaA== - -"@swc/core-win32-x64-msvc@1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.1.tgz#71382cfd60811b5fecdf1ece458bd21992a37ae5" - integrity sha512-lu4h4wFBb/bOK6N2MuZwg7TrEpwYXgpQf5R7ObNSXL65BwZ9BG8XRzD+dLJmALu8l5N08rP/TrpoKRoGT4WSxw== +"@swc/core-darwin-arm64@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.4.5.tgz#639b50cb9b748319b1bcd110778d0f322c60d03d" + integrity sha512-toMSkbByHNfGXESyY1aiq5L3KutgijrNWB/THgdHIA1aIbwtrgMdFQfxpSE+INuuvWYi/Fxarv86EnU7ewbI0Q== + +"@swc/core-darwin-x64@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.4.5.tgz#f309224da2a243e34a53624bfd1b82d3211eb12f" + integrity sha512-LN8cbnmb4Gav8UcbBc+L/DEthmzCWZz22rQr6fIEHMN+f0d71fuKnV0ca0hoKbpZn33dlzUmXQE53HRjlRUQbw== + +"@swc/core-linux-arm-gnueabihf@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.4.5.tgz#05d3c6e163408eed733268afd31c5e2594430b56" + integrity sha512-suRFkhBWmOQxlM4frpos1uqjmHfaEI8FuJ0LL5+yRE7IunNDeQJBKujGZt6taeuxo1KqC0N0Ajr8IluN2wrKpA== + +"@swc/core-linux-arm64-gnu@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.4.5.tgz#3c0659fb8fff6b05925f1536dbf52f181e73047f" + integrity sha512-mLKxasQArDGmR6k9c0tkPVUdoo8VfUecocMG1Mx9NYvpidJNaZ3xq9nYM77v7uq1fQqrs/59DM1fJTNRWvv/UQ== + +"@swc/core-linux-arm64-musl@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.4.5.tgz#5b9d65efb09616fabbf536566b5da9ad8652272f" + integrity sha512-pgKuyRP7S29U/HMDTx+x8dFcklWxwB9cHFNCNWSE6bS4vHR93jc4quwPX9OEQX5CVHxm+c8+xof043I4OGkAXw== + +"@swc/core-linux-x64-gnu@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.4.5.tgz#39075d5cf978509ea64f5832d9d7d7b5b640a9fd" + integrity sha512-srR+YN86Oerzoghd0DPCzTbTp08feeJPSr9kkNdmtQWENOa4l/9cJV3+XY6vviw0sEjezPmYnc3SwRxJRaxvEw== + +"@swc/core-linux-x64-musl@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.4.5.tgz#2ce0dc1679e9348eccaa07f688a870b3259e480c" + integrity sha512-aSf41LZtDeG5VXI4RCnzcu0UInPyNm3ip8Kw+sCK+sSqW9o7DgBkyqqbip3RZq84fNUHBQQQQdKXetltsyRRqw== + +"@swc/core-win32-arm64-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.4.5.tgz#3921291e22581dc94e49f56ccb69222fe927e18a" + integrity sha512-vU3k8JwRUlTkJMfJQY9E4VvLrsIFOpfhnvbuXB84Amo1cJsz+bYQcC6RSvY7qpaDzDKFdUGbJco4uZTRoRf7Mg== + +"@swc/core-win32-ia32-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.4.5.tgz#69740dc87e449cd82c71d92c899f42b8529cd723" + integrity sha512-856YRh3frRK2XbrSjDOFBgoAqWJLNRkaEtfGzXfeEoyJlOz0BFsSJHxKlHAFkxRfHe2li9DJRUQFTEhXn4OUWw== + +"@swc/core-win32-x64-msvc@1.4.5": + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.5.tgz#b511eddfe643f7540bbe26fa4982e99c9137746c" + integrity sha512-j1+kV7jmWY1+NbXAvxAEW165781yLXVZKLcoXIZKmw18EatqMF6w8acg1gDG8C+Iw5aWLkRZVS4pijSh7+DtCQ== "@swc/core@^1.3.107": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.1.tgz#e6bee0fa5d0c93957b274eaa6186bbbad43f2063" - integrity sha512-3y+Y8js+e7BbM16iND+6Rcs3jdiL28q3iVtYsCviYSSpP2uUVKkp5sJnCY4pg8AaVvyN7CGQHO7gLEZQ5ByozQ== + version "1.4.5" + resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.4.5.tgz#c4a2e1f40117d1ab639751e0fd19e103a85b2809" + integrity sha512-4/JGkG4b1Z/QwCGgx+Ub46MlzrsZvBk5JSkxm9PcZ4bSX81c+4Y94Xm3iLp5Ka8NxzS5rD4mJSpcYuN3Tw0ceg== dependencies: "@swc/counter" "^0.1.2" "@swc/types" "^0.1.5" optionalDependencies: - "@swc/core-darwin-arm64" "1.4.1" - "@swc/core-darwin-x64" "1.4.1" - "@swc/core-linux-arm-gnueabihf" "1.4.1" - "@swc/core-linux-arm64-gnu" "1.4.1" - "@swc/core-linux-arm64-musl" "1.4.1" - "@swc/core-linux-x64-gnu" "1.4.1" - "@swc/core-linux-x64-musl" "1.4.1" - "@swc/core-win32-arm64-msvc" "1.4.1" - "@swc/core-win32-ia32-msvc" "1.4.1" - "@swc/core-win32-x64-msvc" "1.4.1" + "@swc/core-darwin-arm64" "1.4.5" + "@swc/core-darwin-x64" "1.4.5" + "@swc/core-linux-arm-gnueabihf" "1.4.5" + "@swc/core-linux-arm64-gnu" "1.4.5" + "@swc/core-linux-arm64-musl" "1.4.5" + "@swc/core-linux-x64-gnu" "1.4.5" + "@swc/core-linux-x64-musl" "1.4.5" + "@swc/core-win32-arm64-msvc" "1.4.5" + "@swc/core-win32-ia32-msvc" "1.4.5" + "@swc/core-win32-x64-msvc" "1.4.5" "@swc/counter@^0.1.2": version "0.1.3" @@ -2555,7 +2533,7 @@ dependencies: "@types/geojson" "*" -"@types/geojson@*", "@types/geojson@^7946.0.13", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": +"@types/geojson@*", "@types/geojson@^7946.0.14", "@types/geojson@^7946.0.7", "@types/geojson@^7946.0.8": version "7946.0.14" resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613" integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg== @@ -2595,7 +2573,14 @@ dependencies: "@types/node" "*" -"@types/mapbox-gl@>=1.0.0", "@types/mapbox-gl@^2.6.3": +"@types/mapbox-gl@>=1.0.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-3.1.0.tgz#81b80950b2e2d8763bdb797fc0f1bd09d80e4fdb" + integrity sha512-hI6cQDjw1bkJw7MC/eHMqq5TWUamLwsujnUUeiIX2KDRjxRNSYMjnHz07+LATz9I9XIsKumOtUz4gRYnZOJ/FA== + dependencies: + "@types/geojson" "*" + +"@types/mapbox-gl@^2.6.3": version "2.7.21" resolved "https://registry.yarnpkg.com/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz#b0cad1e4c3d1bf1592444de36a4f27e890310416" integrity sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA== @@ -2622,16 +2607,16 @@ integrity sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g== "@types/node@*": - version "20.11.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292" - integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw== + version "20.11.24" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.24.tgz#cc207511104694e84e9fb17f9a0c4c42d4517792" + integrity sha512-Kza43ewS3xoLgCEpQrsT+xRo/EJej1y0kVYGiLFE1NEODXGzTfwiC6tXTLMQskn1X4/Rjlh0MQUvx9W+L9long== dependencies: undici-types "~5.26.4" "@types/node@^18.11.18": - version "18.19.15" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.15.tgz#313a9d75435669a57fc28dc8694e7f4c4319f419" - integrity sha512-AMZ2UWx+woHNfM11PyAEQmfSxi05jm9OlkxczuHeEqmvwPkYj6MWv44gbzDPefYOLysTOFyI3ziiy2ONmUZfpA== + version "18.19.21" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.21.tgz#f4ca1ac8ffb05ee4b89163c2d6fac9a1a59ee149" + integrity sha512-2Q2NeB6BmiTFQi4DHBzncSoq/cJMLDdhPaAoJFnFCyD9a8VPZRf7a1GAwp1Edb7ROaZc5Jz/tnZyL6EsWMRaqw== dependencies: undici-types "~5.26.4" @@ -2659,16 +2644,16 @@ integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng== "@types/react-dom@^18.0.9": - version "18.2.19" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.19.tgz#b84b7c30c635a6c26c6a6dfbb599b2da9788be58" - integrity sha512-aZvQL6uUbIJpjZk4U8JZGbau9KDeAwMfmhyWorxgBkqDIEf6ROjRozcmPIicqsUwPUjbkDfHKgGee1Lq65APcA== + version "18.2.20" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.20.tgz#cbdf7abb3cc2377980bb1294bc51375016a8320f" + integrity sha512-HXN/biJY8nv20Cn9ZbCFq3liERd4CozVZmKbaiZ9KiKTrWqsP7eoGDO6OOGvJQwoVFuiXaiJ7nBBjiFFbRmQMQ== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^18.0.26": - version "18.2.55" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.55.tgz#38141821b7084404b5013742bc4ae08e44da7a67" - integrity sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA== + version "18.2.63" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.63.tgz#4637c56146ad90f96d0583171edab953f7e6fe57" + integrity sha512-ppaqODhs15PYL2nGUOaOu2RSCCB4Difu4UFrP4I3NHLloXC/ESQzQMi9nvjfT1+rudd0d2L3fQPJxRSey+rGlQ== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2794,16 +2779,17 @@ ansi-styles@^6.1.0: integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug== antd@^5.14.1: - version "5.14.1" - resolved "https://registry.yarnpkg.com/antd/-/antd-5.14.1.tgz#e56faf6a421911543a0d232e2564a6b42d3696fa" - integrity sha512-P0Bwt9NKSZqnEJ0QAyAb13ay34FjOKsz+KEp/ts+feYsynhUxF7/Ay6d1jS6ZcNpcs+JWTlLKO59YFZ3tX07wQ== + version "5.15.0" + resolved "https://registry.yarnpkg.com/antd/-/antd-5.15.0.tgz#081c74f362dc81a0023c85c6419242a3896ccaff" + integrity sha512-6AsP4KjYxwMMv3ipSGNB6n5kwW/X3da5MgjaEIL1GFOYZZvdKSrKx9eijC4T5pUXB5hTCwYPfk9qtb1lZIPm8w== dependencies: "@ant-design/colors" "^7.0.2" "@ant-design/cssinjs" "^1.18.4" - "@ant-design/icons" "^5.3.0" + "@ant-design/icons" "^5.3.1" "@ant-design/react-slick" "~1.0.2" + "@babel/runtime" "^7.24.0" "@ctrl/tinycolor" "^3.6.1" - "@rc-component/color-picker" "~1.5.1" + "@rc-component/color-picker" "~1.5.2" "@rc-component/mutate-observer" "^1.1.0" "@rc-component/tour" "~1.12.3" "@rc-component/trigger" "^1.18.3" @@ -2811,14 +2797,14 @@ antd@^5.14.1: copy-to-clipboard "^3.3.3" dayjs "^1.11.10" qrcode.react "^3.1.0" - rc-cascader "~3.21.2" - rc-checkbox "~3.1.0" + rc-cascader "~3.22.0" + rc-checkbox "~3.2.0" rc-collapse "~3.7.2" - rc-dialog "~9.3.4" - rc-drawer "~7.0.0" + rc-dialog "~9.4.0" + rc-drawer "~7.1.0" rc-dropdown "~4.1.0" - rc-field-form "~1.41.0" - rc-image "~7.5.1" + rc-field-form "~1.42.0" + rc-image "~7.6.0" rc-input "~1.4.3" rc-input-number "~9.0.0" rc-mentions "~2.10.1" @@ -2826,23 +2812,23 @@ antd@^5.14.1: rc-motion "^2.9.0" rc-notification "~5.3.0" rc-pagination "~4.0.4" - rc-picker "~4.1.1" + rc-picker "~4.2.0" rc-progress "~3.5.1" rc-rate "~2.12.0" rc-resize-observer "^1.4.0" rc-segmented "~2.3.0" - rc-select "~14.11.0" + rc-select "~14.12.0" rc-slider "~10.5.0" rc-steps "~6.0.1" rc-switch "~4.1.0" - rc-table "~7.39.0" + rc-table "~7.42.0" rc-tabs "~14.0.0" rc-textarea "~1.6.3" rc-tooltip "~6.1.3" rc-tree "~5.8.5" - rc-tree-select "~5.17.0" + rc-tree-select "~5.18.0" rc-upload "~4.5.2" - rc-util "^5.38.1" + rc-util "^5.38.2" scroll-into-view-if-needed "^3.1.0" throttle-debounce "^5.0.0" @@ -2851,26 +2837,25 @@ app-builder-bin@4.0.0: resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-4.0.0.tgz#1df8e654bd1395e4a319d82545c98667d7eed2f0" integrity sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA== -app-builder-lib@24.9.1: - version "24.9.1" - resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.9.1.tgz#bf3568529298b4de8595ed1acbb351fe27db5ba4" - integrity sha512-Q1nYxZcio4r+W72cnIRVYofEAyjBd3mG47o+zms8HlD51zWtA/YxJb01Jei5F+jkWhge/PTQK+uldsPh6d0/4g== +app-builder-lib@24.13.3: + version "24.13.3" + resolved "https://registry.yarnpkg.com/app-builder-lib/-/app-builder-lib-24.13.3.tgz#36e47b65fecb8780bb73bff0fee4e0480c28274b" + integrity sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig== dependencies: - "7zip-bin" "~5.2.0" "@develar/schema-utils" "~2.6.5" - "@electron/notarize" "2.1.0" + "@electron/notarize" "2.2.1" "@electron/osx-sign" "1.0.5" - "@electron/universal" "1.4.1" + "@electron/universal" "1.5.1" "@malept/flatpak-bundler" "^0.4.0" "@types/fs-extra" "9.0.13" async-exit-hook "^2.0.1" bluebird-lst "^1.0.9" - builder-util "24.8.1" - builder-util-runtime "9.2.3" + builder-util "24.13.1" + builder-util-runtime "9.2.4" chromium-pickle-js "^0.2.0" debug "^4.3.4" ejs "^3.1.8" - electron-publish "24.8.1" + electron-publish "24.13.1" form-data "^4.0.0" fs-extra "^10.1.0" hosted-git-info "^4.1.0" @@ -2909,7 +2894,7 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q== -array-buffer-byte-length@^1.0.0, array-buffer-byte-length@^1.0.1: +array-buffer-byte-length@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== @@ -2944,6 +2929,17 @@ array.prototype.filter@^1.0.3: es-array-method-boxes-properly "^1.0.0" is-string "^1.0.7" +array.prototype.findlast@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.4.tgz#eeb9e45fc894055c82e5675c463e8077b827ad36" + integrity sha512-BMtLxpV+8BD+6ZPFIWmnUBpQoy+A+ujcg4rhp2iwCRJYA7PEh2MS4NL3lz8EiDlLrJPp2hg9qWihr5pd//jcGw== + dependencies: + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.3.0" + es-shim-unscopables "^1.0.2" + array.prototype.findlastindex@^1.2.3: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz#d1c50f0b3a9da191981ff8942a0aedd82794404f" @@ -2965,7 +2961,7 @@ array.prototype.flat@^1.3.1, array.prototype.flat@^1.3.2: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.2: +array.prototype.flatmap@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== @@ -2975,7 +2971,17 @@ array.prototype.flatmap@^1.3.1, array.prototype.flatmap@^1.3.2: es-abstract "^1.22.1" es-shim-unscopables "^1.0.0" -array.prototype.tosorted@^1.1.1: +array.prototype.toreversed@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz#b989a6bf35c4c5051e1dc0325151bf8088954eba" + integrity sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.tosorted@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz#c8c89348337e51b8a3c48a9227f9ce93ceedcba8" integrity sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg== @@ -2986,7 +2992,7 @@ array.prototype.tosorted@^1.1.1: es-errors "^1.1.0" es-shim-unscopables "^1.0.2" -arraybuffer.prototype.slice@^1.0.2: +arraybuffer.prototype.slice@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== @@ -3057,10 +3063,12 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -available-typed-arrays@^1.0.5, available-typed-arrays@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" - integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg== +available-typed-arrays@^1.0.6, available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" axe-core@=4.7.0: version "4.7.0" @@ -3166,24 +3174,24 @@ buffer@^5.1.0: base64-js "^1.3.1" ieee754 "^1.1.13" -builder-util-runtime@9.2.3: - version "9.2.3" - resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz#0a82c7aca8eadef46d67b353c638f052c206b83c" - integrity sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw== +builder-util-runtime@9.2.4: + version "9.2.4" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz#13cd1763da621e53458739a1e63f7fcba673c42a" + integrity sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA== dependencies: debug "^4.3.4" sax "^1.2.4" -builder-util@24.8.1: - version "24.8.1" - resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.8.1.tgz#594d45b0c86d1d17f5c7bebbb77405080b2571c2" - integrity sha512-ibmQ4BnnqCnJTNrdmdNlnhF48kfqhNzSeqFMXHLIl+o9/yhn6QfOaVrloZ9YUu3m0k3rexvlT5wcki6LWpjTZw== +builder-util@24.13.1: + version "24.13.1" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-24.13.1.tgz#4a4c4f9466b016b85c6990a0ea15aa14edec6816" + integrity sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA== dependencies: "7zip-bin" "~5.2.0" "@types/debug" "^4.1.6" app-builder-bin "4.0.0" bluebird-lst "^1.0.9" - builder-util-runtime "9.2.3" + builder-util-runtime "9.2.4" chalk "^4.1.2" cross-spawn "^7.0.3" debug "^4.3.4" @@ -3229,7 +3237,7 @@ cacheable-request@^7.0.2: normalize-url "^6.0.1" responselike "^2.0.0" -call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6: +call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== @@ -3598,22 +3606,22 @@ debug@^3.2.7: ms "^2.1.1" deck.gl@^8.9.34: - version "8.9.34" - resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-8.9.34.tgz#990193a7779a0175f6887490c4acfabb19357491" - integrity sha512-3c7gu7xSDlNmBXDexk+RF783cVbl6D/WbSQNpPrmY5glct102A3hXqbVSV3l4jiCG2zd4y3AMBjSHdkHzgfBrw== + version "8.9.35" + resolved "https://registry.yarnpkg.com/deck.gl/-/deck.gl-8.9.35.tgz#3cc6a4e0a30fe4e5c7e0524dede97cd1ef374edc" + integrity sha512-qP5A/Q2I7hRKrVagbSifiAg4tTe0IdMhc3pgDt0XMm1xV5P+aKa6GQMljXFSRRQyQ5UEN2uCHEiL18g/ZiqChQ== dependencies: "@babel/runtime" "^7.0.0" - "@deck.gl/aggregation-layers" "8.9.34" - "@deck.gl/carto" "8.9.34" - "@deck.gl/core" "8.9.34" - "@deck.gl/extensions" "8.9.34" - "@deck.gl/geo-layers" "8.9.34" - "@deck.gl/google-maps" "8.9.34" - "@deck.gl/json" "8.9.34" - "@deck.gl/layers" "8.9.34" - "@deck.gl/mapbox" "8.9.34" - "@deck.gl/mesh-layers" "8.9.34" - "@deck.gl/react" "8.9.34" + "@deck.gl/aggregation-layers" "8.9.35" + "@deck.gl/carto" "8.9.35" + "@deck.gl/core" "8.9.35" + "@deck.gl/extensions" "8.9.35" + "@deck.gl/geo-layers" "8.9.35" + "@deck.gl/google-maps" "8.9.35" + "@deck.gl/json" "8.9.35" + "@deck.gl/layers" "8.9.35" + "@deck.gl/mapbox" "8.9.35" + "@deck.gl/mesh-layers" "8.9.35" + "@deck.gl/react" "8.9.35" decompress-response@^6.0.0: version "6.0.0" @@ -3656,15 +3664,14 @@ defer-to-connect@^2.0.0: resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587" integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg== -define-data-property@^1.0.1, define-data-property@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.3.tgz#281845e04737d709c2de99e278546189b65d3055" - integrity sha512-h3GBouC+RPtNX2N0hHVLo2ZwPYurq8mLmXpOLTsw71gr7lHt5VaI4vVkDUNOfiWmm48JEXe3VM7PmLX45AMmmg== +define-data-property@^1.0.1, define-data-property@^1.1.2, define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== dependencies: + es-define-property "^1.0.0" es-errors "^1.3.0" - get-intrinsic "^1.2.4" gopd "^1.0.1" - has-property-descriptors "^1.0.1" define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1: version "1.2.1" @@ -3703,14 +3710,14 @@ dir-compare@^3.0.0: buffer-equal "^1.0.0" minimatch "^3.0.4" -dmg-builder@24.9.1: - version "24.9.1" - resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.9.1.tgz#04bf6c0dcd235f6214511f2358a78ed2b9379421" - integrity sha512-huC+O6hvHd24Ubj3cy2GMiGLe2xGFKN3klqVMLAdcbB6SWMd1yPSdZvV8W1O01ICzCCRlZDHiv4VrNUgnPUfbQ== +dmg-builder@24.13.3: + version "24.13.3" + resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-24.13.3.tgz#95d5b99c587c592f90d168a616d7ec55907c7e55" + integrity sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ== dependencies: - app-builder-lib "24.9.1" - builder-util "24.8.1" - builder-util-runtime "9.2.3" + app-builder-lib "24.13.3" + builder-util "24.13.1" + builder-util-runtime "9.2.4" fs-extra "^10.1.0" iconv-lite "^0.6.2" js-yaml "^4.1.0" @@ -3818,15 +3825,15 @@ ejs@^3.1.8: jake "^10.8.5" electron-builder@^24.9.1: - version "24.9.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.9.1.tgz#4aee03947963b829a7f48a850fe02c219311ef63" - integrity sha512-v7BuakDuY6sKMUYM8mfQGrwyjBpZ/ObaqnenU0H+igEL10nc6ht049rsCw2HghRBdEwJxGIBuzs3jbEhNaMDmg== + version "24.13.3" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-24.13.3.tgz#c506dfebd36d9a50a83ee8aa32d803d83dbe4616" + integrity sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg== dependencies: - app-builder-lib "24.9.1" - builder-util "24.8.1" - builder-util-runtime "9.2.3" + app-builder-lib "24.13.3" + builder-util "24.13.1" + builder-util-runtime "9.2.4" chalk "^4.1.2" - dmg-builder "24.9.1" + dmg-builder "24.13.3" fs-extra "^10.1.0" is-ci "^3.0.0" lazy-val "^1.0.5" @@ -3834,23 +3841,23 @@ electron-builder@^24.9.1: simple-update-notifier "2.0.0" yargs "^17.6.2" -electron-publish@24.8.1: - version "24.8.1" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.8.1.tgz#4216740372bf4297a429543402a1a15ce8c3560b" - integrity sha512-IFNXkdxMVzUdweoLJNXSupXkqnvgbrn3J4vognuOY06LaS/m0xvfFYIf+o1CM8if6DuWYWoQFKPcWZt/FUjZPw== +electron-publish@24.13.1: + version "24.13.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-24.13.1.tgz#57289b2f7af18737dc2ad134668cdd4a1b574a0c" + integrity sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A== dependencies: "@types/fs-extra" "^9.0.11" - builder-util "24.8.1" - builder-util-runtime "9.2.3" + builder-util "24.13.1" + builder-util-runtime "9.2.4" chalk "^4.1.2" fs-extra "^10.1.0" lazy-val "^1.0.5" mime "^2.5.2" electron@^28.2.3: - version "28.2.3" - resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.3.tgz#d26821bcfda7ee445b4b75231da4b057a7ce6e7b" - integrity sha512-he9nGphZo03ejDjYBXpmFVw0KBKogXvR2tYxE4dyYvnfw42uaFIBFrwGeenvqoEOfheJfcI0u4rFG6h3QxDwnA== + version "28.2.5" + resolved "https://registry.yarnpkg.com/electron/-/electron-28.2.5.tgz#d8e85306e8c51456042223a51f560f6ada565dc8" + integrity sha512-qlvQkDNVAzN647NpiJJw7GYJqE0NwK4+1evkhrQ0Xv6Qgab1EtN50G4oDr4/x/+O5pGUG2P5d3isXu+37O3RDw== dependencies: "@electron/get" "^2.0.0" "@types/node" "^18.11.18" @@ -3904,50 +3911,52 @@ err-code@^2.0.2: resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9" integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA== -es-abstract@^1.22.1, es-abstract@^1.22.3: - version "1.22.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.3.tgz#48e79f5573198de6dee3589195727f4f74bc4f32" - integrity sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA== +es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.22.4: + version "1.22.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.5.tgz#1417df4e97cc55f09bf7e58d1e614bc61cb8df46" + integrity sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w== dependencies: - array-buffer-byte-length "^1.0.0" - arraybuffer.prototype.slice "^1.0.2" - available-typed-arrays "^1.0.5" - call-bind "^1.0.5" - es-set-tostringtag "^2.0.1" + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.3" es-to-primitive "^1.2.1" function.prototype.name "^1.1.6" - get-intrinsic "^1.2.2" - get-symbol-description "^1.0.0" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" globalthis "^1.0.3" gopd "^1.0.1" - has-property-descriptors "^1.0.0" - has-proto "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" has-symbols "^1.0.3" - hasown "^2.0.0" - internal-slot "^1.0.5" - is-array-buffer "^3.0.2" + hasown "^2.0.1" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" is-callable "^1.2.7" - is-negative-zero "^2.0.2" + is-negative-zero "^2.0.3" is-regex "^1.1.4" - is-shared-array-buffer "^1.0.2" + is-shared-array-buffer "^1.0.3" is-string "^1.0.7" - is-typed-array "^1.1.12" + is-typed-array "^1.1.13" is-weakref "^1.0.2" object-inspect "^1.13.1" object-keys "^1.1.1" - object.assign "^4.1.4" - regexp.prototype.flags "^1.5.1" - safe-array-concat "^1.0.1" - safe-regex-test "^1.0.0" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.0" + safe-regex-test "^1.0.3" string.prototype.trim "^1.2.8" string.prototype.trimend "^1.0.7" string.prototype.trimstart "^1.0.7" - typed-array-buffer "^1.0.0" - typed-array-byte-length "^1.0.0" - typed-array-byte-offset "^1.0.0" - typed-array-length "^1.0.4" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.5" unbox-primitive "^1.0.2" - which-typed-array "^1.1.13" + which-typed-array "^1.1.14" es-array-method-boxes-properly@^1.0.0: version "1.0.0" @@ -3966,35 +3975,35 @@ es-errors@^1.0.0, es-errors@^1.1.0, es-errors@^1.2.1, es-errors@^1.3.0: resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== -es-iterator-helpers@^1.0.12, es-iterator-helpers@^1.0.15: - version "1.0.16" - resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.16.tgz#495756d38dd5f9cc8e3091e913ee790d353e6f28" - integrity sha512-CREG2A9Vq7bpDRnldhFcMKuKArvkZtsH6Y0DHOHVg49qhf+LD8uEdUM3OkOAICv0EziGtDEnQtqY2/mfBILpFw== +es-iterator-helpers@^1.0.15, es-iterator-helpers@^1.0.17: + version "1.0.17" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz#123d1315780df15b34eb181022da43e734388bb8" + integrity sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ== dependencies: asynciterator.prototype "^1.0.0" - call-bind "^1.0.6" + call-bind "^1.0.7" define-properties "^1.2.1" - es-abstract "^1.22.3" + es-abstract "^1.22.4" es-errors "^1.3.0" es-set-tostringtag "^2.0.2" function-bind "^1.1.2" get-intrinsic "^1.2.4" globalthis "^1.0.3" - has-property-descriptors "^1.0.1" + has-property-descriptors "^1.0.2" has-proto "^1.0.1" has-symbols "^1.0.3" internal-slot "^1.0.7" iterator.prototype "^1.1.2" safe-array-concat "^1.1.0" -es-set-tostringtag@^2.0.1, es-set-tostringtag@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" - integrity sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q== +es-set-tostringtag@^2.0.2, es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== dependencies: - get-intrinsic "^1.2.2" - has-tostringtag "^1.0.0" - hasown "^2.0.0" + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: version "1.0.2" @@ -4071,9 +4080,9 @@ eslint-import-resolver-node@^0.3.9: resolve "^1.22.4" eslint-module-utils@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" - integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== + version "2.8.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz#52f2404300c3bd33deece9d7372fb337cc1d7c34" + integrity sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q== dependencies: debug "^3.2.7" @@ -4141,26 +4150,28 @@ eslint-plugin-react-refresh@^0.4.5: integrity sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w== eslint-plugin-react@^7.33.2: - version "7.33.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz#69ee09443ffc583927eafe86ffebb470ee737608" - integrity sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw== + version "7.34.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.34.0.tgz#ab71484d54fc409c37025c5eca00eb4177a5e88c" + integrity sha512-MeVXdReleBTdkz/bvcQMSnCXGi+c9kvy51IpinjnJgutl3YTHWsDdke7Z1ufZpGfDG8xduBDKyjtB9JH1eBKIQ== dependencies: - array-includes "^3.1.6" - array.prototype.flatmap "^1.3.1" - array.prototype.tosorted "^1.1.1" + array-includes "^3.1.7" + array.prototype.findlast "^1.2.4" + array.prototype.flatmap "^1.3.2" + array.prototype.toreversed "^1.1.2" + array.prototype.tosorted "^1.1.3" doctrine "^2.1.0" - es-iterator-helpers "^1.0.12" + es-iterator-helpers "^1.0.17" estraverse "^5.3.0" jsx-ast-utils "^2.4.1 || ^3.0.0" minimatch "^3.1.2" - object.entries "^1.1.6" - object.fromentries "^2.0.6" - object.hasown "^1.1.2" - object.values "^1.1.6" + object.entries "^1.1.7" + object.fromentries "^2.0.7" + object.hasown "^1.1.3" + object.values "^1.1.7" prop-types "^15.8.1" - resolve "^2.0.0-next.4" + resolve "^2.0.0-next.5" semver "^6.3.1" - string.prototype.matchall "^4.0.8" + string.prototype.matchall "^4.0.10" eslint-plugin-simple-import-sort@^7.0.0: version "7.0.0" @@ -4181,15 +4192,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== eslint@^8.56.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -4321,9 +4332,9 @@ fast-levenshtein@^2.0.6: integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-xml-parser@^4.2.5: - version "4.3.4" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.4.tgz#385cc256ad7bbc57b91515a38a22502a9e1fca0d" - integrity sha512-utnwm92SyozgA3hhH2I8qldf2lBqm6qHOICawRNRFu1qMe3+oqr+GcXjGqTmXTMGE5T4eC03kr/rlh5C1IRdZA== + version "4.3.5" + resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.3.5.tgz#e2f2a2ae8377e9c3dc321b151e58f420ca7e5ccc" + integrity sha512-sWvP1Pl8H03B8oFJpFR3HE31HUfwtX7Rlf9BNsvdpujD4n7WMhfmu8h9wOV2u+c1k0ZilTADhPqypzx2J690ZQ== dependencies: strnum "^1.0.5" @@ -4373,9 +4384,9 @@ flat-cache@^3.0.4: rimraf "^3.0.2" flatted@^3.2.9: - version "3.2.9" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf" - integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ== + version "3.3.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a" + integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw== follow-redirects@^1.15.4: version "1.15.5" @@ -4541,7 +4552,7 @@ get-stream@^6.0.1: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== -get-symbol-description@^1.0.0: +get-symbol-description@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== @@ -4696,31 +4707,31 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1: +has-property-descriptors@^1.0.0, has-property-descriptors@^1.0.1, has-property-descriptors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== dependencies: es-define-property "^1.0.0" -has-proto@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" - integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.1, has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== -has-tostringtag@^1.0.0, has-tostringtag@^1.0.1: +has-tostringtag@^1.0.0, has-tostringtag@^1.0.1, has-tostringtag@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== dependencies: has-symbols "^1.0.3" -hasown@^2.0.0: +hasown@^2.0.0, hasown@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.1.tgz#26f48f039de2c0f8d3356c223fb8d50253519faa" integrity sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA== @@ -4924,7 +4935,7 @@ is-arguments@^1.1.1: call-bind "^1.0.2" has-tostringtag "^1.0.0" -is-array-buffer@^3.0.2, is-array-buffer@^3.0.4: +is-array-buffer@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== @@ -5033,10 +5044,10 @@ is-map@^2.0.1: resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.2.tgz#00922db8c9bf73e81b7a335827bc2a43f2b91127" integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg== -is-negative-zero@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" - integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== is-number-object@^1.0.4: version "1.0.7" @@ -5070,12 +5081,12 @@ is-set@^2.0.1: resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.2.tgz#90755fa4c2562dc1c5d4024760d6119b94ca18ec" integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g== -is-shared-array-buffer@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" - integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA== +is-shared-array-buffer@^1.0.2, is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" is-string@^1.0.5, is-string@^1.0.7: version "1.0.7" @@ -5091,7 +5102,7 @@ is-symbol@^1.0.2, is-symbol@^1.0.3: dependencies: has-symbols "^1.0.2" -is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.13, is-typed-array@^1.1.9: +is-typed-array@^1.1.13: version "1.1.13" resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== @@ -5179,9 +5190,9 @@ jake@^10.8.5: minimatch "^3.1.2" joi@^17.11.0: - version "17.12.1" - resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.1.tgz#3347ecf4cd3301962d42191c021b165eef1f395b" - integrity sha512-vtxmq+Lsc5SlfqotnfVjlViWfOL9nt/avKNbKYizwf6gsCfq9NYY/ceYRMFD8XDdrjJ9abJyScWmhmIiy+XRtQ== + version "17.12.2" + resolved "https://registry.yarnpkg.com/joi/-/joi-17.12.2.tgz#283a664dabb80c7e52943c557aab82faea09f521" + integrity sha512-RonXAIzCiHLc8ss3Ibuz45u28GOsWE1UpfDXLbN/9NKbL4tCJf8TWYVKsoYuuh+sAUt7fsSNpA+r2+TBA6Wjmw== dependencies: "@hapi/hoek" "^9.3.0" "@hapi/topo" "^5.1.0" @@ -5410,9 +5421,9 @@ lru-cache@^6.0.0: integrity sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q== maplibre-gl@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-4.0.0.tgz#bcb01eee68378402e9f7d499389664d3ca7211bf" - integrity sha512-bzVQ2pdOWITwbE+JHKSiAB/viVBBx4Aa1puydc1xizOWGbvRHD9pXpy3dsaW2ZlbmZKbv9r9sHpcvM9fTLGsKA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/maplibre-gl/-/maplibre-gl-4.1.0.tgz#b2c7f438bafa7d029c6b5a0a5f5dfc6770cffc44" + integrity sha512-4RQFJSroo/JAJml6Rj2FFIZOfnjsqPp0O9kSp8aVXQUY0HGXNupltzPKbBZeucqi7ynRQHFeu+onTM3hY0Makw== dependencies: "@mapbox/geojson-rewind" "^0.5.2" "@mapbox/jsonlint-lines-primitives" "^2.0.2" @@ -5421,8 +5432,8 @@ maplibre-gl@^4.0.0: "@mapbox/unitbezier" "^0.0.1" "@mapbox/vector-tile" "^1.3.1" "@mapbox/whoots-js" "^3.1.0" - "@maplibre/maplibre-gl-style-spec" "^20.1.0" - "@types/geojson" "^7946.0.13" + "@maplibre/maplibre-gl-style-spec" "^20.1.1" + "@types/geojson" "^7946.0.14" "@types/geojson-vt" "3.2.5" "@types/mapbox__point-geometry" "^0.1.4" "@types/mapbox__vector-tile" "^1.3.4" @@ -5665,19 +5676,19 @@ object-inspect@^1.13.1: integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ== object-is@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac" - integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw== + version "1.1.6" + resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.6.tgz#1a6a53aed2dd8f7e6775ff870bea58545956ab07" + integrity sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q== dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" + call-bind "^1.0.7" + define-properties "^1.2.1" object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.4: +object.assign@^4.1.4, object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== @@ -5687,7 +5698,7 @@ object.assign@^4.1.4: has-symbols "^1.0.3" object-keys "^1.1.1" -object.entries@^1.1.6, object.entries@^1.1.7: +object.entries@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.7.tgz#2b47760e2a2e3a752f39dd874655c61a7f03c131" integrity sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA== @@ -5696,7 +5707,7 @@ object.entries@^1.1.6, object.entries@^1.1.7: define-properties "^1.2.0" es-abstract "^1.22.1" -object.fromentries@^2.0.6, object.fromentries@^2.0.7: +object.fromentries@^2.0.7: version "2.0.7" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.7.tgz#71e95f441e9a0ea6baf682ecaaf37fa2a8d7e616" integrity sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA== @@ -5716,7 +5727,7 @@ object.groupby@^1.0.1: es-abstract "^1.22.3" es-errors "^1.0.0" -object.hasown@^1.1.2: +object.hasown@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.3.tgz#6a5f2897bb4d3668b8e79364f98ccf971bda55ae" integrity sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA== @@ -5870,6 +5881,11 @@ polygon-clipping@^0.15.3: robust-predicates "^3.0.2" splaytree "^3.1.0" +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss@^8.4.35: version "8.4.35" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.35.tgz#60997775689ce09011edf083a549cea44aabe2f7" @@ -6014,22 +6030,22 @@ rc-animate@^3.1.1: raf "^3.4.0" rc-util "^4.15.3" -rc-cascader@~3.21.2: - version "3.21.2" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.21.2.tgz#3421841131cdc15157201fefd955da31f409ac85" - integrity sha512-J7GozpgsLaOtzfIHFJFuh4oFY0ePb1w10twqK6is3pAkqHkca/PsokbDr822KIRZ8/CK8CqevxohuPDVZ1RO/A== +rc-cascader@~3.22.0: + version "3.22.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.22.0.tgz#816d86f8f5d80bcbd8fe175193904ff6ea4562ae" + integrity sha512-zTVa1zE7C+MX0anBkieMmTzQ7OvQ+7wJn3dzrlYN3tIG9WXPJKoTgMeHqTBspGU5KhV5SyoqTPvpinVrxgliHg== dependencies: "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" classnames "^2.3.1" - rc-select "~14.11.0" + rc-select "~14.12.0" rc-tree "~5.8.1" rc-util "^5.37.0" -rc-checkbox@~3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-3.1.0.tgz#6be0d9d8de2cc96fb5e37f9036a1c3e360d0a42d" - integrity sha512-PAwpJFnBa3Ei+5pyqMMXdcKYKNBMS+TvSDiLdDnARnMJHC8ESxwPfm4Ao1gJiKtWLdmGfigascnCpwrHFgoOBQ== +rc-checkbox@~3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/rc-checkbox/-/rc-checkbox-3.2.0.tgz#04f83b7f2bf63eaf0e2da25e947b88a0a6321b5a" + integrity sha512-8inzw4y9dAhZmv/Ydl59Qdy5tdp9CKg4oPVcRigi+ga/yKPZS5m5SyyQPtYSgbcqHRYOdUhiPSeKfktc76du1A== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.3.2" @@ -6045,10 +6061,10 @@ rc-collapse@~3.7.2: rc-motion "^2.3.4" rc-util "^5.27.0" -rc-dialog@~9.3.4: - version "9.3.4" - resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-9.3.4.tgz#e0decb3d4a0dbe36524a67ed2f8fe2daa4b7b73c" - integrity sha512-975X3018GhR+EjZFbxA2Z57SX5rnu0G0/OxFgMMvZK4/hQWEm3MHaNvP4wXpxYDoJsp+xUvVW+GB9CMMCm81jA== +rc-dialog@~9.4.0: + version "9.4.0" + resolved "https://registry.yarnpkg.com/rc-dialog/-/rc-dialog-9.4.0.tgz#194c107d34cb36a56f1db4a49dc73f6d59eeae85" + integrity sha512-AScCexaLACvf8KZRqCPz12BJ8olszXOS4lKlkMyzDQHS1m0zj1KZMYgmMCh39ee0Dcv8kyrj8mTqxuLyhH+QuQ== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/portal" "^1.0.0-8" @@ -6056,16 +6072,16 @@ rc-dialog@~9.3.4: rc-motion "^2.3.0" rc-util "^5.21.0" -rc-drawer@~7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-7.0.0.tgz#5632ad00284431665d4ff622b274d234fc9eefb2" - integrity sha512-ePcS4KtQnn57bCbVXazHN2iC8nTPCXlWEIA/Pft87Pd9U7ZeDkdRzG47jWG2/TAFXFlFltRAMcslqmUM8NPCGA== +rc-drawer@~7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/rc-drawer/-/rc-drawer-7.1.0.tgz#2beabb8bab1784aea255d0d850bc206c3dc715da" + integrity sha512-nBE1rF5iZvpavoyqhSSz2mk/yANltA7g3aF0U45xkx381n3we/RKs9cJfNKp9mSWCedOKWt9FLEwZDaAaOGn2w== dependencies: - "@babel/runtime" "^7.10.1" + "@babel/runtime" "^7.23.9" "@rc-component/portal" "^1.1.1" classnames "^2.2.6" rc-motion "^2.6.1" - rc-util "^5.36.0" + rc-util "^5.38.1" rc-dropdown@~4.1.0: version "4.1.0" @@ -6077,10 +6093,10 @@ rc-dropdown@~4.1.0: classnames "^2.2.6" rc-util "^5.17.0" -rc-field-form@~1.41.0: - version "1.41.0" - resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.41.0.tgz#660ed8691fdabbc1e5b1ee6b5e0e4f534b295cf0" - integrity sha512-k9AS0wmxfJfusWDP/YXWTpteDNaQ4isJx9UKxx4/e8Dub4spFeZ54/EuN2sYrMRID/+hUznPgVZeg+Gf7XSYCw== +rc-field-form@~1.42.0: + version "1.42.1" + resolved "https://registry.yarnpkg.com/rc-field-form/-/rc-field-form-1.42.1.tgz#70a1c479a1c011b28375bd129d2e9366ed0a1757" + integrity sha512-SqiEmWNP+I61Lt80+ofPvT+3l8Ij6vb35IS+x14gheVnCJN0SRnOwEgsqCEB5FslT7xqjUqDnU845hRZ1jzlAA== dependencies: "@babel/runtime" "^7.18.0" async-validator "^4.1.0" @@ -6101,15 +6117,15 @@ rc-form@^2.4.12: react-is "^16.13.1" warning "^4.0.3" -rc-image@~7.5.1: - version "7.5.1" - resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-7.5.1.tgz#39a93354e14fe3e5eaafd9c9464e8fe3c6c171a0" - integrity sha512-Z9loECh92SQp0nSipc0MBuf5+yVC05H/pzC+Nf8xw1BKDFUJzUeehYBjaWlxly8VGBZJcTHYri61Fz9ng1G3Ag== +rc-image@~7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/rc-image/-/rc-image-7.6.0.tgz#2867087b77c8595ea9eb37d18ca863e47904b191" + integrity sha512-tL3Rvd1sS+frZQ01i+tkeUPaOeFz2iG9/scAt/Cfs0hyCRVA/w0Pu1J/JxIX8blalvmHE0bZQRYdOmRAzWu4Hg== dependencies: "@babel/runtime" "^7.11.2" "@rc-component/portal" "^1.0.2" classnames "^2.2.6" - rc-dialog "~9.3.4" + rc-dialog "~9.4.0" rc-motion "^2.6.2" rc-util "^5.34.1" @@ -6196,10 +6212,10 @@ rc-pagination@~4.0.4: classnames "^2.3.2" rc-util "^5.38.0" -rc-picker@~4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-4.1.1.tgz#e3fd8931cc6aa0b8afc7f616b81c056563ceb449" - integrity sha512-H99qaHUepHjHnAqMLiftJEATXRuHJZcUyFoRkyIqUvTHVGnx/uHxFFNm7QIu1valCpfwdsGWQxiWgn9CAxvlvA== +rc-picker@~4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/rc-picker/-/rc-picker-4.2.0.tgz#c5d0cae263515f467932bf3694343de0cec0259e" + integrity sha512-4a5Gv9UtxDMGhqzJPDDAfXni6DGReqyHI4nu7e3nPrHsuTLH13lL1ykqIXqJ25f5ZqqyjpnMeogU1F4aaOdwhA== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/trigger" "^1.5.0" @@ -6246,10 +6262,10 @@ rc-segmented@~2.3.0: rc-motion "^2.4.4" rc-util "^5.17.0" -rc-select@~14.11.0, rc-select@~14.11.0-0: - version "14.11.0" - resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.11.0.tgz#37c63acea92ac1dcd0e1b7ebd9c0614b53dd8346" - integrity sha512-8J8G/7duaGjFiTXCBLWfh5P+KDWyA3KTlZDfV3xj/asMPqB2cmxfM+lH50wRiPIRsCQ6EbkCFBccPuaje3DHIg== +rc-select@~14.12.0: + version "14.12.0" + resolved "https://registry.yarnpkg.com/rc-select/-/rc-select-14.12.0.tgz#ba398b0e767e9e036232114f4182cbe3fb799fdb" + integrity sha512-DJgL3pZGjoLOhV1IL8MUSyiZW+yLf/ArMvxZK8ES5HUadfAP2i5uPcaex9nGdX+MMk9iQ0iFTdMwwNt0ufNlqQ== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/trigger" "^1.5.0" @@ -6286,10 +6302,10 @@ rc-switch@~4.1.0: classnames "^2.2.1" rc-util "^5.30.0" -rc-table@~7.39.0: - version "7.39.0" - resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.39.0.tgz#61822efc489c546e5a56edac47c9a092152b5280" - integrity sha512-7fHLMNsm/2DlGwyIMkdH2xIeRzb5I69bLsFaEVtX+gqmGhByy0wtOAgHkiOew3PtXozSJyh+iXifjLgQzWdczw== +rc-table@~7.42.0: + version "7.42.0" + resolved "https://registry.yarnpkg.com/rc-table/-/rc-table-7.42.0.tgz#94a2ce0c76b38336ed04a69587ad264bfc533805" + integrity sha512-GwHV9Zs3HvWxBkoXatO/IeKoElzy3Ojf3dcyw1Rj3cyQVb+ZHtexslKdyzsrKRPJ0mUa62BoX+ZAg3zgTEql8w== dependencies: "@babel/runtime" "^7.10.1" "@rc-component/context" "^1.4.0" @@ -6331,14 +6347,14 @@ rc-tooltip@~6.1.3: "@rc-component/trigger" "^1.18.0" classnames "^2.3.1" -rc-tree-select@~5.17.0: - version "5.17.0" - resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.17.0.tgz#be5bcad09b5874bfcff14be758e76dd992e42359" - integrity sha512-7sRGafswBhf7n6IuHyCEFCildwQIgyKiV8zfYyUoWfZEFdhuk7lCH+DN0aHt+oJrdiY9+6Io/LDXloGe01O8XQ== +rc-tree-select@~5.18.0: + version "5.18.0" + resolved "https://registry.yarnpkg.com/rc-tree-select/-/rc-tree-select-5.18.0.tgz#5b8ede52930fa329d6eb61df5de83631b987d103" + integrity sha512-gctFd1ATKom/YGQ3NBKDPaYkHhJvJbd2hC0cvNXspbg9jYEJe8QBVgCwVnt0QvSkxN4Jxjx/CxA4UEidl084Sw== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" - rc-select "~14.11.0-0" + rc-select "~14.12.0" rc-tree "~5.8.1" rc-util "^5.16.1" @@ -6373,10 +6389,10 @@ rc-util@^4.15.3: react-lifecycles-compat "^3.0.4" shallowequal "^1.1.0" -rc-util@^5.0.1, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.24.4, rc-util@^5.24.5, rc-util@^5.25.2, rc-util@^5.27.0, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.2, rc-util@^5.34.1, rc-util@^5.35.0, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.38.1: - version "5.38.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.38.1.tgz#4915503b89855f5c5cd9afd4c72a7a17568777bb" - integrity sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng== +rc-util@^5.0.1, rc-util@^5.16.1, rc-util@^5.17.0, rc-util@^5.18.1, rc-util@^5.2.0, rc-util@^5.20.1, rc-util@^5.21.0, rc-util@^5.24.4, rc-util@^5.24.5, rc-util@^5.25.2, rc-util@^5.27.0, rc-util@^5.28.0, rc-util@^5.30.0, rc-util@^5.31.1, rc-util@^5.32.2, rc-util@^5.34.1, rc-util@^5.35.0, rc-util@^5.36.0, rc-util@^5.37.0, rc-util@^5.38.0, rc-util@^5.38.1, rc-util@^5.38.2: + version "5.39.0" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.39.0.tgz#910eda7fb4d6080215aac1c65a442ae5f672993d" + integrity sha512-fEVbkOApBUK/lg+NTkfC3fw336EhgRy531ly2QvZj8G+21OjPEzb9TtH/zfKDL2BuQqbGh8J5zXeFyfcELXOlQ== dependencies: "@babel/runtime" "^7.18.3" react-is "^18.2.0" @@ -6533,7 +6549,7 @@ regenerator-runtime@^0.14.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: +regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== @@ -6584,7 +6600,7 @@ resolve@^1.22.4: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" -resolve@^2.0.0-next.4: +resolve@^2.0.0-next.5: version "2.0.0-next.5" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== @@ -6610,7 +6626,7 @@ reusify@^1.0.4: resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -6640,25 +6656,25 @@ robust-predicates@^3.0.2: integrity sha512-IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg== rollup@^4.2.0: - version "4.10.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.10.0.tgz#244c2cb54a8de004a949fe6036a0801be9060456" - integrity sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g== + version "4.12.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.12.1.tgz#0659cb02551cde4c5b210e9bd3af050b5b5b415d" + integrity sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg== dependencies: "@types/estree" "1.0.5" optionalDependencies: - "@rollup/rollup-android-arm-eabi" "4.10.0" - "@rollup/rollup-android-arm64" "4.10.0" - "@rollup/rollup-darwin-arm64" "4.10.0" - "@rollup/rollup-darwin-x64" "4.10.0" - "@rollup/rollup-linux-arm-gnueabihf" "4.10.0" - "@rollup/rollup-linux-arm64-gnu" "4.10.0" - "@rollup/rollup-linux-arm64-musl" "4.10.0" - "@rollup/rollup-linux-riscv64-gnu" "4.10.0" - "@rollup/rollup-linux-x64-gnu" "4.10.0" - "@rollup/rollup-linux-x64-musl" "4.10.0" - "@rollup/rollup-win32-arm64-msvc" "4.10.0" - "@rollup/rollup-win32-ia32-msvc" "4.10.0" - "@rollup/rollup-win32-x64-msvc" "4.10.0" + "@rollup/rollup-android-arm-eabi" "4.12.1" + "@rollup/rollup-android-arm64" "4.12.1" + "@rollup/rollup-darwin-arm64" "4.12.1" + "@rollup/rollup-darwin-x64" "4.12.1" + "@rollup/rollup-linux-arm-gnueabihf" "4.12.1" + "@rollup/rollup-linux-arm64-gnu" "4.12.1" + "@rollup/rollup-linux-arm64-musl" "4.12.1" + "@rollup/rollup-linux-riscv64-gnu" "4.12.1" + "@rollup/rollup-linux-x64-gnu" "4.12.1" + "@rollup/rollup-linux-x64-musl" "4.12.1" + "@rollup/rollup-win32-arm64-msvc" "4.12.1" + "@rollup/rollup-win32-ia32-msvc" "4.12.1" + "@rollup/rollup-win32-x64-msvc" "4.12.1" fsevents "~2.3.2" run-parallel@^1.1.9: @@ -6680,7 +6696,7 @@ rxjs@^7.8.1: dependencies: tslib "^2.1.0" -safe-array-concat@^1.0.1, safe-array-concat@^1.1.0: +safe-array-concat@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.0.tgz#8d0cae9cb806d6d1c06e08ab13d847293ebe0692" integrity sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg== @@ -6690,7 +6706,7 @@ safe-array-concat@^1.0.1, safe-array-concat@^1.1.0: has-symbols "^1.0.3" isarray "^2.0.5" -safe-regex-test@^1.0.0: +safe-regex-test@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== @@ -6772,13 +6788,14 @@ set-function-length@^1.2.1: has-property-descriptors "^1.0.1" set-function-name@^2.0.0, set-function-name@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.1.tgz#12ce38b7954310b9f61faa12701620a0c882793a" - integrity sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA== + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== dependencies: - define-data-property "^1.0.1" + define-data-property "^1.1.4" + es-errors "^1.3.0" functions-have-names "^1.2.3" - has-property-descriptors "^1.0.0" + has-property-descriptors "^1.0.2" set-value@^2.0.1: version "2.0.1" @@ -6813,11 +6830,11 @@ shell-quote@^1.8.1: integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== side-channel@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.5.tgz#9a84546599b48909fb6af1211708d23b1946221b" - integrity sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ== + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" es-errors "^1.3.0" get-intrinsic "^1.2.4" object-inspect "^1.13.1" @@ -6966,7 +6983,7 @@ string-width@^5.0.1, string-width@^5.1.2: emoji-regex "^9.2.2" strip-ansi "^7.0.1" -string.prototype.matchall@^4.0.8: +string.prototype.matchall@^4.0.10: version "4.0.10" resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz#a1553eb532221d4180c51581d6072cd65d1ee100" integrity sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ== @@ -7146,9 +7163,9 @@ tilebelt@^1.0.1: integrity sha512-cxHzpa5JgsugY9NUVRH43gPaGJw/29LecAn4X7UGOP64+kB8pU4VQ3bIhSyfb5Mk4jDxwl3yk330L/EIhbJ5aw== tiny-invariant@^1.0.2: - version "1.3.1" - resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.1.tgz#8560808c916ef02ecfd55e66090df23a4b7aa642" - integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw== + version "1.3.3" + resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz#46680b7a873a0d5d10005995eb90a70d74d60127" + integrity sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg== tiny-warning@^1.0.0: version "1.0.3" @@ -7168,11 +7185,9 @@ tmp-promise@^3.0.2: tmp "^0.2.0" tmp@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" - integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== - dependencies: - rimraf "^3.0.0" + version "0.2.3" + resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae" + integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w== toggle-selection@^1.0.6: version "1.0.6" @@ -7242,44 +7257,49 @@ type-fest@^0.20.2: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== -typed-array-buffer@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz#0608ffe6bca71bf15a45bff0ca2604107a1325f5" - integrity sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ== +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== dependencies: - call-bind "^1.0.6" + call-bind "^1.0.7" es-errors "^1.3.0" is-typed-array "^1.1.13" -typed-array-byte-length@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" - integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA== +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" -typed-array-byte-offset@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" - integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg== +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== dependencies: - available-typed-arrays "^1.0.5" - call-bind "^1.0.2" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" for-each "^0.3.3" - has-proto "^1.0.1" - is-typed-array "^1.1.10" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" -typed-array-length@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" - integrity sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng== +typed-array-length@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.5.tgz#57d44da160296d8663fd63180a1802ebf25905d5" + integrity sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA== dependencies: - call-bind "^1.0.2" + call-bind "^1.0.7" for-each "^0.3.3" - is-typed-array "^1.1.9" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" typescript@^5.3.3: version "5.3.3" @@ -7377,9 +7397,9 @@ viewport-mercator-project@>=6.0.0: "@math.gl/web-mercator" "^3.5.5" vite@^5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.3.tgz#dd072653a80225702265550a4700561740dfde55" - integrity sha512-UfmUD36DKkqhi/F75RrxvPpry+9+tTkrXfMNZD+SboZqBCMsxKtO52XeGzzuh7ioz+Eo/SYDBbdb0Z7vgcDJew== + version "5.1.5" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.1.5.tgz#bdbc2b15e8000d9cc5172f059201178f9c9de5fb" + integrity sha512-BdN1xh0Of/oQafhU+FvopafUp6WaYenLU/NFoL5WyJL++GxkNfieKzBhM24H3HVsPQrlAqB7iJYTHabzaRed5Q== dependencies: esbuild "^0.19.3" postcss "^8.4.35" @@ -7453,7 +7473,7 @@ which-collection@^1.0.1: is-weakmap "^2.0.1" is-weakset "^2.0.1" -which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.9: +which-typed-array@^1.1.14, which-typed-array@^1.1.9: version "1.1.14" resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.14.tgz#1f78a111aee1e131ca66164d8bdc3ab062c95a06" integrity sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg== From dac077fc31195ee386795adaa59a06804a87beba Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:35:06 +0100 Subject: [PATCH 115/126] Add link to contact page --- src/components/HomePage/SideNav.jsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index c882d52..97d2c34 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -8,6 +8,7 @@ import { EditOutlined, ExceptionOutlined, FlagOutlined, + MailOutlined, ProjectOutlined, QuestionCircleOutlined, ReadOutlined, @@ -206,9 +207,9 @@ const helpMenuUrls = { documentation: 'http://city-energy-analyst.readthedocs.io/en/latest/', 'report-issue': 'https://github.com/architecture-building-systems/cityenergyanalyst/issues/new', - 'known-issue': 'https://github.com/architecture-building-systems/CityEnergyAnalyst/issues?utf8=%E2%9C%93&q=is%3Aopen%26closed+label%3A%22known+issue%22+', + contact: 'https://www.cityenergyanalyst.com/contact', }; const helpMenuItems = () => { @@ -238,6 +239,11 @@ const helpMenuItems = () => { key: 'known-issue', icon: , }, + { + label: 'Contact Us', + key: 'contact', + icon: , + }, ], }, ]; From f579d4c499ed633cda1db04282bbfd20f48406c5 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 15:59:37 +0100 Subject: [PATCH 116/126] Fix dialog type --- src/components/DatabaseEditor/ExportDatabaseModal.jsx | 4 ++-- src/components/Project/NewProjectModal.jsx | 2 +- src/components/Project/OpenProjectModal.jsx | 2 +- src/components/Tools/Parameter.jsx | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/DatabaseEditor/ExportDatabaseModal.jsx b/src/components/DatabaseEditor/ExportDatabaseModal.jsx index b26e4ba..9e59d76 100644 --- a/src/components/DatabaseEditor/ExportDatabaseModal.jsx +++ b/src/components/DatabaseEditor/ExportDatabaseModal.jsx @@ -1,6 +1,6 @@ import { useState, useRef } from 'react'; import { Form } from '@ant-design/compatible'; -import { Modal, message, Alert, Input } from 'antd'; +import { Modal, message, Alert } from 'antd'; import axios from 'axios'; import { FormItemWrapper, OpenDialogInput } from '../Tools/Parameter'; import { useSelector } from 'react-redux'; @@ -105,7 +105,7 @@ const ExportForm = Form.create()(({ form }) => { initialValue="" help="Path to export Database" required={true} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/NewProjectModal.jsx b/src/components/Project/NewProjectModal.jsx index 7e8e41d..dcbcc4e 100644 --- a/src/components/Project/NewProjectModal.jsx +++ b/src/components/Project/NewProjectModal.jsx @@ -109,7 +109,7 @@ const NewProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Project/OpenProjectModal.jsx b/src/components/Project/OpenProjectModal.jsx index 2289f9b..b8c52b6 100644 --- a/src/components/Project/OpenProjectModal.jsx +++ b/src/components/Project/OpenProjectModal.jsx @@ -74,7 +74,7 @@ const OpenProjectForm = Form.create()(({ form, initialValue }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); diff --git a/src/components/Tools/Parameter.jsx b/src/components/Tools/Parameter.jsx index bf7c61f..fb425a2 100644 --- a/src/components/Tools/Parameter.jsx +++ b/src/components/Tools/Parameter.jsx @@ -42,6 +42,7 @@ const Parameter = ({ parameter, form }) => { } case 'PathParameter': case 'FileParameter': { + const contentType = type == 'PathParameter' ? 'directory' : 'file'; return ( { console.log({ parameter }); if (value == '' && nullable) return callback(); - const contentType = - type == 'PathParameter' ? 'directory' : 'file'; - const pathExists = contentType == 'directory' ? await checkExist('', contentType, value) @@ -73,7 +71,7 @@ const Parameter = ({ parameter, form }) => { }, }, ]} - inputComponent={} + inputComponent={} /> ); } From 0b4c37de26ee4e186225926c352bd6dcb2434790 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:43:52 +0100 Subject: [PATCH 117/126] Ignore pycache files --- .gitignore | 2 ++ package.json | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8e3556d..467ce04 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ out *.njsproj *.sln *.sw? + +dependencies diff --git a/package.json b/package.json index da9e7b0..c75b9f6 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,11 @@ "extraResources": [ { "from": "dependencies", - "to": "." + "to": ".", + "filter": [ + "**/*", + "!**/__pycache__" + ] } ] }, @@ -109,4 +113,4 @@ ] } } -} \ No newline at end of file +} From f56d3e7c1da2accd003fa63ac31148d6b3ba3264 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:56:25 +0100 Subject: [PATCH 118/126] Allow database to update changes --- src/components/DatabaseEditor/Database.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/DatabaseEditor/Database.jsx b/src/components/DatabaseEditor/Database.jsx index 0f656bd..5a41af3 100644 --- a/src/components/DatabaseEditor/Database.jsx +++ b/src/components/DatabaseEditor/Database.jsx @@ -3,7 +3,7 @@ import { useSelector } from 'react-redux'; import { Tabs } from 'antd'; import { withErrorBoundary } from '../../utils/ErrorBoundary'; import './DatabaseEditor.css'; -import Table, { TableButtons } from './Table'; +import Table, { TableButtons, useTableUpdateRedux } from './Table'; import ColumnGlossary from './ColumnGlossary'; const Database = ({ name, data, schema }) => { @@ -32,11 +32,12 @@ const Database = ({ name, data, schema }) => { const DatabaseTable = ({ databaseName, sheetName, sheetData, schema }) => { const data = useSelector((state) => state.databaseEditor.data); const tableRef = useRef(null); + const updateRedux = useTableUpdateRedux(tableRef, databaseName, sheetName); const { columns, colHeaders } = getTableSchema( schema, sheetName, sheetData, - data + data, ); // Validate cells on mount @@ -75,7 +76,7 @@ export const getTableSchema = ( sheetName, tableData, data, - colHeaders + colHeaders, ) => { const _colHeaders = colHeaders || Object.keys(tableData[0]); const columns = _colHeaders.map((key) => { From 4c66a14a8918a071b3a566be3aebf35a99abbe89 Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 10:56:40 +0100 Subject: [PATCH 119/126] Show error when schema for database is not found --- src/components/DatabaseEditor/DatabaseEditor.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/DatabaseEditor/DatabaseEditor.jsx b/src/components/DatabaseEditor/DatabaseEditor.jsx index ff80f9a..434a212 100644 --- a/src/components/DatabaseEditor/DatabaseEditor.jsx +++ b/src/components/DatabaseEditor/DatabaseEditor.jsx @@ -227,6 +227,9 @@ const DatabaseContainer = () => { ) return
    {`${category}-${name} database not found`}
    ; + if (!schema?.[name]) + return
    {`Schema for database ${category}-${name} was not found`}
    ; + return (
    From 13ab02787ba78c841aefd2a2e3c3531d0c2e546b Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 14:42:58 +0100 Subject: [PATCH 120/126] Add link to website to logo --- src/components/HomePage/SideNav.jsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/HomePage/SideNav.jsx b/src/components/HomePage/SideNav.jsx index 97d2c34..4ef9d46 100644 --- a/src/components/HomePage/SideNav.jsx +++ b/src/components/HomePage/SideNav.jsx @@ -77,7 +77,16 @@ const SideNav = () => { collapsed={collapsed} hidden={breakpoint && collapsed} > -
    + -
    - parameters: -
    - 
    -          {JSON.stringify(job.parameters, null, 2)}
-
    +
    + + Show parameters + + 
    +            {JSON.stringify(job.parameters, null, 2)}
+
    +
    ); From 824f9b0adfcf83a73352ebbe0956cbbf647023eb Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:03:27 +0100 Subject: [PATCH 123/126] Add space between buttons --- src/components/HomePage/StatusBar/StatusBar.jsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/HomePage/StatusBar/StatusBar.jsx b/src/components/HomePage/StatusBar/StatusBar.jsx index 0505ddd..a8be5fd 100644 --- a/src/components/HomePage/StatusBar/StatusBar.jsx +++ b/src/components/HomePage/StatusBar/StatusBar.jsx @@ -11,7 +11,7 @@ import { ToolFilled, } from '@ant-design/icons'; -import { Popover, notification, Button, Modal } from 'antd'; +import { Popover, notification, Button, Modal, Space } from 'antd'; import io from 'socket.io-client'; import axios from 'axios'; import { fetchJobs, updateJob, dismissJob } from '../../../actions/jobs'; @@ -230,9 +230,13 @@ const JobInfoCard = ({ id, job, setModalVisible, setSelectedJob }) => { {`jobID: ${id} - ${job.script}`}
    -
    + {job.state < 2 && ( - )} @@ -243,9 +247,9 @@ const JobInfoCard = ({ id, job, setModalVisible, setSelectedJob }) => { setModalVisible(true); }} > - More Info + Show Logs -
    +
    @@ -291,7 +295,7 @@ const JobOutputModal = ({ job, visible, setVisible }) => { const resp = await axios.get( `${import.meta.env.VITE_CEA_URL}/server/streams/read/${job.id}`, null, - { responseType: 'text' } + { responseType: 'text' }, ); setMessage(resp.data); } catch (error) { From a966e9d677a7d57cc59924348315157474eeee0e Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:24:19 +0100 Subject: [PATCH 124/126] Show scenario --- src/components/HomePage/StatusBar/StatusBar.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/HomePage/StatusBar/StatusBar.jsx b/src/components/HomePage/StatusBar/StatusBar.jsx index a8be5fd..fccda89 100644 --- a/src/components/HomePage/StatusBar/StatusBar.jsx +++ b/src/components/HomePage/StatusBar/StatusBar.jsx @@ -256,6 +256,14 @@ const JobInfoCard = ({ id, job, setModalVisible, setSelectedJob }) => { status: {` ${JOB_STATES[job.state]}`}
    + +
    + + scenario: {job.parameters?.scenario} + + +
    +
    Show parameters From 24f3ef36f8c9b3b03b1605e897cb25e27bc0ea7e Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:24:36 +0100 Subject: [PATCH 125/126] Remove pointer cursor --- src/components/HomePage/StatusBar/StatusBar.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/HomePage/StatusBar/StatusBar.css b/src/components/HomePage/StatusBar/StatusBar.css index fd7f226..70c543c 100644 --- a/src/components/HomePage/StatusBar/StatusBar.css +++ b/src/components/HomePage/StatusBar/StatusBar.css @@ -52,7 +52,6 @@ .cea-job-info-card:hover { background-color: rgba(255, 255, 255, 0.9); - cursor: pointer; } .ant-notification { From f49cd29359fe7fa6e45e7bc7a5f3c5af202196df Mon Sep 17 00:00:00 2001 From: Reynold Mok <34395415+reyery@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:28:31 +0100 Subject: [PATCH 126/126] Update README.md --- README.md | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 14847d5..4f73825 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # City Energy Analyst GUI -This is the new interface of CEA in Electron. +Made with the help of [`electron-builder`](https://www.electron.build). -Made with the help of [`electron-forge`](https://www.electronforge.io/). +There are currently two possible build targets for the GUI. One for desktop (using Electron) and one for the web. ## Getting Started (development) @@ -10,19 +10,45 @@ Simply clone down this repository, install dependencies, and get started on your The use of the [yarn](https://yarnpkg.com/) package manager and [VS Code](https://code.visualstudio.com/) editor is recommended for development. +e.g. + ```bash git clone https://github.com/architecture-building-systems/CityEnergyAnalyst-GUI.git +cd CityEnergyAnalyst-GUI + # install dependencies yarn ``` ### Development Scripts +For desktop version + +```bash +# app will be launched using electron +yarn electron:dev +``` + +For web version + ```bash -# run application in development mode -yarn start +# web app will be accessible from the browser on http://localhost:5173/ +yarn dev +``` -# compile source code and create the OS specific application in the `out` folder -yarn package +### Build Scripts + +For desktop version + +```bash +# compiles source code and creates the OS specific application in the `out` folder +yarn electron:build +``` + +For web version + +```bash +# bundles source code and creates the web files in the `dist` folder +yarn build ```