diff --git a/.changeset/silly-falcons-jam.md b/.changeset/silly-falcons-jam.md new file mode 100644 index 000000000..4c6d885b0 --- /dev/null +++ b/.changeset/silly-falcons-jam.md @@ -0,0 +1,5 @@ +--- +"@tma.js/init-data-node": minor +--- + +Export "parse" function. diff --git a/apps/docs/packages/node/tma-js-init-data-node.md b/apps/docs/packages/node/tma-js-init-data-node.md index 31ef8b515..f3c4fc988 100644 --- a/apps/docs/packages/node/tma-js-init-data-node.md +++ b/apps/docs/packages/node/tma-js-init-data-node.md @@ -29,7 +29,7 @@ yarn add @tma.js/init-data-node ## Parsing You can learn more about parsing utilities in [@tma.js/sdk](../typescript/tma-js-sdk/init-data/about#parsing) -documentation. +documentation. This package re-exports the `parseInitData` function as `parse`. ## Validation diff --git a/package.json b/package.json index 70d83c7a1..7cd878c0d 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@vitest/ui": "^0.34.6", "commitizen": "^4.3.0", "cz-conventional-changelog": "^3.3.0", - "eslint": "^8.54.0", + "eslint": "^8.56.0", "happy-dom": "^12.5.0", "prettier": "^2.5.1", "tslib": "^2.6.0", diff --git a/packages/build-utils/src/createVitestConfig.ts b/packages/build-utils/src/createVitestConfig.ts index fc88fe5ab..5e9944fdd 100644 --- a/packages/build-utils/src/createVitestConfig.ts +++ b/packages/build-utils/src/createVitestConfig.ts @@ -11,7 +11,7 @@ export function createVitestConfig(options: Options = {}): InlineConfig { coverage, } = options; const config: InlineConfig = { - include: ['tests/**/*.ts'], + include: ['src/**/__tests__/**/*.ts'], }; if (environment) { @@ -23,7 +23,10 @@ export function createVitestConfig(options: Options = {}): InlineConfig { enabled: true, provider: 'v8', include: ['src/**/*.ts'], - exclude: ['src/**/index.ts'], + exclude: [ + 'src/**/index.ts', + 'src/**/__tests__/**/*', + ], ...coverage, }; } diff --git a/packages/eslint-config-custom/base.js b/packages/eslint-config-custom/base.js index 1810d1068..f8b3d072e 100644 --- a/packages/eslint-config-custom/base.js +++ b/packages/eslint-config-custom/base.js @@ -11,4 +11,5 @@ module.exports = { 'import', ], rules: require('./rules'), + ignorePatterns: ['**/__tests__/*'], }; diff --git a/packages/init-data-node/package.json b/packages/init-data-node/package.json index b54b5d3be..a2a59a566 100644 --- a/packages/init-data-node/package.json +++ b/packages/init-data-node/package.json @@ -38,18 +38,21 @@ }, "scripts": { "test": "vitest --run", - "lint": "eslint src/**/*", + "lint": "eslint src", "lint:fix": "pnpm run lint --fix", "typecheck": "tsc --noEmit", "build": "vite build" }, "devDependencies": { "@types/node": "^16.0.0", - "tsconfig": "workspace:*", + "build-utils": "workspace:*", "eslint-config-custom": "workspace:*", - "build-utils": "workspace:*" + "tsconfig": "workspace:*" }, "publishConfig": { "access": "public" + }, + "dependencies": { + "@tma.js/sdk": "workspace:^" } } diff --git a/packages/init-data-node/src/__tests__/validate.ts b/packages/init-data-node/src/__tests__/validate.ts new file mode 100644 index 000000000..ecab4d589 --- /dev/null +++ b/packages/init-data-node/src/__tests__/validate.ts @@ -0,0 +1,43 @@ +import { URLSearchParams } from 'node:url'; + +import { expect, it } from 'vitest'; + +import { validate } from '../validate.js'; + +const sp = 'query_id=AAHdF6IQAAAAAN0XohDhrOrc&user=%7B%22id%22%3A279058397%2C%22first_name%22%3A%22Vladislav%22%2C%22last_name%22%3A%22Kibenko%22%2C%22username%22%3A%22vdkfrost%22%2C%22language_code%22%3A%22ru%22%2C%22is_premium%22%3Atrue%7D&auth_date=1662771648&hash=c501b71e775f74ce10e377dea85a7ea24ecd640b223ea86dfe453e0eaed2e2b2'; +const secretToken = '5768337691:AAH5YkoiEuPk8-FZa32hStHTqXiLPtAEhx8'; + +it('should throw missing hash error in case, it is not in search params', () => { + expect(() => validate('auth_date=1', secretToken)) + .toThrowError('"hash" is empty or not found'); +}); + +it('should throw an error on case, auth_date is not passed, equal to 0 or does not represent integer', () => { + expect(() => validate('auth_date=0&hash=HHH', secretToken)) + .toThrowError('"auth_date" is empty or not found'); + expect(() => validate('hash=HHH', secretToken)) + .toThrowError('"auth_date" is empty or not found'); + expect(() => validate('auth_date=AAA&hash=HHH', secretToken)) + .toThrowError('"auth_date" should present integer'); +}); + +it('should throw an error in case, parameters are expired', () => { + expect(() => validate(sp, secretToken, { + expiresIn: 1, + })).toThrowError('Init data expired'); +}); + +it('should throw an error in case, sign is invalid', () => { + expect(() => validate(sp, `${secretToken}A`, { + expiresIn: 0, + })).toThrowError('Signature is invalid'); +}); + +it('should correctly validate parameters in case, they are valid', () => { + expect(() => validate(sp, secretToken, { expiresIn: 0 })).not.toThrow(); + expect(() => validate(new URLSearchParams(sp), secretToken, { expiresIn: 0 })).not.toThrow(); +}); + +it('should throw an error in case, expiration time is not passed, parameters were created more than 1 day ago and already expired', () => { + expect(() => validate(sp, secretToken)).toThrow('Init data expired'); +}); diff --git a/packages/init-data-node/src/index.ts b/packages/init-data-node/src/index.ts index ca05ce371..483d8b877 100644 --- a/packages/init-data-node/src/index.ts +++ b/packages/init-data-node/src/index.ts @@ -1 +1,2 @@ -export * from './validation.js'; +export { parse } from './parse.js'; +export { validate, type ValidateOptions } from './validate.js'; diff --git a/packages/init-data-node/src/parse.ts b/packages/init-data-node/src/parse.ts new file mode 100644 index 000000000..8b0580e2c --- /dev/null +++ b/packages/init-data-node/src/parse.ts @@ -0,0 +1,3 @@ +import { parseInitData } from '@tma.js/sdk'; + +export { parseInitData as parse }; diff --git a/packages/init-data-node/src/validation.ts b/packages/init-data-node/src/validate.ts similarity index 100% rename from packages/init-data-node/src/validation.ts rename to packages/init-data-node/src/validate.ts diff --git a/packages/init-data-node/tests/validation.ts b/packages/init-data-node/tests/validation.ts deleted file mode 100644 index 51db13a1d..000000000 --- a/packages/init-data-node/tests/validation.ts +++ /dev/null @@ -1,46 +0,0 @@ -import { URLSearchParams } from 'url'; -import { describe, expect, it } from 'vitest'; - -import { validate } from '../src/index.js'; - -const sp = 'query_id=AAHdF6IQAAAAAN0XohDhrOrc&user=%7B%22id%22%3A279058397%2C%22first_name%22%3A%22Vladislav%22%2C%22last_name%22%3A%22Kibenko%22%2C%22username%22%3A%22vdkfrost%22%2C%22language_code%22%3A%22ru%22%2C%22is_premium%22%3Atrue%7D&auth_date=1662771648&hash=c501b71e775f74ce10e377dea85a7ea24ecd640b223ea86dfe453e0eaed2e2b2'; -const secretToken = '5768337691:AAH5YkoiEuPk8-FZa32hStHTqXiLPtAEhx8'; - -describe('validation', () => { - describe('validate', () => { - it('should throw missing hash error in case, it is not in search params', () => { - expect(() => validate('auth_date=1', secretToken)) - .toThrowError('"hash" is empty or not found'); - }); - - it('should throw an error on case, auth_date is not passed, equal to 0 or does not represent integer', () => { - expect(() => validate('auth_date=0&hash=HHH', secretToken)) - .toThrowError('"auth_date" is empty or not found'); - expect(() => validate('hash=HHH', secretToken)) - .toThrowError('"auth_date" is empty or not found'); - expect(() => validate('auth_date=AAA&hash=HHH', secretToken)) - .toThrowError('"auth_date" should present integer'); - }); - - it('should throw an error in case, parameters are expired', () => { - expect(() => validate(sp, secretToken, { - expiresIn: 1, - })).toThrowError('Init data expired'); - }); - - it('should throw an error in case, sign is invalid', () => { - expect(() => validate(sp, `${secretToken}A`, { - expiresIn: 0, - })).toThrowError('Signature is invalid'); - }); - - it('should correctly validate parameters in case, they are valid', () => { - expect(() => validate(sp, secretToken, { expiresIn: 0 })).not.toThrow(); - expect(() => validate(new URLSearchParams(sp), secretToken, { expiresIn: 0 })).not.toThrow(); - }); - - it('should throw an error in case, expiration time is not passed, parameters were created more than 1 day ago and already expired', () => { - expect(() => validate(sp, secretToken)).toThrow('Init data expired'); - }); - }); -}); diff --git a/packages/init-data-node/tsconfig.json b/packages/init-data-node/tsconfig.json index 2945ef57f..bb76e7f23 100644 --- a/packages/init-data-node/tsconfig.json +++ b/packages/init-data-node/tsconfig.json @@ -3,6 +3,9 @@ "include": [ "src" ], + "exclude": [ + "src/**/__tests__" + ], "references": [ { "path": "./tsconfig.node.json" diff --git a/packages/sdk-react/package.json b/packages/sdk-react/package.json index 898e6004e..732033b96 100644 --- a/packages/sdk-react/package.json +++ b/packages/sdk-react/package.json @@ -37,7 +37,7 @@ } }, "scripts": { - "lint": "eslint src/**/*", + "lint": "eslint src", "lint:fix": "pnpm run lint --fix", "typecheck": "tsc --noEmit", "build": "vite build" diff --git a/packages/sdk-react/src/DisplayGate.tsx b/packages/sdk-react/src/DisplayGate.tsx index 027355f06..0fbe75b88 100644 --- a/packages/sdk-react/src/DisplayGate.tsx +++ b/packages/sdk-react/src/DisplayGate.tsx @@ -23,7 +23,7 @@ export interface DisplayGateProps extends PropsWithChildren { function render(Component: ReactNode | ComponentType): ReactNode; function render(Component: ReactNode | ComponentType, props: T): ReactNode; function render(Component: ReactNode | ComponentType, props = {}): ReactNode { - return typeof Component === 'function' ? : Component; + return typeof Component === 'function' ? : Component; } /** @@ -34,9 +34,10 @@ function render(Component: ReactNode | ComponentType, props = {}): ReactNode { export function DisplayGate(props: DisplayGateProps): ReactNode { const { loading, initResult, error } = useSDKContext(); - return initResult - ? props.children - : error - ? render(props.error, { error }) - : render(loading ? props.loading : props.initial); -} \ No newline at end of file + if (initResult) { + return props.children; + } + return error + ? render(props.error, { error }) + : render(loading ? props.loading : props.initial); +} diff --git a/packages/sdk-solid/package.json b/packages/sdk-solid/package.json index c56df6e5c..26dd5ce5f 100644 --- a/packages/sdk-solid/package.json +++ b/packages/sdk-solid/package.json @@ -37,7 +37,7 @@ } }, "scripts": { - "lint": "eslint src/**/*", + "lint": "eslint src", "lint:fix": "pnpm run lint --fix", "typecheck": "tsc --noEmit", "build": "vite build" diff --git a/packages/sdk-solid/src/DisplayGate.tsx b/packages/sdk-solid/src/DisplayGate.tsx index 712bfe836..194e35d65 100644 --- a/packages/sdk-solid/src/DisplayGate.tsx +++ b/packages/sdk-solid/src/DisplayGate.tsx @@ -1,9 +1,9 @@ import { - Match, - Switch, type Component, - type ParentProps, type JSX, + Match, + type ParentProps, + Switch, } from 'solid-js'; import { useSDKContext } from './provider/index.js'; @@ -53,4 +53,4 @@ export function DisplayGate(props: DisplayGateProps) { ); -} \ No newline at end of file +} diff --git a/packages/sdk-solid/src/index.ts b/packages/sdk-solid/src/index.ts index 007f25ec1..2abf7d689 100644 --- a/packages/sdk-solid/src/index.ts +++ b/packages/sdk-solid/src/index.ts @@ -25,7 +25,7 @@ export { } from './provider/index.js'; export { DisplayGate, - type DisplayGateProps + type DisplayGateProps, } from './DisplayGate.js'; export type { InitOptions, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index 7a2ac8f3e..cd3d72095 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -38,7 +38,7 @@ }, "scripts": { "test": "vitest --run", - "lint": "eslint src/**/*", + "lint": "eslint src", "lint:fix": "pnpm run lint --fix", "typecheck": "tsc --noEmit -p tsconfig.build.json", "build": "pnpm run build:default && pnpm run build:iife", diff --git a/packages/sdk/tests/globals.ts b/packages/sdk/src/__tests__/globals.ts similarity index 97% rename from packages/sdk/tests/globals.ts rename to packages/sdk/src/__tests__/globals.ts index 24494f735..2a7c12a63 100644 --- a/packages/sdk/tests/globals.ts +++ b/packages/sdk/src/__tests__/globals.ts @@ -5,7 +5,7 @@ import { setDebug, setTargetOrigin, targetOrigin, -} from '~/globals.js'; +} from '../globals'; afterEach(() => { vi.restoreAllMocks(); diff --git a/packages/sdk/tests/back-button/BackButton.ts b/packages/sdk/src/back-button/__tests__/BackButton.ts similarity index 98% rename from packages/sdk/tests/back-button/BackButton.ts rename to packages/sdk/src/back-button/__tests__/BackButton.ts index ae2028a5c..560f462b5 100644 --- a/packages/sdk/tests/back-button/BackButton.ts +++ b/packages/sdk/src/back-button/__tests__/BackButton.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { BackButton } from '~/back-button/index.js'; +import { BackButton } from '../BackButton'; describe('hide', () => { it('should call "web_app_setup_back_button" method with "is_visible" equal to false', () => { @@ -126,4 +126,4 @@ describe('supports', () => { expect(backButton3.supports('hide')).toBe(true); }); }); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/bridge/request.ts b/packages/sdk/src/bridge/__tests__/request.ts similarity index 94% rename from packages/sdk/tests/bridge/request.ts rename to packages/sdk/src/bridge/__tests__/request.ts index e751c9c11..95be33e0f 100644 --- a/packages/sdk/tests/bridge/request.ts +++ b/packages/sdk/src/bridge/__tests__/request.ts @@ -11,14 +11,14 @@ import { afterAll, } from 'vitest'; -import { request, type PostEvent } from '~/bridge/index.js'; -import { postEvent as globalPostEvent } from '~/bridge/methods/postEvent.js'; -import { createWindow } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { request } from '../request'; +import { type PostEvent, postEvent as globalPostEvent } from '../methods/postEvent'; +import { createWindow } from '../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../test-utils/dispatchWindowMessageEvent'; -vi.mock('~/bridge/methods/postEvent.js', async () => { +vi.mock('../methods/postEvent.js', async () => { const { postEvent: actualPostEvent } = await vi - .importActual('../../src/bridge/methods/postEvent.js') as { postEvent: PostEvent }; + .importActual('../methods/postEvent.js') as { postEvent: PostEvent }; return { postEvent: vi.fn(actualPostEvent), diff --git a/packages/sdk/tests/bridge/env/hasExternalNotify.ts b/packages/sdk/src/bridge/env/__tests__/hasExternalNotify.ts similarity index 87% rename from packages/sdk/tests/bridge/env/hasExternalNotify.ts rename to packages/sdk/src/bridge/env/__tests__/hasExternalNotify.ts index 5b29b339b..b05d7794c 100644 --- a/packages/sdk/tests/bridge/env/hasExternalNotify.ts +++ b/packages/sdk/src/bridge/env/__tests__/hasExternalNotify.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { hasExternalNotify } from '~/bridge/index.js'; +import { hasExternalNotify } from '../hasExternalNotify.js'; it('should return true if passed object contains path property "external.notify" and "notify" is a function property.', () => { expect(hasExternalNotify({})).toBe(false); @@ -12,4 +12,4 @@ it('should return true if passed object contains path property "external.notify" }, }, })).toBe(true); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/bridge/env/hasWebviewProxy.ts b/packages/sdk/src/bridge/env/__tests__/hasWebviewProxy.ts similarity index 89% rename from packages/sdk/tests/bridge/env/hasWebviewProxy.ts rename to packages/sdk/src/bridge/env/__tests__/hasWebviewProxy.ts index 51d0298fd..fee1e6965 100644 --- a/packages/sdk/tests/bridge/env/hasWebviewProxy.ts +++ b/packages/sdk/src/bridge/env/__tests__/hasWebviewProxy.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { hasWebviewProxy } from '~/bridge/index.js'; +import { hasWebviewProxy } from '../hasWebviewProxy.js'; it('should return true if passed object contains path property "TelegramWebviewProxy.postEvent" and "postEvent" is a function property.', () => { expect(hasWebviewProxy({})).toBe(false); @@ -12,4 +12,4 @@ it('should return true if passed object contains path property "TelegramWebviewP }, }, })).toBe(true); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/bridge/env/isIframe.ts b/packages/sdk/src/bridge/env/__tests__/isIframe.ts similarity index 93% rename from packages/sdk/tests/bridge/env/isIframe.ts rename to packages/sdk/src/bridge/env/__tests__/isIframe.ts index fae1c9c02..a55af69a7 100644 --- a/packages/sdk/tests/bridge/env/isIframe.ts +++ b/packages/sdk/src/bridge/env/__tests__/isIframe.ts @@ -1,6 +1,6 @@ import { afterAll, afterEach, expect, it, vi } from 'vitest'; -import { isIframe } from '~/bridge/index.js'; +import { isIframe } from '../isIframe.js'; const windowSpy = vi.spyOn(window, 'window', 'get'); @@ -27,4 +27,4 @@ it('should return true in case window.self getter threw an error', () => { }, }) as any); expect(isIframe()).toBe(true); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/bridge/events/createEmitter.ts b/packages/sdk/src/bridge/events/__tests__/createEmitter.ts similarity index 90% rename from packages/sdk/tests/bridge/events/createEmitter.ts rename to packages/sdk/src/bridge/events/__tests__/createEmitter.ts index b8bafdc64..f2b00769e 100644 --- a/packages/sdk/tests/bridge/events/createEmitter.ts +++ b/packages/sdk/src/bridge/events/__tests__/createEmitter.ts @@ -1,9 +1,9 @@ -import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; +import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; -import { createEmitter } from '~/bridge/events/createEmitter.js'; -import type { MiniAppsEventParams, MiniAppsEventName } from '~/bridge/index.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { createEmitter } from '../createEmitter'; +import type { MiniAppsEventName, MiniAppsEventParams } from '../events'; type TestCase = | [input: any, expected: MiniAppsEventParams] diff --git a/packages/sdk/tests/bridge/events/off.ts b/packages/sdk/src/bridge/events/__tests__/off.ts similarity index 64% rename from packages/sdk/tests/bridge/events/off.ts rename to packages/sdk/src/bridge/events/__tests__/off.ts index 18bbf83a4..161f7a777 100644 --- a/packages/sdk/tests/bridge/events/off.ts +++ b/packages/sdk/src/bridge/events/__tests__/off.ts @@ -1,8 +1,9 @@ -import { expect, vi, beforeEach, afterEach, it } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { on, off } from '~/bridge/index.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { off } from '../off'; +import { on } from '../on'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/on.ts b/packages/sdk/src/bridge/events/__tests__/on.ts similarity index 78% rename from packages/sdk/tests/bridge/events/on.ts rename to packages/sdk/src/bridge/events/__tests__/on.ts index 584d8893b..108f34828 100644 --- a/packages/sdk/tests/bridge/events/on.ts +++ b/packages/sdk/src/bridge/events/__tests__/on.ts @@ -1,8 +1,8 @@ -import { expect, it, vi, afterEach, beforeEach } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { on } from '~/bridge/index.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { on } from '../on'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/onTelegramEvent.ts b/packages/sdk/src/bridge/events/__tests__/onTelegramEvent.ts similarity index 82% rename from packages/sdk/tests/bridge/events/onTelegramEvent.ts rename to packages/sdk/src/bridge/events/__tests__/onTelegramEvent.ts index 5d65402e4..1c8f5a679 100644 --- a/packages/sdk/tests/bridge/events/onTelegramEvent.ts +++ b/packages/sdk/src/bridge/events/__tests__/onTelegramEvent.ts @@ -1,8 +1,8 @@ -import { expect, vi, beforeEach, afterEach, it } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { onTelegramEvent } from '~/bridge/events/onTelegramEvent.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { onTelegramEvent } from '../onTelegramEvent'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/once.ts b/packages/sdk/src/bridge/events/__tests__/once.ts similarity index 82% rename from packages/sdk/tests/bridge/events/once.ts rename to packages/sdk/src/bridge/events/__tests__/once.ts index 1eb7459de..41e05dcfc 100644 --- a/packages/sdk/tests/bridge/events/once.ts +++ b/packages/sdk/src/bridge/events/__tests__/once.ts @@ -1,8 +1,8 @@ -import { expect, vi, afterEach, it, beforeEach } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { once } from '~/bridge/index.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { once } from '../once'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/singletonEmitter.ts b/packages/sdk/src/bridge/events/__tests__/singletonEmitter.ts similarity index 64% rename from packages/sdk/tests/bridge/events/singletonEmitter.ts rename to packages/sdk/src/bridge/events/__tests__/singletonEmitter.ts index c09633b30..46da6d8c3 100644 --- a/packages/sdk/tests/bridge/events/singletonEmitter.ts +++ b/packages/sdk/src/bridge/events/__tests__/singletonEmitter.ts @@ -1,7 +1,8 @@ import { afterEach, beforeEach, expect, it } from 'vitest'; -import { singletonEmitter } from '~/bridge/events/singletonEmitter.js'; -import { createWindow, WindowSpy } from '~test-utils/createWindow.js'; +import type { WindowSpy } from '../../../../test-utils/createWindow'; +import { createWindow } from '../../../../test-utils/createWindow'; +import { singletonEmitter } from '../singletonEmitter'; let windowSpy: WindowSpy; @@ -18,4 +19,4 @@ afterEach(() => { it('should return the same instance of emitter', () => { expect(singletonEmitter()).toEqual(singletonEmitter()); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/bridge/events/subscribe.ts b/packages/sdk/src/bridge/events/__tests__/subscribe.ts similarity index 77% rename from packages/sdk/tests/bridge/events/subscribe.ts rename to packages/sdk/src/bridge/events/__tests__/subscribe.ts index c9b052f66..b2d3504f5 100644 --- a/packages/sdk/tests/bridge/events/subscribe.ts +++ b/packages/sdk/src/bridge/events/__tests__/subscribe.ts @@ -1,8 +1,8 @@ -import { expect, it, vi, beforeEach, afterEach } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { subscribe } from '~/bridge/index.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { subscribe } from '../subscribe'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/unsubscribe.ts b/packages/sdk/src/bridge/events/__tests__/unsubscribe.ts similarity index 61% rename from packages/sdk/tests/bridge/events/unsubscribe.ts rename to packages/sdk/src/bridge/events/__tests__/unsubscribe.ts index ed9abbea1..085035be1 100644 --- a/packages/sdk/tests/bridge/events/unsubscribe.ts +++ b/packages/sdk/src/bridge/events/__tests__/unsubscribe.ts @@ -1,8 +1,9 @@ -import { expect, it, vi, beforeEach, afterEach } from 'vitest'; +import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { subscribe, unsubscribe } from '~/bridge/index.js'; -import { createWindow, type WindowSpy } from '~test-utils/createWindow.js'; -import { dispatchWindowMessageEvent } from '~test-utils/dispatchWindowMessageEvent.js'; +import { createWindow, type WindowSpy } from '../../../../test-utils/createWindow'; +import { dispatchWindowMessageEvent } from '../../../../test-utils/dispatchWindowMessageEvent'; +import { subscribe } from '../subscribe'; +import { unsubscribe } from '../unsubscribe'; let windowSpy: WindowSpy; diff --git a/packages/sdk/tests/bridge/events/parsers/clipboardTextReceived.ts b/packages/sdk/src/bridge/events/parsers/__tests__/clipboardTextReceived.ts similarity index 90% rename from packages/sdk/tests/bridge/events/parsers/clipboardTextReceived.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/clipboardTextReceived.ts index a5c6e9ff5..5f50b7dfc 100644 --- a/packages/sdk/tests/bridge/events/parsers/clipboardTextReceived.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/clipboardTextReceived.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { clipboardTextReceived } from '~/bridge/events/index.js'; +import { clipboardTextReceived } from '../clipboardTextReceived'; it('should return parsed value in case, passed value satisfies schema', () => { const cases = [ diff --git a/packages/sdk/tests/bridge/events/parsers/invoiceClosed.ts b/packages/sdk/src/bridge/events/parsers/__tests__/invoiceClosed.ts similarity index 86% rename from packages/sdk/tests/bridge/events/parsers/invoiceClosed.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/invoiceClosed.ts index 15b0269c3..32ccc37dc 100644 --- a/packages/sdk/tests/bridge/events/parsers/invoiceClosed.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/invoiceClosed.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { invoiceClosed } from '~/bridge/events/index.js'; +import { invoiceClosed } from '../invoiceClosed'; it('should return parsed value in case, passed value satisfies schema', () => { const value = { slug: 'abc', status: 'def' }; diff --git a/packages/sdk/tests/bridge/events/parsers/popupClosed.ts b/packages/sdk/src/bridge/events/parsers/__tests__/popupClosed.ts similarity index 88% rename from packages/sdk/tests/bridge/events/parsers/popupClosed.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/popupClosed.ts index aeee7f82e..0bfa2132c 100644 --- a/packages/sdk/tests/bridge/events/parsers/popupClosed.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/popupClosed.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { popupClosed } from '~/bridge/events/index.js'; +import { popupClosed } from '../popupClosed'; it('should return parsed value in case, passed value satisfies schema', () => { expect(popupClosed().parse({ button_id: 'ok' })).toStrictEqual({ button_id: 'ok' }); diff --git a/packages/sdk/tests/bridge/events/parsers/qrTextReceived.ts b/packages/sdk/src/bridge/events/parsers/__tests__/qrTextReceived.ts similarity index 85% rename from packages/sdk/tests/bridge/events/parsers/qrTextReceived.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/qrTextReceived.ts index d96b1fe90..318fa5480 100644 --- a/packages/sdk/tests/bridge/events/parsers/qrTextReceived.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/qrTextReceived.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { qrTextReceived } from '~/bridge/events/index.js'; +import { qrTextReceived } from '../qrTextReceived'; it('should return parsed value in case, passed value satisfies schema', () => { expect(qrTextReceived().parse({ data: 'ok' })).toStrictEqual({ data: 'ok' }); diff --git a/packages/sdk/tests/bridge/events/parsers/theme-changed.ts b/packages/sdk/src/bridge/events/parsers/__tests__/theme-changed.ts similarity index 95% rename from packages/sdk/tests/bridge/events/parsers/theme-changed.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/theme-changed.ts index 03162740a..0074a6e0b 100644 --- a/packages/sdk/tests/bridge/events/parsers/theme-changed.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/theme-changed.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { themeChanged } from '~/bridge/events/index.js'; +import { themeChanged } from '../theme-changed'; it('should return parsed value in case, passed value satisfies schema', () => { const values = [ diff --git a/packages/sdk/tests/bridge/events/parsers/viewportChanged.ts b/packages/sdk/src/bridge/events/parsers/__tests__/viewportChanged.ts similarity index 94% rename from packages/sdk/tests/bridge/events/parsers/viewportChanged.ts rename to packages/sdk/src/bridge/events/parsers/__tests__/viewportChanged.ts index e891388e3..f8f446135 100644 --- a/packages/sdk/tests/bridge/events/parsers/viewportChanged.ts +++ b/packages/sdk/src/bridge/events/parsers/__tests__/viewportChanged.ts @@ -1,6 +1,6 @@ import { afterEach, beforeEach, expect, it, vi } from 'vitest'; -import { viewportChanged } from '~/bridge/events/index.js'; +import { viewportChanged } from '../viewportChanged'; const windowSpy = vi.spyOn(window, 'window', 'get'); // const innerWidth = 2000; diff --git a/packages/sdk/tests/bridge/methods/createPostEvent.ts b/packages/sdk/src/bridge/methods/__tests__/createPostEvent.ts similarity index 88% rename from packages/sdk/tests/bridge/methods/createPostEvent.ts rename to packages/sdk/src/bridge/methods/__tests__/createPostEvent.ts index ac2681612..c6f3c2600 100644 --- a/packages/sdk/tests/bridge/methods/createPostEvent.ts +++ b/packages/sdk/src/bridge/methods/__tests__/createPostEvent.ts @@ -1,7 +1,7 @@ -import { expect, vi, it } from 'vitest'; +import { expect, it, vi } from 'vitest'; -import * as postEventModule from '~/bridge/methods/postEvent.js'; -import { createPostEvent } from '~/bridge/index.js'; +import { createPostEvent } from '../../index'; +import * as postEventModule from '../postEvent'; vi.mock('~/bridge/methods/postEvent.js', () => ({ postEvent: vi.fn(), diff --git a/packages/sdk/tests/bridge/methods/postEvent.ts b/packages/sdk/src/bridge/methods/__tests__/postEvent.ts similarity index 97% rename from packages/sdk/tests/bridge/methods/postEvent.ts rename to packages/sdk/src/bridge/methods/__tests__/postEvent.ts index 8dbe6279b..90e6897b6 100644 --- a/packages/sdk/tests/bridge/methods/postEvent.ts +++ b/packages/sdk/src/bridge/methods/__tests__/postEvent.ts @@ -1,14 +1,14 @@ import { - expect, - it, - vi, afterEach, beforeAll, + expect, + it, type SpyInstance, + vi, } from 'vitest'; -import { postEvent } from '~/bridge/index.js'; -import { setTargetOrigin } from '~/globals.js'; +import { setTargetOrigin } from '../../../globals'; +import { postEvent } from '../../index'; let windowSpy: SpyInstance<[], Window & typeof globalThis>; diff --git a/packages/sdk/tests/classnames/classNames.ts b/packages/sdk/src/classnames/__tests__/classNames.ts similarity index 88% rename from packages/sdk/tests/classnames/classNames.ts rename to packages/sdk/src/classnames/__tests__/classNames.ts index 436193a19..2c0a6d97a 100644 --- a/packages/sdk/tests/classnames/classNames.ts +++ b/packages/sdk/src/classnames/__tests__/classNames.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { classNames } from '~/classnames/index.js'; +import { classNames } from '../classNames'; it('should ignore all non-empty strings and objects', () => { expect(classNames('', 2, 'b', null, undefined, false, true, [], 'a', 'c')).toBe('b a c'); diff --git a/packages/sdk/tests/classnames/mergeClassNames.ts b/packages/sdk/src/classnames/__tests__/mergeClassNames.ts similarity index 90% rename from packages/sdk/tests/classnames/mergeClassNames.ts rename to packages/sdk/src/classnames/__tests__/mergeClassNames.ts index ef57208e8..898ef0970 100644 --- a/packages/sdk/tests/classnames/mergeClassNames.ts +++ b/packages/sdk/src/classnames/__tests__/mergeClassNames.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { mergeClassNames } from '~/classnames/index.js'; +import { mergeClassNames } from '../mergeClassNames'; it('should ignore non-object values', () => { expect(mergeClassNames({}, null, undefined, false, true, {})); diff --git a/packages/sdk/tests/closing-behavior/ClosingBehavior.ts b/packages/sdk/src/closing-behavior/__tests__/ClosingBehavior.ts similarity index 97% rename from packages/sdk/tests/closing-behavior/ClosingBehavior.ts rename to packages/sdk/src/closing-behavior/__tests__/ClosingBehavior.ts index bd052530a..31d269004 100644 --- a/packages/sdk/tests/closing-behavior/ClosingBehavior.ts +++ b/packages/sdk/src/closing-behavior/__tests__/ClosingBehavior.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { ClosingBehavior } from '~/closing-behavior/index.js'; +import { ClosingBehavior } from '../ClosingBehavior'; describe('disable', () => { it('should call "web_app_setup_closing_behavior" method with "need_confirmation" equal to false', () => { @@ -83,4 +83,4 @@ describe('off', () => { expect(listener).toHaveBeenCalledTimes(0); }); }); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/colors/isColorDark.ts b/packages/sdk/src/colors/__tests__/isColorDark.ts similarity index 90% rename from packages/sdk/tests/colors/isColorDark.ts rename to packages/sdk/src/colors/__tests__/isColorDark.ts index f64d3abe1..30dcc5cd9 100644 --- a/packages/sdk/tests/colors/isColorDark.ts +++ b/packages/sdk/src/colors/__tests__/isColorDark.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { isColorDark } from '~/colors/index.js'; +import { isColorDark } from '../isColorDark'; it('should return true in case, the value which is equal to Math.sqrt(0.299 * R * R + 0.587 * G * G + 0.114 * B * B) is less than 120 and false otherwise', () => { expect(isColorDark('#17212b')).toBe(true); diff --git a/packages/sdk/tests/colors/isRGB.ts b/packages/sdk/src/colors/__tests__/isRGB.ts similarity index 87% rename from packages/sdk/tests/colors/isRGB.ts rename to packages/sdk/src/colors/__tests__/isRGB.ts index 0992067d1..c283fc1c8 100644 --- a/packages/sdk/tests/colors/isRGB.ts +++ b/packages/sdk/src/colors/__tests__/isRGB.ts @@ -1,5 +1,6 @@ import { expect, it } from 'vitest'; -import { isRGB } from '~/colors/index.js'; + +import { isRGB } from '../isRGB'; it('should return true for correct full RGB representation', () => { expect(isRGB('#ffffff')).toBe(true); diff --git a/packages/sdk/tests/colors/isRGBShort.ts b/packages/sdk/src/colors/__tests__/isRGBShort.ts similarity index 86% rename from packages/sdk/tests/colors/isRGBShort.ts rename to packages/sdk/src/colors/__tests__/isRGBShort.ts index c7bc6c5aa..d62bcad88 100644 --- a/packages/sdk/tests/colors/isRGBShort.ts +++ b/packages/sdk/src/colors/__tests__/isRGBShort.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { isRGBShort } from '~/colors/index.js'; +import { isRGBShort } from '../isRGBShort'; it('should return true for correct short RGB representation', () => { expect(isRGBShort('#fff')).toBe(true); diff --git a/packages/sdk/tests/colors/toRGB.ts b/packages/sdk/src/colors/__tests__/toRGB.ts similarity index 93% rename from packages/sdk/tests/colors/toRGB.ts rename to packages/sdk/src/colors/__tests__/toRGB.ts index cb5867a40..b56df7869 100644 --- a/packages/sdk/tests/colors/toRGB.ts +++ b/packages/sdk/src/colors/__tests__/toRGB.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { toRGB } from '~/colors/index.js'; +import { toRGB } from '../toRGB'; it('should return same value in case, full version of RGB is passed', () => { expect(toRGB('#ffffff')).toBe('#ffffff'); @@ -20,4 +20,4 @@ it('should return RGB representation of rgba(*,*,*) pattern', () => { it('should throw an error in other cases', () => { expect(() => toRGB('abc')).toThrow(); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/event-emitter/EventEmitter.ts b/packages/sdk/src/event-emitter/__tests__/EventEmitter.ts similarity index 97% rename from packages/sdk/tests/event-emitter/EventEmitter.ts rename to packages/sdk/src/event-emitter/__tests__/EventEmitter.ts index 88e6bf99d..0b05af7b2 100644 --- a/packages/sdk/tests/event-emitter/EventEmitter.ts +++ b/packages/sdk/src/event-emitter/__tests__/EventEmitter.ts @@ -1,6 +1,6 @@ -import { expect, it, beforeEach, vi, describe } from 'vitest'; +import { beforeEach, describe, expect, it, vi } from 'vitest'; -import { EventEmitter } from '~/event-emitter/index.js'; +import { EventEmitter } from '../EventEmitter'; interface EventsMap { test: (a: number, b: boolean) => void; diff --git a/packages/sdk/tests/haptic-feedback/HapticFeedback.ts b/packages/sdk/src/haptic-feedback/__tests__/HapticFeedback.ts similarity index 97% rename from packages/sdk/tests/haptic-feedback/HapticFeedback.ts rename to packages/sdk/src/haptic-feedback/__tests__/HapticFeedback.ts index 7d1b7377e..3d8578019 100644 --- a/packages/sdk/tests/haptic-feedback/HapticFeedback.ts +++ b/packages/sdk/src/haptic-feedback/__tests__/HapticFeedback.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { HapticFeedback } from '~/haptic-feedback/index.js'; +import { HapticFeedback } from '../HapticFeedback'; describe('impactOccurred', () => { it('should call "web_app_trigger_haptic_feedback" method with { type: "impact", style: {{style}} }', () => { @@ -65,4 +65,4 @@ describe('supports', () => { expect(haptic3.supports('selectionChanged')).toBe(true); }); }); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/init-data/InitData.ts b/packages/sdk/src/init-data/__tests__/InitData.ts similarity index 96% rename from packages/sdk/tests/init-data/InitData.ts rename to packages/sdk/src/init-data/__tests__/InitData.ts index 1742a1f18..865a301e6 100644 --- a/packages/sdk/tests/init-data/InitData.ts +++ b/packages/sdk/src/init-data/__tests__/InitData.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { InitData } from '~/init-data/index.js'; +import { InitData } from '../InitData'; it('should return fields specified in constructor', () => { const authDate = new Date(123); @@ -93,6 +93,6 @@ it('should have canSendAfterData equal to authDate + canSendAfter seconds', () = expect(initData.canSendAfter).toBe(32000); expect(initData.canSendAfterDate).toStrictEqual( - new Date(authDate.getTime() + 32000000) + new Date(authDate.getTime() + 32000000), ); -}) \ No newline at end of file +}); diff --git a/packages/sdk/tests/init-data/chatParser.ts b/packages/sdk/src/init-data/__tests__/chatParser.ts similarity index 97% rename from packages/sdk/tests/init-data/chatParser.ts rename to packages/sdk/src/init-data/__tests__/chatParser.ts index ca20908ea..5b75e7f13 100644 --- a/packages/sdk/tests/init-data/chatParser.ts +++ b/packages/sdk/src/init-data/__tests__/chatParser.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { chatParser } from '~/init-data/index.js'; +import { chatParser } from '../chatParser'; describe('id', () => { it('should throw an error in case, this property is missing', () => { diff --git a/packages/sdk/tests/init-data/initDataParser.ts b/packages/sdk/src/init-data/__tests__/initDataParser.ts similarity index 98% rename from packages/sdk/tests/init-data/initDataParser.ts rename to packages/sdk/src/init-data/__tests__/initDataParser.ts index 0f1b526e0..9bc225c0c 100644 --- a/packages/sdk/tests/init-data/initDataParser.ts +++ b/packages/sdk/src/init-data/__tests__/initDataParser.ts @@ -1,7 +1,7 @@ +import { toSearchParams } from 'test-utils'; import { describe, expect, it } from 'vitest'; -import { initDataParser } from '~/init-data/index.js'; -import { toSearchParams } from 'test-utils'; +import { initDataParser } from '../initDataParser'; describe('auth_date', () => { it('should throw an error in case, this property is missing', () => { diff --git a/packages/sdk/tests/init-data/parseInitData.ts b/packages/sdk/src/init-data/__tests__/parseInitData.ts similarity index 98% rename from packages/sdk/tests/init-data/parseInitData.ts rename to packages/sdk/src/init-data/__tests__/parseInitData.ts index 2e84db83d..f40b1efee 100644 --- a/packages/sdk/tests/init-data/parseInitData.ts +++ b/packages/sdk/src/init-data/__tests__/parseInitData.ts @@ -1,7 +1,7 @@ -import { describe, expect, it } from 'vitest'; import { toSearchParams } from 'test-utils'; +import { describe, expect, it } from 'vitest'; -import { parseInitData } from '~/init-data/index.js'; +import { parseInitData } from '../parseInitData'; describe('auth_date', () => { it('should throw an error in case, this property is missing', () => { diff --git a/packages/sdk/tests/init-data/userParser.ts b/packages/sdk/src/init-data/__tests__/userParser.ts similarity index 97% rename from packages/sdk/tests/init-data/userParser.ts rename to packages/sdk/src/init-data/__tests__/userParser.ts index 1ebda5207..669c96efe 100644 --- a/packages/sdk/tests/init-data/userParser.ts +++ b/packages/sdk/src/init-data/__tests__/userParser.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { userParser } from '~/init-data/index.js'; +import { userParser } from '../userParser'; describe('first_name', () => { it('should throw an error in case, this property is missing', () => { diff --git a/packages/sdk/tests/init/creators/createViewport.ts b/packages/sdk/src/init/creators/__tests__/createViewport.ts similarity index 82% rename from packages/sdk/tests/init/creators/createViewport.ts rename to packages/sdk/src/init/creators/__tests__/createViewport.ts index 2d7b95f2f..d64e95365 100644 --- a/packages/sdk/tests/init/creators/createViewport.ts +++ b/packages/sdk/src/init/creators/__tests__/createViewport.ts @@ -1,18 +1,20 @@ -import { it, vi, afterEach, expect, SpyInstance } from 'vitest'; import { mockSessionStorageGetItem } from 'test-utils'; +import type { SpyInstance } from 'vitest'; +import { afterEach, expect, it, vi } from 'vitest'; -import { createViewport } from '~/init/creators/createViewport.js'; -import { createWindow } from '~test-utils/createWindow.js'; -import { requestViewport } from '~/viewport/requestViewport.js'; +import { createWindow } from '../../../../test-utils/createWindow'; +import { requestViewport } from '../../../viewport/requestViewport'; +import { createViewport } from '../createViewport'; -vi.mock('~/viewport/requestViewport.js', () => { +vi.mock('../../../viewport/requestViewport', () => { return { requestViewport: vi.fn(), }; }); -const requestViewportMock = - requestViewport as unknown as SpyInstance, ReturnType>; +type RequestViewport = typeof requestViewport; + +const requestViewportMock = requestViewport as unknown as SpyInstance, ReturnType>; afterEach(() => { vi.restoreAllMocks(); diff --git a/packages/sdk/tests/logger/Logger.ts b/packages/sdk/src/logger/__tests__/Logger.ts similarity index 98% rename from packages/sdk/tests/logger/Logger.ts rename to packages/sdk/src/logger/__tests__/Logger.ts index 0e9301bf5..eef4ba885 100644 --- a/packages/sdk/tests/logger/Logger.ts +++ b/packages/sdk/src/logger/__tests__/Logger.ts @@ -8,7 +8,7 @@ import { vi, } from 'vitest'; -import { Logger } from '~/logger/index.js'; +import { Logger } from '../Logger'; const now = new Date('2022-11-04T09:09:43.007Z'); diff --git a/packages/sdk/tests/main-button/MainButton.ts b/packages/sdk/src/main-button/__tests__/MainButton.ts similarity index 99% rename from packages/sdk/tests/main-button/MainButton.ts rename to packages/sdk/src/main-button/__tests__/MainButton.ts index b1dc3595e..5642eeef4 100644 --- a/packages/sdk/tests/main-button/MainButton.ts +++ b/packages/sdk/src/main-button/__tests__/MainButton.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; -import { MainButton } from '~/main-button/index.js'; +import { MainButton } from '../MainButton'; describe('disable', () => { it('should call "web_app_setup_main_button" method with parameter where "is_active" property equal to false', () => { diff --git a/packages/sdk/tests/mini-app/MiniApp.ts b/packages/sdk/src/mini-app/__tests__/MiniApp.ts similarity index 92% rename from packages/sdk/tests/mini-app/MiniApp.ts rename to packages/sdk/src/mini-app/__tests__/MiniApp.ts index 19d253605..93f87199c 100644 --- a/packages/sdk/tests/mini-app/MiniApp.ts +++ b/packages/sdk/src/mini-app/__tests__/MiniApp.ts @@ -1,8 +1,10 @@ import { describe, expect, it, vi } from 'vitest'; -import { RGB } from '~/colors/index.js'; -import { MiniApp, MiniAppHeaderColor } from '~/mini-app/index.js'; -import { PostEvent } from '~/bridge/index.js'; +import type { PostEvent } from '../../bridge'; +import type { RGB } from '../../colors'; +import { createRequestIdGenerator } from '../../init/creators'; +import { MiniApp } from '../MiniApp'; +import type { MiniAppHeaderColor } from '../types'; interface CreateWebAppOptions { backgroundColor?: RGB; @@ -18,7 +20,7 @@ function createMiniApp(options: CreateWebAppOptions = {}): MiniApp { backgroundColor = '#000000', headerColor = 'bg_color', version = '6.0', - botInline = false + botInline = false, } = options; return new MiniApp({ @@ -26,7 +28,8 @@ function createMiniApp(options: CreateWebAppOptions = {}): MiniApp { botInline, postEvent, headerColor, - backgroundColor + backgroundColor, + createRequestId: createRequestIdGenerator(), }); } diff --git a/packages/sdk/tests/misc/isRecord.ts b/packages/sdk/src/misc/__tests__/isRecord.ts similarity index 91% rename from packages/sdk/tests/misc/isRecord.ts rename to packages/sdk/src/misc/__tests__/isRecord.ts index 1900cd3e3..f80bdcc73 100644 --- a/packages/sdk/tests/misc/isRecord.ts +++ b/packages/sdk/src/misc/__tests__/isRecord.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { isRecord } from '~/misc/index.js'; +import { isRecord } from '../isRecord'; it('should return false for non-object value', () => { [true, 123, 'abc'].forEach((v) => { diff --git a/packages/sdk/tests/navigation/HashNavigator/HashNavigator.ts b/packages/sdk/src/navigation/HashNavigator/__tests__/HashNavigator.ts similarity index 97% rename from packages/sdk/tests/navigation/HashNavigator/HashNavigator.ts rename to packages/sdk/src/navigation/HashNavigator/__tests__/HashNavigator.ts index f1895d1ee..0b30eef68 100644 --- a/packages/sdk/tests/navigation/HashNavigator/HashNavigator.ts +++ b/packages/sdk/src/navigation/HashNavigator/__tests__/HashNavigator.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import { HashNavigator } from '~/navigation/index.js'; +import { HashNavigator } from '../HashNavigator'; // TODO: Add more tests. diff --git a/packages/sdk/tests/navigation/HashNavigator/drop.ts b/packages/sdk/src/navigation/HashNavigator/__tests__/drop.ts similarity index 93% rename from packages/sdk/tests/navigation/HashNavigator/drop.ts rename to packages/sdk/src/navigation/HashNavigator/__tests__/drop.ts index 7a7298f30..62025d7ca 100644 --- a/packages/sdk/tests/navigation/HashNavigator/drop.ts +++ b/packages/sdk/src/navigation/HashNavigator/__tests__/drop.ts @@ -1,6 +1,6 @@ import { afterEach, expect, it, vi } from 'vitest'; -import { drop } from '~/navigation/HashNavigator/drop.js'; +import { drop } from '../drop'; // TODO: Add more tests. @@ -39,4 +39,4 @@ it('should push empty state', () => { expect(pushStateSpy).toHaveBeenCalledOnce(); expect(pushStateSpy).toHaveBeenCalledWith(null, ''); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/navigation/HashNavigator/go.ts b/packages/sdk/src/navigation/HashNavigator/__tests__/go.ts similarity index 55% rename from packages/sdk/tests/navigation/HashNavigator/go.ts rename to packages/sdk/src/navigation/HashNavigator/__tests__/go.ts index 3a63c5bb3..d29c6f7c6 100644 --- a/packages/sdk/tests/navigation/HashNavigator/go.ts +++ b/packages/sdk/src/navigation/HashNavigator/__tests__/go.ts @@ -1,10 +1,9 @@ -import { it, expect } from 'vitest'; +import { expect, it } from 'vitest'; -import { go } from '~/navigation/HashNavigator/go.js'; +import { go } from '../go'; // TODO: Add more tests. it('should return true if delta is 0', () => { expect(go(0)).resolves.toBe(true); }); - diff --git a/packages/sdk/tests/parsing/ArrayValueParser.ts b/packages/sdk/src/parsing/__tests__/ArrayValueParser.ts similarity index 84% rename from packages/sdk/tests/parsing/ArrayValueParser.ts rename to packages/sdk/src/parsing/__tests__/ArrayValueParser.ts index ed7fec862..22ccb1046 100644 --- a/packages/sdk/tests/parsing/ArrayValueParser.ts +++ b/packages/sdk/src/parsing/__tests__/ArrayValueParser.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from 'vitest'; -import { ArrayValueParser, string } from '~/parsing/index.js'; +import { ArrayValueParser } from '../ArrayValueParser'; +import { string } from '../parsers'; describe('constructor', () => { it('should apply parser value directly if it is function', () => { diff --git a/packages/sdk/tests/parsing/toRecord.ts b/packages/sdk/src/parsing/__tests__/toRecord.ts similarity index 87% rename from packages/sdk/tests/parsing/toRecord.ts rename to packages/sdk/src/parsing/__tests__/toRecord.ts index e711b3c88..ca4c2a525 100644 --- a/packages/sdk/tests/parsing/toRecord.ts +++ b/packages/sdk/src/parsing/__tests__/toRecord.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { toRecord } from '~/parsing/index.js'; +import { toRecord } from '../index'; it('should throw an error in case, passed value is not JSON object or not JSON object converted to string', () => { expect(() => toRecord('')).toThrow(); diff --git a/packages/sdk/tests/parsing/parsers/array.ts b/packages/sdk/src/parsing/parsers/__tests__/array.ts similarity index 94% rename from packages/sdk/tests/parsing/parsers/array.ts rename to packages/sdk/src/parsing/parsers/__tests__/array.ts index 2c2952a04..1ec208753 100644 --- a/packages/sdk/tests/parsing/parsers/array.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/array.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from 'vitest'; -import { array, string } from '~/parsing/index.js'; +import { array } from '../array'; +import { string } from '../string'; it('should return value in case, it is array', () => { expect(array().parse(['abc'])).toStrictEqual(['abc']); diff --git a/packages/sdk/tests/parsing/parsers/boolean.ts b/packages/sdk/src/parsing/parsers/__tests__/boolean.ts similarity index 95% rename from packages/sdk/tests/parsing/parsers/boolean.ts rename to packages/sdk/src/parsing/parsers/__tests__/boolean.ts index 8121fe1d2..70f2502bb 100644 --- a/packages/sdk/tests/parsing/parsers/boolean.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/boolean.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { boolean } from '~/parsing/index.js'; +import { boolean } from '../boolean'; it('should return value in case, it has type boolean', () => { expect(boolean().parse(true)).toBe(true); diff --git a/packages/sdk/tests/parsing/parsers/date.ts b/packages/sdk/src/parsing/parsers/__tests__/date.ts similarity index 94% rename from packages/sdk/tests/parsing/parsers/date.ts rename to packages/sdk/src/parsing/parsers/__tests__/date.ts index 25d121b3c..4bc3bacf9 100644 --- a/packages/sdk/tests/parsing/parsers/date.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/date.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { date } from '~/parsing/index.js'; +import { date } from '../date'; it('should return value in case, it is instance of Date', () => { const d = new Date(); diff --git a/packages/sdk/tests/parsing/parsers/json.ts b/packages/sdk/src/parsing/parsers/__tests__/json.ts similarity index 94% rename from packages/sdk/tests/parsing/parsers/json.ts rename to packages/sdk/src/parsing/parsers/__tests__/json.ts index 303af6800..2297c6e76 100644 --- a/packages/sdk/tests/parsing/parsers/json.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/json.ts @@ -1,6 +1,9 @@ import { describe, expect, it } from 'vitest'; -import { boolean, json, number, string } from '~/parsing/index.js'; +import { boolean } from '../boolean'; +import { json } from '../json'; +import { number } from '../number'; +import { string } from '../string'; it('should throw an error in case, passed value is not JSON object or not JSON object converted to string', () => { const parser = json({}); diff --git a/packages/sdk/tests/parsing/parsers/number.ts b/packages/sdk/src/parsing/parsers/__tests__/number.ts similarity index 94% rename from packages/sdk/tests/parsing/parsers/number.ts rename to packages/sdk/src/parsing/parsers/__tests__/number.ts index b97258949..8d728c3b4 100644 --- a/packages/sdk/tests/parsing/parsers/number.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/number.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { number } from '~/parsing/index.js'; +import { number } from '../number'; it('should return value in case, it has type number', () => { expect(number().parse(9992)).toBe(9992); diff --git a/packages/sdk/tests/parsing/parsers/rgb.ts b/packages/sdk/src/parsing/parsers/__tests__/rgb.ts similarity index 93% rename from packages/sdk/tests/parsing/parsers/rgb.ts rename to packages/sdk/src/parsing/parsers/__tests__/rgb.ts index 6f235d635..ba5c0aaa0 100644 --- a/packages/sdk/tests/parsing/parsers/rgb.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/rgb.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { rgb } from '~/parsing/index.js'; +import { rgb } from '../rgb'; it('should return value in case, it represents RGB color', () => { expect(rgb().parse('#fff')).toBe('#ffffff'); diff --git a/packages/sdk/tests/parsing/parsers/searchParams.ts b/packages/sdk/src/parsing/parsers/__tests__/searchParams.ts similarity index 95% rename from packages/sdk/tests/parsing/parsers/searchParams.ts rename to packages/sdk/src/parsing/parsers/__tests__/searchParams.ts index f97b8ec9d..0604551f2 100644 --- a/packages/sdk/tests/parsing/parsers/searchParams.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/searchParams.ts @@ -1,6 +1,8 @@ import { expect, it } from 'vitest'; -import { date, searchParams, string } from '~/parsing/index.js'; +import { date } from '../date'; +import { searchParams } from '../searchParams'; +import { string } from '../string'; it('should throw an error in case, passed value is not of type string or URLSearchParams', () => { const parser = searchParams({}); diff --git a/packages/sdk/tests/parsing/parsers/string.ts b/packages/sdk/src/parsing/parsers/__tests__/string.ts similarity index 94% rename from packages/sdk/tests/parsing/parsers/string.ts rename to packages/sdk/src/parsing/parsers/__tests__/string.ts index 4e107547a..6f1701853 100644 --- a/packages/sdk/tests/parsing/parsers/string.ts +++ b/packages/sdk/src/parsing/parsers/__tests__/string.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { string } from '~/parsing/index.js'; +import { string } from '../string'; it('should return value in case, it has type string', () => { expect(string().parse('abc')).toBe('abc'); diff --git a/packages/sdk/tests/popup/Popup.ts b/packages/sdk/src/popup/__tests__/Popup.ts similarity index 100% rename from packages/sdk/tests/popup/Popup.ts rename to packages/sdk/src/popup/__tests__/Popup.ts diff --git a/packages/sdk/tests/popup/preparePopupParams.ts b/packages/sdk/src/popup/__tests__/preparePopupParams.ts similarity index 97% rename from packages/sdk/tests/popup/preparePopupParams.ts rename to packages/sdk/src/popup/__tests__/preparePopupParams.ts index be458a530..835e8b306 100644 --- a/packages/sdk/tests/popup/preparePopupParams.ts +++ b/packages/sdk/src/popup/__tests__/preparePopupParams.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { preparePopupParams } from '~/popup/preparePopupParams.js'; +import { preparePopupParams } from '../preparePopupParams'; /** * Creates test text. diff --git a/packages/sdk/tests/bridge/supports.ts b/packages/sdk/src/supports/__tests__/supports.ts similarity index 96% rename from packages/sdk/tests/bridge/supports.ts rename to packages/sdk/src/supports/__tests__/supports.ts index 8f8840955..1ac0b75d4 100644 --- a/packages/sdk/tests/bridge/supports.ts +++ b/packages/sdk/src/supports/__tests__/supports.ts @@ -1,13 +1,12 @@ import { expect, it } from 'vitest'; -import { Version } from '~/version/index.js'; -import { +import type { MiniAppsMethodName, - MiniAppsMethodWithVersionedParams, MiniAppsMethodVersionedParams, -} from '~/bridge/index.js'; -import { supports } from '~/supports/index.js'; - + MiniAppsMethodWithVersionedParams, +} from '../../bridge'; +import type { Version } from '../../version'; +import { supports } from '../supports'; type HaveCheckSupportMethodTuple = { [M in MiniAppsMethodWithVersionedParams]: [M, MiniAppsMethodVersionedParams] diff --git a/packages/sdk/tests/theme-params/keys.ts b/packages/sdk/src/theme-params/__tests__/keys.ts similarity index 91% rename from packages/sdk/tests/theme-params/keys.ts rename to packages/sdk/src/theme-params/__tests__/keys.ts index 0ea581e89..d735620a7 100644 --- a/packages/sdk/tests/theme-params/keys.ts +++ b/packages/sdk/src/theme-params/__tests__/keys.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; -import { keyToExternal, keyToLocal } from '~/theme-params/keys.js'; +import { keyToExternal, keyToLocal } from '../keys'; describe('keyToLocal', () => { it('should replace "^bg" and "_bg" with "background" and "_background". Then replace _[a-z] with [A-Z]', () => { diff --git a/packages/sdk/tests/theme-params/parseThemeParams.ts b/packages/sdk/src/theme-params/__tests__/parseThemeParams.ts similarity index 90% rename from packages/sdk/tests/theme-params/parseThemeParams.ts rename to packages/sdk/src/theme-params/__tests__/parseThemeParams.ts index 026b9aa5e..868815211 100644 --- a/packages/sdk/tests/theme-params/parseThemeParams.ts +++ b/packages/sdk/src/theme-params/__tests__/parseThemeParams.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import { parseThemeParams } from '~/theme-params/index.js'; +import { parseThemeParams } from '../parseThemeParams'; [ ['accent_text_color', 'accentTextColor'], diff --git a/packages/sdk/tests/theme-params/serializeThemeParams.ts b/packages/sdk/src/theme-params/__tests__/serializeThemeParams.ts similarity index 89% rename from packages/sdk/tests/theme-params/serializeThemeParams.ts rename to packages/sdk/src/theme-params/__tests__/serializeThemeParams.ts index 2dea00cd1..295577fb3 100644 --- a/packages/sdk/tests/theme-params/serializeThemeParams.ts +++ b/packages/sdk/src/theme-params/__tests__/serializeThemeParams.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import { serializeThemeParams } from '~/theme-params/index.js'; +import { serializeThemeParams } from '../serializeThemeParams'; [ ['accent_text_color', 'accentTextColor'], diff --git a/packages/sdk/tests/theme-params/themeParamsParser.ts b/packages/sdk/src/theme-params/__tests__/themeParamsParser.ts similarity index 90% rename from packages/sdk/tests/theme-params/themeParamsParser.ts rename to packages/sdk/src/theme-params/__tests__/themeParamsParser.ts index 1f303912f..0e6de4abd 100644 --- a/packages/sdk/tests/theme-params/themeParamsParser.ts +++ b/packages/sdk/src/theme-params/__tests__/themeParamsParser.ts @@ -1,6 +1,6 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; -import { themeParamsParser } from '~/theme-params/index.js'; +import { themeParamsParser } from '../themeParamsParser'; [ ['accent_text_color', 'accentTextColor'], diff --git a/packages/sdk/tests/timeout/isTimeoutError.ts b/packages/sdk/src/timeout/__tests__/isTimeoutError.ts similarity index 68% rename from packages/sdk/tests/timeout/isTimeoutError.ts rename to packages/sdk/src/timeout/__tests__/isTimeoutError.ts index 594a6cc3c..3677cefb7 100644 --- a/packages/sdk/tests/timeout/isTimeoutError.ts +++ b/packages/sdk/src/timeout/__tests__/isTimeoutError.ts @@ -1,8 +1,9 @@ import { expect, it } from 'vitest'; -import { isTimeoutError, TimeoutError } from '~/timeout/index.js'; +import { isTimeoutError } from '../isTimeoutError'; +import { TimeoutError } from '../TimeoutError'; it('should return true if passed value is instance of TimeoutError', () => { expect(isTimeoutError(null)).toBe(false); expect(isTimeoutError(new TimeoutError(1000))).toBe(true); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tests/timeout/withTimeout.ts b/packages/sdk/src/timeout/__tests__/withTimeout.ts similarity index 91% rename from packages/sdk/tests/timeout/withTimeout.ts rename to packages/sdk/src/timeout/__tests__/withTimeout.ts index 0aa5291f9..f3d423d56 100644 --- a/packages/sdk/tests/timeout/withTimeout.ts +++ b/packages/sdk/src/timeout/__tests__/withTimeout.ts @@ -1,6 +1,6 @@ import { afterAll, beforeAll, expect, it, vi } from 'vitest'; -import { withTimeout, TimeoutError } from '~/timeout/index.js'; +import { TimeoutError, withTimeout } from '../index'; beforeAll(() => { vi.useFakeTimers(); diff --git a/packages/sdk/tests/version/compareVersions.ts b/packages/sdk/src/version/__tests__/compareVersions.ts similarity index 91% rename from packages/sdk/tests/version/compareVersions.ts rename to packages/sdk/src/version/__tests__/compareVersions.ts index 64cf751c5..c24274301 100644 --- a/packages/sdk/tests/version/compareVersions.ts +++ b/packages/sdk/src/version/__tests__/compareVersions.ts @@ -1,6 +1,6 @@ import { expect, it } from 'vitest'; -import { compareVersions } from '~/version/index.js'; +import { compareVersions } from '../compareVersions'; it('should return 1 in case "a" is greater than "b"', () => { expect(compareVersions('6.1', '6.0')).toBe(1); diff --git a/packages/sdk/tests/viewport/isStableViewportPlatform.ts b/packages/sdk/src/viewport/__tests__/isStableViewportPlatform.ts similarity index 59% rename from packages/sdk/tests/viewport/isStableViewportPlatform.ts rename to packages/sdk/src/viewport/__tests__/isStableViewportPlatform.ts index 46935ed80..9addce9a8 100644 --- a/packages/sdk/tests/viewport/isStableViewportPlatform.ts +++ b/packages/sdk/src/viewport/__tests__/isStableViewportPlatform.ts @@ -1,14 +1,15 @@ import { expect, it } from 'vitest'; -import { isStableViewportPlatform } from '~/viewport/index.js'; -for (const platform of ['macos', 'tdesktop', 'unigram', 'web', 'weba']) { +import { isStableViewportPlatform } from '../isStableViewportPlatform'; + +['macos', 'tdesktop', 'unigram', 'web', 'weba'].forEach((platform) => { it(`should return true if passed platform is "${platform}"`, () => { expect(isStableViewportPlatform(platform)).toBe(true); }); -} +}); -for (const platform of ['unknown', 'android', 'android_x']) { +['unknown', 'android', 'android_x'].forEach((platform) => { it(`should return false if passed platform is "${platform}"`, () => { expect(isStableViewportPlatform(platform)).toBe(false); }); -} +}); diff --git a/packages/sdk/tests/viewport/utils.ts b/packages/sdk/src/viewport/__tests__/utils.ts similarity index 83% rename from packages/sdk/tests/viewport/utils.ts rename to packages/sdk/src/viewport/__tests__/utils.ts index 5d68b0971..d1fb7fdaf 100644 --- a/packages/sdk/tests/viewport/utils.ts +++ b/packages/sdk/src/viewport/__tests__/utils.ts @@ -1,5 +1,6 @@ import { expect, it } from 'vitest'; -import { truncate } from '~/viewport/utils.js'; + +import { truncate } from '../utils'; it('should return zero if value is less than 0', () => { expect(truncate(-1)).toBe(0); @@ -8,4 +9,4 @@ it('should return zero if value is less than 0', () => { it('should return value if it is equals to or higher than 0', () => { expect(truncate(0)).toBe(0); expect(truncate(20)).toBe(20); -}); \ No newline at end of file +}); diff --git a/packages/sdk/tsconfig.build.json b/packages/sdk/tsconfig.build.json index 04191a5ec..79922ba59 100644 --- a/packages/sdk/tsconfig.build.json +++ b/packages/sdk/tsconfig.build.json @@ -12,5 +12,8 @@ }, "include": [ "src" + ], + "exclude": [ + "**/__tests__" ] } \ No newline at end of file diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json index 5e7e20fed..b171cab23 100644 --- a/packages/sdk/tsconfig.json +++ b/packages/sdk/tsconfig.json @@ -2,8 +2,7 @@ "extends": "./tsconfig.build.json", "include": [ "src", - "test-utils", - "tests" + "test-utils" ], "references": [ { diff --git a/packages/sdk/vite.config.ts b/packages/sdk/vite.config.ts index d9e697a19..badabf1c5 100644 --- a/packages/sdk/vite.config.ts +++ b/packages/sdk/vite.config.ts @@ -21,6 +21,7 @@ export default createViteConfig({ // of the folders or files from the coverage. To be done in the future. exclude: [ prefix('**/index.ts'), + prefix('**/__tests__'), prefix('back-button/BackButton.ts'), prefix('bridge/invoke-custom-method.ts'), prefix('closing-behavior/ClosingBehavior.ts'), diff --git a/packages/solid-router-integration/package.json b/packages/solid-router-integration/package.json index 0167963f7..6613054cd 100644 --- a/packages/solid-router-integration/package.json +++ b/packages/solid-router-integration/package.json @@ -37,7 +37,7 @@ } }, "scripts": { - "lint": "eslint src/**/*", + "lint": "eslint src", "lint:fix": "pnpm run lint --fix", "typecheck": "tsc --noEmit", "build": "vite build" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db0ea3bd3..3808d8608 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -16,7 +16,7 @@ importers: version: 15.2.3 '@turbo/gen': specifier: ^1.9.7 - version: 1.9.7(@types/node@16.0.0)(typescript@5.3.2) + version: 1.9.7(@types/node@20.10.8)(typescript@5.3.2) '@vitest/coverage-v8': specifier: ^0.34.6 version: 0.34.6(vitest@0.34.6) @@ -25,13 +25,13 @@ importers: version: 0.34.6(vitest@0.34.6) commitizen: specifier: ^4.3.0 - version: 4.3.0(typescript@5.3.2) + version: 4.3.0(@types/node@20.10.8)(typescript@5.3.2) cz-conventional-changelog: specifier: ^3.3.0 - version: 3.3.0(typescript@5.3.2) + version: 3.3.0(@types/node@20.10.8)(typescript@5.3.2) eslint: - specifier: ^8.54.0 - version: 8.54.0 + specifier: ^8.56.0 + version: 8.56.0 happy-dom: specifier: ^12.5.0 version: 12.5.0 @@ -49,13 +49,13 @@ importers: version: 5.3.2 vite: specifier: ^4.5.0 - version: 4.5.0(@types/node@16.0.0) + version: 4.5.0(@types/node@20.10.8) vite-plugin-dts: specifier: ^3.6.0 - version: 3.6.0(@types/node@16.0.0)(typescript@5.3.2)(vite@4.5.0) + version: 3.6.0(@types/node@20.10.8)(typescript@5.3.2)(vite@4.5.0) vite-plugin-solid: specifier: ^2.7.0 - version: 2.7.0(solid-js@1.8.6)(vite@4.5.0) + version: 2.7.0(solid-js@1.8.10)(vite@4.5.0) vite-tsconfig-paths: specifier: ^4.2.1 version: 4.2.1(typescript@5.3.2)(vite@4.5.0) @@ -67,7 +67,7 @@ importers: devDependencies: vitepress: specifier: 1.0.0-rc.24 - version: 1.0.0-rc.24(@algolia/client-search@4.20.0)(@types/node@16.0.0)(search-insights@2.11.0)(typescript@5.3.2) + version: 1.0.0-rc.24(@algolia/client-search@4.22.1)(@types/node@20.10.8)(search-insights@2.13.0)(typescript@5.3.2) apps/local-playground: {} @@ -81,24 +81,28 @@ importers: dependencies: eslint-config-airbnb: specifier: ^19.0.4 - version: 19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.54.0) + version: 19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.56.0) eslint-config-airbnb-base: specifier: ^15.0.0 - version: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0) + version: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.56.0) eslint-config-airbnb-typescript: specifier: ^17.1.0 - version: 17.1.0(@typescript-eslint/eslint-plugin@5.62.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0) + version: 17.1.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.0)(eslint@8.56.0) eslint-plugin-import: specifier: ^2.29.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + version: 2.29.0(@typescript-eslint/parser@6.18.1)(eslint@8.56.0) eslint-plugin-simple-import-sort: specifier: ^10.0.0 - version: 10.0.0(eslint@8.54.0) + version: 10.0.0(eslint@8.56.0) eslint-plugin-solid: specifier: ^0.13.0 - version: 0.13.0(eslint@8.54.0)(typescript@5.3.2) + version: 0.13.0(eslint@8.56.0)(typescript@5.3.3) packages/init-data-node: + dependencies: + '@tma.js/sdk': + specifier: workspace:^ + version: link:../sdk devDependencies: '@types/node': specifier: ^16.0.0 @@ -173,7 +177,7 @@ importers: dependencies: '@solidjs/router': specifier: ^0.x - version: 0.8.3(solid-js@1.8.6) + version: 0.8.3(solid-js@1.8.10) '@tma.js/sdk': specifier: workspace:* version: link:../sdk @@ -205,47 +209,47 @@ packages: resolution: {integrity: sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==} engines: {node: '>=0.10.0'} - /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0)(search-insights@2.11.0): + /@algolia/autocomplete-core@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0)(search-insights@2.13.0): resolution: {integrity: sha512-009HdfugtGCdC4JdXUbVJClA0q0zh24yyePn+KUGk3rP7j8FEe/m5Yo/z65gn6nP/cM39PxpzqKrL7A6fP6PPw==} dependencies: - '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0)(search-insights@2.11.0) - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0) + '@algolia/autocomplete-plugin-algolia-insights': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0)(search-insights@2.13.0) + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0) transitivePeerDependencies: - '@algolia/client-search' - algoliasearch - search-insights dev: true - /@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0)(search-insights@2.11.0): + /@algolia/autocomplete-plugin-algolia-insights@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0)(search-insights@2.13.0): resolution: {integrity: sha512-a/yTUkcO/Vyy+JffmAnTWbr4/90cLzw+CC3bRbhnULr/EM0fGNvM13oQQ14f2moLMcVDyAx/leczLlAOovhSZg==} peerDependencies: search-insights: '>= 1 < 3' dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0) - search-insights: 2.11.0 + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0) + search-insights: 2.13.0 transitivePeerDependencies: - '@algolia/client-search' - algoliasearch dev: true - /@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0): + /@algolia/autocomplete-preset-algolia@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0): resolution: {integrity: sha512-d4qlt6YmrLMYy95n5TB52wtNDr6EgAIPH81dvvvW8UmuWRgxEtY0NJiPwl/h95JtG2vmRM804M0DSwMCNZlzRA==} peerDependencies: '@algolia/client-search': '>= 4.9.1 < 6' algoliasearch: '>= 4.9.1 < 6' dependencies: - '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0) - '@algolia/client-search': 4.20.0 + '@algolia/autocomplete-shared': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0) + '@algolia/client-search': 4.22.1 algoliasearch: 4.20.0 dev: true - /@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0): + /@algolia/autocomplete-shared@1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0): resolution: {integrity: sha512-Wnm9E4Ye6Rl6sTTqjoymD+l8DjSTHsHboVRYrKgEt8Q7UHm9nYbqhN/i0fhUYA3OAEH7WA8x3jfpnmJm3rKvaQ==} peerDependencies: '@algolia/client-search': '>= 4.9.1 < 6' algoliasearch: '>= 4.9.1 < 6' dependencies: - '@algolia/client-search': 4.20.0 + '@algolia/client-search': 4.22.1 algoliasearch: 4.20.0 dev: true @@ -259,6 +263,10 @@ packages: resolution: {integrity: sha512-vCfxauaZutL3NImzB2G9LjLt36vKAckc6DhMp05An14kVo8F1Yofb6SIl6U3SaEz8pG2QOB9ptwM5c+zGevwIQ==} dev: true + /@algolia/cache-common@4.22.1: + resolution: {integrity: sha512-TJMBKqZNKYB9TptRRjSUtevJeQVXRmg6rk9qgFKWvOy8jhCPdyNZV1nB3SKGufzvTVbomAukFR8guu/8NRKBTA==} + dev: true + /@algolia/cache-in-memory@4.20.0: resolution: {integrity: sha512-Wm9ak/IaacAZXS4mB3+qF/KCoVSBV6aLgIGFEtQtJwjv64g4ePMapORGmCyulCFwfePaRAtcaTbMcJF+voc/bg==} dependencies: @@ -289,6 +297,13 @@ packages: '@algolia/transporter': 4.20.0 dev: true + /@algolia/client-common@4.22.1: + resolution: {integrity: sha512-IvaL5v9mZtm4k4QHbBGDmU3wa/mKokmqNBqPj0K7lcR8ZDKzUorhcGp/u8PkPC/e0zoHSTvRh7TRkGX3Lm7iOQ==} + dependencies: + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 + dev: true + /@algolia/client-personalization@4.20.0: resolution: {integrity: sha512-N9+zx0tWOQsLc3K4PVRDV8GUeOLAY0i445En79Pr3zWB+m67V+n/8w4Kw1C5LlbHDDJcyhMMIlqezh6BEk7xAQ==} dependencies: @@ -305,10 +320,22 @@ packages: '@algolia/transporter': 4.20.0 dev: true + /@algolia/client-search@4.22.1: + resolution: {integrity: sha512-yb05NA4tNaOgx3+rOxAmFztgMTtGBi97X7PC3jyNeGiwkAjOZc2QrdZBYyIdcDLoI09N0gjtpClcackoTN0gPA==} + dependencies: + '@algolia/client-common': 4.22.1 + '@algolia/requester-common': 4.22.1 + '@algolia/transporter': 4.22.1 + dev: true + /@algolia/logger-common@4.20.0: resolution: {integrity: sha512-xouigCMB5WJYEwvoWW5XDv7Z9f0A8VoXJc3VKwlHJw/je+3p2RcDXfksLI4G4lIVncFUYMZx30tP/rsdlvvzHQ==} dev: true + /@algolia/logger-common@4.22.1: + resolution: {integrity: sha512-OnTFymd2odHSO39r4DSWRFETkBufnY2iGUZNrMXpIhF5cmFE8pGoINNPzwg02QLBlGSaLqdKy0bM8S0GyqPLBg==} + dev: true + /@algolia/logger-console@4.20.0: resolution: {integrity: sha512-THlIGG1g/FS63z0StQqDhT6bprUczBI8wnLT3JWvfAQDZX5P6fCg7dG+pIrUBpDIHGszgkqYEqECaKKsdNKOUA==} dependencies: @@ -325,6 +352,10 @@ packages: resolution: {integrity: sha512-9h6ye6RY/BkfmeJp7Z8gyyeMrmmWsMOCRBXQDs4mZKKsyVlfIVICpcSibbeYcuUdurLhIlrOUkH3rQEgZzonng==} dev: true + /@algolia/requester-common@4.22.1: + resolution: {integrity: sha512-dgvhSAtg2MJnR+BxrIFqlLtkLlVVhas9HgYKMk2Uxiy5m6/8HZBL40JVAMb2LovoPFs9I/EWIoFVjOrFwzn5Qg==} + dev: true + /@algolia/requester-node-http@4.20.0: resolution: {integrity: sha512-ocJ66L60ABSSTRFnCHIEZpNHv6qTxsBwJEPfYaSBsLQodm0F9ptvalFkHMpvj5DfE22oZrcrLbOYM2bdPJRHng==} dependencies: @@ -339,6 +370,14 @@ packages: '@algolia/requester-common': 4.20.0 dev: true + /@algolia/transporter@4.22.1: + resolution: {integrity: sha512-kzWgc2c9IdxMa3YqA6TN0NW5VrKYYW/BELIn7vnLyn+U/RFdZ4lxxt9/8yq3DKV5snvoDzzO4ClyejZRdV3lMQ==} + dependencies: + '@algolia/cache-common': 4.22.1 + '@algolia/logger-common': 4.22.1 + '@algolia/requester-common': 4.22.1 + dev: true + /@ampproject/remapping@2.2.1: resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==} engines: {node: '>=6.0.0'} @@ -667,11 +706,11 @@ packages: regenerator-runtime: 0.13.11 dev: true - /@babel/runtime@7.23.4: - resolution: {integrity: sha512-2Yv65nlWnWlSpe3fXEyX5i7fx5kIKo4Qbcj+hMO0odwaneFjfXw5fdum+4yL20O0QiaHpia0cYQ9xpNMqrBwHg==} + /@babel/runtime@7.23.8: + resolution: {integrity: sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==} engines: {node: '>=6.9.0'} dependencies: - regenerator-runtime: 0.14.0 + regenerator-runtime: 0.14.1 dev: false /@babel/template@7.22.15: @@ -907,52 +946,52 @@ packages: prettier: 2.8.8 dev: true - /@commitlint/config-validator@18.4.3: - resolution: {integrity: sha512-FPZZmTJBARPCyef9ohRC9EANiQEKSWIdatx5OlgeHKu878dWwpyeFauVkhzuBRJFcCA4Uvz/FDtlDKs008IHcA==} + /@commitlint/config-validator@18.4.4: + resolution: {integrity: sha512-/QI8KIg/h7O0Eus36fPcEcO3QPBcdXuGfZeCF5m15k0EB2bcU8s6pHNTNEa6xz9PrAefHCL+yzRJj7w20T6Mow==} engines: {node: '>=v18'} requiresBuild: true dependencies: - '@commitlint/types': 18.4.3 + '@commitlint/types': 18.4.4 ajv: 8.12.0 dev: true optional: true - /@commitlint/execute-rule@18.4.3: - resolution: {integrity: sha512-t7FM4c+BdX9WWZCPrrbV5+0SWLgT3kCq7e7/GhHCreYifg3V8qyvO127HF796vyFql75n4TFF+5v1asOOWkV1Q==} + /@commitlint/execute-rule@18.4.4: + resolution: {integrity: sha512-a37Nd3bDQydtg9PCLLWM9ZC+GO7X5i4zJvrggJv5jBhaHsXeQ9ZWdO6ODYR+f0LxBXXNYK3geYXJrCWUCP8JEg==} engines: {node: '>=v18'} requiresBuild: true dev: true optional: true - /@commitlint/load@18.4.3(typescript@5.3.2): - resolution: {integrity: sha512-v6j2WhvRQJrcJaj5D+EyES2WKTxPpxENmNpNG3Ww8MZGik3jWRXtph0QTzia5ZJyPh2ib5aC/6BIDymkUUM58Q==} + /@commitlint/load@18.4.4(@types/node@20.10.8)(typescript@5.3.2): + resolution: {integrity: sha512-RaDIa9qwOw2xRJ3Jr2DBXd14rmnHJIX2XdZF4kmoF1rgsg/+7cvrExLSUNAkQUNimyjCn1b/bKX2Omm+GdY0XQ==} engines: {node: '>=v18'} requiresBuild: true dependencies: - '@commitlint/config-validator': 18.4.3 - '@commitlint/execute-rule': 18.4.3 - '@commitlint/resolve-extends': 18.4.3 - '@commitlint/types': 18.4.3 - '@types/node': 18.18.12 + '@commitlint/config-validator': 18.4.4 + '@commitlint/execute-rule': 18.4.4 + '@commitlint/resolve-extends': 18.4.4 + '@commitlint/types': 18.4.4 chalk: 4.1.2 cosmiconfig: 8.3.6(typescript@5.3.2) - cosmiconfig-typescript-loader: 5.0.0(@types/node@18.18.12)(cosmiconfig@8.3.6)(typescript@5.3.2) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.10.8)(cosmiconfig@8.3.6)(typescript@5.3.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 resolve-from: 5.0.0 transitivePeerDependencies: + - '@types/node' - typescript dev: true optional: true - /@commitlint/resolve-extends@18.4.3: - resolution: {integrity: sha512-30sk04LZWf8+SDgJrbJCjM90gTg2LxsD9cykCFeFu+JFHvBFq5ugzp2eO/DJGylAdVaqxej3c7eTSE64hR/lnw==} + /@commitlint/resolve-extends@18.4.4: + resolution: {integrity: sha512-RRpIHSbRnFvmGifVk21Gqazf1QF/yeP+Kkg/e3PlkegcOKd/FGOXp/Kx9cvSO2K7ucSn4GD/oBvgasFoy+NCAw==} engines: {node: '>=v18'} requiresBuild: true dependencies: - '@commitlint/config-validator': 18.4.3 - '@commitlint/types': 18.4.3 + '@commitlint/config-validator': 18.4.4 + '@commitlint/types': 18.4.4 import-fresh: 3.3.0 lodash.mergewith: 4.6.2 resolve-from: 5.0.0 @@ -960,8 +999,8 @@ packages: dev: true optional: true - /@commitlint/types@18.4.3: - resolution: {integrity: sha512-cvzx+vtY/I2hVBZHCLrpoh+sA0hfuzHwDc+BAFPimYLjJkpHnghQM+z8W/KyLGkygJh3BtI3xXXq+dKjnSWEmA==} + /@commitlint/types@18.4.4: + resolution: {integrity: sha512-/FykLtodD8gKs3+VNkAUwofu4LBHankclj+I8fB2jTRvG6PV7k/OUt4P+VbM7ip853qS4F0g7Z6hLNa6JeMcAQ==} engines: {node: '>=v18'} requiresBuild: true dependencies: @@ -980,10 +1019,10 @@ packages: resolution: {integrity: sha512-SPiDHaWKQZpwR2siD0KQUwlStvIAnEyK6tAE2h2Wuoq8ue9skzhlyVQ1ddzOxX6khULnAALDiR/isSF3bnuciA==} dev: true - /@docsearch/js@3.5.2(@algolia/client-search@4.20.0)(search-insights@2.11.0): + /@docsearch/js@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): resolution: {integrity: sha512-p1YFTCDflk8ieHgFJYfmyHBki1D61+U9idwrLh+GQQMrBSP3DLGKpy0XUJtPjAOPltcVbqsTjiPFfH7JImjUNg==} dependencies: - '@docsearch/react': 3.5.2(@algolia/client-search@4.20.0)(search-insights@2.11.0) + '@docsearch/react': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) preact: 10.18.1 transitivePeerDependencies: - '@algolia/client-search' @@ -993,7 +1032,7 @@ packages: - search-insights dev: true - /@docsearch/react@3.5.2(@algolia/client-search@4.20.0)(search-insights@2.11.0): + /@docsearch/react@3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0): resolution: {integrity: sha512-9Ahcrs5z2jq/DcAvYtvlqEBHImbm4YJI8M9y0x6Tqg598P40HTEkX7hsMcIuThI+hTFxRGZ9hll0Wygm2yEjng==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' @@ -1010,11 +1049,11 @@ packages: search-insights: optional: true dependencies: - '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0)(search-insights@2.11.0) - '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.20.0)(algoliasearch@4.20.0) + '@algolia/autocomplete-core': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0)(search-insights@2.13.0) + '@algolia/autocomplete-preset-algolia': 1.9.3(@algolia/client-search@4.22.1)(algoliasearch@4.20.0) '@docsearch/css': 3.5.2 algoliasearch: 4.20.0 - search-insights: 2.11.0 + search-insights: 2.13.0 transitivePeerDependencies: - '@algolia/client-search' dev: true @@ -1217,27 +1256,27 @@ packages: dev: true optional: true - /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): + /@eslint-community/eslint-utils@4.4.0(eslint@8.56.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 dependencies: - eslint: 8.54.0 + eslint: 8.56.0 eslint-visitor-keys: 3.4.3 /@eslint-community/regexpp@4.10.0: resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0} - /@eslint/eslintrc@2.1.3: - resolution: {integrity: sha512-yZzuIG+jnVu6hNSzFEN07e8BxF3uAzYtQb6uDkaYZLo6oYZDCq454c5kB8zxnzfCYyP4MIuyBn10L0DqwujTmA==} + /@eslint/eslintrc@2.1.4: + resolution: {integrity: sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 debug: 4.3.4 espree: 9.6.1 - globals: 13.23.0 + globals: 13.24.0 ignore: 5.3.0 import-fresh: 3.3.0 js-yaml: 4.1.0 @@ -1246,8 +1285,8 @@ packages: transitivePeerDependencies: - supports-color - /@eslint/js@8.54.0: - resolution: {integrity: sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==} + /@eslint/js@8.56.0: + resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} /@humanwhocodes/config-array@0.11.13: @@ -1336,24 +1375,24 @@ packages: read-yaml-file: 1.1.0 dev: true - /@microsoft/api-extractor-model@7.28.2(@types/node@16.0.0): + /@microsoft/api-extractor-model@7.28.2(@types/node@20.10.8): resolution: {integrity: sha512-vkojrM2fo3q4n4oPh4uUZdjJ2DxQ2+RnDQL/xhTWSRUNPF6P4QyrvY357HBxbnltKcYu+nNNolVqc6TIGQ73Ig==} dependencies: '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.61.0(@types/node@16.0.0) + '@rushstack/node-core-library': 3.61.0(@types/node@20.10.8) transitivePeerDependencies: - '@types/node' dev: true - /@microsoft/api-extractor@7.37.3(@types/node@16.0.0): + /@microsoft/api-extractor@7.37.3(@types/node@20.10.8): resolution: {integrity: sha512-daC5IKZw/Qg8DYucnQVvagihKsTr5L7Bgf5VJYe/FwQhQuR9VRqKZfr2JkqoszsVqOf8C0KtFNTaqyB7chD/HQ==} hasBin: true dependencies: - '@microsoft/api-extractor-model': 7.28.2(@types/node@16.0.0) + '@microsoft/api-extractor-model': 7.28.2(@types/node@20.10.8) '@microsoft/tsdoc': 0.14.2 '@microsoft/tsdoc-config': 0.16.2 - '@rushstack/node-core-library': 3.61.0(@types/node@16.0.0) + '@rushstack/node-core-library': 3.61.0(@types/node@20.10.8) '@rushstack/rig-package': 0.5.1 '@rushstack/ts-command-line': 4.16.1 colors: 1.2.5 @@ -1395,7 +1434,7 @@ packages: engines: {node: '>= 8'} dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.13.0 + fastq: 1.16.0 /@polka/url@1.0.0-next.23: resolution: {integrity: sha512-C16M+IYz0rgRhWZdCmK+h58JMv8vijAA61gmz2rspCSwKwzBebpdcsiUmwrtJRdphuY30i6BSLEOP8ppbNLyLg==} @@ -1432,7 +1471,7 @@ packages: picomatch: 2.3.1 dev: true - /@rushstack/node-core-library@3.61.0(@types/node@16.0.0): + /@rushstack/node-core-library@3.61.0(@types/node@20.10.8): resolution: {integrity: sha512-tdOjdErme+/YOu4gPed3sFS72GhtWCgNV9oDsHDnoLY5oDfwjKUc9Z+JOZZ37uAxcm/OCahDHfuu2ugqrfWAVQ==} peerDependencies: '@types/node': '*' @@ -1440,7 +1479,7 @@ packages: '@types/node': optional: true dependencies: - '@types/node': 16.0.0 + '@types/node': 20.10.8 colors: 1.2.5 fs-extra: 7.0.1 import-lazy: 4.0.0 @@ -1470,12 +1509,12 @@ packages: resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==} dev: true - /@solidjs/router@0.8.3(solid-js@1.8.6): + /@solidjs/router@0.8.3(solid-js@1.8.10): resolution: {integrity: sha512-oJuqQo10rVTiQYhe1qXIG1NyZIZ2YOwHnlLc8Xx+g/iJhFCJo1saLOIrD/Dkh2fpIaIny5ZMkz1cYYqoTYGJbg==} peerDependencies: solid-js: ^1.5.3 dependencies: - solid-js: 1.8.6 + solid-js: 1.8.10 dev: false /@tsconfig/node10@1.0.9: @@ -1494,7 +1533,7 @@ packages: resolution: {integrity: sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==} dev: true - /@turbo/gen@1.9.7(@types/node@16.0.0)(typescript@5.3.2): + /@turbo/gen@1.9.7(@types/node@20.10.8)(typescript@5.3.2): resolution: {integrity: sha512-mjenROdRNvYxZixNfamJY/XxwKMT+01PuQby8+qdRUUa5ZLBPOv4rw11n+II1O8ZnpFpBJIGGFJcnRNY+lCddw==} hasBin: true dependencies: @@ -1505,7 +1544,7 @@ packages: minimatch: 9.0.3 node-plop: 0.26.3 semver: 7.3.8 - ts-node: 10.9.1(@types/node@16.0.0)(typescript@5.3.2) + ts-node: 10.9.1(@types/node@20.10.8)(typescript@5.3.2) update-check: 1.5.4 validate-npm-package-name: 5.0.0 transitivePeerDependencies: @@ -1590,6 +1629,10 @@ packages: resolution: {integrity: sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==} dev: false + /@types/json-schema@7.0.15: + resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} + dev: false + /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: false @@ -1625,13 +1668,11 @@ packages: resolution: {integrity: sha512-TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg==} dev: true - /@types/node@18.18.12: - resolution: {integrity: sha512-G7slVfkwOm7g8VqcEF1/5SXiMjP3Tbt+pXDU3r/qhlM2KkGm786DUD4xyMA2QzEElFrv/KZV9gjygv4LnkpbMQ==} - requiresBuild: true + /@types/node@20.10.8: + resolution: {integrity: sha512-f8nQs3cLxbAFc00vEU59yf9UyGUftkPaLGfvbVOIDdx2i1b8epBqj2aNGyP19fiyXWvlmZ7qC1XLjAzw/OKIeA==} dependencies: undici-types: 5.26.5 dev: true - optional: true /@types/normalize-package-data@2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} @@ -1665,6 +1706,10 @@ packages: resolution: {integrity: sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==} dev: false + /@types/semver@7.5.6: + resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==} + dev: false + /@types/through@0.0.30: resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==} dependencies: @@ -1675,62 +1720,56 @@ packages: resolution: {integrity: sha512-v/ZHEj9xh82usl8LMR3GarzFY1IrbXJw5L4QfQhokjRV91q+SelFqxQWSep1ucXEZ22+dSTwLFkXeur25sPIbw==} dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/eslint-plugin@6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-nISDRYnnIpk7VCFrGcu1rnZfM1Dh9LRHnfgdkjcbi/l7g16VYRri3TjXi9Ir4lOZSw5N/gnV/3H7jIPQ8Q4daA==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - '@typescript-eslint/parser': ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/scope-manager': 6.18.1 + '@typescript-eslint/type-utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.18.1 debug: 4.3.4 - eslint: 8.54.0 + eslint: 8.56.0 graphemer: 1.4.0 ignore: 5.3.0 - natural-compare-lite: 1.4.0 + natural-compare: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.3.2) - typescript: 5.3.2 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/parser@5.62.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/parser@6.18.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.2) + '@typescript-eslint/scope-manager': 6.18.1 + '@typescript-eslint/types': 6.18.1 + '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3) + '@typescript-eslint/visitor-keys': 6.18.1 debug: 4.3.4 - eslint: 8.54.0 - typescript: 5.3.2 + eslint: 8.56.0 + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/scope-manager@5.62.0: - resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 - dev: false - /@typescript-eslint/scope-manager@6.12.0: resolution: {integrity: sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==} engines: {node: ^16.0.0 || >=18.0.0} @@ -1739,59 +1778,67 @@ packages: '@typescript-eslint/visitor-keys': 6.12.0 dev: false - /@typescript-eslint/type-utils@5.62.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/scope-manager@6.18.1: + resolution: {integrity: sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==} + engines: {node: ^16.0.0 || >=18.0.0} + dependencies: + '@typescript-eslint/types': 6.18.1 + '@typescript-eslint/visitor-keys': 6.18.1 + dev: false + + /@typescript-eslint/type-utils@6.18.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-wyOSKhuzHeU/5pcRDP2G2Ndci+4g653V43gXTpt4nbyoIOAASkGDA9JIAgbQCdCkcr1MvpSYWzxTz0olCn8+/Q==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: '*' + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.2) - '@typescript-eslint/utils': 5.62.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3) + '@typescript-eslint/utils': 6.18.1(eslint@8.56.0)(typescript@5.3.3) debug: 4.3.4 - eslint: 8.54.0 - tsutils: 3.21.0(typescript@5.3.2) - typescript: 5.3.2 + eslint: 8.56.0 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/types@5.62.0: - resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dev: false - /@typescript-eslint/types@6.12.0: resolution: {integrity: sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==} engines: {node: ^16.0.0 || >=18.0.0} dev: false - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.3.2): - resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/types@6.18.1: + resolution: {integrity: sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==} + engines: {node: ^16.0.0 || >=18.0.0} + dev: false + + /@typescript-eslint/typescript-estree@6.12.0(typescript@5.3.3): + resolution: {integrity: sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 + '@typescript-eslint/types': 6.12.0 + '@typescript-eslint/visitor-keys': 6.12.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@5.3.2) - typescript: 5.3.2 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/typescript-estree@6.12.0(typescript@5.3.2): - resolution: {integrity: sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==} + /@typescript-eslint/typescript-estree@6.18.1(typescript@5.3.3): + resolution: {integrity: sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' @@ -1799,70 +1846,70 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/visitor-keys': 6.12.0 + '@typescript-eslint/types': 6.18.1 + '@typescript-eslint/visitor-keys': 6.18.1 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 + minimatch: 9.0.3 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.3.2) - typescript: 5.3.2 + ts-api-utils: 1.0.3(typescript@5.3.3) + typescript: 5.3.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/utils@5.62.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/utils@6.12.0(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.13 '@types/semver': 7.5.2 - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.3.2) - eslint: 8.54.0 - eslint-scope: 5.1.1 + '@typescript-eslint/scope-manager': 6.12.0 + '@typescript-eslint/types': 6.12.0 + '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.3) + eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript dev: false - /@typescript-eslint/utils@6.12.0(eslint@8.54.0)(typescript@5.3.2): - resolution: {integrity: sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==} + /@typescript-eslint/utils@6.18.1(eslint@8.56.0)(typescript@5.3.3): + resolution: {integrity: sha512-zZmTuVZvD1wpoceHvoQpOiewmWu3uP9FuTWo8vqpy2ffsmfCE8mklRPi+vmnIYAIk9t/4kOThri2QCDgor+OpQ==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: eslint: ^7.0.0 || ^8.0.0 dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) - '@types/json-schema': 7.0.13 - '@types/semver': 7.5.2 - '@typescript-eslint/scope-manager': 6.12.0 - '@typescript-eslint/types': 6.12.0 - '@typescript-eslint/typescript-estree': 6.12.0(typescript@5.3.2) - eslint: 8.54.0 + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) + '@types/json-schema': 7.0.15 + '@types/semver': 7.5.6 + '@typescript-eslint/scope-manager': 6.18.1 + '@typescript-eslint/types': 6.18.1 + '@typescript-eslint/typescript-estree': 6.18.1(typescript@5.3.3) + eslint: 8.56.0 semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript dev: false - /@typescript-eslint/visitor-keys@5.62.0: - resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/visitor-keys@6.12.0: + resolution: {integrity: sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==} + engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 5.62.0 + '@typescript-eslint/types': 6.12.0 eslint-visitor-keys: 3.4.3 dev: false - /@typescript-eslint/visitor-keys@6.12.0: - resolution: {integrity: sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==} + /@typescript-eslint/visitor-keys@6.18.1: + resolution: {integrity: sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==} engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 6.12.0 + '@typescript-eslint/types': 6.18.1 eslint-visitor-keys: 3.4.3 dev: false @@ -1876,7 +1923,7 @@ packages: vite: ^4.0.0 vue: ^3.2.25 dependencies: - vite: 4.5.0(@types/node@16.0.0) + vite: 4.5.0(@types/node@20.10.8) vue: 3.3.6(typescript@5.3.2) dev: true @@ -2188,12 +2235,12 @@ packages: - vue dev: true - /acorn-jsx@5.3.2(acorn@8.10.0): + /acorn-jsx@5.3.2(acorn@8.11.3): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.10.0 + acorn: 8.11.3 /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} @@ -2204,6 +2251,12 @@ packages: resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} engines: {node: '>=0.4.0'} hasBin: true + dev: true + + /acorn@8.11.3: + resolution: {integrity: sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==} + engines: {node: '>=0.4.0'} + hasBin: true /aggregate-error@3.1.0: resolution: {integrity: sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==} @@ -2475,7 +2528,6 @@ packages: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} dependencies: balanced-match: 1.0.2 - dev: true /braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} @@ -2712,13 +2764,13 @@ packages: dev: true optional: true - /commitizen@4.3.0(typescript@5.3.2): + /commitizen@4.3.0(@types/node@20.10.8)(typescript@5.3.2): resolution: {integrity: sha512-H0iNtClNEhT0fotHvGV3E9tDejDeS04sN1veIebsKYGMuGscFaswRoYJKmT3eW85eIJAs0F28bG2+a/9wCOfPw==} engines: {node: '>= 12'} hasBin: true dependencies: cachedir: 2.3.0 - cz-conventional-changelog: 3.3.0(typescript@5.3.2) + cz-conventional-changelog: 3.3.0(@types/node@20.10.8)(typescript@5.3.2) dedent: 0.7.0 detect-indent: 6.1.0 find-node-modules: 2.1.3 @@ -2732,6 +2784,7 @@ packages: strip-bom: 4.0.0 strip-json-comments: 3.1.1 transitivePeerDependencies: + - '@types/node' - typescript dev: true @@ -2762,7 +2815,7 @@ packages: requiresBuild: true dev: true - /cosmiconfig-typescript-loader@5.0.0(@types/node@18.18.12)(cosmiconfig@8.3.6)(typescript@5.3.2): + /cosmiconfig-typescript-loader@5.0.0(@types/node@20.10.8)(cosmiconfig@8.3.6)(typescript@5.3.2): resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==} engines: {node: '>=v16'} requiresBuild: true @@ -2771,7 +2824,7 @@ packages: cosmiconfig: '>=8.2' typescript: '>=4' dependencies: - '@types/node': 18.18.12 + '@types/node': 20.10.8 cosmiconfig: 8.3.6(typescript@5.3.2) jiti: 1.21.0 typescript: 5.3.2 @@ -2823,6 +2876,9 @@ packages: /csstype@3.1.2: resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==} + /csstype@3.1.3: + resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==} + /csv-generate@3.4.3: resolution: {integrity: sha512-w/T+rqR0vwvHqWs/1ZyMDWtHHSJaN06klRqJXBEpDJaM/+dZkso0OKh1VcuuYvK3XM53KysVNq8Ko/epCK8wOw==} dev: true @@ -2845,19 +2901,20 @@ packages: stream-transform: 2.1.3 dev: true - /cz-conventional-changelog@3.3.0(typescript@5.3.2): + /cz-conventional-changelog@3.3.0(@types/node@20.10.8)(typescript@5.3.2): resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==} engines: {node: '>= 10'} dependencies: chalk: 2.4.2 - commitizen: 4.3.0(typescript@5.3.2) + commitizen: 4.3.0(@types/node@20.10.8)(typescript@5.3.2) conventional-commit-types: 3.0.0 lodash.map: 4.6.0 longest: 2.0.1 word-wrap: 1.2.3 optionalDependencies: - '@commitlint/load': 18.4.3(typescript@5.3.2) + '@commitlint/load': 18.4.4(@types/node@20.10.8)(typescript@5.3.2) transitivePeerDependencies: + - '@types/node' - typescript dev: true @@ -3173,7 +3230,7 @@ packages: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} - /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0): + /eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.0)(eslint@8.56.0): resolution: {integrity: sha512-xaX3z4ZZIcFLvh2oUNvcX5oEofXda7giYmuplVxoOg5A7EXJMrUyqRgR+mhDhPK8LZ4PttFOBvCYDbX3sUoUig==} engines: {node: ^10.12.0 || >=12.0.0} peerDependencies: @@ -3181,14 +3238,14 @@ packages: eslint-plugin-import: ^2.25.2 dependencies: confusing-browser-globals: 1.0.11 - eslint: 8.54.0 - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + eslint: 8.56.0 + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.18.1)(eslint@8.56.0) object.assign: 4.1.4 object.entries: 1.1.7 semver: 6.3.1 dev: false - /eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@5.62.0)(@typescript-eslint/parser@5.62.0)(eslint-plugin-import@2.29.0)(eslint@8.54.0): + /eslint-config-airbnb-typescript@17.1.0(@typescript-eslint/eslint-plugin@6.18.1)(@typescript-eslint/parser@6.18.1)(eslint-plugin-import@2.29.0)(eslint@8.56.0): resolution: {integrity: sha512-GPxI5URre6dDpJ0CtcthSZVBAfI+Uw7un5OYNVxP2EYi3H81Jw701yFP7AU+/vCE7xBtFmjge7kfhhk4+RAiig==} peerDependencies: '@typescript-eslint/eslint-plugin': ^5.13.0 || ^6.0.0 @@ -3196,14 +3253,14 @@ packages: eslint: ^7.32.0 || ^8.2.0 eslint-plugin-import: ^2.25.3 dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0)(typescript@5.3.2) - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.3.2) - eslint: 8.54.0 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) + '@typescript-eslint/eslint-plugin': 6.18.1(@typescript-eslint/parser@6.18.1)(eslint@8.56.0)(typescript@5.3.3) + '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3) + eslint: 8.56.0 + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.56.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.18.1)(eslint@8.56.0) dev: false - /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.54.0): + /eslint-config-airbnb@19.0.4(eslint-plugin-import@2.29.0)(eslint-plugin-jsx-a11y@6.8.0)(eslint-plugin-react-hooks@4.6.0)(eslint-plugin-react@7.33.2)(eslint@8.56.0): resolution: {integrity: sha512-T75QYQVQX57jiNgpF9r1KegMICE94VYwoFQyMGhrvc+lB8YF2E/M/PYDaQe1AJcWaEgqLE+ErXV1Og/+6Vyzew==} engines: {node: ^10.12.0 || ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -3213,12 +3270,12 @@ packages: eslint-plugin-react: ^7.28.0 eslint-plugin-react-hooks: ^4.3.0 dependencies: - eslint: 8.54.0 - eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.54.0) - eslint-plugin-import: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0) - eslint-plugin-jsx-a11y: 6.8.0(eslint@8.54.0) - eslint-plugin-react: 7.33.2(eslint@8.54.0) - eslint-plugin-react-hooks: 4.6.0(eslint@8.54.0) + eslint: 8.56.0 + eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.0)(eslint@8.56.0) + eslint-plugin-import: 2.29.0(@typescript-eslint/parser@6.18.1)(eslint@8.56.0) + eslint-plugin-jsx-a11y: 6.8.0(eslint@8.56.0) + eslint-plugin-react: 7.33.2(eslint@8.56.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.56.0) object.assign: 4.1.4 object.entries: 1.1.7 dev: false @@ -3233,7 +3290,7 @@ packages: - supports-color dev: false - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.18.1)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -3254,15 +3311,15 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3) debug: 3.2.7 - eslint: 8.54.0 + eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 transitivePeerDependencies: - supports-color dev: false - /eslint-plugin-import@2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.54.0): + /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.18.1)(eslint@8.56.0): resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} engines: {node: '>=4'} peerDependencies: @@ -3272,16 +3329,16 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.54.0)(typescript@5.3.2) + '@typescript-eslint/parser': 6.18.1(eslint@8.56.0)(typescript@5.3.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 array.prototype.flatmap: 1.3.2 debug: 3.2.7 doctrine: 2.1.0 - eslint: 8.54.0 + eslint: 8.56.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.54.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.18.1)(eslint-import-resolver-node@0.3.9)(eslint@8.56.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -3297,13 +3354,13 @@ packages: - supports-color dev: false - /eslint-plugin-jsx-a11y@6.8.0(eslint@8.54.0): + /eslint-plugin-jsx-a11y@6.8.0(eslint@8.56.0): resolution: {integrity: sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==} engines: {node: '>=4.0'} peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 dependencies: - '@babel/runtime': 7.23.4 + '@babel/runtime': 7.23.8 aria-query: 5.3.0 array-includes: 3.1.7 array.prototype.flatmap: 1.3.2 @@ -3313,7 +3370,7 @@ packages: damerau-levenshtein: 1.0.8 emoji-regex: 9.2.2 es-iterator-helpers: 1.0.15 - eslint: 8.54.0 + eslint: 8.56.0 hasown: 2.0.0 jsx-ast-utils: 3.3.5 language-tags: 1.0.9 @@ -3322,16 +3379,16 @@ packages: object.fromentries: 2.0.7 dev: false - /eslint-plugin-react-hooks@4.6.0(eslint@8.54.0): + /eslint-plugin-react-hooks@4.6.0(eslint@8.56.0): resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} engines: {node: '>=10'} peerDependencies: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: - eslint: 8.54.0 + eslint: 8.56.0 dev: false - /eslint-plugin-react@7.33.2(eslint@8.54.0): + /eslint-plugin-react@7.33.2(eslint@8.56.0): resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} engines: {node: '>=4'} peerDependencies: @@ -3342,7 +3399,7 @@ packages: array.prototype.tosorted: 1.1.2 doctrine: 2.1.0 es-iterator-helpers: 1.0.15 - eslint: 8.54.0 + eslint: 8.56.0 estraverse: 5.3.0 jsx-ast-utils: 3.3.5 minimatch: 3.1.2 @@ -3356,22 +3413,22 @@ packages: string.prototype.matchall: 4.0.10 dev: false - /eslint-plugin-simple-import-sort@10.0.0(eslint@8.54.0): + /eslint-plugin-simple-import-sort@10.0.0(eslint@8.56.0): resolution: {integrity: sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==} peerDependencies: eslint: '>=5.0.0' dependencies: - eslint: 8.54.0 + eslint: 8.56.0 dev: false - /eslint-plugin-solid@0.13.0(eslint@8.54.0)(typescript@5.3.2): + /eslint-plugin-solid@0.13.0(eslint@8.56.0)(typescript@5.3.3): resolution: {integrity: sha512-Sutd+DxEGu9+Z9ITtHKXRAClxVe1a6C1XQZSuN8iBsMy0IAVEc6Tca1UYgc7tD2ZrRRjZKB9mohBOaZl5NJLgg==} engines: {node: '>=12.0.0'} peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 6.12.0(eslint@8.54.0)(typescript@5.3.2) - eslint: 8.54.0 + '@typescript-eslint/utils': 6.12.0(eslint@8.56.0)(typescript@5.3.3) + eslint: 8.56.0 is-html: 2.0.0 jsx-ast-utils: 3.3.5 kebab-case: 1.0.2 @@ -3382,14 +3439,6 @@ packages: - typescript dev: false - /eslint-scope@5.1.1: - resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} - engines: {node: '>=8.0.0'} - dependencies: - esrecurse: 4.3.0 - estraverse: 4.3.0 - dev: false - /eslint-scope@7.2.2: resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -3401,15 +3450,15 @@ packages: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - /eslint@8.54.0: - resolution: {integrity: sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==} + /eslint@8.56.0: + resolution: {integrity: sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} hasBin: true dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@8.54.0) + '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@eslint-community/regexpp': 4.10.0 - '@eslint/eslintrc': 2.1.3 - '@eslint/js': 8.54.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.56.0 '@humanwhocodes/config-array': 0.11.13 '@humanwhocodes/module-importer': 1.0.1 '@nodelib/fs.walk': 1.2.8 @@ -3429,7 +3478,7 @@ packages: file-entry-cache: 6.0.1 find-up: 5.0.0 glob-parent: 6.0.2 - globals: 13.23.0 + globals: 13.24.0 graphemer: 1.4.0 ignore: 5.3.0 imurmurhash: 0.1.4 @@ -3451,8 +3500,8 @@ packages: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.10.0 - acorn-jsx: 5.3.2(acorn@8.10.0) + acorn: 8.11.3 + acorn-jsx: 5.3.2(acorn@8.11.3) eslint-visitor-keys: 3.4.3 /esprima@4.0.1: @@ -3473,11 +3522,6 @@ packages: dependencies: estraverse: 5.3.0 - /estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} - engines: {node: '>=4.0'} - dev: false - /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} @@ -3529,8 +3573,8 @@ packages: /fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - /fastq@1.13.0: - resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==} + /fastq@1.16.0: + resolution: {integrity: sha512-ifCoaXsDrsdkWTtiNJX5uzHDsrck5TzfKKDcuFFTIrrc/BS076qgEIfoIy1VeZqViznfKiysPYTh/QeHtnIsYA==} dependencies: reusify: 1.0.4 @@ -3549,7 +3593,7 @@ packages: resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flat-cache: 3.0.4 + flat-cache: 3.2.0 /fill-range@7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} @@ -3600,15 +3644,20 @@ packages: resolve-dir: 1.0.1 dev: true - /flat-cache@3.0.4: - resolution: {integrity: sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==} + /flat-cache@3.2.0: + resolution: {integrity: sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==} engines: {node: ^10.12.0 || >=12.0.0} dependencies: - flatted: 3.2.7 + flatted: 3.2.9 + keyv: 4.5.4 rimraf: 3.0.2 /flatted@3.2.7: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} + dev: true + + /flatted@3.2.9: + resolution: {integrity: sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==} /focus-trap@7.5.4: resolution: {integrity: sha512-N7kHdlgsO/v+iD/dMoJKtsSqs5Dz/dXZVebRgJw23LDk+jMi/974zyiOYDziY2JPp8xivq9BmUGwIJMiuSBi7w==} @@ -3769,8 +3818,8 @@ packages: engines: {node: '>=4'} dev: true - /globals@13.23.0: - resolution: {integrity: sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==} + /globals@13.24.0: + resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==} engines: {node: '>=8'} dependencies: type-fest: 0.20.2 @@ -4361,6 +4410,9 @@ packages: hasBin: true dev: true + /json-buffer@3.0.1: + resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} + /json-parse-even-better-errors@2.3.1: resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} requiresBuild: true @@ -4398,7 +4450,7 @@ packages: /jsonfile@4.0.0: resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==} optionalDependencies: - graceful-fs: 4.2.11 + graceful-fs: 4.2.10 dev: true /jsonfile@6.1.0: @@ -4423,6 +4475,11 @@ packages: resolution: {integrity: sha512-7n6wXq4gNgBELfDCpzKc+mRrZFs7D+wgfF5WRFLNAr4DA/qtr9Js8uOAVAfHhuLMfAcQ0pRKqbpjx+TcJVdE1Q==} dev: false + /keyv@4.5.4: + resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} + dependencies: + json-buffer: 3.0.1 + /kind-of@6.0.3: resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==} engines: {node: '>=0.10.0'} @@ -4686,7 +4743,6 @@ packages: engines: {node: '>=16 || 14 >=14.17'} dependencies: brace-expansion: 2.0.1 - dev: true /minimist-options@4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} @@ -4755,10 +4811,6 @@ packages: hasBin: true dev: true - /natural-compare-lite@1.4.0: - resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} - dev: false - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} @@ -5126,8 +5178,8 @@ packages: resolution: {integrity: sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==} dev: true - /punycode@2.1.1: - resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==} + /punycode@2.3.1: + resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==} engines: {node: '>=6'} requiresBuild: true @@ -5226,8 +5278,8 @@ packages: resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==} dev: true - /regenerator-runtime@0.14.0: - resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + /regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} dev: false /regexp.prototype.flags@1.5.1: @@ -5392,8 +5444,8 @@ packages: resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==} dev: true - /search-insights@2.11.0: - resolution: {integrity: sha512-Uin2J8Bpm3xaZi9Y8QibSys6uJOFZ+REMrf42v20AA3FUDUrshKkMEP6liJbMAHCm71wO6ls4mwAf7a3gFVxLw==} + /search-insights@2.13.0: + resolution: {integrity: sha512-Orrsjf9trHHxFRuo9/rzm0KIWmgzE8RMlZMzuhZOJ01Rnz3D0YBAe+V6473t6/H6c7irs6Lt48brULAiRWb3Vw==} dev: true /semver@5.7.2: @@ -5427,15 +5479,23 @@ packages: upper-case-first: 1.1.2 dev: true - /seroval@0.14.1: - resolution: {integrity: sha512-ZlC9y1KVDhZFdEHLYZup1RjKDutyX1tt3ffOauqRbRURa2vRr2NU/bHuVEuNEqR3zE2uCU3WM6LqH6Oinc3tWg==} + /seroval-plugins@1.0.3(seroval@1.0.3): + resolution: {integrity: sha512-/nda3/5lVpznsbsliN8SNbx075VH6nO6lCpIknLxOPUtfqXA5ji30ThFjQD1PNed3Dnxkkj8raK/WtS8PbEuKQ==} engines: {node: '>=10'} + peerDependencies: + seroval: ^1.0 + dependencies: + seroval: 1.0.3 /seroval@0.5.1: resolution: {integrity: sha512-ZfhQVB59hmIauJG5Ydynupy8KHyr5imGNtdDhbZG68Ufh1Ynkv9KOYOAABf71oVbQxJ8VkWnMHAjEHE7fWkH5g==} engines: {node: '>=10'} dev: false + /seroval@1.0.3: + resolution: {integrity: sha512-v5Psun3O2OdehTS/BpTC9EezHxyQRM4lqtvOdbngEq8qOZUECqG5XaoFNZgBQrJKXZFgcyZtMH6Dv7G96pKSSQ==} + engines: {node: '>=10'} + /set-blocking@2.0.0: resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==} dev: true @@ -5542,13 +5602,14 @@ packages: seroval: 0.5.1 dev: false - /solid-js@1.8.6: - resolution: {integrity: sha512-yiH6ZfBBZ3xj/aU/PBpVKB+8r8WWp100NGF7k/Z0IrK9Y8Lv0jwvFiJY1cHdc6Tj7GqXArKnMBabM0m1k+LzkA==} + /solid-js@1.8.10: + resolution: {integrity: sha512-YTT2Py/M+f8sArdkZsTtqpXeYWo6Mtj5XbeLN39yMTRoOzlntT9cPGBkaemjwxRCN95gDKSh80ypxebUYVeKYg==} dependencies: - csstype: 3.1.2 - seroval: 0.14.1 + csstype: 3.1.3 + seroval: 1.0.3 + seroval-plugins: 1.0.3(seroval@1.0.3) - /solid-refresh@0.5.3(solid-js@1.8.6): + /solid-refresh@0.5.3(solid-js@1.8.10): resolution: {integrity: sha512-Otg5it5sjOdZbQZJnvo99TEBAr6J7PQ5AubZLNU6szZzg3RQQ5MX04oteBIIGDs0y2Qv8aXKm9e44V8z+UnFdw==} peerDependencies: solid-js: ^1.3 @@ -5556,7 +5617,7 @@ packages: '@babel/generator': 7.22.15 '@babel/helper-module-imports': 7.22.15 '@babel/types': 7.22.19 - solid-js: 1.8.6 + solid-js: 1.8.10 dev: true /source-map-js@1.0.2: @@ -5813,16 +5874,16 @@ packages: engines: {node: '>=8'} dev: true - /ts-api-utils@1.0.3(typescript@5.3.2): + /ts-api-utils@1.0.3(typescript@5.3.3): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: typescript: '>=4.2.0' dependencies: - typescript: 5.3.2 + typescript: 5.3.3 dev: false - /ts-node@10.9.1(@types/node@16.0.0)(typescript@5.3.2): + /ts-node@10.9.1(@types/node@20.10.8)(typescript@5.3.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -5841,7 +5902,7 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.3 - '@types/node': 16.0.0 + '@types/node': 20.10.8 acorn: 8.10.0 acorn-walk: 8.2.0 arg: 4.1.3 @@ -5877,6 +5938,7 @@ packages: /tslib@1.14.1: resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} + dev: true /tslib@2.6.0: resolution: {integrity: sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA==} @@ -5886,16 +5948,6 @@ packages: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true - /tsutils@3.21.0(typescript@5.3.2): - resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} - engines: {node: '>= 6'} - peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' - dependencies: - tslib: 1.14.1 - typescript: 5.3.2 - dev: false - /tty-table@4.2.1: resolution: {integrity: sha512-xz0uKo+KakCQ+Dxj1D/tKn2FSyreSYWzdkL/BYhgN6oMW808g8QRMuh1atAV9fjTPbWBjfbkKQpI/5rEcnAc7g==} engines: {node: '>=8.0.0'} @@ -6049,6 +6101,13 @@ packages: resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} engines: {node: '>=14.17'} hasBin: true + dev: true + + /typescript@5.3.3: + resolution: {integrity: sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==} + engines: {node: '>=14.17'} + hasBin: true + dev: false /ufo@1.3.1: resolution: {integrity: sha512-uY/99gMLIOlJPwATcMVYfqDSxUR9//AUcgZMzwfSTJPDKzA1S8mX4VLqa+fiAtveraQUBCz4FFcwVZBGbwBXIw==} @@ -6074,7 +6133,6 @@ packages: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} requiresBuild: true dev: true - optional: true /universalify@0.1.2: resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==} @@ -6117,7 +6175,7 @@ packages: /uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} dependencies: - punycode: 2.1.1 + punycode: 2.3.1 /util-deprecate@1.0.2: resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} @@ -6181,7 +6239,7 @@ packages: - terser dev: true - /vite-plugin-dts@3.6.0(@types/node@16.0.0)(typescript@5.3.2)(vite@4.5.0): + /vite-plugin-dts@3.6.0(@types/node@20.10.8)(typescript@5.3.2)(vite@4.5.0): resolution: {integrity: sha512-doxhDRFJCZD2sGjIp4V800nm8Y19GvmwckjG5vYPuiqJ7OBjc9NlW1Vp9Gkyh2aXlUs1jTDRH/lxWfcsPLOQHg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -6191,13 +6249,13 @@ packages: vite: optional: true dependencies: - '@microsoft/api-extractor': 7.37.3(@types/node@16.0.0) + '@microsoft/api-extractor': 7.37.3(@types/node@20.10.8) '@rollup/pluginutils': 5.0.2 '@vue/language-core': 1.8.15(typescript@5.3.2) debug: 4.3.4 kolorist: 1.8.0 typescript: 5.3.2 - vite: 4.5.0(@types/node@16.0.0) + vite: 4.5.0(@types/node@20.10.8) vue-tsc: 1.8.15(typescript@5.3.2) transitivePeerDependencies: - '@types/node' @@ -6205,7 +6263,7 @@ packages: - supports-color dev: true - /vite-plugin-solid@2.7.0(solid-js@1.8.6)(vite@4.5.0): + /vite-plugin-solid@2.7.0(solid-js@1.8.10)(vite@4.5.0): resolution: {integrity: sha512-avp/Jl5zOp/Itfo67xtDB2O61U7idviaIp4mLsjhCa13PjKNasz+IID0jYTyqUp9SFx6/PmBr6v4KgDppqompg==} peerDependencies: solid-js: ^1.7.2 @@ -6216,9 +6274,9 @@ packages: '@types/babel__core': 7.20.1 babel-preset-solid: 1.7.7(@babel/core@7.22.20) merge-anything: 5.1.7 - solid-js: 1.8.6 - solid-refresh: 0.5.3(solid-js@1.8.6) - vite: 4.5.0(@types/node@16.0.0) + solid-js: 1.8.10 + solid-refresh: 0.5.3(solid-js@1.8.10) + vite: 4.5.0(@types/node@20.10.8) vitefu: 0.2.4(vite@4.5.0) transitivePeerDependencies: - supports-color @@ -6235,7 +6293,7 @@ packages: debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.2(typescript@5.3.2) - vite: 4.5.0(@types/node@16.0.0) + vite: 4.5.0(@types/node@20.10.8) transitivePeerDependencies: - supports-color - typescript @@ -6277,6 +6335,42 @@ packages: fsevents: 2.3.3 dev: true + /vite@4.5.0(@types/node@20.10.8): + resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + lightningcss: ^1.21.0 + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + '@types/node': 20.10.8 + esbuild: 0.18.20 + postcss: 8.4.31 + rollup: 3.29.4 + optionalDependencies: + fsevents: 2.3.3 + dev: true + /vitefu@0.2.4(vite@4.5.0): resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==} peerDependencies: @@ -6285,10 +6379,10 @@ packages: vite: optional: true dependencies: - vite: 4.5.0(@types/node@16.0.0) + vite: 4.5.0(@types/node@20.10.8) dev: true - /vitepress@1.0.0-rc.24(@algolia/client-search@4.20.0)(@types/node@16.0.0)(search-insights@2.11.0)(typescript@5.3.2): + /vitepress@1.0.0-rc.24(@algolia/client-search@4.22.1)(@types/node@20.10.8)(search-insights@2.13.0)(typescript@5.3.2): resolution: {integrity: sha512-RpnL8cnOGwiRlBbrYQUm9sYkJbtyOt/wYXk2diTcokY4yvks/5lq9LuSt+MURWB6ZqwpSNHvTmxgaSfLoG0/OA==} hasBin: true peerDependencies: @@ -6301,7 +6395,7 @@ packages: optional: true dependencies: '@docsearch/css': 3.5.2 - '@docsearch/js': 3.5.2(@algolia/client-search@4.20.0)(search-insights@2.11.0) + '@docsearch/js': 3.5.2(@algolia/client-search@4.22.1)(search-insights@2.13.0) '@types/markdown-it': 13.0.5 '@vitejs/plugin-vue': 4.3.1(vite@4.5.0)(vue@3.3.6) '@vue/devtools-api': 6.5.1 @@ -6311,7 +6405,7 @@ packages: mark.js: 8.11.1 minisearch: 6.1.0 shiki: 0.14.5 - vite: 4.5.0(@types/node@16.0.0) + vite: 4.5.0(@types/node@20.10.8) vue: 3.3.6(typescript@5.3.2) transitivePeerDependencies: - '@algolia/client-search' diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 27786e65c..3ff5faaaf 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,4 +1,3 @@ packages: - "apps/*" - - "apps-local/*" - "packages/*"