diff --git a/.dockerignore b/.dockerignore index 4474c93b5..c41035f8b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,12 +14,7 @@ **/*.tar.gz **/*.tar.xz **/*.zip - -!**/modules/demo/**/*.png -!**/modules/demo/**/*.jpg -!**/modules/demo/**/*.gif -!**/modules/demo/**/*.las -!**/modules/demo/**/*.laz +**/*.pyc **/lerna-debug.log **/docker-compose*.yml @@ -28,19 +23,20 @@ **/z-* **/out/ +**/.logs/ **/.next/ **/_next/ -**/build -**/.cache -**/.ccache -**/.clangd -**/.github -**/.vscode -**/.cmake-js -**/node_modules -**/modules/**/doc -**/modules/**/lib -**/modules/**/data +**/build/ +**/.cache/ +**/.ccache/ +**/.clangd/ +**/.github/ +**/.vscode/ +**/.cmake-js/ +**/node_modules/ +**/modules/**/doc/* +**/modules/**/lib/* +**/modules/**/data/* **/modules/*/include/napi.h **/modules/*/include/napi-inl.h @@ -59,3 +55,16 @@ dev/dockerfiles .gitignore .clang-format .dockerignore + +!**/modules/demo/**/data/*.png +!**/modules/demo/**/data/*.jpg +!**/modules/demo/**/data/*.gif +!**/modules/demo/**/data/*.las +!**/modules/demo/**/data/*.laz +!**/modules/demo/**/data/*.arrow +!**/modules/demo/**/public/*.png +!**/modules/demo/**/public/*.jpg +!**/modules/demo/**/public/*.gif +!**/modules/demo/**/public/*.las +!**/modules/demo/**/public/*.laz +!**/modules/demo/**/public/*.arrow diff --git a/.github/workflows/build-and-push-image-ssh.yml b/.github/workflows/build-and-push-image-ssh.yml index eb3d5b04b..904436911 100644 --- a/.github/workflows/build-and-push-image-ssh.yml +++ b/.github/workflows/build-and-push-image-ssh.yml @@ -108,7 +108,7 @@ jobs: - name: Check if files changed id: files_changed if: ${{ ! inputs.manual-build }} - uses: tj-actions/changed-files@v23.1 + uses: tj-actions/changed-files@v35.4.4 with: base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} files: | diff --git a/.github/workflows/build-and-push-image.yml b/.github/workflows/build-and-push-image.yml index 7829742f1..94bbf5b87 100644 --- a/.github/workflows/build-and-push-image.yml +++ b/.github/workflows/build-and-push-image.yml @@ -99,7 +99,7 @@ jobs: - name: Check if files changed id: files_changed if: ${{ ! inputs.manual-build }} - uses: tj-actions/changed-files@v23.1 + uses: tj-actions/changed-files@v35.4.4 with: base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} files: | diff --git a/.github/workflows/main.pr.yml b/.github/workflows/main.pr.yml index daae576e1..d36119725 100644 --- a/.github/workflows/main.pr.yml +++ b/.github/workflows/main.pr.yml @@ -60,7 +60,7 @@ jobs: - name: Check if source files changed id: src_changed - uses: tj-actions/changed-files@v23.1 + uses: tj-actions/changed-files@v35.4.4 with: path: node base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} @@ -84,7 +84,7 @@ jobs: - name: Check if GitHub Actions or devel main Dockerfile changed id: dev_changed - uses: tj-actions/changed-files@v23.1 + uses: tj-actions/changed-files@v35.4.4 with: path: node base_sha: ${{ steps.last_main_commit.outputs.commit_hash }} diff --git a/modules/demo/deck/arc/index.js b/modules/demo/deck/arc/index.js index f594560a7..c24b5358c 100755 --- a/modules/demo/deck/arc/index.js +++ b/modules/demo/deck/arc/index.js @@ -1,6 +1,6 @@ #!/usr/bin/env node -// Copyright (c) 2020-2022, NVIDIA CORPORATION. +// Copyright (c) 2020-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ module.exports = (glfwOptions = { module: {path: __dirname}, }); return Object.assign(jsdom, { - loaded: jsdom.window.evalFn(async () => await import('./app.js')), + loaded: jsdom.loaded.then(() => jsdom.window.evalFn(async () => await import('./app.js'))), }); }; diff --git a/modules/demo/spatial/data.js b/modules/demo/spatial/data.js index dbe4665e3..93cfd5794 100644 --- a/modules/demo/spatial/data.js +++ b/modules/demo/spatial/data.js @@ -17,10 +17,10 @@ const https = require('https'); const {writeFile} = require('fs/promises'); const {finished} = require('stream/promises'); -module.exports = loadSpatialDataset; +module.exports.loadSpatialDataset = loadSpatialDataset; if (require.main === module) { // - module.exports().catch((e) => console.error(e) || process.exit(1)); + loadSpatialDataset().catch((e) => console.error(e) || process.exit(1)); } async function loadSpatialDataset() { diff --git a/modules/demo/spatial/util.js b/modules/demo/spatial/util.js index 1e01b316f..bd4108435 100644 --- a/modules/demo/spatial/util.js +++ b/modules/demo/spatial/util.js @@ -28,7 +28,7 @@ import {existsSync} from 'fs'; import {readFile as fsReadFile} from 'fs/promises'; import * as Path from 'path'; -import * as loadSpatialDataset from './data'; +import {loadSpatialDataset} from './data'; /** * @param {Map} colorMap @@ -148,8 +148,7 @@ export async function loadPoints() { return table; } catch (e) { if (loadDatasetIfNotFound) { - console.error(e); - console.log('dataset not found, now downloading...'); + console.log('Point data not found, downloading now...'); return await loadSpatialDataset().then(() => loadPointsTable(false)) } console.error(` diff --git a/modules/glfw/src/callbacks.cpp b/modules/glfw/src/callbacks.cpp index f1e8da4fc..d591c8cdf 100644 --- a/modules/glfw/src/callbacks.cpp +++ b/modules/glfw/src/callbacks.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2021, NVIDIA CORPORATION. +// Copyright (c) 2020-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -277,7 +277,7 @@ void GLFWdrop_cb(GLFWwindow* window, int count, const char** paths) { }; // namespace -GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun callback); +// GLFWAPI GLFWerrorfun glfwSetErrorCallback(GLFWerrorfun callback); void glfwSetErrorCallback(Napi::CallbackInfo const& info) { auto env = info.Env(); if (info[0].IsFunction()) { diff --git a/modules/glfw/src/glfw.ts b/modules/glfw/src/glfw.ts index 860e1b86b..c5c8d3f77 100644 --- a/modules/glfw/src/glfw.ts +++ b/modules/glfw/src/glfw.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2022, NVIDIA CORPORATION. +// Copyright (c) 2020-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,6 +19,9 @@ export const GLFW: any = require('bindings')(isHeadless ? 'rapidsai_glfw_eglheadless.node' : 'rapidsai_glfw_x11.node') .init(CORE); +process?.on && process?.on('exit', () => GLFW.terminate()); +process?.on && process?.on('beforeExit', () => GLFW.terminate()); + export default GLFW; export type GLFWmonitor = number; diff --git a/modules/jsdom/.vscode/launch.json b/modules/jsdom/.vscode/launch.json index 382f4a409..bf65d6ddb 100644 --- a/modules/jsdom/.vscode/launch.json +++ b/modules/jsdom/.vscode/launch.json @@ -14,6 +14,7 @@ "program": "${workspaceFolder}/node_modules/.bin/jest", "skipFiles": [ // "/**", + "/**/fs/utils", // "${workspaceFolder}/node_modules/**" ], "env": { @@ -38,6 +39,7 @@ "program": "test/test-import.js", "skipFiles": [ // "/**", + "/**/fs/utils", // "${workspaceFolder}/node_modules/**" ], "env": { diff --git a/modules/jsdom/src/index.ts b/modules/jsdom/src/index.ts index 5efd373b6..90ee19e80 100644 --- a/modules/jsdom/src/index.ts +++ b/modules/jsdom/src/index.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2022, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -39,58 +39,50 @@ export interface RapidsJSDOMOptions extends jsdom.ConstructorOptions { onAnimationFrameRequested?: AnimationFrameRequestedCallback; } -const defaultOptions = { - frameRate: 60, - glfwOptions: {}, - reportUnhandledExceptions: true, - onAnimationFrameRequested: undefined, - babel: { - babelrc: false, - presets: [ - // Uncomment this if we want to transpile all ESM to CJS - // ['@babel/preset-env', {'targets': {'node': 'current'}}], - ['@babel/preset-react', {'useBuiltIns': true}], - ], - } -}; - export class RapidsJSDOM extends jsdom.JSDOM { + static defaultOptions = { + frameRate: 60, + glfwOptions: {}, + reportUnhandledExceptions: true, + onAnimationFrameRequested: undefined, + babel: { + babelrc: false, + presets: [['@babel/preset-react', {'useBuiltIns': true}]], + } as import('@babel/core').TransformOptions + }; + static fromReactComponent(componentPath: string, jsdomOptions: RapidsJSDOMOptions = {}, reactProps = {}) { const jsdom = new RapidsJSDOM(jsdomOptions); return Object.assign(jsdom, { - loaded: jsdom.window.evalFn( - async () => { - const {createElement} = require('react'); - const {render} = require('react-dom'); - return await window.eval(`import('${componentPath}')`).then((Component: any) => { - render(createElement(Component.default || Component, reactProps), - document.body.appendChild(document.createElement('div'))); - }); - }, - {componentPath, reactProps}) + loaded: jsdom.loaded.then( + () => jsdom.window.evalFn( + async () => { + const {createElement} = require('react'); + const {render} = require('react-dom'); + return await window.eval(`import('${componentPath}')`).then((Component: any) => { + render(createElement(Component.default || Component, reactProps), + document.body.appendChild(document.createElement('div'))); + }); + }, + {componentPath, reactProps})) }); } public loaded: Promise; constructor(options: RapidsJSDOMOptions = {}) { - const opts = Object.assign({}, defaultOptions, options); + const opts = Object.assign({}, RapidsJSDOM.defaultOptions, options); const {path: dir = process.cwd()} = opts.module ?? require.main ?? module; - const babel = - Object.assign({}, defaultOptions.babel, !opts.babel ? {} : opts.babel, {cwd: dir}); + const babel = Object.assign( + {}, RapidsJSDOM.defaultOptions.babel, !opts.babel ? {} : opts.babel, {cwd: dir}); const {url, tmpdir} = createObjectUrlAndTmpDir(); const imageLoader = new ImageLoader(url, dir); - const polyfillFetchPath = require.resolve('./polyfills/fetch'); - const polyfillImagePath = require.resolve('./polyfills/image'); - const polyfillCanvasPath = require.resolve('./polyfills/canvas'); - const polyfillStreamsPath = require.resolve('./polyfills/streams'); - const polyfillObjectURLPath = require.resolve('./polyfills/object-url'); - const polyfillTransformPath = require.resolve('./polyfills/modules/transform'); + let loaded: Promise|undefined = undefined; super(undefined, { ...opts, @@ -124,64 +116,77 @@ export class RapidsJSDOM extends jsdom.JSDOM { }) ].reduce((window, fn) => fn(window), window); - window.evalFn(() => { - const {createTransform} = - require(polyfillTransformPath) as typeof import('./polyfills/modules/transform'); - - const {extensions: _extensions, transform: _transform} = createTransform({ - ...babel, - preTransform(path: string, code: string) { - // prepend a fix for mapbox-gl's serialization code - if (path.includes('mapbox-gl/dist/mapbox-gl') || - path.includes('maplibre-gl/dist/maplibre-gl')) { - return ` - Object.defineProperty(({}).constructor, '_classRegistryKey', {value: 'Object', writable: false}); - ${code}`; - } - return code; - } - }); - Object.assign(window.jsdom.global.require, {extensions: _extensions}); - Object.assign(window.jsdom.global.require.main, {_extensions, _transform}); - - const {installFetch} = // - require(polyfillFetchPath) as typeof import('./polyfills/fetch'); - const {installImageData, installImageDecode} = - require(polyfillImagePath) as typeof import('./polyfills/image'); - const {installGetContext} = - require(polyfillCanvasPath) as typeof import('./polyfills/canvas'); - const {installStreams} = - require(polyfillStreamsPath) as typeof import('./polyfills/streams'); - const {installObjectURL} = - require(polyfillObjectURLPath) as typeof import('./polyfills/object-url'); - - [installFetch, - installStreams, - installObjectURL(tmpdir), - installImageData, - installImageDecode, - installGetContext, - ].reduce((window, fn) => fn(window), window); - - imageLoader.svg2img = require('svg2img').default; - }, { - babel, - tmpdir, - frameRate, - glfwOptions, - imageLoader, - polyfillFetchPath, - polyfillImagePath, - polyfillCanvasPath, - polyfillStreamsPath, - polyfillObjectURLPath, - polyfillTransformPath, - onAnimationFrameRequested, - }); + const polyfillFetchPath = require.resolve('./polyfills/fetch'); + const polyfillImagePath = require.resolve('./polyfills/image'); + const polyfillCanvasPath = require.resolve('./polyfills/canvas'); + const polyfillStreamsPath = require.resolve('./polyfills/streams'); + const polyfillObjectURLPath = require.resolve('./polyfills/object-url'); + const polyfillTransformPath = require.resolve('./polyfills/modules/transform'); + + loaded = + window + .evalFn( + async () => { + const {createTransform} = await window.import(polyfillTransformPath) as + typeof import('./polyfills/modules/transform'); + const {extensions: _extensions, transform: _transform} = createTransform({ + ...babel, + preTransform(path: string, code: string) { + // prepend a fix for mapbox-gl's serialization code + if (path.includes('mapbox-gl/dist/mapbox-gl') || + path.includes('maplibre-gl/dist/maplibre-gl')) { + return `\ +Object.defineProperty(({}).constructor, '_classRegistryKey', {value: 'Object', writable: false}); +${code}`; + } + return code; + } + }); + + Object.assign(window.jsdom.global.require, {extensions: _extensions}); + Object.assign(window.jsdom.global.require.main, {_extensions, _transform}); + + const {installFetch} = + await window.import(polyfillFetchPath) as typeof import('./polyfills/fetch'); + const {installImageData, installImageDecode} = + await window.import(polyfillImagePath) as typeof import('./polyfills/image'); + const {installGetContext} = + await window.import(polyfillCanvasPath) as typeof import('./polyfills/canvas'); + const {installStreams} = + await window.import(polyfillStreamsPath) as typeof import('./polyfills/streams'); + const {installObjectURL} = await window.import(polyfillObjectURLPath) as + typeof import('./polyfills/object-url'); + + [installFetch, + installStreams, + installObjectURL(tmpdir), + installImageData, + installImageDecode, + installGetContext, + ].reduce((window, fn) => fn(window), window); + + imageLoader.svg2img = + (await window.import('svg2img')) as typeof import('svg2img').default; + }, + { + babel, + tmpdir, + frameRate, + glfwOptions, + imageLoader, + polyfillFetchPath, + polyfillImagePath, + polyfillCanvasPath, + polyfillStreamsPath, + polyfillObjectURLPath, + polyfillTransformPath, + onAnimationFrameRequested, + }) + .then(() => window); } }); - this.loaded = Promise.resolve(this.window); + this.loaded = loaded ?? Promise.resolve(this.window); } } diff --git a/modules/jsdom/src/polyfills/events/dnd.ts b/modules/jsdom/src/polyfills/events/dnd.ts index 93cd66b34..1f040e2db 100644 --- a/modules/jsdom/src/polyfills/events/dnd.ts +++ b/modules/jsdom/src/polyfills/events/dnd.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import {map, publish, refCount} from 'rxjs/operators'; import {GLFWEvent, windowCallbackAsObservable} from './event'; export function dndEvents(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setDropCallback, window) + return windowCallbackAsObservable(glfw.setDropCallback, window.id) .pipe(map(([, ...rest]) => GLFWDndEvent.create(window, ...rest))) .pipe(publish(), refCount()); } diff --git a/modules/jsdom/src/polyfills/events/event.ts b/modules/jsdom/src/polyfills/events/event.ts index 2afa81c4c..280b7ca58 100644 --- a/modules/jsdom/src/polyfills/events/event.ts +++ b/modules/jsdom/src/polyfills/events/event.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ // limitations under the License. import {GLFWModifierKey} from '@rapidsai/glfw'; -import {DOMWindow} from 'jsdom'; import {Observable, Observer} from 'rxjs'; export const isAltKey = (modifiers: number) => (modifiers & GLFWModifierKey.MOD_ALT) !== 0; @@ -59,14 +58,13 @@ export function glfwCallbackAsObservable(setCallback: }); } -export function windowCallbackAsObservable( - setCallback: C, window: DOMWindow|DOMWindow) { +export function windowCallbackAsObservable(setCallback: C, + windowId: number) { type Args = WindowCallbackArgs; return new Observable((observer: Observer) => { const next = (..._: Args) => observer.next(_); - const dispose = () => trySetCallback(setCallback.name, () => setCallback(window.id, null)); - return trySetCallback(setCallback.name, () => setCallback(window.id, next)) ? dispose - : () => {}; + const dispose = () => trySetCallback(setCallback.name, () => setCallback(windowId, null)); + return trySetCallback(setCallback.name, () => setCallback(windowId, next)) ? dispose : () => {}; }); } diff --git a/modules/jsdom/src/polyfills/events/keyboard.ts b/modules/jsdom/src/polyfills/events/keyboard.ts index 5724ae69a..8c9c5f353 100644 --- a/modules/jsdom/src/polyfills/events/keyboard.ts +++ b/modules/jsdom/src/polyfills/events/keyboard.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -45,13 +45,13 @@ export function keyboardEvents(window: DOMWindow) { } function keyUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setKeyCallback, window) + return windowCallbackAsObservable(glfw.setKeyCallback, window.id) .pipe(map(([, ...rest]) => GLFWKeyboardEvent.fromKeyEvent(window, ...rest))) .pipe(publish(), refCount()); } function characterUpdates(window: DOMWindow, charKeys: Observable) { - const charCodes = windowCallbackAsObservable(glfw.setCharCallback, window) + const charCodes = windowCallbackAsObservable(glfw.setCharCallback, window.id) .pipe(map(([, charCode]) => charCode), publish(), refCount()); return charCodes .pipe(withLatestFrom(charKeys, diff --git a/modules/jsdom/src/polyfills/events/mouse.ts b/modules/jsdom/src/polyfills/events/mouse.ts index 1915bae31..b379adbc9 100644 --- a/modules/jsdom/src/polyfills/events/mouse.ts +++ b/modules/jsdom/src/polyfills/events/mouse.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ export function mouseEvents(window: DOMWindow) { } function buttonUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setMouseButtonCallback, window) + return windowCallbackAsObservable(glfw.setMouseButtonCallback, window.id) .pipe(flatMap(function*([, ...rest]) { const mouseEvt = GLFWMouseEvent.fromMouseButton(window, ...rest); yield mouseEvt; @@ -47,7 +47,7 @@ function buttonUpdates(window: DOMWindow) { } function positionUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setCursorPosCallback, window) + return windowCallbackAsObservable(glfw.setCursorPosCallback, window.id) .pipe(flatMap(function*([, ...rest]) { const mouseEvt = GLFWMouseEvent.fromMouseMove(window, ...rest); yield mouseEvt; @@ -58,7 +58,7 @@ function positionUpdates(window: DOMWindow) { } function boundaryUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setCursorEnterCallback, window) + return windowCallbackAsObservable(glfw.setCursorEnterCallback, window.id) .pipe(flatMap(function*([, ...rest]) { const mouseEvt = GLFWMouseEvent.fromMouseEnter(window, ...rest); yield mouseEvt; diff --git a/modules/jsdom/src/polyfills/events/wheel.ts b/modules/jsdom/src/polyfills/events/wheel.ts index 3c838bb1b..8a2acd22c 100644 --- a/modules/jsdom/src/polyfills/events/wheel.ts +++ b/modules/jsdom/src/polyfills/events/wheel.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,7 +19,7 @@ import {map, publish, refCount} from 'rxjs/operators'; import {GLFWEvent, windowCallbackAsObservable} from './event'; export function wheelEvents(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setScrollCallback, window) + return windowCallbackAsObservable(glfw.setScrollCallback, window.id) .pipe(map(([, ...rest]) => GLFWWheelEvent.create(window, ...rest))) .pipe(publish(), refCount()); } diff --git a/modules/jsdom/src/polyfills/events/window.ts b/modules/jsdom/src/polyfills/events/window.ts index f427e40de..c88b37376 100644 --- a/modules/jsdom/src/polyfills/events/window.ts +++ b/modules/jsdom/src/polyfills/events/window.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -34,55 +34,55 @@ export function windowEvents(window: DOMWindow) { } function moveUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowPosCallback, window) + return windowCallbackAsObservable(glfw.setWindowPosCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromMove(window, ...rest))) .pipe(publish(), refCount()); } function sizeUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowSizeCallback, window) + return windowCallbackAsObservable(glfw.setWindowSizeCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromResize(window, ...rest))) .pipe(publish(), refCount()); } function scaleUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowContentScaleCallback, window) + return windowCallbackAsObservable(glfw.setWindowContentScaleCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromScale(window, ...rest))) .pipe(publish(), refCount()); } function framebufferSizeUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setFramebufferSizeCallback, window) + return windowCallbackAsObservable(glfw.setFramebufferSizeCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromFramebufferResize(window, ...rest))) .pipe(publish(), refCount()); } function closeUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowCloseCallback, window) + return windowCallbackAsObservable(glfw.setWindowCloseCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromClose(window, ...rest))) .pipe(publish(), refCount()); } // function refreshUpdates(window: DOMWindow) { -// return windowCallbackAsObservable(glfw.setWindowRefreshCallback, window) +// return windowCallbackAsObservable(glfw.setWindowRefreshCallback, window.id) // .pipe(map(([_, ...rest]) => GLFWWindowEvent.fromRefresh(window, ...rest))) // .pipe(publish(), refCount()); // } function focusUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowFocusCallback, window) + return windowCallbackAsObservable(glfw.setWindowFocusCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromFocus(window, ...rest))) .pipe(publish(), refCount()); } function iconifyUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowIconifyCallback, window) + return windowCallbackAsObservable(glfw.setWindowIconifyCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromIconify(window, ...rest))) .pipe(publish(), refCount()); } function maximizeUpdates(window: DOMWindow) { - return windowCallbackAsObservable(glfw.setWindowMaximizeCallback, window) + return windowCallbackAsObservable(glfw.setWindowMaximizeCallback, window.id) .pipe(map(([, ...rest]) => GLFWWindowEvent.fromMaximize(window, ...rest))) .pipe(publish(), refCount()); } diff --git a/modules/jsdom/src/polyfills/jsdom.ts b/modules/jsdom/src/polyfills/jsdom.ts index 5acdfa319..4cbc3431c 100644 --- a/modules/jsdom/src/polyfills/jsdom.ts +++ b/modules/jsdom/src/polyfills/jsdom.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2022, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -23,8 +23,8 @@ import { declare module 'jsdom' { // clang-format off interface DOMWindow { - import: (specifier: string) => Promise; - evalFn: (script: () => any, globals?: Record) => any; + import: (specifier: string) => Promise; + evalFn: (script: () => T, globals?: Record) => T; } // clang-format on } @@ -38,7 +38,8 @@ export function installJSDOMUtils(options: { const require = window.jsdom.global.require = createRequire({...options, context: createContext()}); - window.import = window.jsdom.global.import = require.main._cachedDynamicImporter; + window.import = window.jsdom.global.import = (specifier: string) => + require.main._cachedDynamicImporter(specifier).then((m: any) => m.namespace); if (window.jsdom.utils.implForWrapper(window.document)._origin === 'null') { window.jsdom.utils.implForWrapper(window.document)._origin = ''; diff --git a/modules/jsdom/src/polyfills/modules/import.ts b/modules/jsdom/src/polyfills/modules/import.ts index 7447705f2..a4b388ef1 100644 --- a/modules/jsdom/src/polyfills/modules/import.ts +++ b/modules/jsdom/src/polyfills/modules/import.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2022, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import * as fs from 'fs/promises'; +import {readFile} from 'fs/promises'; import * as Path from 'path'; import * as vm from 'vm'; import {SourceTextModule, SyntheticModule} from 'vm'; @@ -27,78 +27,66 @@ Object.entries({SyntheticModule, SourceTextModule}).forEach(([name, Class]) => { } }); -declare module 'vm' { - interface Module { - context: vm.Context; - identifier: string; - evaluate(): Promise; - link(linker: (specifier: string, parent?: vm.Module) => vm.Module | - Promise): Promise; - } +export function createDynamicImporter( + require: Require, outerContext: vm.Context, transform: (path: string, code: string) => string) { + const moduleLinker = createModuleLinker(require, outerContext, transform); - interface SyntheticModule extends Module { - setExport(name: string, value: any): void; - } - interface SyntheticModuleConstructor { - new(exportNames: string[], - evaluateCallback: (this: vm.SyntheticModule) => void, - options?: string|{identifier: string, context?: vm.Context}): SyntheticModule; - readonly name: 'SyntheticModule'; - } - const SyntheticModule: SyntheticModuleConstructor; + return importModuleDynamically; - type SourceTextModule = Module - interface SourceTextModuleConstructor { - new(code: string, - options?: string|{identifier: string, context?: vm.Context}): SourceTextModule; - readonly name: 'SourceTextModule'; + function importModuleDynamically( + specifier: string, _script?: vm.Script, assertions: {[key: string]: any} = {}) { + return moduleLinker(specifier, {context: outerContext}, {assert: assertions}) as any; } - const SourceTextModule: SourceTextModuleConstructor; } -export function createImport(require: Require, - context: import('vm').Context, - transform: (path: string, code: string) => string) { - return importModuleDynamically; - - async function importModuleDynamically(specifier: string, parent?: vm.Script|vm.Module) { - const path = require.resolve(specifier); +export function createModuleLinker( + require: Require, outerContext: vm.Context, transform: (path: string, code: string) => string) { + return linkModule; + function linkModule(specifier: string, + {context}: {context: vm.Context} = {context: outerContext}, + {assert: assertions}: {assert: {[key: string]: any}} = {assert: {}}) { const opts = { - identifier: path, - displayErrors: true, - importModuleDynamically, - context: (parent)?.context || context, - }; + context, + identifier: require.resolve(specifier), + importModuleDynamically: createDynamicImporter(require, context, transform), + } as (vm.SyntheticModuleOptions | vm.SourceTextModuleOptions); try { // Try importing as CJS first - return await tryRequire(path, opts); + return tryRequire(opts, assertions); } catch (e1: any) { try { // If CJS throws, try importing as ESM - return await tryImport(path, opts); + return tryImport(opts, assertions); } catch (e2: any) { // throw[e1, e2]; } } } - function tryRequire(path: string, opts: any) { - const exports = (require as any)(path, true); - const keys = Object.keys(exports); - if (exports.__esModule && !('default' in exports)) { - exports.default = exports; - keys[keys.indexOf('__esModule')] = 'default'; + function tryRequire(opts: vm.SyntheticModuleOptions, assertions: {[key: string]: any}) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const path = opts.identifier!; + const exports = require(path); + if (!exports[ESMSyntheticModule]) { + const keys = Object.keys(exports); + if (exports.__esModule && !('default' in exports)) { + exports.default = exports; + keys[keys.indexOf('__esModule')] = 'default'; + } + const mod = new SyntheticModule(keys, function() { // + keys.forEach((name) => this.setExport(name, exports[name])); + }, opts); + return linkAndEvaluate(exports[ESMSyntheticModule] = mod, assertions); } - const mod = new SyntheticModule(keys, function() { // - keys.forEach((name) => this.setExport(name, exports[name])); - }, opts); - return linkAndEvaluate(exports[ESMSyntheticModule] = mod); + return Promise.resolve(exports[ESMSyntheticModule]); } - function tryImport(path: string, opts: any) { - const dir = Path.dirname(path); - const ext = Path.extname(path); - return fs.readFile(path, 'utf8') + function tryImport(opts: vm.SourceTextModuleOptions, assertions: {[key: string]: any}) { + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion + const path = opts.identifier!; + const dir = Path.dirname(path); + const ext = Path.extname(path); + return readFile(path, 'utf8') .then((code) => { code = `var __dirname='${dir}';\n${code}`; code = `var __filename='${path}';\n${code}`; @@ -107,10 +95,11 @@ export function createImport(require: Require, } return new SourceTextModule(code, opts); }) - .then(linkAndEvaluate); + .then((module) => linkAndEvaluate(module, assertions)); } - function linkAndEvaluate(module: vm.Module) { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + function linkAndEvaluate(module: vm.Module, _assertions: {[key: string]: any}) { let r = require; const dir = Path.dirname(module.identifier); if (dir !== require.main.path) { @@ -120,14 +109,14 @@ export function createImport(require: Require, parent: require.main, extensions: require.extensions, resolve: require.main.__resolve, - context: module.context || context, + context: module.context || outerContext, }); r.main._moduleCache = require.cache; r.main._resolveCache = require.main._resolveCache; } - return module.link(createImport(r, r.main._context, transform)) + return module.link(createModuleLinker(r, r.main._context, transform)) .then(() => module.evaluate()) .then(() => module); } diff --git a/modules/jsdom/src/polyfills/modules/require.ts b/modules/jsdom/src/polyfills/modules/require.ts index d6fc77175..48e9a3eef 100644 --- a/modules/jsdom/src/polyfills/modules/require.ts +++ b/modules/jsdom/src/polyfills/modules/require.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2022, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ import * as Module from 'module'; import * as Path from 'path'; import * as vm from 'vm'; -import {createImport} from './import'; +import {createDynamicImporter} from './import'; import {Resolver} from './resolve'; import {Transform} from './transform'; @@ -72,7 +72,9 @@ export class ContextModule extends Module { declare public __resolve: Resolver; declare public _transform: Transform; - declare public _cachedDynamicImporter: (specifier: string) => Promise; + // This should return Promise, but the TS typings are incorrect. + declare public _cachedDynamicImporter: + (specifier: string, script?: vm.Script, assertions?: {[key: string]: any}) => any; /** * Custom nodejs Module implementation which uses a provided @@ -106,8 +108,8 @@ export class ContextModule extends Module { this._resolveFilename = module_static__resolveFilename; } - this._cachedDynamicImporter = createImport( - this._require, context, (path: string, code: string) => this._transform(path, code)); + this._cachedDynamicImporter = createDynamicImporter( + this._require, this._context, (path: string, code: string) => this._transform(path, code)); this.loaded = true; } @@ -141,10 +143,9 @@ export class ContextModule extends Module { public load(filename: string) { return patched_prototype_load.call(this, filename); } public exec(require: Require, content: string, filename: string, inner = this._context) { - const outer = this._context; - const options = { + const outer = this._context; + const options: vm.ScriptOptions = { filename, - displayErrors: true, importModuleDynamically: this.createDynamicImporter(require, inner), }; return tryAndReset( @@ -157,7 +158,7 @@ export class ContextModule extends Module { public createDynamicImporter(require: Require = this._require, context = this._context) { return context === this._context // ? this._cachedDynamicImporter - : createImport(require, context, this._transform); + : createDynamicImporter(require, context, this._transform); } } @@ -181,7 +182,9 @@ function patched_static__load(request: string, parent: Module, isMain: boolean): const cache = Path.extname(filename) === '.node' ? module_static__cache : module._moduleCache; const child = cache[filename]; if (child) { - if (parent.children.indexOf(child) === -1) { parent.children.push(child); } + if (parent.children.indexOf(child) === -1) { // + parent.children.push(child); + } return child.exports; } Module_._cache = cache; @@ -252,14 +255,9 @@ function patched_prototype__compile(this: Module, content: string, filename: str const module = findNearestContextModule(this); if (module) { - const {id} = this; - const require = createRequire(this); + const require = createRequire(this, module); const dirname = Path.dirname(filename); - let exports = this.exports; - if (module._proxyExports[id]) { - delete module._proxyExports[id]; - exports = makeESMExportsProxy(this, exports); - } + const exports = makeESMExportsProxy(this, this.exports); return module.exec(require, Module_.wrap(content), filename) .call(exports, exports, require, this, filename, dirname); } @@ -320,8 +318,7 @@ function tryAndReset any>(setup: () => any, work: Work, reset: * @param mod The module to create a require function for. */ function createRequire(mod: Module, main = findNearestContextModule(mod)) { - function require(id: string, isAttemptingToRequireCJSAsESM = false) { - main && (main._proxyExports[id] = isAttemptingToRequireCJSAsESM); + function require(id: string) { return tryAndReset( installModuleHooks, () => mod.require(id), @@ -376,22 +373,47 @@ const ES6ExportsProxyHandler: ProxyHandler = { if (mod) { mod.setExport(p, v); } } return success; - }, + } +}; + +const BuiltInES6ExportsProxyHandler = { + ...ES6ExportsProxyHandler, + get(target: any, p: string|symbol, receiver: any) { + const value = Reflect.get(target, p, receiver); + if (typeof value === 'function' && (p in target.constructor.prototype)) { + return function(this: any) { + // eslint-disable-next-line prefer-rest-params + return value.apply(this === receiver ? target : this, arguments); + }; + } + return value; + } }; function makeESMExportsProxy(module: Module, exports: any) { - let proxiedExports = new Proxy(exports, ES6ExportsProxyHandler); + let proxiedExports: any; + if ((exports?.constructor?.name === 'Map') || // + (exports?.constructor?.name === 'Set') || // + (exports?.constructor?.name === 'WeakMap') || // + (exports?.constructor?.name === 'WeakSet')) { + proxiedExports = new Proxy(exports, BuiltInES6ExportsProxyHandler); + } else { + proxiedExports = new Proxy(exports, ES6ExportsProxyHandler); + } + Object.defineProperty(module, 'exports', { get() { return proxiedExports; }, set(value: any) { if (value !== proxiedExports) { - if (value && typeof value === 'object') { // - proxiedExports = new Proxy(value, ES6ExportsProxyHandler); + if ((typeof value === 'function') || // + (value && typeof value === 'object')) { + proxiedExports = makeESMExportsProxy(module, value); } else { proxiedExports = value; } } }, }); + return proxiedExports; } diff --git a/modules/jsdom/test/require-tests-transpiled.ts b/modules/jsdom/test/require-tests-transpiled.ts new file mode 100644 index 000000000..416e3eec1 --- /dev/null +++ b/modules/jsdom/test/require-tests-transpiled.ts @@ -0,0 +1,30 @@ +// Copyright (c) 2023, NVIDIA CORPORATION. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import {eval_, transpileESMToCJS} from './utils'; + +transpileESMToCJS(); + +// this requires we transpile ESM to CJS with babel +test('requires a local ESModule module', () => { + const code = `require('./files/test-esm-module').default`; + expect(typeof eval_(code)).toBe('object'); +}); + +// this requires we transpile ESM to CJS with babel +test('requires a local ESModule module that imports an ESModule', () => { + const code = `require('./files/test-esm-import')`; + const {importedModuleSharesGlobalsWithThisModule} = eval_(code).default; + expect(importedModuleSharesGlobalsWithThisModule).toBe(true); +}); diff --git a/modules/jsdom/test/require-tests.ts b/modules/jsdom/test/require-tests.ts index fa46e65fd..5a6b53a5c 100644 --- a/modules/jsdom/test/require-tests.ts +++ b/modules/jsdom/test/require-tests.ts @@ -12,12 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import {globalWindow} from './utils'; - -const eval_ = (code: string) => globalWindow.evalFn(() => { - const res = eval(code); - return res; -}, {code}); +import {eval_, globalWindow} from './utils'; test('fails to require a non-existent file', () => { expect(() => globalWindow.eval(`require('./files/nonexistent_file')`)) // @@ -29,12 +24,6 @@ test('requires a local CommonJS module', () => { expect(typeof eval_(code)).toBe('object'); }); -// this requires we transpile ESM to CJS with babel -test.skip('requires a local ESModule module', () => { - const code = `require('./files/test-esm-module').default`; - expect(typeof eval_(code)).toBe('object'); -}); - test('imports a local CommonJS module', async () => { const code = `import('./files/test-cjs-module')`; expect(typeof (await eval_(code))).toBe('object'); @@ -51,13 +40,6 @@ test('requires a local CommonJS module that imports an ESModule', () => { expect(importedModuleSharesGlobalsWithThisModule).toBe(true); }); -// this requires we transpile ESM to CJS with babel -test.skip('requires a local ESModule module that imports an ESModule', () => { - const code = `require('./files/test-esm-import')`; - const {importedModuleSharesGlobalsWithThisModule} = eval_(code).default; - expect(importedModuleSharesGlobalsWithThisModule).toBe(true); -}); - test('imports a local CommonJS module that imports an ESModule', async () => { const code = `import('./files/test-cjs-import')`; const {importedModuleSharesGlobalsWithThisModule} = await eval_(code); diff --git a/modules/jsdom/test/test-import.js b/modules/jsdom/test/test-import.js index 83d76ca86..6c60c3d67 100644 --- a/modules/jsdom/test/test-import.js +++ b/modules/jsdom/test/test-import.js @@ -1,4 +1,4 @@ -// Copyright (c) 2022, NVIDIA CORPORATION. +// Copyright (c) 2022-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -32,6 +32,8 @@ const {RapidsJSDOM} = require('@rapidsai/jsdom'); })) === true, 'test-cjs-import and test-cjs-module should share globals'); + jsdom.window.dispatchEvent(new jsdom.window.CloseEvent('close')); + return 0; })() .catch((e) => { diff --git a/modules/jsdom/test/utils.ts b/modules/jsdom/test/utils.ts index 3bd714130..c9cd74eb7 100644 --- a/modules/jsdom/test/utils.ts +++ b/modules/jsdom/test/utils.ts @@ -1,4 +1,4 @@ -// Copyright (c) 2021-2022, NVIDIA CORPORATION. +// Copyright (c) 2021-2023, NVIDIA CORPORATION. // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,11 +17,29 @@ import * as jsdom from 'jsdom'; export let globalWindow: jsdom.DOMWindow; -beforeAll(() => { - ({window: globalWindow} = new RapidsJSDOM({glfwOptions: {visible: false}, module: require.main})); +beforeAll(async () => { + const opts = { + ...RapidsJSDOM.defaultOptions, + glfwOptions: {visible: false}, + module: require.main, + }; + if (_transpileESMToCJS) { + opts.babel.presets = [ + // transpile all ESM to CJS + ['@babel/preset-env', {targets: {node: 'current'}}], + ...(opts.babel.presets || []), + ]; + } + globalWindow = await (new RapidsJSDOM(opts)).loaded; }); + afterAll(() => { if (globalWindow) { // globalWindow.dispatchEvent(new globalWindow.CloseEvent('close')); } }); + +let _transpileESMToCJS = false; +export function transpileESMToCJS() { _transpileESMToCJS = true; } + +export const eval_ = (code: string) => globalWindow.evalFn(() => eval(code), {code}); diff --git a/yarn.lock b/yarn.lock index a5ce59654..152e07282 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3,11 +3,11 @@ "@ampproject/remapping@^2.2.0": - version "2.2.0" - resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" - integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== + version "2.2.1" + resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630" + integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg== dependencies: - "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" "@babel/code-frame@7.12.11": @@ -17,17 +17,17 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6": - version "7.18.6" - resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a" - integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4": + version "7.21.4" + resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39" + integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g== dependencies: "@babel/highlight" "^7.18.6" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.20.5": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.0.tgz#c241dc454e5b5917e40d37e525e2f4530c399298" - integrity sha512-gMuZsmsgxk/ENC3O/fRw5QY8A9/uxQbbCEypnLIiYYc/qVJtEV7ouxC3EllIIwNzMqAQee5tanFabWsUOutS7g== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.5": + version "7.21.7" + resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc" + integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA== "@babel/core@7.15.5": version "7.15.5" @@ -51,32 +51,32 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.5.5", "@babel/core@^7.7.5": - version "7.21.3" - resolved "https://registry.npmjs.org/@babel/core/-/core-7.21.3.tgz#cf1c877284a469da5d1ce1d1e53665253fae712e" - integrity sha512-qIJONzoa/qiHghnm0l1n4i/6IIziDpzqc36FBs4pzMhDUraHqponwJLiAKm1hGLP3OSB/TVNz6rMwVGpwxxySw== + version "7.21.8" + resolved "https://registry.npmjs.org/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4" + integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ== dependencies: "@ampproject/remapping" "^2.2.0" - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-compilation-targets" "^7.20.7" - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helpers" "^7.21.0" - "@babel/parser" "^7.21.3" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-compilation-targets" "^7.21.5" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helpers" "^7.21.5" + "@babel/parser" "^7.21.8" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.3" - "@babel/types" "^7.21.3" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.2.2" semver "^6.3.0" -"@babel/generator@^7.15.4", "@babel/generator@^7.21.3": - version "7.21.3" - resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.3.tgz#232359d0874b392df04045d72ce2fd9bb5045fce" - integrity sha512-QS3iR1GYC/YGUnW7IdggFeN5c1poPUurnGttOV/bZgPGV+izC/D8HnD6DLwod0fsatNyVn1G3EVWMYIF0nHbeA== +"@babel/generator@^7.15.4", "@babel/generator@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f" + integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w== dependencies: - "@babel/types" "^7.21.3" + "@babel/types" "^7.21.5" "@jridgewell/gen-mapping" "^0.3.2" "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" @@ -89,45 +89,46 @@ "@babel/types" "^7.18.6" "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6": - version "7.18.9" - resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb" - integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz#817f73b6c59726ab39f6ba18c234268a519e5abb" + integrity sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g== dependencies: - "@babel/helper-explode-assignable-expression" "^7.18.6" - "@babel/types" "^7.18.9" + "@babel/types" "^7.21.5" -"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.7.tgz#a6cd33e93629f5eb473b021aac05df62c4cd09bb" - integrity sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366" + integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w== dependencies: - "@babel/compat-data" "^7.20.5" - "@babel/helper-validator-option" "^7.18.6" + "@babel/compat-data" "^7.21.5" + "@babel/helper-validator-option" "^7.21.0" browserslist "^4.21.3" lru-cache "^5.1.1" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.0.tgz#64f49ecb0020532f19b1d014b03bccaa1ab85fb9" - integrity sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ== + version "7.21.8" + resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz#205b26330258625ef8869672ebca1e0dee5a0f02" + integrity sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-environment-visitor" "^7.18.9" + "@babel/helper-environment-visitor" "^7.21.5" "@babel/helper-function-name" "^7.21.0" - "@babel/helper-member-expression-to-functions" "^7.21.0" + "@babel/helper-member-expression-to-functions" "^7.21.5" "@babel/helper-optimise-call-expression" "^7.18.6" - "@babel/helper-replace-supers" "^7.20.7" + "@babel/helper-replace-supers" "^7.21.5" "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0" "@babel/helper-split-export-declaration" "^7.18.6" + semver "^6.3.0" "@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.0.tgz#53ff78472e5ce10a52664272a239787107603ebb" - integrity sha512-N+LaFW/auRSWdx7SHD/HiARwXQju1vXTW4fKr4u5SgBUTm51OKEjKgj+cs00ggW3kEvNqwErnlwuq7Y3xBe4eg== + version "7.21.8" + resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc" + integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" regexpu-core "^5.3.1" + semver "^6.3.0" "@babel/helper-define-polyfill-provider@^0.2.2", "@babel/helper-define-polyfill-provider@^0.2.4": version "0.2.4" @@ -143,17 +144,10 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-environment-visitor@^7.18.9": - version "7.18.9" - resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be" - integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg== - -"@babel/helper-explode-assignable-expression@^7.18.6": - version "7.18.6" - resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096" - integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg== - dependencies: - "@babel/types" "^7.18.6" +"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba" + integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ== "@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0": version "7.21.0" @@ -170,33 +164,33 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-member-expression-to-functions@^7.20.7", "@babel/helper-member-expression-to-functions@^7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.0.tgz#319c6a940431a133897148515877d2f3269c3ba5" - integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q== +"@babel/helper-member-expression-to-functions@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz#3b1a009af932e586af77c1030fba9ee0bde396c0" + integrity sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg== dependencies: - "@babel/types" "^7.21.0" + "@babel/types" "^7.21.5" -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6": - version "7.18.6" - resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e" - integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA== +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4": + version "7.21.4" + resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af" + integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg== dependencies: - "@babel/types" "^7.18.6" + "@babel/types" "^7.21.4" -"@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2": - version "7.21.2" - resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2" - integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ== +"@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420" + integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw== dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-environment-visitor" "^7.21.5" + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-simple-access" "^7.21.5" "@babel/helper-split-export-declaration" "^7.18.6" "@babel/helper-validator-identifier" "^7.19.1" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.2" - "@babel/types" "^7.21.2" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" "@babel/helper-optimise-call-expression@^7.18.6": version "7.18.6" @@ -205,10 +199,10 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.20.2" - resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629" - integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ== +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56" + integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg== "@babel/helper-remap-async-to-generator@^7.18.9": version "7.18.9" @@ -220,24 +214,24 @@ "@babel/helper-wrap-function" "^7.18.9" "@babel/types" "^7.18.9" -"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz#243ecd2724d2071532b2c8ad2f0f9f083bcae331" - integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A== +"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz#a6ad005ba1c7d9bc2973dfde05a1bba7065dde3c" + integrity sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg== dependencies: - "@babel/helper-environment-visitor" "^7.18.9" - "@babel/helper-member-expression-to-functions" "^7.20.7" + "@babel/helper-environment-visitor" "^7.21.5" + "@babel/helper-member-expression-to-functions" "^7.21.5" "@babel/helper-optimise-call-expression" "^7.18.6" "@babel/template" "^7.20.7" - "@babel/traverse" "^7.20.7" - "@babel/types" "^7.20.7" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" -"@babel/helper-simple-access@^7.20.2": - version "7.20.2" - resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9" - integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA== +"@babel/helper-simple-access@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee" + integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg== dependencies: - "@babel/types" "^7.20.2" + "@babel/types" "^7.21.5" "@babel/helper-skip-transparent-expression-wrappers@^7.20.0": version "7.20.0" @@ -253,17 +247,17 @@ dependencies: "@babel/types" "^7.18.6" -"@babel/helper-string-parser@^7.19.4": - version "7.19.4" - resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63" - integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw== +"@babel/helper-string-parser@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd" + integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w== "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1": version "7.19.1" resolved "https://registry.npmjs.org/@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.14.5", "@babel/helper-validator-option@^7.18.6": +"@babel/helper-validator-option@^7.14.5", "@babel/helper-validator-option@^7.21.0": version "7.21.0" resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180" integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ== @@ -278,14 +272,14 @@ "@babel/traverse" "^7.20.5" "@babel/types" "^7.20.5" -"@babel/helpers@^7.15.4", "@babel/helpers@^7.21.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e" - integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA== +"@babel/helpers@^7.15.4", "@babel/helpers@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08" + integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA== dependencies: "@babel/template" "^7.20.7" - "@babel/traverse" "^7.21.0" - "@babel/types" "^7.21.0" + "@babel/traverse" "^7.21.5" + "@babel/types" "^7.21.5" "@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6": version "7.18.6" @@ -296,10 +290,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.5", "@babel/parser@^7.20.7", "@babel/parser@^7.21.3": - version "7.21.3" - resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.3.tgz#1d285d67a19162ff9daa358d4cb41d50c06220b3" - integrity sha512-lobG0d7aOfQRXh8AyklEAgZGvA4FShxo6xQbUrrT/cNBPUdIDojlokwJsQyCC/eKia7ifqM0yP+2DRZ4WKw2RQ== +"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.15.5", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8": + version "7.21.8" + resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8" + integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4": version "7.20.7" @@ -502,12 +496,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-jsx@^7.18.6": - version "7.18.6" - resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0" - integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q== +"@babel/plugin-syntax-jsx@^7.21.4": + version "7.21.4" + resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2" + integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ== dependencies: - "@babel/helper-plugin-utils" "^7.18.6" + "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -566,11 +560,11 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-arrow-functions@^7.14.5": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551" - integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz#9bb42a53de447936a57ba256fbf537fc312b6929" + integrity sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/plugin-transform-async-to-generator@^7.14.5": version "7.20.7" @@ -611,11 +605,11 @@ globals "^11.1.0" "@babel/plugin-transform-computed-properties@^7.14.5": - version "7.20.7" - resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa" - integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz#3a2d8bb771cd2ef1cd736435f6552fe502e11b44" + integrity sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/template" "^7.20.7" "@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.5.0": @@ -649,11 +643,11 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-for-of@^7.15.4": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e" - integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz#e890032b535f5a2e237a18535f56a9fdaa7b83fc" + integrity sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/plugin-transform-function-name@^7.14.5": version "7.18.9" @@ -687,13 +681,13 @@ "@babel/helper-plugin-utils" "^7.20.2" "@babel/plugin-transform-modules-commonjs@^7.15.4": - version "7.21.2" - resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7" - integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz#d69fb947eed51af91de82e4708f676864e5e47bc" + integrity sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ== dependencies: - "@babel/helper-module-transforms" "^7.21.2" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/helper-simple-access" "^7.20.2" + "@babel/helper-module-transforms" "^7.21.5" + "@babel/helper-plugin-utils" "^7.21.5" + "@babel/helper-simple-access" "^7.21.5" "@babel/plugin-transform-modules-systemjs@^7.15.4": version "7.20.11" @@ -765,15 +759,15 @@ "@babel/plugin-transform-react-jsx" "^7.18.6" "@babel/plugin-transform-react-jsx@^7.14.5", "@babel/plugin-transform-react-jsx@^7.18.6", "@babel/plugin-transform-react-jsx@^7.3.0": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.0.tgz#656b42c2fdea0a6d8762075d58ef9d4e3c4ab8a2" - integrity sha512-6OAWljMvQrZjR2DaNhVfRz6dkCAVV+ymcLUmaf8bccGOHn2v5rHJK3tTpij0BuhdYWP4LLaqj5lwcdlpAAPuvg== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.21.5.tgz#bd98f3b429688243e4fa131fe1cbb2ef31ce6f38" + integrity sha512-ELdlq61FpoEkHO6gFRpfj0kUgSwQTGoaEU8eMRoS8Dv3v6e7BjEAj5WMtIBRdHUeAioMhKP5HyxNzNnP+heKbA== dependencies: "@babel/helper-annotate-as-pure" "^7.18.6" - "@babel/helper-module-imports" "^7.18.6" - "@babel/helper-plugin-utils" "^7.20.2" - "@babel/plugin-syntax-jsx" "^7.18.6" - "@babel/types" "^7.21.0" + "@babel/helper-module-imports" "^7.21.4" + "@babel/helper-plugin-utils" "^7.21.5" + "@babel/plugin-syntax-jsx" "^7.21.4" + "@babel/types" "^7.21.5" "@babel/plugin-transform-react-pure-annotations@^7.14.5": version "7.18.6" @@ -784,11 +778,11 @@ "@babel/helper-plugin-utils" "^7.18.6" "@babel/plugin-transform-regenerator@^7.14.5": - version "7.20.5" - resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d" - integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz#576c62f9923f94bcb1c855adc53561fd7913724e" + integrity sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w== dependencies: - "@babel/helper-plugin-utils" "^7.20.2" + "@babel/helper-plugin-utils" "^7.21.5" regenerator-transform "^0.15.1" "@babel/plugin-transform-reserved-words@^7.14.5": @@ -835,11 +829,11 @@ "@babel/helper-plugin-utils" "^7.18.9" "@babel/plugin-transform-unicode-escapes@^7.14.5": - version "7.18.10" - resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246" - integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz#1e55ed6195259b0e9061d81f5ef45a9b009fb7f2" + integrity sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg== dependencies: - "@babel/helper-plugin-utils" "^7.18.9" + "@babel/helper-plugin-utils" "^7.21.5" "@babel/plugin-transform-unicode-regex@^7.14.5": version "7.18.6" @@ -975,9 +969,9 @@ regenerator-runtime "^0.13.4" "@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.8", "@babel/runtime@^7.14.0", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.0", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": - version "7.21.0" - resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673" - integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw== + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200" + integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q== dependencies: regenerator-runtime "^0.13.11" @@ -990,19 +984,19 @@ "@babel/parser" "^7.20.7" "@babel/types" "^7.20.7" -"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.20.5", "@babel/traverse@^7.20.7", "@babel/traverse@^7.21.0", "@babel/traverse@^7.21.2", "@babel/traverse@^7.21.3": - version "7.21.3" - resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.3.tgz#4747c5e7903d224be71f90788b06798331896f67" - integrity sha512-XLyopNeaTancVitYZe2MlUEvgKb6YVVPXzofHgqHijCImG33b/uTurMS488ht/Hbsb2XK3U2BnSTxKVNGV3nGQ== +"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4", "@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133" + integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw== dependencies: - "@babel/code-frame" "^7.18.6" - "@babel/generator" "^7.21.3" - "@babel/helper-environment-visitor" "^7.18.9" + "@babel/code-frame" "^7.21.4" + "@babel/generator" "^7.21.5" + "@babel/helper-environment-visitor" "^7.21.5" "@babel/helper-function-name" "^7.21.0" "@babel/helper-hoist-variables" "^7.18.6" "@babel/helper-split-export-declaration" "^7.18.6" - "@babel/parser" "^7.21.3" - "@babel/types" "^7.21.3" + "@babel/parser" "^7.21.5" + "@babel/types" "^7.21.5" debug "^4.1.0" globals "^11.1.0" @@ -1014,12 +1008,12 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" -"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.2", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.2", "@babel/types@^7.21.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.21.3" - resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.3.tgz#4865a5357ce40f64e3400b0f3b737dc6d4f64d05" - integrity sha512-sBGdETxC+/M4o/zKC0sl6sjWv62WFR/uzxrJ6uYyMLZOUlPnwzw0tKgVHOXxaAd5l2g8pEDM5RZ495GPQI77kg== +"@babel/types@^7.0.0", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.21.5" + resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6" + integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q== dependencies: - "@babel/helper-string-parser" "^7.19.4" + "@babel/helper-string-parser" "^7.21.5" "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" @@ -1385,12 +1379,12 @@ resolved "https://registry.npmjs.org/@fastify/error/-/error-3.2.0.tgz#9010e0acfe07965f5fc7d2b367f58f042d0f4106" integrity sha512-KAfcLa+CnknwVi5fWogrLXgidLic+GXnLjijXdpl8pvkvbXU5BGa37iZO9FGvsh9ZL4y+oFi5cbHBm5UOG+dmQ== -"@fastify/fast-json-stringify-compiler@^4.1.0": - version "4.2.0" - resolved "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.2.0.tgz#52d047fac76b0d75bd660f04a5dd606659f57c5a" - integrity sha512-ypZynRvXA3dibfPykQN3RB5wBdEUgSGgny8Qc6k163wYPLD4mEGEDkACp+00YmqkGvIm8D/xYoHajwyEdWD/eg== +"@fastify/fast-json-stringify-compiler@^4.3.0": + version "4.3.0" + resolved "https://registry.npmjs.org/@fastify/fast-json-stringify-compiler/-/fast-json-stringify-compiler-4.3.0.tgz#5df89fa4d1592cbb8780f78998355feb471646d5" + integrity sha512-aZAXGYo6m22Fk1zZzEUKBvut/CIIQe/BapEORnxiD5Qr0kPHqqI69NtEMCme74h+at72sPhbkb4ZrLd1W3KRLA== dependencies: - fast-json-stringify "^5.0.0" + fast-json-stringify "^5.7.0" "@fastify/multipart@^6.0.0": version "6.0.1" @@ -1681,18 +1675,10 @@ "@types/yargs" "^15.0.0" chalk "^4.0.0" -"@jridgewell/gen-mapping@^0.1.0": - version "0.1.1" - resolved "https://registry.npmjs.org/@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.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9" - integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A== +"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2": + version "0.3.3" + resolved "https://registry.npmjs.org/@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" @@ -1703,20 +1689,25 @@ resolved "https://registry.npmjs.org/@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": +"@jridgewell/set-array@^1.0.1": version "1.1.2" resolved "https://registry.npmjs.org/@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": +"@jridgewell/sourcemap-codec@1.4.14": version "1.4.14" resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24" integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw== +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.15" + resolved "https://registry.npmjs.org/@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.17" - resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985" - integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g== + version "0.3.18" + resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6" + integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA== dependencies: "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" @@ -2449,13 +2440,13 @@ "@loaders.gl/worker-utils" "3.2.9" draco3d "1.4.1" -"@loaders.gl/gis@3.3.1", "@loaders.gl/gis@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.3.1.tgz#3f54d2e01f9ada08ec862ff139fa063f0a9a1ee9" - integrity sha512-Yzs84xMhPb8I4tjWYSGEso1SKwLF3dKY+C0AJbsUyL9zjljHcPSDjdHHdx6inBO+OoGjXr2HstPtPoaTyfKfaw== +"@loaders.gl/gis@3.3.5", "@loaders.gl/gis@^3.2.5": + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.3.5.tgz#6352f9e2dea0b0eb5a3d23d27b923155705732ba" + integrity sha512-wYNibFjvQB1myQ+gJo9PdebtK2pRom1F65tgUnxqeZkNckWva5TGusdsMNpYlDikInf/QSBe+5sI6ysulREj9A== dependencies: - "@loaders.gl/loader-utils" "3.3.1" - "@loaders.gl/schema" "3.3.1" + "@loaders.gl/loader-utils" "3.3.5" + "@loaders.gl/schema" "3.3.5" "@mapbox/vector-tile" "^1.3.1" "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" @@ -2487,7 +2478,7 @@ "@math.gl/geospatial" "^3.5.1" probe.gl "^3.4.0" -"@loaders.gl/images@3.2.9", "@loaders.gl/images@3.3.1", "@loaders.gl/images@^3.2.5": +"@loaders.gl/images@3.2.9", "@loaders.gl/images@3.3.5", "@loaders.gl/images@^3.2.5": version "3.2.9" resolved "https://registry.npmjs.org/@loaders.gl/images/-/images-3.2.9.tgz#fb0df01e5d39a27225502c8205a5bdb2397155af" integrity sha512-Akx9lep4zeSXxD9fRtOP6nS+IjzX4dZQ+P7uIXJ0ydqeBNbUjzKtPgkVEtBqYQNUjPXuXvQ0xahVTNatb/2tLg== @@ -2513,13 +2504,13 @@ "@loaders.gl/worker-utils" "3.2.9" "@probe.gl/stats" "^3.5.0" -"@loaders.gl/loader-utils@3.3.1", "@loaders.gl/loader-utils@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.3.1.tgz#32db4a943389897b833d78f3f652225072dfdc5e" - integrity sha512-yp3ngZw4O9OY7O3d8DCFwsuwDGR4IlDqJCFp47CVS3crrpANBOP12hBZl1uLZJQ8KN1gFXp0tIQtp5/J2bv+Hg== +"@loaders.gl/loader-utils@3.3.5", "@loaders.gl/loader-utils@^3.2.5": + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.3.5.tgz#1b852609329fdc92ffd67bd02faef5341a57ad11" + integrity sha512-fsXwmPc9jgZABaHgm2oxmUyYE3DDZD84KHf2JqphsdgEdyxvrAYZecdEWwOt7we8DObWxx4YKZBCOqT4aWqpIQ== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "3.3.1" + "@loaders.gl/worker-utils" "3.3.5" "@probe.gl/stats" "^3.5.0" "@loaders.gl/math@3.2.9": @@ -2531,23 +2522,23 @@ "@loaders.gl/loader-utils" "3.2.9" "@math.gl/core" "^3.5.1" -"@loaders.gl/math@3.3.1": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/math/-/math-3.3.1.tgz#3d6ba691528c1a05540b9c1ce8f83aa012390d11" - integrity sha512-s2ApdsxBsHqmZlopx3DOL2pav5S9iobdbAXD1ZEUWzTFcxcSIf0Z1CYIWKPBlUuzRJYaqd5fxHewfC4Er4sF5A== +"@loaders.gl/math@3.3.5": + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/math/-/math-3.3.5.tgz#771f5abf8d137940a4384c44cf43ce27a748dc5c" + integrity sha512-tZTvY8/vW0HXI9pGpYqeGbG6HO79/MbbY6nz5x5Ww5XFz54Uq4xtbAqPk1/1L+C9lk7KBYTyWxIK6IwskcxXUw== dependencies: - "@loaders.gl/images" "3.3.1" - "@loaders.gl/loader-utils" "3.3.1" + "@loaders.gl/images" "3.3.5" + "@loaders.gl/loader-utils" "3.3.5" "@math.gl/core" "^3.5.1" "@loaders.gl/mvt@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.3.1.tgz#5c3eb8cd6f2c3c3296f98a842f2080859340d468" - integrity sha512-I6E6gmtDTSAUZIP0gY8PVcjFVPVWby3l3c95JkFKpqyKyPWFEPOkxuxWk34TQXHe09Zj9GEEav/bMC6GvEit/Q== + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.3.5.tgz#6f734ed2801ee31d18493190ecf6589af6a97d15" + integrity sha512-WeWVCnWWvIxSuR4405O2f4MGiTwqq32XOEbE827Z6fkvL/C0tVbCcM3Ci4gsQvIFlUJMf900Eaepbsuugtog6w== dependencies: - "@loaders.gl/gis" "3.3.1" - "@loaders.gl/loader-utils" "3.3.1" - "@loaders.gl/schema" "3.3.1" + "@loaders.gl/gis" "3.3.5" + "@loaders.gl/loader-utils" "3.3.5" + "@loaders.gl/schema" "3.3.5" "@math.gl/polygon" "^3.5.1" pbf "^3.2.1" @@ -2577,21 +2568,21 @@ "@types/geojson" "^7946.0.7" apache-arrow "^4.0.0" -"@loaders.gl/schema@3.3.1", "@loaders.gl/schema@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.3.1.tgz#038d51e340faf1e76aa0fed8ecd54c6083cd9395" - integrity sha512-VpVFLCc+38P0ddJ5478NnXN60YhNx9/dYHy1Y9ccOGTzaXPn8uFqM7DW/eNaJ7ikyiAWeSD75TpSQPzBrAd5MQ== +"@loaders.gl/schema@3.3.5", "@loaders.gl/schema@^3.2.5": + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.3.5.tgz#7f6a7f32ecc2695fc98fb7f485117deda39b040b" + integrity sha512-NWzNUEJh3RCSxek5koM0hHj4H0dzV/mhEjVci6WGK4ntAy5+gOgwkjhNObPWvlssoE5W+qErHXlgUmjqnL6AuA== dependencies: "@types/geojson" "^7946.0.7" "@loaders.gl/terrain@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.3.1.tgz#0230634eeb64af964098d16faa4396dd9c09cbd6" - integrity sha512-WCABqgdzsIL0j5zP7xhBhIkz4nQ8EsSOyAS0bKGXlUWLWGZ9L9oVKSL4AHGgm4ult5S7ogZrPnMs7iSO9nab0g== + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.3.5.tgz#483289d02edbe4c3a098d60f07ed490b66c2386b" + integrity sha512-ys+FUlZpVevQtLWwe4T3fd03A8vXPyim65IWGg+fR9w3gV/9mn8NY0f8tNbFhZlMMxohda6kaqZXbmWj8oitdg== dependencies: "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.3.1" - "@loaders.gl/schema" "3.3.1" + "@loaders.gl/loader-utils" "3.3.5" + "@loaders.gl/schema" "3.3.5" "@mapbox/martini" "^0.2.0" "@loaders.gl/textures@3.2.9": @@ -2620,12 +2611,12 @@ "@probe.gl/stats" "^3.5.0" "@loaders.gl/tiles@^3.2.5": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.3.1.tgz#29c2bfd2521ff14cd1112aa748f3d0cee09b8797" - integrity sha512-dcy+3sYqLZehPLn4FrnViqZskwoxJbDzbtWcrcBE313GLcu+k0E1B+eZss0xwWfb89TltZqfugBVIUd/LW41FA== + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.3.5.tgz#d01a775dfb7fde4e5eb7a32ce1336f77bbee0c7e" + integrity sha512-5p94WH1zOMmmIFE3T7CkzaY31NhW4szwRYxpTN9SRiSehYaAjUTrhXN4ka9QpCZyJ2KAHZKuomkU5fElgxq5FA== dependencies: - "@loaders.gl/loader-utils" "3.3.1" - "@loaders.gl/math" "3.3.1" + "@loaders.gl/loader-utils" "3.3.5" + "@loaders.gl/math" "3.3.5" "@math.gl/core" "^3.5.1" "@math.gl/culling" "^3.5.1" "@math.gl/geospatial" "^3.5.1" @@ -2639,10 +2630,10 @@ dependencies: "@babel/runtime" "^7.3.1" -"@loaders.gl/worker-utils@3.3.1": - version "3.3.1" - resolved "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.3.1.tgz#7c81a7888a3398f0d8b627d7f8a5cc915198392e" - integrity sha512-r1u358xZEMKUsv7gOabmc6fA6knWArYU0BqeWOaJHyN/72ESuDZrzjtk+Adux9rIJLlxrMHLq/o/WCsO1tmrYw== +"@loaders.gl/worker-utils@3.3.5": + version "3.3.5" + resolved "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.3.5.tgz#9b3f36ffb5bec488eebddcfbd02cd6870d261fbb" + integrity sha512-qDWLw7X53Y18pN3ANnTJgNahB6cDz9JGC0rX/q+oNhwZP1hSCa1WQ4hyPHPJiR6ka4D3gdeeSHAoXKnxxEfwIA== dependencies: "@babel/runtime" "^7.3.1" @@ -3146,9 +3137,9 @@ "@octokit/openapi-types" "^12.11.0" "@popperjs/core@^2.11.6": - version "2.11.6" - resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" - integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== + version "2.11.7" + resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz#ccab5c8f7dc557a52ca3288c10075c9ccd37fff7" + integrity sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw== "@probe.gl/env@3.6.0", "@probe.gl/env@^3.5.0": version "3.6.0" @@ -3308,9 +3299,9 @@ "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.18.3" - resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.3.tgz#dfc508a85781e5698d5b33443416b6268c4b3e8d" - integrity sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w== + version "7.18.5" + resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80" + integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q== dependencies: "@babel/types" "^7.3.0" @@ -3423,9 +3414,9 @@ integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@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#a3a32a366bad8966c0a40b78209ed430ba018ce1" - integrity sha512-nMVEcu9bAcenvx6oPWubQSPevsekByjOfKjlkr+8P91vawtkxTnopDoXXq1Qn/f4cg3zt0Z2W9DVsVsKRNXJTw== + version "2.7.11" + resolved "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.11.tgz#c9b9ed2ed24970aeef947609fdfcfcf826a3aa49" + integrity sha512-4vSwPSTQIawZTFRiTY2R74aZwAiM9gE6KGj871xdyAPpa+DmEObXxQQXqL2PsMH31/rP9nxJ2Kv0boeTVJMXVw== dependencies: "@types/geojson" "*" @@ -3454,17 +3445,17 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node-fetch@^2.1.2": - version "2.6.2" - resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" - integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== + version "2.6.3" + resolved "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.3.tgz#175d977f5e24d93ad0f57602693c435c57ad7e80" + integrity sha512-ETTL1mOEdq/sxUtgtOhKjyB2Irra4cjxksvcMUR5Zr4n+PxVhsCD9WS46oPbHL3et9Zde7CNRr+WUNlcHvsX+w== dependencies: "@types/node" "*" form-data "^3.0.0" "@types/node@*", "@types/node@>= 8", "@types/node@>=10.0.0": - version "18.15.3" - resolved "https://registry.npmjs.org/@types/node/-/node-18.15.3.tgz#f0b991c32cfc6a4e7f3399d6cb4b8cf9a0315014" - integrity sha512-p6ua9zBxz5otCmbpb5D3U4B5Nanw6Pk3PPyX05xnxbB/fRv71N7CPmORg7uAD5P70T0xmx1pzAx/FUfa5X+3cw== + version "20.1.4" + resolved "https://registry.npmjs.org/@types/node/-/node-20.1.4.tgz#83f148d2d1f5fe6add4c53358ba00d97fc4cdb71" + integrity sha512-At4pvmIOki8yuwLtd7BNHl3CiWNbtclUbNtScGx4OHfBd4/oWoJC8KRCIxXwkdndzhxOsPXihrsOoydxBjlE9Q== "@types/node@17.0.33": version "17.0.33" @@ -3544,34 +3535,34 @@ integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw== "@types/react-transition-group@^4.2.0", "@types/react-transition-group@^4.4.1": - version "4.4.5" - resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz#aae20dcf773c5aa275d5b9f7cdbca638abc5e416" - integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA== + version "4.4.6" + resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz#18187bcda5281f8e10dfc48f0943e2fdf4f75e2e" + integrity sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew== dependencies: "@types/react" "*" "@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11": - version "18.0.28" - resolved "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz#accaeb8b86f4908057ad629a26635fe641480065" - integrity sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew== + version "18.2.6" + resolved "https://registry.npmjs.org/@types/react/-/react-18.2.6.tgz#5cd53ee0d30ffc193b159d3516c8c8ad2f19d571" + integrity sha512-wRZClXn//zxCFW+ye/D2qY65UsYP1Fpex2YXorHc8awoNamkMZSvBxwxdYVInsHOZZd2Ppq8isnSzJL5Mpf8OA== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/react@^17.0.52": - version "17.0.53" - resolved "https://registry.npmjs.org/@types/react/-/react-17.0.53.tgz#10d4d5999b8af3d6bc6a9369d7eb953da82442ab" - integrity sha512-1yIpQR2zdYu1Z/dc1OxC+MA6GR240u3gcnP4l6mvj/PJiVaqHsQPmWttsvHsfnhfPbU2FuGmo0wSITPygjBmsw== + version "17.0.59" + resolved "https://registry.npmjs.org/@types/react/-/react-17.0.59.tgz#5aa4e161a356fcb824d81f166e01bad9e82243bb" + integrity sha512-gSON5zWYIGyoBcycCE75E9+r6dCC2dHdsrVkOEiIYNU5+Q28HcBAuqvDuxHcCbMfHBHdeT5Tva/AFn3rnMKE4g== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/scheduler@*": - version "0.16.2" - resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" - integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + version "0.16.3" + resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz#cef09e3ec9af1d63d2a6cc5b383a737e24e6dcf5" + integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ== "@types/seedrandom@2.4.27": version "2.4.27" @@ -4276,9 +4267,9 @@ axios@0.22.0: follow-redirects "^1.14.4" axios@^1.3.2: - version "1.3.4" - resolved "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz#f5760cefd9cfb51fd2481acf88c05f67c4523024" - integrity sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ== + version "1.4.0" + resolved "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" + integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA== dependencies: follow-redirects "^1.15.0" form-data "^4.0.0" @@ -4875,14 +4866,14 @@ camelcase@^6.0.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001202, caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001449: - version "1.0.30001466" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001466.tgz#c1e6197c540392e09709ecaa9e3e403428c53375" - integrity sha512-ewtFBSfWjEmxUgNBSZItFSmVtvk9zkwkl1OfRZlKA8slltRN+/C/tuGVrF9styXkN36Yu3+SeJ1qkXxDEyNZ5w== + version "1.0.30001487" + resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001487.tgz#d882d1a34d89c11aea53b8cdc791931bdab5fe1b" + integrity sha512-83564Z3yWGqXsh2vaH/mhXfEM0wX+NlBCm1jYHOb97TrTWJEmPTccZgeLTPBUUb0PNVo+oomb7wkimZBIERClA== canvas@^2.11.0, canvas@^2.6.0: - version "2.11.0" - resolved "https://registry.npmjs.org/canvas/-/canvas-2.11.0.tgz#7f0c3e9ae94cf469269b5d3a7963a7f3a9936434" - integrity sha512-bdTjFexjKJEwtIo0oRx8eD4G2yWoUOXP9lj279jmQ2zMnTQhT8C3512OKz3s+ZOaQlLbE7TuVvRDYDB3Llyy5g== + version "2.11.2" + resolved "https://registry.npmjs.org/canvas/-/canvas-2.11.2.tgz#553d87b1e0228c7ac0fc72887c3adbac4abbd860" + integrity sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw== dependencies: "@mapbox/node-pre-gyp" "^1.0.0" nan "^2.17.0" @@ -5212,9 +5203,9 @@ clone@^2.1.2: integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w== close-with-grace@^1.1.0: - version "1.1.0" - resolved "https://registry.npmjs.org/close-with-grace/-/close-with-grace-1.1.0.tgz#91a48cf2019b5ae6e67b0255a32abcfd9bbca233" - integrity sha512-6cCp71Y5tKw1o9sGVBOa9OwY4vJ+YoLpFcWiTt9YCBhYlcQi0z68EiiN9mJ6/401Za6TZ5YOZg012IHHZt15lw== + version "1.2.0" + resolved "https://registry.npmjs.org/close-with-grace/-/close-with-grace-1.2.0.tgz#9af82cc62b40125125e4c772e4dbe3cd8c3ff494" + integrity sha512-Xga0jyAb4fX98u5pZAgqlbqHP8cHuy5M3Wto0k0L/36aP2C25Cjp51XfPw3Hz7dNC2L2/hF/PK/KJhO275L+VA== clsx@^1.0.2, clsx@^1.0.4, clsx@^1.1.0: version "1.2.1" @@ -5310,9 +5301,9 @@ colorette@^1.2.2: integrity sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g== colorette@^2.0.16: - version "2.0.19" - resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" - integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== + version "2.0.20" + resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== colors@1.0.3: version "1.0.3" @@ -5607,16 +5598,16 @@ copy-descriptor@^0.1.0: integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw== core-js-compat@^3.16.0, core-js-compat@^3.16.2: - version "3.29.1" - resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.29.1.tgz#15c0fb812ea27c973c18d425099afa50b934b41b" - integrity sha512-QmchCua884D8wWskMX8tW5ydINzd8oSJVx38lx/pVkFGqztxt73GYre3pm/hyYq8bPf+MW5In4I/uRShFDsbrA== + version "3.30.2" + resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.2.tgz#83f136e375babdb8c80ad3c22d67c69098c1dd8b" + integrity sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA== dependencies: browserslist "^4.21.5" core-js@3, core-js@^3.8.3: - version "3.29.1" - resolved "https://registry.npmjs.org/core-js/-/core-js-3.29.1.tgz#40ff3b41588b091aaed19ca1aa5cb111803fa9a6" - integrity sha512-+jwgnhg6cQxKYIIjGtAHq2nwUOolo9eoFZ4sHfUH09BLXBgxnH4gA0zEd+t+BO2cNB8idaBtZFcFTRjQJRJmAw== + version "3.30.2" + resolved "https://registry.npmjs.org/core-js/-/core-js-3.30.2.tgz#6528abfda65e5ad728143ea23f7a14f0dcf503fc" + integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg== core-util-is@1.0.2: version "1.0.2" @@ -5815,9 +5806,9 @@ csstype@^2.5.2, csstype@^2.5.7: integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w== csstype@^3.0.2: - version "3.1.1" - resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz#841b532c45c758ee546a11d5bd7b7b473c8c30b9" - integrity sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw== + version "3.1.2" + resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz#1d4bf9d572f11c14031f0436e1c10bc1f571f50b" + integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ== currently-unhandled@^0.4.1: version "0.4.1" @@ -6301,9 +6292,9 @@ deep-is@^0.1.3, deep-is@~0.1.3: integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ== deepmerge@^4.2.2: - version "4.3.0" - resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.0.tgz#65491893ec47756d44719ae520e0e2609233b59b" - integrity sha512-z2wJZXrmeHdvYJp/Ux55wIjqo81G5Bp4c+oELTW+7ar6SogWHajt5a9gO3s3IDaGSAXjDk0vlQKN3rms8ab3og== + version "4.3.1" + resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" + integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== default-require-extensions@^3.0.0: version "3.0.1" @@ -6319,7 +6310,7 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" -define-properties@^1.1.3, define-properties@^1.1.4: +define-properties@^1.1.3, define-properties@^1.1.4, define-properties@^1.2.0: version "1.2.0" resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz#52988570670c9eacedd8064f4a990f2405849bd5" integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA== @@ -6571,9 +6562,9 @@ ee-first@1.1.1: integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== electron-to-chromium@^1.3.723, electron-to-chromium@^1.4.284: - version "1.4.330" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.330.tgz#4740378db7160d7210afb29800c74048cdf10a99" - integrity sha512-PqyefhybrVdjAJ45HaPLtuVaehiSw7C3ya0aad+rvmV53IVyXmYRk3pwIOb2TxTDTnmgQdn46NjMMaysx79/6Q== + version "1.4.396" + resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.396.tgz#3d3664eb58d86376fbe2fece3705f68ca197205c" + integrity sha512-pqKTdqp/c5vsrc0xUPYXTDBo9ixZuGY8es4ZOjjd6HD6bFYbu5QA09VoW3fkY4LF1T0zYk86lN6bZnNlBuOpdQ== elliptic@^6.5.3: version "6.5.4" @@ -6682,9 +6673,9 @@ engine.io@~5.1.1: ws "~7.4.2" engine.io@~6.4.1: - version "6.4.1" - resolved "https://registry.npmjs.org/engine.io/-/engine.io-6.4.1.tgz#8056b4526a88e779f9c280d820422d4e3eeaaae5" - integrity sha512-JFYQurD/nbsA5BSPmbaOSLa3tSVj8L6o4srSwXXY3NqE+gGUNmmPTbhn8tjzcCtSqhFgIeqef81ngny8JM25hw== + version "6.4.2" + resolved "https://registry.npmjs.org/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f" + integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg== dependencies: "@types/cookie" "^0.4.1" "@types/cors" "^2.8.12" @@ -6705,9 +6696,9 @@ enquirer@^2.3.6: ansi-colors "^4.1.1" entities@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174" - integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA== + version "4.5.0" + resolved "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48" + integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw== env-paths@^2.2.0: version "2.2.1" @@ -6736,7 +6727,7 @@ error-ex@^1.2.0, error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.19.0, es-abstract@^1.20.4: +es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2: version "1.21.2" resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff" integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg== @@ -6878,9 +6869,9 @@ eslint-scope@^5.1.1: estraverse "^4.1.1" eslint-scope@^7.1.1: - version "7.1.1" - resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" - integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== + version "7.2.0" + resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b" + integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw== dependencies: esrecurse "^4.3.0" estraverse "^5.2.0" @@ -6897,10 +6888,10 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-visitor-keys@^3.3.0: - version "3.3.0" - resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" - integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1: + version "3.4.1" + resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994" + integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA== eslint@8.18.0: version "8.18.0" @@ -6944,13 +6935,13 @@ eslint@8.18.0: v8-compile-cache "^2.0.3" espree@^9.3.2, espree@^9.4.0: - version "9.5.0" - resolved "https://registry.npmjs.org/espree/-/espree-9.5.0.tgz#3646d4e3f58907464edba852fa047e6a27bdf113" - integrity sha512-JPbJGhKc47++oo4JkEoTe2wjy4fmMwvFpgJT9cQzmfXKp22Dr6Hf1tdCteLz1h0P3t+mGvWZ+4Uankvh8+c6zw== + version "9.5.2" + resolved "https://registry.npmjs.org/espree/-/espree-9.5.2.tgz#e994e7dc33a082a7a82dceaf12883a829353215b" + integrity sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw== dependencies: acorn "^8.8.0" acorn-jsx "^5.3.2" - eslint-visitor-keys "^3.3.0" + eslint-visitor-keys "^3.4.1" esprima@^4.0.0, esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" @@ -7234,10 +7225,10 @@ fast-json-stringify@^2.5.2: rfdc "^1.2.0" string-similarity "^4.0.1" -fast-json-stringify@^5.0.0: - version "5.6.2" - resolved "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.6.2.tgz#1ea6c2b8d0f27f297f682d1af039398a603af507" - integrity sha512-F6xkRrXvtGbAiDSEI5Rk7qk2P63Y9kc8bO6Dnsd3Rt6sBNr2QxNFWs0JbKftgiyOfGxnJaRoHe4SizCTqeAyrA== +fast-json-stringify@^5.7.0: + version "5.7.0" + resolved "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.7.0.tgz#b0a04c848fdeb6ecd83440c71a4db35067023bed" + integrity sha512-sBVPTgnAZseLu1Qgj6lUbQ0HfjFhZWXAmpZ5AaSGkyLh5gAXBga/uPJjQPHpDFjC9adWIpdOcCLSDTgrZ7snoQ== dependencies: "@fastify/deepmerge" "^1.0.0" ajv "^8.10.0" @@ -7259,9 +7250,9 @@ fast-querystring@^1.0.0: fast-decode-uri-component "^1.0.1" fast-redact@^3.0.0, fast-redact@^3.1.1: - version "3.1.2" - resolved "https://registry.npmjs.org/fast-redact/-/fast-redact-3.1.2.tgz#d58e69e9084ce9fa4c1a6fa98a3e1ecf5d7839aa" - integrity sha512-+0em+Iya9fKGfEQGcd62Yv6onjBmmhV1uh86XVfOU8VwAe6kaFdQCWI9s0/Nnugx5Vd9tdbZ7e6gE2tR9dzXdw== + version "3.2.0" + resolved "https://registry.npmjs.org/fast-redact/-/fast-redact-3.2.0.tgz#b1e2d39bc731376d28bde844454fa23e26919987" + integrity sha512-zaTadChr+NekyzallAMXATXLOR8MNx3zqpZ0MUF2aGf4EathnG0f32VLODNlY8IuGY3HoRO2L6/6fSzNsLaHIw== fast-safe-stringify@^2.0.8: version "2.1.1" @@ -7417,17 +7408,18 @@ fastify@^3.0.0: tiny-lru "^8.0.1" fastify@^4.0.0: - version "4.14.1" - resolved "https://registry.npmjs.org/fastify/-/fastify-4.14.1.tgz#be1b27a13910c74ecb8625de4fa42feab9703259" - integrity sha512-yjrDeXe77j9gRlSV2UJry8mcFWbD0NQ5JYjnPi4tkFjHZVaG3/BD5wxOmRzGnHPC0YvaBJ0XWrIfFPl2IHRa1w== + version "4.17.0" + resolved "https://registry.npmjs.org/fastify/-/fastify-4.17.0.tgz#b2c8245e572edef0b02a167d2d411a3c8a46d01a" + integrity sha512-tzuY1tgWJo2Y6qEKwmLhFvACUmr68Io2pqP/sDKU71KRM6A6R3DrCDqLGqANbeLZcKUfdfY58ut35CGqemcTgg== dependencies: "@fastify/ajv-compiler" "^3.5.0" "@fastify/error" "^3.0.0" - "@fastify/fast-json-stringify-compiler" "^4.1.0" + "@fastify/fast-json-stringify-compiler" "^4.3.0" abstract-logging "^2.0.1" avvio "^8.2.0" fast-content-type-parse "^1.0.0" - find-my-way "^7.3.0" + fast-json-stringify "^5.7.0" + find-my-way "^7.6.0" light-my-request "^5.6.1" pino "^8.5.0" process-warning "^2.0.0" @@ -7435,7 +7427,7 @@ fastify@^4.0.0: rfdc "^1.3.0" secure-json-parse "^2.5.0" semver "^7.3.7" - tiny-lru "^10.0.0" + tiny-lru "^11.0.1" fastq@^1.6.0, fastq@^1.6.1: version "1.15.0" @@ -7555,10 +7547,10 @@ find-my-way@^4.1.0, find-my-way@^4.5.0: safe-regex2 "^2.0.0" semver-store "^0.3.0" -find-my-way@^7.3.0: - version "7.6.0" - resolved "https://registry.npmjs.org/find-my-way/-/find-my-way-7.6.0.tgz#f1e271fd1aafe87e87860662f9940124274f73c7" - integrity sha512-H7berWdHJ+5CNVr4ilLWPai4ml7Y2qAsxjw3pfeBxPigZmaDTzF0wjJLj90xRCmGcWYcyt050yN+34OZDJm1eQ== +find-my-way@^7.6.0: + version "7.6.2" + resolved "https://registry.npmjs.org/find-my-way/-/find-my-way-7.6.2.tgz#4dd40200d3536aeef5c7342b10028e04cf79146c" + integrity sha512-0OjHn1b1nCX3eVbm9ByeEHiscPYiHLfhei1wOUU9qffQkk98wE0Lo8VrVYfSGMgnSnDh86DxedduAnBf4nwUEw== dependencies: fast-deep-equal "^3.1.3" fast-querystring "^1.0.0" @@ -7824,7 +7816,7 @@ functional-red-black-tree@^1.0.1: resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== -functions-have-names@^1.2.2: +functions-have-names@^1.2.2, functions-have-names@^1.2.3: version "1.2.3" resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834" integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ== @@ -7913,12 +7905,13 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0: - version "1.2.0" - resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f" - integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q== + version "1.2.1" + resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82" + integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw== dependencies: function-bind "^1.1.1" has "^1.0.3" + has-proto "^1.0.1" has-symbols "^1.0.3" get-orientation@1.1.2: @@ -8216,9 +8209,9 @@ gopd@^1.0.1: get-intrinsic "^1.1.3" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4: - version "4.2.10" - resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c" - integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA== + version "4.2.11" + resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" + integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== growly@^1.3.0: version "1.3.0" @@ -8935,10 +8928,10 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" -is-core-module@^2.5.0, is-core-module@^2.9.0: - version "2.11.0" - resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" - integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== +is-core-module@^2.11.0, is-core-module@^2.5.0: + version "2.12.0" + resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4" + integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ== dependencies: has "^1.0.3" @@ -9233,6 +9226,11 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0: resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw== + isbinaryfile@^4.0.2: version "4.0.10" resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3" @@ -10742,10 +10740,10 @@ minipass@^3.0.0, minipass@^3.1.5, minipass@^3.1.6, minipass@^3.3.4: dependencies: yallist "^4.0.0" -minipass@^4.0.0: - version "4.2.5" - resolved "https://registry.npmjs.org/minipass/-/minipass-4.2.5.tgz#9e0e5256f1e3513f8c34691dd68549e85b2c8ceb" - integrity sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q== +minipass@^5.0.0: + version "5.0.0" + resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d" + integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ== minizlib@^1.3.3: version "1.3.3" @@ -10802,9 +10800,9 @@ mkdirp-promise@^5.0.1: mkdirp "*" mkdirp@*: - version "2.1.5" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-2.1.5.tgz#78d7eaf15e069ba7b6b47d76dd94cfadf7a4062f" - integrity sha512-jbjfql+shJtAPrFoKxHOXip4xS+kul9W3OzfzzrqueWK2QMGon2bFH2opl6W9EagBThjEz+iysyi/swOoVfB/w== + version "3.0.1" + resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz#e44e4c5607fb279c168241713cc6e0fea9adcb50" + integrity sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg== mkdirp@1.x, mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" @@ -10838,9 +10836,9 @@ moment-timezone@0.5.14: moment ">= 2.9.0" moment-timezone@^0.5.33: - version "0.5.41" - resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.41.tgz#a7ad3285fd24aaf5f93b8119a9d749c8039c64c5" - integrity sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg== + version "0.5.43" + resolved "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz#3dd7f3d0c67f78c23cd1906b9b2137a09b3c4790" + integrity sha512-72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ== dependencies: moment "^2.29.4" @@ -10941,9 +10939,9 @@ nanoid@3.1.31: integrity sha512-ZivnJm0o9bb13p2Ot5CpgC2rQdzB9Uxm/mFZweqm5eMViqOJe3PV6LU2E30SiLgheesmcPrjquqraoolONSA0A== nanoid@^3.1.23: - version "3.3.4" - resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab" - integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw== + version "3.3.6" + resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c" + integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA== nanomatch@^1.2.9: version "1.2.13" @@ -11075,9 +11073,9 @@ node-fetch@2.6.1: integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-fetch@^2.5.0, node-fetch@^2.6.7, node-fetch@~2.6.1: - version "2.6.9" - resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== + version "2.6.11" + resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz#cde7fc71deef3131ef80a738919f999e6edfff25" + integrity sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w== dependencies: whatwg-url "^5.0.0" @@ -11329,9 +11327,9 @@ number-is-nan@^1.0.0: integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== nwsapi@^2.2.0: - version "2.2.2" - resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0" - integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw== + version "2.2.4" + resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5" + integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g== nyc@^15.1.0: version "15.1.0" @@ -11421,14 +11419,15 @@ object.assign@^4.1.4: object-keys "^1.1.1" object.getownpropertydescriptors@^2.0.3: - version "2.1.5" - resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.5.tgz#db5a9002489b64eef903df81d6623c07e5b4b4d3" - integrity sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw== + version "2.1.6" + resolved "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312" + integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ== dependencies: array.prototype.reduce "^1.0.5" call-bind "^1.0.2" - define-properties "^1.1.4" - es-abstract "^1.20.4" + define-properties "^1.2.0" + es-abstract "^1.21.2" + safe-array-concat "^1.0.0" object.pick@^1.3.0: version "1.3.0" @@ -11980,9 +11979,9 @@ pino-std-serializers@^3.1.0: integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg== pino-std-serializers@^6.0.0: - version "6.1.0" - resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.1.0.tgz#307490fd426eefc95e06067e85d8558603e8e844" - integrity sha512-KO0m2f1HkrPe9S0ldjx7za9BJjeHqBku5Ch8JyxETxT8dEFGz1PwgrHaOQupVYitpzbFSYm7nnljxD8dik2c+g== + version "6.2.1" + resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-6.2.1.tgz#369f4ae2a19eb6d769ddf2c88a2164b76879a284" + integrity sha512-wHuWB+CvSVb2XqXM0W/WOYUkVSPbiJb9S5fNB7TBhd8s892Xq910bRxwHtC4l71hgztObTjXL6ZheZXFjhDrDQ== pino@^6.13.0: version "6.14.0" @@ -11998,9 +11997,9 @@ pino@^6.13.0: sonic-boom "^1.0.2" pino@^8.5.0: - version "8.11.0" - resolved "https://registry.npmjs.org/pino/-/pino-8.11.0.tgz#2a91f454106b13e708a66c74ebc1c2ab7ab38498" - integrity sha512-Z2eKSvlrl2rH8p5eveNUnTdd4AjJk8tAsLkHYZQKGHP4WTh2Gi1cOSOs3eWPqaj+niS3gj4UkoreoaWgF3ZWYg== + version "8.14.1" + resolved "https://registry.npmjs.org/pino/-/pino-8.14.1.tgz#bb38dcda8b500dd90c1193b6c9171eb777a47ac8" + integrity sha512-8LYNv7BKWXSfS+k6oEc6occy5La+q2sPwU3q2ljTX5AZk7v+5kND2o5W794FyRaqha6DJajmkNRsWtPpFyMUdw== dependencies: atomic-sleep "^1.0.0" fast-redact "^3.1.1" @@ -12173,9 +12172,9 @@ process-warning@^1.0.0: integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q== process-warning@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/process-warning/-/process-warning-2.1.0.tgz#1e60e3bfe8183033bbc1e702c2da74f099422d1a" - integrity sha512-9C20RLxrZU/rFnxWncDkuF6O999NdIf3E1ws4B0ZeY3sRVPzWBMsYDE2lxjxhiXxg464cQTgKUGm8/i6y2YGXg== + version "2.2.0" + resolved "https://registry.npmjs.org/process-warning/-/process-warning-2.2.0.tgz#008ec76b579820a8e5c35d81960525ca64feb626" + integrity sha512-/1WZ8+VQjR6avWOgHeEPd7SDQmFQ1B5mC1eRXsCm5TarlNmx/wCsa5GEaxGm05BORRtyG/Ex/3xq3TuRvq57qg== process@0.11.10, process@^0.11.1, process@^0.11.10: version "0.11.10" @@ -12339,9 +12338,9 @@ q@^1.5.1: integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw== qs@^6.9.4: - version "6.11.1" - resolved "https://registry.npmjs.org/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f" - integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ== + version "6.11.2" + resolved "https://registry.npmjs.org/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9" + integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA== dependencies: side-channel "^1.0.4" @@ -12527,9 +12526,9 @@ react-burger-menu@3.0.6: snapsvg-cjs "0.0.6" react-devtools-core@^4.19.1: - version "4.27.2" - resolved "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.2.tgz#d20fc57e258c656eedabafc2c851d38b33583148" - integrity sha512-8SzmIkpO87alD7Xr6gWIEa1jHkMjawOZ+6egjazlnjB4UUcbnzGDf/vBJ4BzGuWWEM+pzrxuzsPpcMqlQkYK2g== + version "4.27.7" + resolved "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.27.7.tgz#458a6541483078d60a036c75bf88f54c478086ec" + integrity sha512-12N0HrhCPbD76Z7SkyJdGdXdPGouUsgV6tlEsbSpAnLDO06tjXZP+irht4wPdYwJAJRQ85DxL48eQoz7UmrSuQ== dependencies: shell-quote "^1.6.1" ws "^7" @@ -12764,9 +12763,9 @@ read@1, read@~1.0.1: util-deprecate "^1.0.1" readable-stream@^4.0.0: - version "4.3.0" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-4.3.0.tgz#0914d0c72db03b316c9733bb3461d64a3cc50cba" - integrity sha512-MuEnA0lbSi7JS8XM+WNJlWZkHAAdm7gETHdFK//Q/mChGyj2akEFtdLZh32jSdkWGbRwCW9pn6g3LWDdDeZnBQ== + version "4.4.0" + resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-4.4.0.tgz#55ce132d60a988c460d75c631e9ccf6a7229b468" + integrity sha512-kDMOq0qLtxV9f/SQv522h8cxZBqNZXuXNyjyezmfAAuribMyVXziljpQ/uQhfE1XLg2/TLTW2DsnoE4VAi/krg== dependencies: abort-controller "^3.0.0" buffer "^6.0.3" @@ -12902,13 +12901,13 @@ regex-not@^1.0.0, regex-not@^1.0.2: safe-regex "^1.1.0" regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== + version "1.5.0" + resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb" + integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA== dependencies: call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" + define-properties "^1.2.0" + functions-have-names "^1.2.3" regexpp@^3.2.0: version "3.2.0" @@ -13061,11 +13060,11 @@ resolve@1.1.7: integrity sha512-9znBF0vBcaSN3W2j7wKvdERPwqTxSpCq+if5C0WoTCyV9n24rua28jeuQ2pL/HOf+yUe/Mef+H/5p60K0Id3bg== resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.18.1: - version "1.22.1" - resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" - integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== + version "1.22.2" + resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== dependencies: - is-core-module "^2.9.0" + is-core-module "^2.11.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -13230,12 +13229,22 @@ rxjs@6.6.7, rxjs@^6.4.0: tslib "^1.9.0" rxjs@^7.5.1: - version "7.8.0" - resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" - integrity sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg== + version "7.8.1" + resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" + integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== dependencies: tslib "^2.1.0" +safe-array-concat@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz#2064223cba3c08d2ee05148eedbc563cd6d84060" + integrity sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.0" + has-symbols "^1.0.3" + isarray "^2.0.5" + safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" @@ -13270,9 +13279,9 @@ safe-regex@^1.1.0: ret "~0.1.10" safe-stable-stringify@^2.3.1: - version "2.4.2" - resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.2.tgz#ec7b037768098bf65310d1d64370de0dc02353aa" - integrity sha512-gMxvPJYhP0O9n2pvcfYfIuYgbledAOJFcqRThtPRmjscaipiwcwPPKLytpVzMkG2HAN87Qmo2d4PtGiri1dSLA== + version "2.4.3" + resolved "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886" + integrity sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g== "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" @@ -13350,9 +13359,9 @@ semver@5.5.0: integrity sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA== semver@7.x, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8: - version "7.3.8" - resolved "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798" - integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A== + version "7.5.1" + resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec" + integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw== dependencies: lru-cache "^6.0.0" @@ -13386,9 +13395,9 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== set-cookie-parser@^2.4.1: - version "2.5.1" - resolved "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.5.1.tgz#ddd3e9a566b0e8e0862aca974a6ac0e01349430b" - integrity sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ== + version "2.6.0" + resolved "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.6.0.tgz#131921e50f62ff1a66a461d7d62d7b21d5d15a51" + integrity sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ== set-value@^2.0.0, set-value@^2.0.1: version "2.0.1" @@ -13460,9 +13469,9 @@ shell-quote@1.7.2: integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== shell-quote@^1.6.1: - version "1.8.0" - resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba" - integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ== + version "1.8.1" + resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" + integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== shelljs@0.8.1: version "0.8.1" @@ -13738,9 +13747,9 @@ sonic-boom@^1.0.2: flatstr "^1.0.12" sonic-boom@^3.1.0: - version "3.2.1" - resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.2.1.tgz#972ceab831b5840a08a002fa95a672008bda1c38" - integrity sha512-iITeTHxy3B9FGu8aVdiDXUVAcHMF9Ss0cCsAOo2HfCrmVGT3/DT5oYaeu0M/YKZDlKTvChEyPq0zI9Hf33EX6A== + version "3.3.0" + resolved "https://registry.npmjs.org/sonic-boom/-/sonic-boom-3.3.0.tgz#cffab6dafee3b2bcb88d08d589394198bee1838c" + integrity sha512-LYxp34KlZ1a2Jb8ZQgFCK3niIHzibdwtwNUWKg0qQRzsDoJ3Gfgkf8KdBTFU3SkejDEIlWwnSnpVdOZIhFMl/g== dependencies: atomic-sleep "^1.0.0" @@ -13874,9 +13883,9 @@ split2@^3.0.0: readable-stream "^3.0.0" split2@^4.0.0, split2@^4.1.0: - version "4.1.0" - resolved "https://registry.npmjs.org/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809" - integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ== + version "4.2.0" + resolved "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz#c9c5920904d148bab0b9f67145f245a86aadbfa4" + integrity sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg== split@^1.0.0: version "1.0.1" @@ -14429,13 +14438,13 @@ tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: yallist "^3.1.1" tar@^6.1.11: - version "6.1.13" - resolved "https://registry.npmjs.org/tar/-/tar-6.1.13.tgz#46e22529000f612180601a6fe0680e7da508847b" - integrity sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw== + version "6.1.14" + resolved "https://registry.npmjs.org/tar/-/tar-6.1.14.tgz#e87926bec1cfe7c9e783a77a79f3e81c1cfa3b66" + integrity sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" - minipass "^4.0.0" + minipass "^5.0.0" minizlib "^2.1.1" mkdirp "^1.0.3" yallist "^4.0.0" @@ -14565,10 +14574,10 @@ timers-browserify@2.0.12, timers-browserify@^2.0.4: dependencies: setimmediate "^1.0.4" -tiny-lru@^10.0.0: - version "10.2.1" - resolved "https://registry.npmjs.org/tiny-lru/-/tiny-lru-10.2.1.tgz#2a7f7cd87cf82ba87f4224af681bc2b478ece722" - integrity sha512-cxcNyX4O50FDnB5x9jdEJupYC+9PPutt6wT16TaOtXeHfV9t41aFqg0VniB9YK5KmBeqmZaYriNMajm/5TtA7Q== +tiny-lru@^11.0.1: + version "11.0.1" + resolved "https://registry.npmjs.org/tiny-lru/-/tiny-lru-11.0.1.tgz#629d6ddd88bd03c0929722680167f1feadf576f2" + integrity sha512-iNgFugVuQgBKrqeO/mpiTTgmBsTP0WL6yeuLfLs/Ctf0pI/ixGqIRm8sDCwMcXGe9WWvt2sGXI5mNqZbValmJg== tiny-lru@^7.0.0: version "7.0.6" @@ -14721,9 +14730,9 @@ trim-newlines@^3.0.0: integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw== trivial-deferred@^1.0.1: - version "1.1.1" - resolved "https://registry.npmjs.org/trivial-deferred/-/trivial-deferred-1.1.1.tgz#306fe043d475394fade5133a68cfd2edf2a23551" - integrity sha512-CRmSsCN0PAzyZ5hSFPByf1OPAOxVy4yLctYfrdz3zYMSxGpZI/2UjhYn22VE1iQTlasP4aLHc5/bhFb6WKJwpA== + version "1.1.2" + resolved "https://registry.npmjs.org/trivial-deferred/-/trivial-deferred-1.1.2.tgz#6b07aa1eb045f6128b8b30673b040f99bfe64a2e" + integrity sha512-vDPiDBC3hyP6O4JrJYMImW3nl3c03Tsj9fEXc7Qc/XKa1O7gf5ZtFfIR/E0dun9SnDHdwjna1Z2rSzYgqpxh/g== ts-jest@26.5.3: version "26.5.3" @@ -15047,9 +15056,9 @@ upath@^1.2.0: integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== update-browserslist-db@^1.0.10: - version "1.0.10" - resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3" - integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ== + version "1.0.11" + resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940" + integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA== dependencies: escalade "^3.1.1" picocolors "^1.0.0" @@ -15377,9 +15386,9 @@ which-boxed-primitive@^1.0.2: is-symbol "^1.0.3" which-module@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q== + version "2.0.1" + resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409" + integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ== which-typed-array@^1.1.2, which-typed-array@^1.1.9: version "1.1.9" @@ -15698,9 +15707,9 @@ yargs@^16.0.3: yargs-parser "^20.2.2" yargs@^17.6.0: - version "17.7.1" - resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + version "17.7.2" + resolved "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269" + integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w== dependencies: cliui "^8.0.1" escalade "^3.1.1"