From be0844c4bdd7dbb4b65681586737f51c769c51c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=A0=20/=20green?= Date: Mon, 24 Apr 2023 17:47:20 +0900 Subject: [PATCH] chore: replace source-map with trace-mapping (#3236) --- packages/vitest/package.json | 2 +- packages/vitest/src/typecheck/typechecker.ts | 17 +- packages/vitest/src/types/rpc.ts | 3 +- pnpm-lock.yaml | 273 ++++++------------- 4 files changed, 96 insertions(+), 199 deletions(-) diff --git a/packages/vitest/package.json b/packages/vitest/package.json index e4995559624e..2758f8e4b54e 100644 --- a/packages/vitest/package.json +++ b/packages/vitest/package.json @@ -152,7 +152,6 @@ "magic-string": "^0.30.0", "pathe": "^1.1.0", "picocolors": "^1.0.0", - "source-map": "^0.6.1", "std-env": "^3.3.2", "strip-literal": "^1.0.1", "tinybench": "^2.4.0", @@ -165,6 +164,7 @@ "@ampproject/remapping": "^2.2.0", "@antfu/install-pkg": "^0.1.1", "@edge-runtime/vm": "2.1.2", + "@jridgewell/trace-mapping": "^0.3.17", "@sinonjs/fake-timers": "^10.0.2", "@types/diff": "^5.0.3", "@types/istanbul-lib-coverage": "^2.0.4", diff --git a/packages/vitest/src/typecheck/typechecker.ts b/packages/vitest/src/typecheck/typechecker.ts index a9a0670c3c92..2c6a1bab0b44 100644 --- a/packages/vitest/src/typecheck/typechecker.ts +++ b/packages/vitest/src/typecheck/typechecker.ts @@ -2,7 +2,8 @@ import { rm } from 'node:fs/promises' import type { ExecaChildProcess } from 'execa' import { execa } from 'execa' import { basename, extname, resolve } from 'pathe' -import { SourceMapConsumer } from 'source-map' +import { TraceMap, generatedPositionFor } from '@jridgewell/trace-mapping' +import type { RawSourceMap } from '@ampproject/remapping' import { getTasks } from '../utils' import { ensurePackageInstalled } from '../node/pkg' import type { Awaitable, File, ParsedStack, Task, TaskResultPack, TaskState, TscErrorInfo } from '../types' @@ -119,7 +120,7 @@ export class Typechecker { } const sortedDefinitions = [...definitions.sort((a, b) => b.start - a.start)] // has no map for ".js" files that use // @ts-check - const mapConsumer = map && new SourceMapConsumer(map) + const traceMap = map && new TraceMap(map as unknown as RawSourceMap) const indexMap = createIndexMap(parsed) const markState = (task: Task, state: TaskState) => { task.result = { @@ -129,11 +130,13 @@ export class Typechecker { markState(task.suite, state) } errors.forEach(({ error, originalError }) => { - const processedPos = mapConsumer?.generatedPositionFor({ - line: originalError.line, - column: originalError.column, - source: basename(path), - }) || originalError + const processedPos = traceMap + ? generatedPositionFor(traceMap, { + line: originalError.line, + column: originalError.column, + source: basename(path), + }) + : originalError const line = processedPos.line ?? originalError.line const column = processedPos.column ?? originalError.column const index = indexMap.get(`${line}:${column}`) diff --git a/packages/vitest/src/types/rpc.ts b/packages/vitest/src/types/rpc.ts index eb10ba97ed35..294b64147051 100644 --- a/packages/vitest/src/types/rpc.ts +++ b/packages/vitest/src/types/rpc.ts @@ -1,5 +1,4 @@ -import type { RawSourceMap } from 'source-map' -import type { FetchResult, ViteNodeResolveId } from 'vite-node' +import type { FetchResult, RawSourceMap, ViteNodeResolveId } from 'vite-node' import type { EnvironmentOptions, ResolvedConfig, VitestEnvironment } from './config' import type { UserConsoleLog } from './general' import type { SnapshotResult } from './snapshot' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b95b9aeaccb6..9e0dc780f457 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -318,7 +318,7 @@ importers: version: 13.3.0(react-dom@18.0.0)(react@18.0.0) '@types/node': specifier: latest - version: 18.15.13 + version: 18.16.0 '@types/react': specifier: latest version: 18.0.38 @@ -1206,9 +1206,6 @@ importers: picocolors: specifier: ^1.0.0 version: 1.0.0 - source-map: - specifier: ^0.6.1 - version: 0.6.1 std-env: specifier: ^3.3.2 version: 3.3.2 @@ -1240,6 +1237,9 @@ importers: '@edge-runtime/vm': specifier: 2.1.2 version: 2.1.2 + '@jridgewell/trace-mapping': + specifier: ^0.3.17 + version: 0.3.17 '@sinonjs/fake-timers': specifier: ^10.0.2 version: 10.0.2 @@ -2124,29 +2124,6 @@ packages: transitivePeerDependencies: - supports-color - /@babel/core@7.20.12: - resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==} - engines: {node: '>=6.9.0'} - dependencies: - '@ampproject/remapping': 2.2.0 - '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.7 - '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.20.12) - '@babel/helper-module-transforms': 7.20.11 - '@babel/helpers': 7.20.7 - '@babel/parser': 7.20.7 - '@babel/template': 7.20.7 - '@babel/traverse': 7.20.12 - '@babel/types': 7.21.3 - convert-source-map: 1.9.0 - debug: 4.3.4(supports-color@8.1.1) - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 6.3.0 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/core@7.20.5: resolution: {integrity: sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==} engines: {node: '>=6.9.0'} @@ -2229,7 +2206,7 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/helper-explode-assignable-expression': 7.18.6 - '@babel/types': 7.21.4 + '@babel/types': 7.21.3 dev: true /@babel/helper-compilation-targets@7.18.9(@babel/core@7.18.13): @@ -2258,20 +2235,6 @@ packages: semver: 6.3.0 dev: true - /@babel/helper-compilation-targets@7.20.7(@babel/core@7.20.12): - resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.20.10 - '@babel/core': 7.20.12 - '@babel/helper-validator-option': 7.18.6 - browserslist: 4.21.3 - lru-cache: 5.1.1 - semver: 6.3.0 - dev: true - /@babel/helper-compilation-targets@7.20.7(@babel/core@7.20.5): resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==} engines: {node: '>=6.9.0'} @@ -2300,20 +2263,6 @@ packages: semver: 6.3.0 dev: true - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.18.13): - resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/compat-data': 7.21.4 - '@babel/core': 7.18.13 - '@babel/helper-validator-option': 7.21.0 - browserslist: 4.21.3 - lru-cache: 5.1.1 - semver: 6.3.0 - dev: true - /@babel/helper-compilation-targets@7.21.4(@babel/core@7.21.4): resolution: {integrity: sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==} engines: {node: '>=6.9.0'} @@ -2346,25 +2295,6 @@ packages: - supports-color dev: true - /@babel/helper-create-class-features-plugin@7.21.0(@babel/core@7.20.12): - resolution: {integrity: sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.20.12 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-function-name': 7.21.0 - '@babel/helper-member-expression-to-functions': 7.21.0 - '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.20.7 - '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 - '@babel/helper-split-export-declaration': 7.18.6 - transitivePeerDependencies: - - supports-color - dev: true - /@babel/helper-create-class-features-plugin@7.21.0(@babel/core@7.20.5): resolution: {integrity: sha512-Q8wNiMIdwsv5la5SPxNYzzkPnjgC0Sy0i7jLkVOCdllu/xcVNkr3TeZzbHBJrj+XXRqzX5uCyCoV9eu6xUG7KQ==} engines: {node: '>=6.9.0'} @@ -2431,10 +2361,10 @@ packages: '@babel/core': ^7.4.0-0 dependencies: '@babel/core': 7.21.4 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4) + '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.21.4) '@babel/helper-module-imports': 7.18.6 '@babel/helper-plugin-utils': 7.20.2 - '@babel/traverse': 7.21.4 + '@babel/traverse': 7.20.12 debug: 4.3.4(supports-color@8.1.1) lodash.debounce: 4.0.8 resolve: 1.22.1 @@ -2449,7 +2379,7 @@ packages: '@babel/core': ^7.4.0-0 dependencies: '@babel/core': 7.18.13 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.13) + '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.18.13) '@babel/helper-plugin-utils': 7.20.2 debug: 4.3.4(supports-color@8.1.1) lodash.debounce: 4.0.8 @@ -2465,7 +2395,7 @@ packages: '@babel/core': ^7.4.0-0 dependencies: '@babel/core': 7.21.4 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4) + '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.21.4) '@babel/helper-plugin-utils': 7.20.2 debug: 4.3.4(supports-color@8.1.1) lodash.debounce: 4.0.8 @@ -2483,7 +2413,7 @@ packages: resolution: {integrity: sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.21.4 + '@babel/types': 7.21.3 dev: true /@babel/helper-function-name@7.21.0: @@ -2590,7 +2520,7 @@ packages: '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-wrap-function': 7.18.11 - '@babel/types': 7.21.4 + '@babel/types': 7.21.3 transitivePeerDependencies: - supports-color dev: true @@ -2605,7 +2535,7 @@ packages: '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-wrap-function': 7.18.11 - '@babel/types': 7.21.4 + '@babel/types': 7.21.3 transitivePeerDependencies: - supports-color dev: true @@ -2665,8 +2595,8 @@ packages: dependencies: '@babel/helper-function-name': 7.21.0 '@babel/template': 7.20.7 - '@babel/traverse': 7.21.4 - '@babel/types': 7.21.4 + '@babel/traverse': 7.20.12 + '@babel/types': 7.21.3 transitivePeerDependencies: - supports-color dev: true @@ -3037,7 +2967,7 @@ packages: dependencies: '@babel/compat-data': 7.20.10 '@babel/core': 7.18.13 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.18.13) + '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.18.13) '@babel/helper-plugin-utils': 7.20.2 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.18.13) '@babel/plugin-transform-parameters': 7.18.8(@babel/core@7.18.13) @@ -3051,7 +2981,7 @@ packages: dependencies: '@babel/compat-data': 7.20.10 '@babel/core': 7.21.4 - '@babel/helper-compilation-targets': 7.21.4(@babel/core@7.21.4) + '@babel/helper-compilation-targets': 7.20.7(@babel/core@7.21.4) '@babel/helper-plugin-utils': 7.20.2 '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.21.4) '@babel/plugin-transform-parameters': 7.18.8(@babel/core@7.21.4) @@ -3378,16 +3308,6 @@ packages: '@babel/helper-plugin-utils': 7.20.2 dev: true - /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.20.12): - resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.20.12 - '@babel/helper-plugin-utils': 7.20.2 - dev: true - /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.20.5): resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==} engines: {node: '>=6.9.0'} @@ -3564,16 +3484,6 @@ packages: '@babel/helper-plugin-utils': 7.20.2 dev: true - /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.20.12): - resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.20.12 - '@babel/helper-plugin-utils': 7.20.2 - dev: true - /@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.20.5): resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==} engines: {node: '>=6.9.0'} @@ -4441,21 +4351,6 @@ packages: '@babel/helper-plugin-utils': 7.20.2 dev: true - /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.20.12): - resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.20.12 - '@babel/helper-annotate-as-pure': 7.18.6 - '@babel/helper-create-class-features-plugin': 7.21.0(@babel/core@7.20.12) - '@babel/helper-plugin-utils': 7.20.2 - '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.20.12) - transitivePeerDependencies: - - supports-color - dev: true - /@babel/plugin-transform-typescript@7.21.3(@babel/core@7.20.5): resolution: {integrity: sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==} engines: {node: '>=6.9.0'} @@ -5632,7 +5527,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 jest-message-util: 27.5.1 jest-util: 27.5.1 @@ -5653,7 +5548,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 @@ -5690,7 +5585,7 @@ packages: dependencies: '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 jest-mock: 27.5.1 dev: true @@ -5707,7 +5602,7 @@ packages: dependencies: '@jest/types': 27.5.1 '@sinonjs/fake-timers': 8.1.0 - '@types/node': 18.15.13 + '@types/node': 18.16.0 jest-message-util: 27.5.1 jest-mock: 27.5.1 jest-util: 27.5.1 @@ -5736,7 +5631,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -5850,7 +5745,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/yargs': 15.0.14 chalk: 4.1.2 dev: true @@ -5861,7 +5756,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/yargs': 16.0.5 chalk: 4.1.2 dev: true @@ -5873,7 +5768,7 @@ packages: '@jest/schemas': 29.0.0 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/yargs': 17.0.12 chalk: 4.1.2 dev: true @@ -6386,7 +6281,7 @@ packages: engines: {node: '>=14'} hasBin: true dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 playwright-core: 1.28.0 dev: true @@ -7637,7 +7532,7 @@ packages: resolution: {integrity: sha512-4biZIWWzoWlCarMZmTpqcJNgo/RBesYZwGFbQeXiGYsswuvfWARZnW9RE9aUEMZ4XPn7B1N3EKkWcdcWe/K2tg==} dependencies: '@babel/generator': 7.20.7 - '@babel/parser': 7.21.4 + '@babel/parser': 7.20.7 '@babel/preset-env': 7.18.10(@babel/core@7.18.13) '@babel/types': 7.21.3 '@mdx-js/mdx': 1.6.22 @@ -7656,7 +7551,7 @@ packages: resolution: {integrity: sha512-4biZIWWzoWlCarMZmTpqcJNgo/RBesYZwGFbQeXiGYsswuvfWARZnW9RE9aUEMZ4XPn7B1N3EKkWcdcWe/K2tg==} dependencies: '@babel/generator': 7.20.7 - '@babel/parser': 7.21.4 + '@babel/parser': 7.20.7 '@babel/preset-env': 7.18.10(@babel/core@7.21.4) '@babel/types': 7.21.3 '@mdx-js/mdx': 1.6.22 @@ -7675,7 +7570,7 @@ packages: resolution: {integrity: sha512-xxUEMy0D+0G1aSYxbeVNbs+XBU5nCqW4I7awpBYSTywXDv/MJWeC6FDRpj5P1pgfq8j8jWDD5ZDvBQ7syFg0LQ==} dependencies: '@babel/generator': 7.20.7 - '@babel/parser': 7.21.4 + '@babel/parser': 7.20.7 '@babel/preset-env': 7.18.10(@babel/core@7.18.13) '@babel/types': 7.21.3 '@mdx-js/mdx': 1.6.22 @@ -8272,7 +8167,7 @@ packages: /@types/cheerio@0.22.31: resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/codemirror@5.60.7: @@ -8340,33 +8235,33 @@ packages: resolution: {integrity: sha512-MxObHvNl4A69ofaTRU8DFqvgzzv8s9yRtaPPm5gud9HDNvpB3GPQFvNuTWAI59B9huVGV5jXYJwbCsmBsOGYWA==} dependencies: '@types/jsonfile': 6.1.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/fs-extra@9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/glob@8.0.0: resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==} dependencies: '@types/minimatch': 5.1.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/graceful-fs@4.1.5: resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/hast@2.3.4: @@ -8431,7 +8326,7 @@ packages: /@types/jsdom@21.1.1: resolution: {integrity: sha512-cZFuoVLtzKP3gmq9eNosUL1R50U+USkbLtUQ1bYVgl/lKp0FZM7Cq4aIHAL8oIvQ17uSHi7jXPtfDOdjPwBE7A==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/tough-cookie': 4.0.2 parse5: 7.1.2 dev: true @@ -8447,7 +8342,7 @@ packages: /@types/jsonfile@6.1.1: resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/lodash@4.14.192: @@ -8481,7 +8376,7 @@ packages: /@types/node-fetch@2.6.2: resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 form-data: 3.0.1 dev: true @@ -8496,8 +8391,8 @@ packages: /@types/node@18.15.11: resolution: {integrity: sha512-E5Kwq2n4SbMzQOn6wnmBjuK9ouqlURrcZDVfbo9ftDDTFt3nk7ZKK4GMOzoYgnpQJKcxwQw+lGaBvvlMo0qN/Q==} - /@types/node@18.15.13: - resolution: {integrity: sha512-N+0kuo9KgrUQ1Sn/ifDXsvg0TTleP7rIy4zOBGECxAljqvqfqpTfzx0Q1NUedOixRMBfe2Whhb056a42cWs26Q==} + /@types/node@18.16.0: + resolution: {integrity: sha512-BsAaKhB+7X+H4GnSjGhJG9Qi8Tw+inU9nJDwmD5CgOmBLEI6ArdhikpLX7DjbjDRDTbqZzU2LSQNZg8WGPiSZQ==} dev: true /@types/node@18.7.13: @@ -8530,7 +8425,7 @@ packages: /@types/prompts@2.4.4: resolution: {integrity: sha512-p5N9uoTH76lLvSAaYSZtBCdEXzpOOufsRjnhjVSrZGXikVGHX9+cc9ERtHRV4hvBKHyZb1bg4K+56Bd2TqUn4A==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 kleur: 3.0.3 dev: true @@ -8603,7 +8498,7 @@ packages: /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/resolve@1.20.2: @@ -8620,7 +8515,7 @@ packages: /@types/set-cookie-parser@2.4.2: resolution: {integrity: sha512-fBZgytwhYAUkj/jC/FAV4RQ5EerRup1YQsXQCh8rZfiHkc4UahC192oH0smGwsXol3cL3A5oETuAHeQHmhXM4w==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/sinonjs__fake-timers@8.1.1: @@ -8694,7 +8589,7 @@ packages: /@types/webpack-sources@3.2.0: resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/source-list-map': 0.1.2 source-map: 0.7.4 dev: true @@ -8702,7 +8597,7 @@ packages: /@types/webpack@4.41.32: resolution: {integrity: sha512-cb+0ioil/7oz5//7tZUSwbrSAN/NWHrQylz5cW8G0dWTcF/g+/dSdMlKVZspBYuMAN1+WnwHrkxiRrLcwd0Heg==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/tapable': 1.0.8 '@types/uglify-js': 3.17.0 '@types/webpack-sources': 3.2.0 @@ -8717,7 +8612,7 @@ packages: /@types/ws@8.5.4: resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@types/yargs-parser@21.0.0: @@ -8746,7 +8641,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true optional: true @@ -9147,7 +9042,7 @@ packages: '@babel/plugin-transform-react-jsx-self': 7.21.0(@babel/core@7.21.4) '@babel/plugin-transform-react-jsx-source': 7.19.6(@babel/core@7.21.4) react-refresh: 0.14.0 - vite: 4.2.1(@types/node@18.15.13) + vite: 4.2.1(@types/node@18.16.0) transitivePeerDependencies: - supports-color dev: true @@ -9159,9 +9054,9 @@ packages: vite: ^4.0.0 vue: ^3.0.0 dependencies: - '@babel/core': 7.20.12 - '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.20.12) - '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.20.12) + '@babel/core': 7.21.4 + '@babel/plugin-transform-typescript': 7.21.3(@babel/core@7.21.4) + '@vue/babel-plugin-jsx': 1.1.1(@babel/core@7.21.4) vite: 4.2.1(@types/node@18.15.11) vue: 3.2.47 transitivePeerDependencies: @@ -9239,11 +9134,11 @@ packages: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: true - /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.20.12): + /@vue/babel-plugin-jsx@1.1.1(@babel/core@7.21.4): resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.20.12) + '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.21.4) '@babel/template': 7.20.7 '@babel/traverse': 7.20.12 '@babel/types': 7.21.3 @@ -9259,7 +9154,7 @@ packages: /@vue/compiler-core@3.2.39: resolution: {integrity: sha512-mf/36OWXqWn0wsC40nwRRGheR/qoID+lZXbIuLnr4/AngM0ov8Xvv8GHunC0rKRIkh60bTqydlqTeBo49rlbqw==} dependencies: - '@babel/parser': 7.20.7 + '@babel/parser': 7.21.4 '@vue/shared': 3.2.39 estree-walker: 2.0.2 source-map: 0.6.1 @@ -9308,7 +9203,7 @@ packages: /@vue/compiler-sfc@3.2.47: resolution: {integrity: sha512-rog05W+2IFfxjMcFw10tM9+f7i/+FFpZJJ5XHX72NP9eC2uRD+42M3pYcQqDXVYoj74kHMSEdQ/WmCjt8JFksQ==} dependencies: - '@babel/parser': 7.20.7 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.47 '@vue/compiler-dom': 3.2.47 '@vue/compiler-ssr': 3.2.47 @@ -9342,7 +9237,7 @@ packages: /@vue/reactivity-transform@3.2.39: resolution: {integrity: sha512-HGuWu864zStiWs9wBC6JYOP1E00UjMdDWIG5W+FpUx28hV3uz9ODOKVNm/vdOy/Pvzg8+OcANxAVC85WFBbl3A==} dependencies: - '@babel/parser': 7.20.7 + '@babel/parser': 7.21.4 '@vue/compiler-core': 3.2.39 '@vue/shared': 3.2.39 estree-walker: 2.0.2 @@ -9617,21 +9512,21 @@ packages: resolution: {integrity: sha512-vyJzqHJ5yOmfVyk5WWo6pRsJ2xhgWl3DVIBdDNR0wKrtFcm/g1jnB+pNf6Eb7NhCDh3oGul25bmhAwWDoxcFYA==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@wdio/types@8.6.8: resolution: {integrity: sha512-hwlkQ6E8DNIFL/l8vHve3Zpl1t6Hqle7vtatEkAlrmbnExc7qI6Yw6SI5T/KiBSAi0ez1OypbGhdrbXFfywxng==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@wdio/types@8.7.0: resolution: {integrity: sha512-baiWFVR28mOdI7gI9802cnicGmlbfSZvhLWjd0cD2ep8BhvdengEWyj4GG+qqjk9ZfraBgHunDT+cB6hdPIPow==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /@wdio/utils@8.6.8: @@ -11606,7 +11501,7 @@ packages: engines: {node: '>=12.13.0'} hasBin: true dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 escape-string-regexp: 4.0.0 is-wsl: 2.2.0 lighthouse-logger: 1.3.0 @@ -12846,7 +12741,7 @@ packages: resolution: {integrity: sha512-Xv7NA5nUPU2ma/VMcAYRIMLX4+YrsEOXMG6ZGPVuU5tC9zylb5L7fkBCqjqYJ/kkVWibbIn3l63hMpnZ63AS5w==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@wdio/config': 8.6.8 '@wdio/logger': 8.6.6 '@wdio/protocols': 8.6.6 @@ -12872,7 +12767,7 @@ packages: resolution: {integrity: sha512-rl6yShHkh624wkCN9WWb7uUxGsgIfUAL2v6fcHQvPmI42BRRkbiXURq2oRds9fup3qyCv2UPeAlYtf4LQerkDQ==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@wdio/config': 8.7.0 '@wdio/logger': 8.6.6 '@wdio/protocols': 8.6.6 @@ -16758,7 +16653,7 @@ packages: '@jest/environment': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -16894,7 +16789,7 @@ packages: '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 jest-mock: 27.5.1 jest-util: 27.5.1 jsdom: 16.7.0 @@ -16912,7 +16807,7 @@ packages: '@jest/environment': 27.5.1 '@jest/fake-timers': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 jest-mock: 27.5.1 jest-util: 27.5.1 dev: true @@ -16933,7 +16828,7 @@ packages: dependencies: '@jest/types': 26.6.2 '@types/graceful-fs': 4.1.5 - '@types/node': 18.15.13 + '@types/node': 18.16.0 anymatch: 3.1.2 fb-watchman: 2.0.1 graceful-fs: 4.2.10 @@ -16956,7 +16851,7 @@ packages: dependencies: '@jest/types': 27.5.1 '@types/graceful-fs': 4.1.5 - '@types/node': 18.15.13 + '@types/node': 18.16.0 anymatch: 3.1.2 fb-watchman: 2.0.1 graceful-fs: 4.2.10 @@ -16996,7 +16891,7 @@ packages: '@jest/source-map': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 co: 4.6.0 expect: 27.5.1 @@ -17076,7 +16971,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): @@ -17137,7 +17032,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 emittery: 0.8.1 graceful-fs: 4.2.10 @@ -17194,7 +17089,7 @@ packages: resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==} engines: {node: '>= 10.14.2'} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 graceful-fs: 4.2.10 dev: true @@ -17202,7 +17097,7 @@ packages: resolution: {integrity: sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 graceful-fs: 4.2.10 dev: true @@ -17241,7 +17136,7 @@ packages: engines: {node: '>= 10.14.2'} dependencies: '@jest/types': 26.6.2 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 graceful-fs: 4.2.10 is-ci: 2.0.0 @@ -17253,7 +17148,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 ci-info: 3.7.0 graceful-fs: 4.2.10 @@ -17265,7 +17160,7 @@ packages: engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} dependencies: '@jest/types': 29.0.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 chalk: 4.1.2 ci-info: 3.7.0 graceful-fs: 4.2.10 @@ -17290,7 +17185,7 @@ packages: dependencies: '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.15.13 + '@types/node': 18.16.0 ansi-escapes: 4.3.2 chalk: 4.1.2 jest-util: 27.5.1 @@ -17301,7 +17196,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 merge-stream: 2.0.0 supports-color: 7.2.0 dev: true @@ -17310,7 +17205,7 @@ packages: resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 merge-stream: 2.0.0 supports-color: 8.1.1 dev: true @@ -21270,7 +21165,7 @@ packages: rollup: 3.20.2 typescript: 5.0.3 optionalDependencies: - '@babel/code-frame': 7.18.6 + '@babel/code-frame': 7.21.4 dev: true /rollup-plugin-esbuild@5.0.0(esbuild@0.17.15)(rollup@3.20.2): @@ -23901,7 +23796,7 @@ packages: optionalDependencies: fsevents: 2.3.2 - /vite@4.2.1(@types/node@18.15.13): + /vite@4.2.1(@types/node@18.16.0): resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -23926,7 +23821,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 esbuild: 0.17.15 postcss: 8.4.21 resolve: 1.22.1 @@ -24227,7 +24122,7 @@ packages: resolution: {integrity: sha512-v+43Z4miGKa1JaFAIxgK5AedBgHV/7MI+jd3fJao24R/KWYNgC9GD4BUD6LxC7AChuyRdA1/cN3NjwrPTg0ujg==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/ws': 8.5.4 '@wdio/config': 8.6.8 '@wdio/logger': 8.6.6 @@ -24247,7 +24142,7 @@ packages: resolution: {integrity: sha512-UYstwTX6OtYJUnkUv6hI1XmSzrPMPqglHPTcanhS+EI1Ve4JmA8bSmkzL08gmiAroBjgLtqzpEcL5KuyAPEiLw==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@types/ws': 8.5.4 '@wdio/config': 8.7.0 '@wdio/logger': 8.6.6 @@ -24267,7 +24162,7 @@ packages: resolution: {integrity: sha512-fyRdDc7vUBje5II0NdpjTTGh9BeTRtva+pDO52dmHiou1lF5Zths7/RlYpRb8xqYeWnCsAaSb7NTkskDvZxbow==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@wdio/config': 8.6.8 '@wdio/logger': 8.6.6 '@wdio/protocols': 8.6.6 @@ -24304,7 +24199,7 @@ packages: resolution: {integrity: sha512-drZKdS1IdGeYOKxZWAh/AOHgbz9oGAM3YVcgKun3npLTZGNh7jSfsrUYRmJe+px8Xz7Ay5Qz30QgqtbEqk7kBQ==} engines: {node: ^16.13 || >=18} dependencies: - '@types/node': 18.15.13 + '@types/node': 18.16.0 '@wdio/config': 8.7.0 '@wdio/logger': 8.6.6 '@wdio/protocols': 8.6.6