Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Feat]: Technical: Translate redusers (composers and combined-updaters) to typescript (#1711)

Maksim Suslovfbe626be44fc
diff --git a/.eslintrc b/.eslintrc
index 23a0e30d7..b3f34cb19 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -19,12 +19,8 @@
"context": true,
"jestPuppeteer": true
},
- "parser": "babel-eslint",
- "plugins": [
- "babel",
- "prettier",
- "react"
- ],
+ "parser": "@babel/eslint-parser",
+ "plugins": ["babel", "prettier", "react", "@typescript-eslint"],
"rules": {
"valid-jsdoc": 0,
"no-var": 0,
diff --git a/package.json b/package.json
index 5dee50d40..14d525e60 100644
--- a/package.json
+++ b/package.json
@@ -171,6 +171,7 @@
"devDependencies": {
"@babel/cli": "^7.12.1",
"@babel/core": "^7.12.1",
+ "@babel/eslint-parser": "^7.17.0",
"@babel/node": "^7.12.1",
"@babel/parser": "^7.12.1",
"@babel/plugin-proposal-class-properties": "^7.12.1",
@@ -192,6 +193,7 @@
"@types/d3-array": "^2.0.0",
"@types/d3-scale": "^3.2.2",
"@types/geojson": "^7946.0.7",
+ "@typescript-eslint/eslint-plugin": "^5.12.0",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.0.0",
"babel-plugin-istanbul": "^6.0.0",
diff --git a/src/reducers/combined-updaters.d.ts b/src/reducers/combined-updaters.d.ts
deleted file mode 100644
index 43e9e871b..000000000
--- a/src/reducers/combined-updaters.d.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import {VisState} from './vis-state-updaters';
-import {MapState} from './map-state-updaters';
-import {UiState} from './ui-state-updaters';
-import {MapStyle} from './map-style-updaters';
-import {ProviderState} from './provider-state-updaters';
-import {AddDataToMapPayload} from 'actions/actions';
-import {FileCacheItem} from 'processors/file-handler';
-import {loadFilesSuccessUpdaterAction} from 'actions/vis-state-actions';
-
-export type KeplerGlState = {
- visState: VisState;
- mapState: MapState;
- mapStyle: MapStyle;
- uiState: UiState;
- providerState: ProviderState;
-};
-
-export function addDataToMapUpdater(
- state: KeplerGlState,
- action: {payload: AddDataToMapPayload}
-): KeplerGlState;
-
-export function loadFilesSuccessUpdater(
- state: KeplerGlState,
- action: loadFilesSuccessUpdaterAction
-): KeplerGlState;
\ No newline at end of file
diff --git a/src/reducers/combined-updaters.js b/src/reducers/combined-updaters.ts
similarity index 86%
rename from src/reducers/combined-updaters.js
rename to src/reducers/combined-updaters.ts
index 93e9e69df..1d64e9cfd 100644
--- a/src/reducers/combined-updaters.js
+++ b/src/reducers/combined-updaters.ts
@@ -32,6 +32,22 @@ import {findMapBounds} from 'utils/data-utils';
import {isPlainObject} from 'utils/utils';
import {filesToDataPayload} from 'processors/file-handler';
import {payload_, apply_, with_, if_, compose_, merge_, pick_} from './composer-helpers';
+import {VisState} from './vis-state-updaters';
+import {MapState} from './map-state-updaters';
+import {UiState} from './ui-state-updaters';
+import {MapStyle} from './map-style-updaters';
+import {ProviderState} from './provider-state-updaters';
+import {AddDataToMapPayload} from 'actions/actions';
+import {loadFilesSuccessUpdaterAction} from 'actions/vis-state-actions';
+import {ParsedConfig} from 'schemas';
+
+export type KeplerGlState = {
+ visState: VisState;
+ mapState: MapState;
+ mapStyle: MapStyle;
+ uiState: UiState;
+ providerState: ProviderState;
+};
// compose action to apply result multiple reducers, with the output of one
@@ -114,10 +130,12 @@ export const defaultAddDataToMapOptions = {
* @property data.fields.name - ***required** Name of the field,
* @property data.rows - ***required** Array of rows, in a tabular format with `fields` and `rows`
*
- * @type {typeof import('./combined-updaters').addDataToMapUpdater}
* @public
*/
-export const addDataToMapUpdater = (state, {payload}) => {
+export const addDataToMapUpdater = (
+ state: KeplerGlState,
+ {payload}: {payload: AddDataToMapPayload}
+): KeplerGlState => {
const {datasets, config, info} = payload;
const options = {
@@ -125,7 +143,8 @@ export const addDataToMapUpdater = (state, {payload}) => {
...payload.options
};
- let parsedConfig = config;
+ // @ts-expect-error
+ let parsedConfig: ParsedConfig = config;
if (isValidConfig(config)) {
// if passed in saved config
@@ -140,7 +159,7 @@ export const addDataToMapUpdater = (state, {payload}) => {
return bounds ? bounds : undefined;
};
- return compose_([
+ return compose_<KeplerGlState>([
pick_('visState')(
apply_(visStateUpdateVisDataUpdater, {
datasets,
@@ -149,7 +168,7 @@ export const addDataToMapUpdater = (state, {payload}) => {
})
),
- if_(info, pick_('visState')(apply_(setMapInfoUpdater, {info}))),
+ if_(Boolean(info), pick_('visState')(apply_(setMapInfoUpdater, {info}))),
with_(({visState}) =>
pick_('mapState')(
@@ -163,21 +182,17 @@ export const addDataToMapUpdater = (state, {payload}) => {
)
)
),
-
pick_('mapStyle')(apply_(styleMapConfigUpdater, payload_({config: parsedConfig, options}))),
-
pick_('uiState')(apply_(uiStateLoadFilesSuccessUpdater, payload_(null))),
-
pick_('uiState')(apply_(toggleModalUpdater, payload_(null))),
-
pick_('uiState')(merge_(options.hasOwnProperty('readOnly') ? {readOnly: options.readOnly} : {}))
])(state);
};
-/**
- * @type {typeof import('./combined-updaters').loadFilesSuccessUpdater}
- */
-export const loadFilesSuccessUpdater = (state, action) => {
+export const loadFilesSuccessUpdater = (
+ state: KeplerGlState,
+ action: loadFilesSuccessUpdaterAction
+): KeplerGlState => {
// still more to load
const payloads = filesToDataPayload(action.result);
const nextState = compose_([
diff --git a/src/reducers/composer-helpers.d.ts b/src/reducers/composer-helpers.d.ts
deleted file mode 100644
index 15eaa8177..000000000
--- a/src/reducers/composer-helpers.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/** Returns a function that logs a value with a given message */
-export declare function log(text: string): (value: any) => void;
-
-/** Wraps a value in an object and stores it the `payload` field */
-export declare function payload_<P>(payload: P): {payload: P};
-
-/** Wraps a value in an object and stores it the `payload` field */
-export declare function compose_<State>(fns: Array<(s: State) => State>): (s: State) => State;
-
-/** TBA */
-export declare function apply_<State, P>(
- updater: (s: State, p: P) => State,
- payload: P
-): (s: State) => State;
-
-/** TBA */
-export declare function pick_<State, Prop extends keyof State>(
- prop: Prop
-): (fn: (p: State[Prop]) => State[Prop]) => (state: State) => State;
-
-/** Returns a reducer function that merges props with state */
-export declare function merge_<State, Props>(object: Props): (state: State) => State & Props;
-
-export declare function pickKepler_<X>(fn: (x: X) => X): (s: {keplerGL: {map: X}}) => {keplerGL: {map: X}};
-
-export declare function swap_<X>(item: X): (arr: X[]) => X[];
-
-export declare function findById<X>(id: string): (arr: X[]) => X | undefined;
-
-export declare function with_<State>(fn: (state: State) => State): (state: State) => State;
-
-export declare function if_(pred: boolean, fn: (state: State) => State): (state: State) => State;
diff --git a/src/reducers/composer-helpers.js b/src/reducers/composer-helpers.ts
similarity index 57%
rename from src/reducers/composer-helpers.js
rename to src/reducers/composer-helpers.ts
index 0904ac691..8ff08d4d8 100644
--- a/src/reducers/composer-helpers.js
+++ b/src/reducers/composer-helpers.ts
@@ -22,49 +22,54 @@ import Console from 'global/console';
const identity = state => state;
-/* eslint-disable no-unused-vars */
-// @ts-ignore
-export function log(text) {
+/** Returns a function that logs a value with a given message */
+export function log(text: string): (value: any) => void {
return value => Console.log(text, value);
}
-/* eslint-enable no-unused-vars */
-
-export function payload_(p) {
- return {payload: p};
+/** Wraps a value in an object and stores it the `payload` field */
+export function payload_<P>(payload: P) {
+ return {payload};
}
-
-export function apply_(updater, payload) {
+/** Wraps a value in an object and stores it the `payload` field */
+export function apply_<State, P>(
+ updater: (state: State, payload: P) => State,
+ payload: P
+): (state: State) => State {
return state => updater(state, payload);
}
-export function with_(fn) {
+export function with_<State>(
+ fn: (state: State) => (state: State) => State
+): (state: State) => State {
return state => fn(state)(state);
}
-export function if_(pred, fn) {
+export function if_<State>(pred: boolean, fn: (state: State) => State): (state: State) => State {
return pred ? fn : identity;
}
-export function compose_(fns) {
+export function compose_<State>(fns: Array<(s: State) => State>): (s: State) => State {
return state => fns.reduce((state2, fn) => fn(state2), state);
}
-
-export function merge_(obj) {
+/** Returns a reducer function that merges props with state */
+export function merge_<Props>(obj: Props): <State>(state: State) => State {
return state => ({...state, ...obj});
}
-export function pick_(prop) {
+export function pick_<Prop extends string>(
+ prop: Prop
+): <Value>(fn: (p: Value) => Value) => <State extends Record<Prop, Value>>(state: State) => State {
return fn => state => ({...state, [prop]: fn(state[prop])});
}
-export function swap_(item) {
+export function swap_<X extends {id: string}>(item: X): (arr: X[]) => X[] {
return arr => arr.map(a => (a.id === item.id ? item : a));
}
-export function findById(id) {
+export function findById<X extends {id: string}>(id: string): (arr: X[]) => X | undefined {
return arr => arr.find(a => a.id === id);
}
-export function map_(fn) {
+export function map_<X>(fn: (state: X) => X): (arr: X[]) => X[] {
return arr => arr.map(e => fn(e));
}
diff --git a/src/reducers/composers.js b/src/reducers/composers.ts
similarity index 100%
rename from src/reducers/composers.js
rename to src/reducers/composers.ts
diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.js
index f6d8b4559..3dd724227 100644
--- a/src/reducers/vis-state-updaters.js
+++ b/src/reducers/vis-state-updaters.js
@@ -1574,6 +1574,7 @@ export function loadNextFileUpdater(state) {
const {loaders, loadOptions} = state;
return withTask(
stateWithProgress,
+ // @ts-expect-error
makeLoadFileTask(file, nextState.fileLoading.fileCache, loaders, loadOptions)
);
}
diff --git a/yarn.lock b/yarn.lock
index 4101729d5..4706c4ea5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -101,6 +101,15 @@
semver "^6.3.0"
source-map "^0.5.0"
+"@babel/eslint-parser@^7.17.0":
+ version "7.17.0"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.17.0.tgz#eabb24ad9f0afa80e5849f8240d0e5facc2d90d6"
+ integrity sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==
+ dependencies:
+ eslint-scope "^5.1.1"
+ eslint-visitor-keys "^2.1.0"
+ semver "^6.3.0"
+
"@babel/generator@^7.1.3", "@babel/generator@^7.12.5":
version "7.12.5"
resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
@@ -3203,6 +3212,11 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
+"@types/json-schema@^7.0.9":
+ version "7.0.9"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
+ integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+
"@types/keymirror@^0.1.1":
version "0.1.1"
resolved "https://registry.yarnpkg.com/@types/keymirror/-/keymirror-0.1.1.tgz#1fe48e6e5e2a969cafecf0f24485ae23c72abd30"
@@ -3347,6 +3361,76 @@
dependencies:
"@types/yargs-parser" "*"
+"@typescript-eslint/eslint-plugin@^5.12.0":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.0.tgz#bb46dd7ce7015c0928b98af1e602118e97df6c70"
+ integrity sha512-fwCMkDimwHVeIOKeBHiZhRUfJXU8n6xW1FL9diDxAyGAFvKcH4csy0v7twivOQdQdA0KC8TDr7GGRd3L4Lv0rQ==
+ dependencies:
+ "@typescript-eslint/scope-manager" "5.12.0"
+ "@typescript-eslint/type-utils" "5.12.0"
+ "@typescript-eslint/utils" "5.12.0"
+ debug "^4.3.2"
+ functional-red-black-tree "^1.0.1"
+ ignore "^5.1.8"
+ regexpp "^3.2.0"
+ semver "^7.3.5"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.12.0.tgz#59619e6e5e2b1ce6cb3948b56014d3a24da83f5e"
+ integrity sha512-GAMobtIJI8FGf1sLlUWNUm2IOkIjvn7laFWyRx7CLrv6nLBI7su+B7lbStqVlK5NdLvHRFiJo2HhiDF7Ki01WQ==
+ dependencies:
+ "@typescript-eslint/types" "5.12.0"
+ "@typescript-eslint/visitor-keys" "5.12.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.12.0.tgz#aaf45765de71c6d9707c66ccff76ec2b9aa31bb6"
+ integrity sha512-9j9rli3zEBV+ae7rlbBOotJcI6zfc6SHFMdKI9M3Nc0sy458LJ79Os+TPWeBBL96J9/e36rdJOfCuyRSgFAA0Q==
+ dependencies:
+ "@typescript-eslint/utils" "5.12.0"
+ debug "^4.3.2"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.12.0.tgz#5b4030a28222ee01e851836562c07769eecda0b8"
+ integrity sha512-JowqbwPf93nvf8fZn5XrPGFBdIK8+yx5UEGs2QFAYFI8IWYfrzz+6zqlurGr2ctShMaJxqwsqmra3WXWjH1nRQ==
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.0.tgz#cabf545fd592722f0e2b4104711e63bf89525cd2"
+ integrity sha512-Dd9gVeOqt38QHR0BEA8oRaT65WYqPYbIc5tRFQPkfLquVEFPD1HAtbZT98TLBkEcCkvwDYOAvuSvAD9DnQhMfQ==
+ dependencies:
+ "@typescript-eslint/types" "5.12.0"
+ "@typescript-eslint/visitor-keys" "5.12.0"
+ debug "^4.3.2"
+ globby "^11.0.4"
+ is-glob "^4.0.3"
+ semver "^7.3.5"
+ tsutils "^3.21.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.12.0.tgz#92fd3193191621ab863add2f553a7b38b65646af"
+ integrity sha512-k4J2WovnMPGI4PzKgDtQdNrCnmBHpMUFy21qjX2CoPdoBcSBIMvVBr9P2YDP8jOqZOeK3ThOL6VO/sy6jtnvzw==
+ dependencies:
+ "@types/json-schema" "^7.0.9"
+ "@typescript-eslint/scope-manager" "5.12.0"
+ "@typescript-eslint/types" "5.12.0"
+ "@typescript-eslint/typescript-estree" "5.12.0"
+ eslint-scope "^5.1.1"
+ eslint-utils "^3.0.0"
+
+"@typescript-eslint/[email protected]":
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.0.tgz#1ac9352ed140b07ba144ebf371b743fdf537ec16"
+ integrity sha512-cFwTlgnMV6TgezQynx2c/4/tx9Tufbuo9LPzmWqyRC3QC4qTGkAG1C6pBr0/4I10PAI/FlYunI3vJjIcu+ZHMg==
+ dependencies:
+ "@typescript-eslint/types" "5.12.0"
+ eslint-visitor-keys "^3.0.0"
+
"@webassemblyjs/[email protected]":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -5745,6 +5829,13 @@ debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
dependencies:
ms "^2.1.1"
+debug@^4.3.2:
+ version "4.3.3"
+ resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
+ integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+ dependencies:
+ ms "2.1.2"
+
decamelize-keys@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -6660,6 +6751,14 @@ eslint-scope@^4.0.3:
esrecurse "^4.1.0"
estraverse "^4.1.1"
+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-utils@^1.3.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
@@ -6667,11 +6766,28 @@ eslint-utils@^1.3.1:
dependencies:
eslint-visitor-keys "^1.1.0"
+eslint-utils@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+ integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+ dependencies:
+ eslint-visitor-keys "^2.0.0"
+
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.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==
+
+eslint-visitor-keys@^3.0.0:
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+ integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+
eslint@^5.16.0:
version "5.16.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
@@ -6735,7 +6851,7 @@ esquery@^1.0.1:
dependencies:
estraverse "^5.1.0"
-esrecurse@^4.1.0:
+esrecurse@^4.1.0, esrecurse@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
@@ -7012,6 +7128,17 @@ fast-glob@^3.1.1, fast-glob@^3.2.4:
micromatch "^4.0.2"
picomatch "^2.2.1"
+fast-glob@^3.2.9:
+ version "3.2.11"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+ integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+ 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"
@@ -7654,6 +7781,13 @@ glob-parent@^5.1.0, glob-parent@~5.1.0:
dependencies:
is-glob "^4.0.1"
+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-stream@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
@@ -7790,6 +7924,18 @@ globby@^11.0.1:
merge2 "^1.3.0"
slash "^3.0.0"
+globby@^11.0.4:
+ 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"
+
globby@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -8336,6 +8482,11 @@ ignore@^5.1.4, ignore@^5.1.8:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+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==
+
import-fresh@^3.0.0, import-fresh@^3.2.1:
version "3.2.2"
resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.2.tgz#fc129c160c5d68235507f4331a6baad186bdbc3e"
@@ -8744,6 +8895,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
dependencies:
is-extglob "^2.1.1"
+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-hexadecimal@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz#cc35c97588da4bd49a8eedd6bc4082d44dcb23a7"
@@ -10282,7 +10440,7 @@ merge-stream@^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.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==
@@ -10327,6 +10485,14 @@ micromatch@^4.0.2:
braces "^3.0.1"
picomatch "^2.0.5"
+micromatch@^4.0.4:
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+ integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+ dependencies:
+ braces "^3.0.1"
+ picomatch "^2.2.3"
+
miller-rabin@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
@@ -11573,6 +11739,11 @@ picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picomatch@^2.2.3:
+ 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"
@@ -12682,6 +12853,11 @@ regexpp@^2.0.1:
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+regexpp@^3.2.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+ integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
regexpu-core@^4.7.1:
version "4.7.1"
resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
@@ -13330,6 +13506,13 @@ semver@^7.3.2:
resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
+semver@^7.3.5:
+ version "7.3.5"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+ integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+ dependencies:
+ lru-cache "^6.0.0"
+
version "0.17.1"
resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
@@ -14694,11 +14877,18 @@ tryer@^1.0.1:
resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8"
integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==
-tslib@^1.10.0, tslib@^1.9.0:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
version "1.14.1"
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
+tsutils@^3.21.0:
+ version "3.21.0"
+ resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+ integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+ dependencies:
+ tslib "^1.8.1"
+
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"