Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

perf(design): optimize clsx runtime (#7633)

白熱0a25893dbeb8
diff --git a/common/shared/package.json b/common/shared/package.json
index 51a9465a35..c2f39eb223 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -33,7 +33,7 @@
"dependencies": {
"@tsdown/css": "^0.22.14",
"@typescript-eslint/parser": "^8.65.0",
- "@vitest/coverage-istanbul": "^4.1.11",
+ "@vitest/coverage-istanbul": "^5.0.0",
"autoprefixer": "^10.5.4",
"eslint-plugin-better-tailwindcss": "^4.7.0",
"eslint-plugin-header": "^3.1.1",
@@ -48,7 +48,7 @@
"tailwindcss": "3.4.18",
"tsdown": "^0.22.14",
"unplugin-vue": "^7.2.0",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
},
"devDependencies": {
"@univerjs/icons": "1.38.0",
diff --git a/docs/NAMING_CONVENTION.md b/docs/NAMING_CONVENTION.md
index e5de1aa4f7..4b6f7fd661 100644
--- a/docs/NAMING_CONVENTION.md
+++ b/docs/NAMING_CONVENTION.md
@@ -192,14 +192,14 @@ A package MUST NOT reference a key whose first segment is another package's name
```typescript
// In @univerjs/sheets-filter
// 🚫 references a key from the UI package
-localeService.t('sheets-filter-ui.panel.empty')
+localeService.t<LocaleKey>('sheets-filter-ui.panel.empty')
// In @univerjs/sheets-filter-ui
// 🚫 references a key from a common/utility package
-localeService.t('sheets-ui.permission.dialog.filterErr')
+localeService.t<LocaleKey>('sheets-ui.permission.dialog.filterErr')
// ✅ sink the key into your own locale file
-localeService.t('sheets-filter-ui.permission.filterErr')
+localeService.t<LocaleKey>('sheets-filter-ui.permission.filterErr')
```
### Namespace must be the single root key
diff --git a/examples/package.json b/examples/package.json
index 34f3fb0b67..504ca5ec5e 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -52,6 +52,6 @@
"tsx": "^4.22.4",
"typescript": "^6.0.3",
"vite": "^8.0.11",
- "vitest": "^4.1.10"
+ "vitest": "^5.0.0"
}
}
diff --git a/package.json b/package.json
index 4b34c263b8..c849eb8b23 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
"tailwindcss": "3.4.18",
"turbo": "^2.10.8",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
},
"lint-staged": {
"*": "eslint --fix"
diff --git a/packages/action-recorder/package.json b/packages/action-recorder/package.json
index 3aa2d65047..96632b9304 100644
--- a/packages/action-recorder/package.json
+++ b/packages/action-recorder/package.json
@@ -88,6 +88,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/core/package.json b/packages/core/package.json
index 7a630ae72b..81b238ed3b 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -95,6 +95,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json
index f578d1f25e..60710f1e10 100644
--- a/packages/data-validation/package.json
+++ b/packages/data-validation/package.json
@@ -81,6 +81,6 @@
"@univerjs/sheets": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/design/.gitignore b/packages/design/.gitignore
new file mode 100644
index 0000000000..d3df7912a3
--- /dev/null
+++ b/packages/design/.gitignore
@@ -0,0 +1 @@
+/src/helper/clsx.generated.ts
diff --git a/packages/design/package.json b/packages/design/package.json
index 478701ada0..701bec9667 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -61,6 +61,7 @@
"lib"
],
"scripts": {
+ "prepare": "node scripts/generate-clsx.mts",
"test": "vitest run",
"test:watch": "vitest",
"coverage": "vitest run --coverage",
@@ -83,10 +84,8 @@
"@radix-ui/react-slot": "^1.3.3",
"@univerjs/icons": "1.38.0",
"class-variance-authority": "^0.7.1",
- "clsx": "^2.1.1",
"cmdk": "1.1.1",
- "sonner": "^2.0.7",
- "tailwind-merge": "2.6.0"
+ "sonner": "^2.0.7"
},
"devDependencies": {
"@testing-library/jest-dom": "6.9.1",
@@ -95,9 +94,10 @@
"postcss": "^8.5.26",
"react": "18.3.1",
"react-dom": "18.3.1",
+ "tailwind-merge": "2.6.0",
"tailwindcss": "3.4.18",
"tailwindcss-animate": "^1.0.7",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/design/scripts/generate-clsx.mts b/packages/design/scripts/generate-clsx.mts
new file mode 100644
index 0000000000..79b194bff7
--- /dev/null
+++ b/packages/design/scripts/generate-clsx.mts
@@ -0,0 +1,87 @@
+import type { Config } from 'tailwind-merge';
+import { readFileSync, writeFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { dirname, resolve } from 'node:path';
+import { getDefaultConfig, validators } from 'tailwind-merge';
+
+type ClassGroup = Config<string, string>['classGroups'][string];
+
+const config = getDefaultConfig();
+const groupNames = Object.keys(config.classGroups);
+const validatorNames = Object.keys(validators).sort() as Array<keyof typeof validators>;
+const groupIds = new Map(groupNames.map((name, index) => [name, index + 1]));
+
+interface IRule {
+ literals: string[];
+ validators: number;
+}
+
+function visit(definitions: ClassGroup, prefix: string, rules: Map<string, IRule>) {
+ const rule = rules.get(prefix) ?? { literals: [], validators: 0 };
+ rules.set(prefix, rule);
+ for (const definition of definitions) {
+ if (typeof definition === 'string') {
+ rule.literals.push(definition);
+ } else if (typeof definition === 'function') {
+ if ('isThemeGetter' in definition) {
+ visit(definition(config.theme), prefix, rules);
+ continue;
+ }
+
+ const validator = validatorNames.findIndex((name) => validators[name] === definition);
+ if (validator === -1) {
+ throw new Error(`Unknown Tailwind v3 validator: ${definition.name}`);
+ }
+
+ rule.validators |= 1 << validator;
+ } else {
+ for (const [part, children] of Object.entries(definition)) {
+ visit(children, prefix + (prefix ? '-' : '') + part, rules);
+ }
+ }
+ }
+}
+
+const classGroups = Object.values(config.classGroups).map((definitions) => {
+ const rules = new Map<string, IRule>();
+ visit(definitions, '', rules);
+ return Array.from(rules)
+ .filter(([, rule]) => rule.literals.length || rule.validators)
+ .map(([prefix, rule]) => `['${prefix}', ${rule.literals.length ? `'${rule.literals.join(' ')}'` : 'null'}, ${rule.validators}]`);
+});
+
+function serializeConflicts(conflicts: Record<string, readonly string[] | undefined>) {
+ return Object.entries(conflicts).map(([name, targets]) =>
+ ` ${groupIds.get(name)}: [${targets!.map((target) => groupIds.get(target)).join(', ')}],`
+ ).join('\n');
+}
+
+const require = createRequire(import.meta.url);
+const packageDir = resolve(dirname(require.resolve('tailwind-merge')), '..');
+const license = readFileSync(resolve(packageDir, 'LICENSE.md'), 'utf8').trim();
+const header = readFileSync(new URL('../src/helper/clsx.ts', import.meta.url), 'utf8').split('\n\n')[0];
+const output = `${header}
+
+// Generated by pnpm --filter @univerjs/design prepare. Do not edit.
+// Complete tailwind-merge 2.6.0 / Tailwind CSS 3.4 rules; the runtime supplies the univer- prefix.
+/*!
+${license.split('\n').map((line) => ` *${line ? ` ${line}` : ''}`).join('\n')}
+ */
+
+export const VALIDATOR_NAMES = [${validatorNames.map((name) => `'${name}'`).join(', ')}] as const;
+
+// Group IDs are one-based. Each rule contains a prefix, literal suffixes and a validator bitmask.
+export const CLASS_GROUPS: ReadonlyArray<ReadonlyArray<readonly [prefix: string, literals: string | null, validators: number]>> = [
+${classGroups.map((rules) => ` [${rules.join(', ')}],`).join('\n')}
+];
+
+export const CLASS_CONFLICTS: Record<number, readonly number[]> = {
+${serializeConflicts(config.conflictingClassGroups)}
+};
+
+export const POSTFIX_CONFLICTS: Record<number, readonly number[]> = {
+${serializeConflicts(config.conflictingClassGroupModifiers)}
+};
+`;
+
+writeFileSync(new URL('../src/helper/clsx.generated.ts', import.meta.url), output);
diff --git a/packages/design/src/helper/__tests__/clsx.spec.ts b/packages/design/src/helper/__tests__/clsx.spec.ts
index 147519e8d2..4f5288e6ea 100644
--- a/packages/design/src/helper/__tests__/clsx.spec.ts
+++ b/packages/design/src/helper/__tests__/clsx.spec.ts
@@ -16,9 +16,24 @@
import { cva } from 'class-variance-authority';
import { describe, expect, it } from 'vitest';
+
import { clsx } from '../clsx';
describe('clsx', () => {
+ it('flattens conditional values without caching mutable arrays or objects by identity', () => {
+ const active = { 'univer-h-8': false };
+ const values = ['univer-h-6'];
+ const inputs = [values, active, [false, null, undefined, 0, Number.NaN, '', true, 7, 1n]];
+
+ expect(clsx(...inputs)).toBe('univer-h-6 7');
+ active['univer-h-8'] = true;
+ expect(clsx(...inputs)).toBe('univer-h-8 7');
+ values.push('univer-p-2');
+ expect(clsx(...inputs)).toBe('univer-p-2 univer-h-8 7');
+ expect(clsx()).toBe('');
+ expect(clsx(' \n univer-p-2\t univer-p-4 ')).toBe('univer-p-4');
+ });
+
it('merges Univer-prefixed conflicting utilities', () => {
expect(clsx('univer-h-6', 'univer-h-[78px]')).toBe('univer-h-[78px]');
expect(clsx('univer-px-3', 'univer-px-8')).toBe('univer-px-8');
@@ -37,4 +52,53 @@ describe('clsx', () => {
expect(clsx(buttonVariants({ size: 'small', className: 'univer-h-[78px]' }))).toBe('univer-h-[78px]');
});
+
+ it.each([
+ ['univer-pr-2 univer-px-4', 'univer-px-4'],
+ ['univer-px-4 univer-pr-2', 'univer-px-4 univer-pr-2'],
+ ['univer-p-2 univer-px-4', 'univer-p-2 univer-px-4'],
+ ['univer-px-4 univer-p-2', 'univer-p-2'],
+ ['univer-w-2 univer-h-4 univer-size-8', 'univer-size-8'],
+ ['univer-size-8 univer-w-2', 'univer-size-8 univer-w-2'],
+ ['-univer-m-2 univer-m-4', 'univer-m-4'],
+ ['univer-p-2 !univer-p-4 !univer-p-8', 'univer-p-2 !univer-p-8'],
+ ['univer-leading-8 univer-text-sm/6', 'univer-text-sm/6'],
+ ['univer-text-sm/6 univer-leading-8', 'univer-text-sm/6 univer-leading-8'],
+ ['univer-w-1/2 univer-w-3/4', 'univer-w-3/4'],
+ ['univer-bg-opacity-25 univer-bg-opacity-50 univer-bg-red-500/50', 'univer-bg-opacity-50 univer-bg-red-500/50'],
+ ['univer-text-opacity-25 univer-text-opacity-75', 'univer-text-opacity-75'],
+ ])('resolves directional and v3-specific conflicts: %s', (input, expected) => {
+ expect(clsx(input)).toBe(expected);
+ });
+
+ it.each([
+ ['hover:focus:univer-p-2 focus:hover:univer-p-4', 'focus:hover:univer-p-4'],
+ ['hover:univer-p-2 focus:univer-p-4', 'hover:univer-p-2 focus:univer-p-4'],
+ ['dark:hover:!univer-p-2 hover:dark:!univer-p-4', 'hover:dark:!univer-p-4'],
+ ['[&:nth-child(2)]:univer-p-2 [&:nth-child(2)]:univer-p-4', '[&:nth-child(2)]:univer-p-4'],
+ ['hover:[&_a]:univer-p-2 [&_a]:hover:univer-p-4', 'hover:[&_a]:univer-p-2 [&_a]:hover:univer-p-4'],
+ ['group-hover/menu:univer-p-2 group-hover/menu:univer-p-4', 'group-hover/menu:univer-p-4'],
+ ['data-[state=open]:univer-p-2 data-[state=open]:univer-p-4', 'data-[state=open]:univer-p-4'],
+ ])('keeps variant scopes distinct: %s', (input, expected) => {
+ expect(clsx(input)).toBe(expected);
+ });
+
+ it.each([
+ ['univer-text-[length:var(--size)] univer-text-[color:var(--color)]', 'univer-text-[length:var(--size)] univer-text-[color:var(--color)]'],
+ ['univer-bg-[url(https://example.com/a-b.svg)] univer-bg-red-500', 'univer-bg-[url(https://example.com/a-b.svg)] univer-bg-red-500'],
+ ['univer-bg-[size:20px_30px] univer-bg-cover', 'univer-bg-cover'],
+ ['univer-shadow-[0_1px_2px_black] univer-shadow-red-500', 'univer-shadow-[0_1px_2px_black] univer-shadow-red-500'],
+ ['[color:red] [color:blue] [background:red]', '[color:blue] [background:red]'],
+ ['hover:[--gutter:1rem] hover:[--gutter:2rem]', 'hover:[--gutter:2rem]'],
+ ['p-2 p-4 univer-custom univer-custom', 'p-2 p-4 univer-custom univer-custom'],
+ ['univer-p-unknown univer-p-2', 'univer-p-unknown univer-p-2'],
+ ['constructor toString __proto__ univer-constructor univer-toString', 'constructor toString __proto__ univer-constructor univer-toString'],
+ ])('recognizes arbitrary values and preserves external classes: %s', (input, expected) => {
+ expect(clsx(input)).toBe(expected);
+ });
+
+ it('handles the v3 leading important marker before a font-size/line-height postfix', () => {
+ expect(clsx('!univer-leading-8 !univer-text-sm/6')).toBe('!univer-text-sm/6');
+ expect(clsx('!univer-text-red-500 !univer-text-sm/6')).toBe('!univer-text-red-500 !univer-text-sm/6');
+ });
});
diff --git a/packages/design/src/helper/clsx.ts b/packages/design/src/helper/clsx.ts
index 7cbf00ac85..cad2bc0a42 100644
--- a/packages/design/src/helper/clsx.ts
+++ b/packages/design/src/helper/clsx.ts
@@ -14,13 +14,256 @@
* limitations under the License.
*/
-/* eslint-disable no-restricted-imports */
-import type { ClassValue } from 'clsx';
-import { clsx as cn } from 'clsx';
-import { extendTailwindMerge } from 'tailwind-merge';
+import { CLASS_CONFLICTS, CLASS_GROUPS, POSTFIX_CONFLICTS, VALIDATOR_NAMES } from './clsx.generated';
-const twMerge = extendTailwindMerge({ prefix: 'univer-' });
+export type ClassValue = string | number | bigint | boolean | null | undefined | ClassValue[] | Record<string, unknown>;
-export function clsx(...inputs: ClassValue[]) {
- return twMerge(cn(inputs));
+interface IClassToken {
+ id: number | string;
+ conflicts: readonly (number | string)[];
+}
+
+const arbitraryValue = /^\[(?:([a-z-]+):)?(.+)\]$/i;
+const lengthValue = /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/;
+const colorValue = /^(rgba?|hsla?|hwb|(ok)?(lab|lch))\(.+\)$/;
+
+function isNumber(value: string) {
+ return Boolean(value) && !Number.isNaN(Number(value));
+}
+
+function isArbitrary(value: string, labels: string[], test: (value: string) => boolean = () => false) {
+ const match = arbitraryValue.exec(value);
+ return !!match && (match[1] ? labels.includes(match[1]) : test(match[2]));
+}
+
+// Tailwind v3 validators, adapted from tailwind-merge 2.6.0.
+// Its MIT license is included with the generated rules in clsx.generated.ts.
+const validators: Record<typeof VALIDATOR_NAMES[number], (value: string) => boolean> = {
+ isAny: () => true,
+ isArbitraryImage: (value) => isArbitrary(value, ['image', 'url'], (value) => /^(url|image|image-set|cross-fade|element|(repeating-)?(linear|radial|conic)-gradient)\(.+\)$/.test(value)),
+ isArbitraryLength: (value) => isArbitrary(value, ['length'], (value) => lengthValue.test(value) && !colorValue.test(value)),
+ isArbitraryNumber: (value) => isArbitrary(value, ['number'], isNumber),
+ isArbitraryPosition: (value) => isArbitrary(value, ['position']),
+ isArbitraryShadow: (value) => isArbitrary(value, [], (value) => /^(inset_)?-?((\d+)?\.?(\d+)[a-z]+|0)_-?((\d+)?\.?(\d+)[a-z]+|0)/.test(value)),
+ isArbitrarySize: (value) => isArbitrary(value, ['length', 'size', 'percentage']),
+ isArbitraryValue: (value) => arbitraryValue.test(value),
+ isInteger: (value) => Boolean(value) && Number.isInteger(Number(value)),
+ isLength: (value) => isNumber(value) || ['px', 'full', 'screen'].includes(value) || /^\d+\/\d+$/.test(value),
+ isNumber,
+ isPercent: (value) => value.endsWith('%') && isNumber(value.slice(0, -1)),
+ isTshirtSize: (value) => /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/.test(value),
+};
+
+const classValidators = VALIDATOR_NAMES.map((name) => validators[name]);
+const classPatterns = new Map<string, number[]>();
+const classGroups = new Map<string, number>();
+const cache = new Map<string, string>();
+const cacheKeys = cache.keys();
+const tokens = new Map<string, IClassToken | null>();
+const tokenKeys = tokens.keys();
+const plainTokens: IClassToken[] = [];
+
+CLASS_GROUPS.forEach((rules, index) => {
+ for (const [prefix, literals, mask] of rules) {
+ if (literals !== null) {
+ for (const suffix of literals.split(' ')) {
+ classGroups.set(prefix + (prefix && suffix ? '-' : '') + suffix, index + 1);
+ }
+ }
+ if (mask) {
+ const patterns = classPatterns.get(prefix) ?? [];
+ patterns.push(index + 1, mask);
+ classPatterns.set(prefix, patterns);
+ }
+ }
+});
+
+function getClassGroup(className: string): number | string | undefined {
+ const positive = className.startsWith('-') ? className.slice(1) : className;
+ if (!positive.startsWith('univer-')) {
+ // Arbitrary properties are unprefixed in Tailwind v3, including in prefixed projects.
+ const property = /^\[([^:]+):.+\]$/.exec(className);
+ return property ? `arbitrary..${property[1]}` : undefined;
+ }
+
+ const utility = positive.slice(7);
+ const exact = classGroups.get(utility);
+ if (exact !== undefined) {
+ return exact;
+ }
+
+ // Longest prefix first preserves v3's precedence (e.g. border-x width before border color).
+ for (let end = utility.lastIndexOf('-'); end > 0; end = utility.lastIndexOf('-', end - 1)) {
+ const rules = classPatterns.get(utility.slice(0, end));
+ if (!rules) {
+ continue;
+ }
+
+ const value = utility.slice(end + 1);
+ for (let index = 0; index < rules.length; index += 2) {
+ // Visit only the validators present in the precompiled bitmask.
+ for (let mask = rules[index + 1]; mask; mask &= mask - 1) {
+ const validator = 31 - Math.clz32(mask & -mask);
+ if (classValidators[validator](value)) {
+ return rules[index];
+ }
+ }
+ }
+ }
+}
+
+function joinClasses(inputs: ClassValue[]): string {
+ let result = '';
+ for (const value of inputs) {
+ if (!value) {
+ continue;
+ }
+
+ let joined = '';
+ if (typeof value === 'string' || typeof value === 'number') {
+ joined = String(value);
+ } else if (Array.isArray(value)) {
+ joined = joinClasses(value);
+ } else if (typeof value === 'object') {
+ for (const key in value) {
+ if (value[key]) {
+ result += (result ? ' ' : '') + key;
+ }
+ }
+ }
+ if (joined) {
+ result += (result ? ' ' : '') + joined;
+ }
+ }
+ return result;
+}
+
+function parseClassName(original: string) {
+ const modifiers: string[] = [];
+ let sortable: string[] = [];
+ let depth = 0;
+ let start = 0;
+ let slash = -1;
+
+ for (let position = 0; position < original.length; position++) {
+ const character = original[position];
+ if (depth === 0 && character === ':') {
+ const modifier = original.slice(start, position);
+ if (modifier.startsWith('[')) {
+ modifiers.push(...sortable.sort(), modifier);
+ sortable = [];
+ } else {
+ sortable.push(modifier);
+ }
+ start = position + 1;
+ } else if (depth === 0 && character === '/') {
+ slash = position;
+ } else if (character === '[') {
+ depth++;
+ } else if (character === ']') {
+ depth--;
+ }
+ }
+
+ const important = original[start] === '!';
+ if (important) {
+ // Strip v3's leading ! before slicing / so text-sm/6 remains a font size, not a color.
+ start++;
+ }
+
+ let hasPostfix = slash > start;
+ let group = getClassGroup(original.slice(start, hasPostfix ? slash : undefined));
+ if (group === undefined && hasPostfix) {
+ group = getClassGroup(original.slice(start));
+ hasPostfix = false;
+ }
+
+ modifiers.push(...sortable.sort());
+ return { group, hasPostfix, scope: `${modifiers.join(':')}|${important ? '!' : ''}` };
+}
+
+function getClassToken(original: string): IClassToken | null {
+ // Arbitrary values often change on every call; retaining them costs more than reusing their group.
+ const cacheable = original.indexOf('[') === -1;
+ if (cacheable) {
+ const cached = tokens.get(original);
+ if (cached !== undefined) {
+ return cached;
+ }
+ }
+
+ let group: number | string | undefined;
+ let scope = '|';
+ let hasPostfix = false;
+ if (original.indexOf(':') === -1 && original.indexOf('/') === -1) {
+ const important = original[0] === '!';
+ group = getClassGroup(important ? original.slice(1) : original);
+ scope = important ? '|!' : '|';
+ } else {
+ ({ group, scope, hasPostfix } = parseClassName(original));
+ }
+
+ const token = group === undefined ? null : createClassToken(group, scope, hasPostfix);
+ if (cacheable) {
+ if (tokens.size >= 2048) {
+ tokens.delete(tokenKeys.next().value!);
+ }
+ tokens.set(original, token);
+ }
+ return token;
+}
+
+function createClassToken(group: number | string, scope: string, hasPostfix: boolean): IClassToken {
+ const plain = scope === '|' || scope === '|!';
+ const offset = scope === '|!' ? CLASS_GROUPS.length : 0;
+ const id = plain && typeof group === 'number' ? group + offset : scope + group;
+ const postfix = hasPostfix && typeof group === 'number' ? POSTFIX_CONFLICTS[group] : undefined;
+ const cached = typeof id === 'number' && !postfix ? plainTokens[id] : undefined;
+ if (cached) {
+ return cached;
+ }
+
+ const conflicts = typeof group === 'number'
+ ? [...(CLASS_CONFLICTS[group] ?? []), ...(postfix ?? [])].map((conflict) => plain ? conflict + offset : scope + conflict)
+ : [];
+ const token = { id, conflicts };
+ if (typeof id === 'number' && !postfix) {
+ plainTokens[id] = token;
+ }
+ return token;
+}
+
+/** Joins conditional classes and resolves Tailwind CSS v3 conflicts for the univer- prefix. */
+export function clsx(...inputs: ClassValue[]): string {
+ const classList = inputs.length === 1 && typeof inputs[0] === 'string' ? inputs[0] : joinClasses(inputs);
+ const cached = cache.get(classList);
+ if (cached !== undefined) {
+ return cached;
+ }
+
+ const classes = classList.trim().split(/\s+/);
+ const conflicts = new Set<number | string>();
+ let result = '';
+
+ for (let index = classes.length - 1; index >= 0; index--) {
+ const original = classes[index];
+ const token = getClassToken(original);
+ if (token) {
+ if (conflicts.has(token.id)) {
+ continue;
+ }
+ conflicts.add(token.id);
+ for (const conflict of token.conflicts) {
+ conflicts.add(conflict);
+ }
+ }
+
+ result = original + (result ? ` ${result}` : '');
+ }
+
+ if (cache.size >= 1000) {
+ cache.delete(cacheKeys.next().value!);
+ }
+ cache.set(classList, result);
+ return result;
}
diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json
index da146f7280..0075491fb2 100644
--- a/packages/docs-drawing-ui/package.json
+++ b/packages/docs-drawing-ui/package.json
@@ -93,6 +93,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-drawing/package.json b/packages/docs-drawing/package.json
index 886f41ff3b..935feef162 100644
--- a/packages/docs-drawing/package.json
+++ b/packages/docs-drawing/package.json
@@ -83,6 +83,6 @@
"@univerjs-infra/shared": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-find-replace/package.json b/packages/docs-find-replace/package.json
index 3c4502857f..006c455ca3 100644
--- a/packages/docs-find-replace/package.json
+++ b/packages/docs-find-replace/package.json
@@ -79,6 +79,6 @@
"react": "18.3.1",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index b7762e6911..fe9303970c 100644
--- a/packages/docs-hyper-link-ui/package.json
+++ b/packages/docs-hyper-link-ui/package.json
@@ -91,6 +91,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-hyper-link/package.json b/packages/docs-hyper-link/package.json
index 54c2db38a3..43fa3d7a1e 100644
--- a/packages/docs-hyper-link/package.json
+++ b/packages/docs-hyper-link/package.json
@@ -69,6 +69,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json
index 6e14e8d94e..25d1d15d64 100644
--- a/packages/docs-quick-insert-ui/package.json
+++ b/packages/docs-quick-insert-ui/package.json
@@ -93,6 +93,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index c94e44da9d..63d909c83b 100644
--- a/packages/docs-thread-comment-ui/package.json
+++ b/packages/docs-thread-comment-ui/package.json
@@ -93,6 +93,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-thread-comment/package.json b/packages/docs-thread-comment/package.json
index 284bebe763..f6572cc7ac 100644
--- a/packages/docs-thread-comment/package.json
+++ b/packages/docs-thread-comment/package.json
@@ -82,6 +82,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.10"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index 662faeac5b..def888f57b 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -103,6 +103,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/docs-ui/src/views/DocLayoutProgress.tsx b/packages/docs-ui/src/views/DocLayoutProgress.tsx
index 537bc227d2..4daab5a80c 100644
--- a/packages/docs-ui/src/views/DocLayoutProgress.tsx
+++ b/packages/docs-ui/src/views/DocLayoutProgress.tsx
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import type { LocaleKey } from '../locale/types';
import { LocaleService } from '@univerjs/core';
import { useDependency, useObservable } from '@univerjs/ui';
import { DocLayoutProgressService } from '../services/doc-layout-progress.service';
@@ -26,7 +27,7 @@ export function DocLayoutProgress() {
}
const { progress } = progressState;
- const label = localeService.t('docs-ui.layout.progress');
+ const label = localeService.t<LocaleKey>('docs-ui.layout.progress');
return (
<div
diff --git a/packages/docs-ui/src/views/DocLayoutRecovery.tsx b/packages/docs-ui/src/views/DocLayoutRecovery.tsx
index f2d0c7ce52..60f7228252 100644
--- a/packages/docs-ui/src/views/DocLayoutRecovery.tsx
+++ b/packages/docs-ui/src/views/DocLayoutRecovery.tsx
@@ -14,6 +14,7 @@
* limitations under the License.
*/
+import type { LocaleKey } from '../locale/types';
import { LocaleService } from '@univerjs/core';
import { LoadingMultiIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
@@ -37,7 +38,7 @@ export function DocLayoutRecovery() {
aria-hidden
className="univer-size-5 univer-animate-spin univer-text-violet-500"
/>
- <span>{localeService.t('docs-ui.layout.recovering')}</span>
+ <span>{localeService.t<LocaleKey>('docs-ui.layout.recovering')}</span>
</div>
);
}
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 2476167a1c..715fdaf60b 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -87,6 +87,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index adce38c330..2746036199 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -88,6 +88,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/drawing/package.json b/packages/drawing/package.json
index bda5d35abf..fca91c8eb0 100644
--- a/packages/drawing/package.json
+++ b/packages/drawing/package.json
@@ -74,6 +74,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/engine-formula/package.json b/packages/engine-formula/package.json
index 67a840c243..46ad374307 100644
--- a/packages/engine-formula/package.json
+++ b/packages/engine-formula/package.json
@@ -93,6 +93,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/engine-render/package.json b/packages/engine-render/package.json
index 3526a9ccf2..abcfc98095 100644
--- a/packages/engine-render/package.json
+++ b/packages/engine-render/package.json
@@ -80,6 +80,6 @@
"rxjs": "^7.8.2",
"tsdown": "^0.22.14",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index 17e75c584c..afaffd6cfa 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -87,6 +87,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/network/package.json b/packages/network/package.json
index bd4650825a..bd9a814347 100644
--- a/packages/network/package.json
+++ b/packages/network/package.json
@@ -84,6 +84,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/protocol/package.json b/packages/protocol/package.json
index 2cd90f04d5..17c6fb5d12 100644
--- a/packages/protocol/package.json
+++ b/packages/protocol/package.json
@@ -70,6 +70,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/rpc-node/package.json b/packages/rpc-node/package.json
index 9a21d209b0..ba990b0047 100644
--- a/packages/rpc-node/package.json
+++ b/packages/rpc-node/package.json
@@ -74,6 +74,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/rpc/package.json b/packages/rpc/package.json
index 246e005ef8..1069b9fe07 100644
--- a/packages/rpc/package.json
+++ b/packages/rpc/package.json
@@ -73,6 +73,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index fa507c3ab6..59a86d977c 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -93,6 +93,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index 4e0f82bce9..fb47d86bae 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -96,6 +96,6 @@
"@univerjs/sheets-formula": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index b49f870f23..a198d5f895 100644
--- a/packages/sheets-crosshair-highlight/package.json
+++ b/packages/sheets-crosshair-highlight/package.json
@@ -100,6 +100,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index e6592b94e0..b1d913d5ba 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -94,6 +94,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json
index 5ad42ad8f2..eadccb4c3d 100644
--- a/packages/sheets-data-validation/package.json
+++ b/packages/sheets-data-validation/package.json
@@ -95,6 +95,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json
index b1381e7058..8fd31bb65d 100644
--- a/packages/sheets-drawing-ui/package.json
+++ b/packages/sheets-drawing-ui/package.json
@@ -105,6 +105,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-drawing/package.json b/packages/sheets-drawing/package.json
index 14e0f30b6b..1592885e3d 100644
--- a/packages/sheets-drawing/package.json
+++ b/packages/sheets-drawing/package.json
@@ -83,6 +83,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index 5b415a14ef..a78a0a539e 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -91,6 +91,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-filter/package.json b/packages/sheets-filter/package.json
index d97f188f4a..27cf710abc 100644
--- a/packages/sheets-filter/package.json
+++ b/packages/sheets-filter/package.json
@@ -94,6 +94,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json
index f42b71145e..4baf6abf4f 100644
--- a/packages/sheets-find-replace/package.json
+++ b/packages/sheets-find-replace/package.json
@@ -88,6 +88,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index 0dfcb4d80d..d1993feb7d 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -104,6 +104,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
index d478897d1c..6a56042fef 100644
--- a/packages/sheets-formula/package.json
+++ b/packages/sheets-formula/package.json
@@ -95,6 +95,6 @@
"@univerjs/engine-render": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index d51cd8c010..77e949cb5e 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -106,6 +106,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-hyper-link/package.json b/packages/sheets-hyper-link/package.json
index 0364fcadf2..69c6acd759 100644
--- a/packages/sheets-hyper-link/package.json
+++ b/packages/sheets-hyper-link/package.json
@@ -93,6 +93,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-note-ui/package.json b/packages/sheets-note-ui/package.json
index ca064d448b..ff143f4f6b 100644
--- a/packages/sheets-note-ui/package.json
+++ b/packages/sheets-note-ui/package.json
@@ -89,6 +89,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-note/package.json b/packages/sheets-note/package.json
index 64c1c81c9c..afeb69f581 100644
--- a/packages/sheets-note/package.json
+++ b/packages/sheets-note/package.json
@@ -88,6 +88,6 @@
"@univerjs/network": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-numfmt-ui/package.json b/packages/sheets-numfmt-ui/package.json
index c7f20b8478..33785b0ee1 100644
--- a/packages/sheets-numfmt-ui/package.json
+++ b/packages/sheets-numfmt-ui/package.json
@@ -91,6 +91,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.json
index 08c7067f85..24d1c8cf38 100644
--- a/packages/sheets-numfmt/package.json
+++ b/packages/sheets-numfmt/package.json
@@ -86,6 +86,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 5312c931ac..220ac7da3a 100644
--- a/packages/sheets-sort-ui/package.json
+++ b/packages/sheets-sort-ui/package.json
@@ -91,6 +91,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-sort/package.json b/packages/sheets-sort/package.json
index e0a13659d6..144c3b8ec6 100644
--- a/packages/sheets-sort/package.json
+++ b/packages/sheets-sort/package.json
@@ -82,6 +82,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-table-ui/package.json b/packages/sheets-table-ui/package.json
index f4b31c3a1c..3cb9412f39 100644
--- a/packages/sheets-table-ui/package.json
+++ b/packages/sheets-table-ui/package.json
@@ -94,6 +94,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-table/package.json b/packages/sheets-table/package.json
index 2b731cf1c9..4e49a96e5f 100644
--- a/packages/sheets-table/package.json
+++ b/packages/sheets-table/package.json
@@ -94,6 +94,6 @@
"@univerjs/sheets-formula": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json
index 7149900588..238cdd0f95 100644
--- a/packages/sheets-thread-comment-ui/package.json
+++ b/packages/sheets-thread-comment-ui/package.json
@@ -93,6 +93,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-thread-comment/package.json b/packages/sheets-thread-comment/package.json
index d68fc98947..c910724fdd 100644
--- a/packages/sheets-thread-comment/package.json
+++ b/packages/sheets-thread-comment/package.json
@@ -87,6 +87,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 1158e74815..cebc2ca371 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -105,6 +105,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/sheets/package.json b/packages/sheets/package.json
index 67ba26e1ce..cf6d9a3542 100644
--- a/packages/sheets/package.json
+++ b/packages/sheets/package.json
@@ -95,6 +95,6 @@
"@univerjs/network": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index 6dd32498f0..1037abf669 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -91,6 +91,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/slides/package.json b/packages/slides/package.json
index db056baca0..d194c07924 100644
--- a/packages/slides/package.json
+++ b/packages/slides/package.json
@@ -74,6 +74,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 15d9353dbf..8601f69918 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -69,6 +69,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index 3e8aff673d..8b3af152b8 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -89,6 +89,6 @@
"rxjs": "^7.8.2",
"tailwindcss": "3.4.18",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/thread-comment/package.json b/packages/thread-comment/package.json
index 4b27988445..e7378ca3c7 100644
--- a/packages/thread-comment/package.json
+++ b/packages/thread-comment/package.json
@@ -84,6 +84,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/ui-adapter-vue3/package.json b/packages/ui-adapter-vue3/package.json
index 474360c585..4abd96c788 100644
--- a/packages/ui-adapter-vue3/package.json
+++ b/packages/ui-adapter-vue3/package.json
@@ -73,7 +73,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11",
+ "vitest": "^5.0.0",
"vue": "^3.5.40"
}
}
diff --git a/packages/ui-adapter-web-component/package.json b/packages/ui-adapter-web-component/package.json
index c3c47a34ec..9f67b95f83 100644
--- a/packages/ui-adapter-web-component/package.json
+++ b/packages/ui-adapter-web-component/package.json
@@ -70,6 +70,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index f5afd53e8d..e78ba193ac 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -104,6 +104,6 @@
"tailwindcss": "3.4.18",
"tailwindcss-animate": "^1.0.7",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/packages/ui/src/views/menu/mobile/MobileMenuDrawer.tsx b/packages/ui/src/views/menu/mobile/MobileMenuDrawer.tsx
index 834420562b..efa298e24a 100644
--- a/packages/ui/src/views/menu/mobile/MobileMenuDrawer.tsx
+++ b/packages/ui/src/views/menu/mobile/MobileMenuDrawer.tsx
@@ -15,6 +15,7 @@
*/
import type { ComponentProps } from 'react';
+import type { LocaleKey } from '../../../locale/types';
import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import type { MobileDrawerSnap } from '../../components/mobile-drawer/MobileDrawer';
import { LocaleService } from '@univerjs/core';
@@ -62,7 +63,7 @@ function MobileMenuDrawerContent(props: IMobileMenuDrawerProps) {
<div dir={direction} className="univer-fixed univer-inset-0 univer-z-[1080] univer-flex univer-items-end">
<button
type="button"
- aria-label={localeService.t('ui.rangeSelector.cancel')}
+ aria-label={localeService.t<LocaleKey>('ui.rangeSelector.cancel')}
className={clsx(resetButtonClassName, `
!univer-absolute !univer-inset-0 !univer-m-0 !univer-block !univer-appearance-none
!univer-rounded-none !univer-border-0 !univer-bg-black/35 !univer-p-0 univer-backdrop-blur-[2px]
@@ -72,8 +73,8 @@ function MobileMenuDrawerContent(props: IMobileMenuDrawerProps) {
<MobileDrawer
componentName="mobile-menu-drawer"
snap={drawerSnap}
- expandLabel={localeService.t('ui.ribbon.more')}
- collapseLabel={localeService.t('ui.ribbon.more')}
+ expandLabel={localeService.t<LocaleKey>('ui.ribbon.more')}
+ collapseLabel={localeService.t<LocaleKey>('ui.ribbon.more')}
onSnapChange={setDrawerSnap}
onClose={onClose}
role="dialog"
@@ -90,7 +91,7 @@ function MobileMenuDrawerContent(props: IMobileMenuDrawerProps) {
? (
<button
type="button"
- aria-label={localeService.t('ui.navigation.back')}
+ aria-label={localeService.t<LocaleKey>('ui.navigation.back')}
className={clsx(resetButtonClassName, `
univer-size-10 univer-rounded-xl univer-text-gray-700
active:univer-bg-gray-200
@@ -114,7 +115,7 @@ function MobileMenuDrawerContent(props: IMobileMenuDrawerProps) {
</div>
<button
type="button"
- aria-label={localeService.t('ui.rangeSelector.cancel')}
+ aria-label={localeService.t<LocaleKey>('ui.rangeSelector.cancel')}
className={clsx(resetButtonClassName, `
univer-size-10 univer-rounded-xl univer-text-gray-700
active:univer-bg-gray-200
diff --git a/packages/watermark/package.json b/packages/watermark/package.json
index 6a96617a08..45a541c7c3 100644
--- a/packages/watermark/package.json
+++ b/packages/watermark/package.json
@@ -85,6 +85,6 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f31aa02a44..73da0042ee 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -218,7 +218,7 @@ importers:
version: 1.2.0
'@antfu/eslint-config':
specifier: ^9.2.0
'@commitlint/cli':
specifier: ^21.2.2
version: 21.2.2(@types/[email protected])([email protected])
@@ -286,8 +286,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
common/debugger:
dependencies:
@@ -353,8 +353,8 @@ importers:
specifier: ^8.65.0
'@vitest/coverage-istanbul':
- specifier: ^4.1.11
+ specifier: ^5.0.0
+ version: 5.0.0([email protected])
autoprefixer:
specifier: ^10.5.4
version: 10.5.4([email protected])
@@ -398,8 +398,8 @@ importers:
specifier: ^7.2.0
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
devDependencies:
'@univerjs/icons':
specifier: 1.38.0
@@ -602,8 +602,8 @@ importers:
specifier: ^8.0.11
vitest:
- specifier: ^4.1.10
+ specifier: ^5.0.0
packages/action-recorder:
dependencies:
@@ -645,8 +645,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/core:
dependencies:
@@ -697,8 +697,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/data-validation:
dependencies:
@@ -722,8 +722,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/design:
dependencies:
@@ -754,18 +754,12 @@ importers:
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
cmdk:
specifier: 1.1.1
sonner:
specifier: ^2.0.7
- tailwind-merge:
- specifier: 2.6.0
- version: 2.6.0
devDependencies:
'@testing-library/jest-dom':
specifier: 6.9.1
@@ -785,6 +779,9 @@ importers:
react-dom:
specifier: 19.2.8
version: 19.2.8([email protected])
+ tailwind-merge:
+ specifier: 2.6.0
+ version: 2.6.0
tailwindcss:
specifier: 3.4.18
version: 3.4.18
@@ -795,8 +792,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs:
dependencies:
@@ -823,8 +820,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-drawing:
dependencies:
@@ -848,8 +845,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-drawing-ui:
dependencies:
@@ -906,8 +903,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-find-replace:
dependencies:
@@ -943,8 +940,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-hyper-link:
dependencies:
@@ -959,8 +956,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-hyper-link-ui:
dependencies:
@@ -1011,8 +1008,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-quick-insert-ui:
dependencies:
@@ -1069,8 +1066,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-thread-comment:
dependencies:
@@ -1094,8 +1091,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.10
+ specifier: ^5.0.0
packages/docs-thread-comment-ui:
dependencies:
@@ -1152,8 +1149,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/docs-ui:
dependencies:
@@ -1207,8 +1204,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/drawing:
dependencies:
@@ -1229,8 +1226,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/drawing-ui:
dependencies:
@@ -1272,8 +1269,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/engine-formula:
dependencies:
@@ -1300,8 +1297,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/engine-render:
dependencies:
@@ -1337,8 +1334,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/find-replace:
dependencies:
@@ -1377,8 +1374,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/network:
dependencies:
@@ -1396,8 +1393,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/protocol:
dependencies:
@@ -1415,8 +1412,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/rpc:
dependencies:
@@ -1434,8 +1431,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/rpc-node:
dependencies:
@@ -1456,8 +1453,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets:
dependencies:
@@ -1490,8 +1487,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-conditional-formatting:
dependencies:
@@ -1524,8 +1521,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-conditional-formatting-ui:
dependencies:
@@ -1582,8 +1579,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-crosshair-highlight:
dependencies:
@@ -1628,8 +1625,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-data-validation:
dependencies:
@@ -1662,8 +1659,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-data-validation-ui:
dependencies:
@@ -1723,8 +1720,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-drawing:
dependencies:
@@ -1748,8 +1745,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-drawing-ui:
dependencies:
@@ -1809,8 +1806,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-filter:
dependencies:
@@ -1840,8 +1837,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-filter-ui:
dependencies:
@@ -1892,8 +1889,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-find-replace:
dependencies:
@@ -1923,8 +1920,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-formula:
dependencies:
@@ -1957,8 +1954,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-formula-ui:
dependencies:
@@ -2015,8 +2012,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-hyper-link:
dependencies:
@@ -2043,8 +2040,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-hyper-link-ui:
dependencies:
@@ -2107,8 +2104,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-note:
dependencies:
@@ -2138,8 +2135,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-note-ui:
dependencies:
@@ -2187,8 +2184,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-numfmt:
dependencies:
@@ -2212,8 +2209,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-numfmt-ui:
dependencies:
@@ -2264,8 +2261,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-sort:
dependencies:
@@ -2286,8 +2283,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-sort-ui:
dependencies:
@@ -2338,8 +2335,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-table:
dependencies:
@@ -2369,8 +2366,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-table-ui:
dependencies:
@@ -2427,8 +2424,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-thread-comment:
dependencies:
@@ -2455,8 +2452,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-thread-comment-ui:
dependencies:
@@ -2513,8 +2510,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/sheets-ui:
dependencies:
@@ -2574,8 +2571,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/slides:
dependencies:
@@ -2596,8 +2593,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/slides-ui:
dependencies:
@@ -2648,8 +2645,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/telemetry:
dependencies:
@@ -2664,8 +2661,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/themes:
devDependencies:
@@ -2689,8 +2686,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/thread-comment-ui:
dependencies:
@@ -2735,8 +2732,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/ui:
dependencies:
@@ -2787,8 +2784,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/ui-adapter-vue3:
dependencies:
@@ -2806,8 +2803,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
vue:
specifier: ^3.5.40
version: 3.5.40([email protected])
@@ -2828,8 +2825,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages/watermark:
dependencies:
@@ -2850,8 +2847,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
presets:
dependencies:
@@ -3556,8 +3553,8 @@ importers:
specifier: ^6.0.3
version: 6.0.3
vitest:
- specifier: ^4.1.11
+ specifier: ^5.0.0
packages:
@@ -3689,6 +3686,10 @@ packages:
resolution: {integrity: sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-dYYg153EyN2Ekbqw2zAsbd6/JR+9N2SEoC7YV2GyyqMM7x9bLDTjBD6XBhSMLH0wtIVyJj03jWNriQhaN+eoCw==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==}
engines: {node: '>=6.9.0'}
@@ -3697,6 +3698,10 @@ packages:
resolution: {integrity: sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-DOjnob/cXOUgDOozCDeq/aK2p5y8dUIVdf6tNhEV1HQRd6I8aQ4f4fbtHRVEvb6lP3BGomrKHiS8ICAASSVQSw==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==}
engines: {node: '>=6.9.0'}
@@ -3705,6 +3710,10 @@ packages:
resolution: {integrity: sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-5FgxM4dLQpMJHSiVATk8foW263dVHQHBVpXYiimNECVWG01f4nFyEbQixeT6Mwvg7TayREJ2gpKl3o2RoMdnqw==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==}
engines: {node: '>=6.9.0'}
@@ -3713,6 +3722,10 @@ packages:
resolution: {integrity: sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-NT9NrVwJsbSV6Y2FSstWa71EETOnzrjkL5/wX3D2mYHtKM+qvqB1DvR4D0Setb/gDBsHzRICifwEWMO8CnTF6g==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==}
engines: {node: '>=6.9.0'}
@@ -3721,6 +3734,10 @@ packages:
resolution: {integrity: sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-JwculLABZvyPvyLBpwU/E/IbH2uM3mnxNtIJpxnIfb24y1PrdVxK5Dqjle4DpgqpGRnwgC7G8IkzPdSXZrO1Ew==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==}
engines: {node: '>=6.9.0'}
@@ -3729,6 +3746,10 @@ packages:
resolution: {integrity: sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-lLozHOM6sWWlxNo8CYqHy4MBZeTvHXNgVPBfPOGsjPKUzHC2Az9QwB6gxdQmpwHl6GlQtbGgS+lj5887guDiLw==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==}
engines: {node: '>=6.9.0'}
@@ -3757,6 +3778,10 @@ packages:
resolution: {integrity: sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-6mJgmFFFIIO82vvoLt9XtRC7/TkzXfts1t/SpRX4IHSzMgqoPYCWesVu1udUPUWioAE/2fcG6WuI8zrkE1gwrg==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==}
engines: {node: '>=6.9.0'}
@@ -3765,6 +3790,10 @@ packages:
resolution: {integrity: sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-4wFaiLd0bVo4cIoTXI3zKI038NIWE/cr3jvBjejOVYVxV/m8Ltav1USiGzG1fmS5J2RhgEOgXNNK46cRPnRsrg==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
engines: {node: '>=6.9.0'}
@@ -3773,6 +3802,10 @@ packages:
resolution: {integrity: sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-U4Dybxh4WESWHt5XhBeExi4DrY0/DNK1aHpQbsrQXCUbFHuMweT0TpLEWKvaraV2Y6fS+ZXunsZ8zIuZIgvF2Q==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==}
engines: {node: '>=6.9.0'}
@@ -3781,6 +3814,10 @@ packages:
resolution: {integrity: sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-wfbi91pM3py96oIiJEz7qIpyXDytgr9zQC1HEWwlGNVRAEmItuU/0a41ZUKu1sJGyhhOIpc4t5vk4PYzt8wpsg==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==}
engines: {node: '>=6.0.0'}
@@ -3791,16 +3828,16 @@ packages:
engines: {node: '>=6.0.0'}
hasBin: true
- '@babel/[email protected]':
- resolution: {integrity: sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==}
- engines: {node: '>=6.0.0'}
- hasBin: true
-
resolution: {integrity: sha512-E8lTAYNB1KW+FH+VGJuZM1ioAx2E6oVlvQFRrf5P8ZZmsiJXYAD9vTFV7yyEURNzgh1dFqMZuO6tUwcARbqFCA==}
engines: {node: '>=6.0.0'}
hasBin: true
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-srpptsAkEbbNIC/q8nT7o+m6CQe8CJUTV/t7MYc9NnWlgYVtHOb7JH6SorxMhN0kuRJjVqXbKClG6xSbPtzz+g==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+ hasBin: true
+
resolution: {integrity: sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==}
engines: {node: '>=6.9.0'}
@@ -3821,6 +3858,10 @@ packages:
resolution: {integrity: sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-eAD0QW/AlbamBbw0FeGiwasbCVPq5ncW0HNVyLP3B9czqLyh4gvw+5JTSNt6le9+ziAU7mqDZsKTHf3jTb4chQ==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==}
engines: {node: '>=6.9.0'}
@@ -3829,6 +3870,10 @@ packages:
resolution: {integrity: sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-bZnmqzGG8UZneG1lLxBoWIH0G6Gr1D846Yu4/3XnY6FhCndMR49u26nTY08u/dAxWmLWF9vGQOuC+84FfIUoeg==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
resolution: {integrity: sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==}
engines: {node: '>=6.9.0'}
@@ -3841,6 +3886,10 @@ packages:
resolution: {integrity: sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==}
engines: {node: '>=6.9.0'}
+ '@babel/[email protected]':
+ resolution: {integrity: sha512-eY+Yn3dCqTGmyiq2QRU66lA5FL8lqqqvecHt0fF3uHONIa7ToYsaCiWV8lOKqAs0Rb2SjixiKFROngnulPtt2g==}
+ engines: {node: ^22.18.0 || >=24.11.0}
+
'@bramus/[email protected]':
resolution: {integrity: sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==}
hasBin: true
@@ -4710,6 +4759,9 @@ packages:
'@jridgewell/[email protected]':
resolution: {integrity: sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==}
+ '@jridgewell/[email protected]':
+ resolution: {integrity: sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==}
+
'@jridgewell/[email protected]':
resolution: {integrity: sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==}
@@ -6086,9 +6138,6 @@ packages:
resolution: {integrity: sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==}
engines: {node: '>=18'}
- '@standard-schema/[email protected]':
- resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
-
'@storybook/[email protected]':
resolution: {integrity: sha512-aWAfP5JMiT5a3zBJizwroCRzOCqZwDTJmvsYvwMD3ilIEa/kT1vhf6Xrbk4XIPhDwbh8Hpb/Gfnka1xBYEISWg==}
peerDependencies:
@@ -6438,12 +6487,18 @@ packages:
resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-MbsRCT7mTikHwKZ0X+LVUTLRrZZRLipTuXEO9qOYO+zmjMVk81axyClMROf6uoPD9MRVu46bx8zoR0Ad9q3NAg==}
+
resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-9VN+6yxLOPLOav+7PwjZbxiID2bVaeq0ED4qSQmdQTdjnXJSaCVKTR58t15oqH1H5t8Ng2ZX1SabJVoN9Q34bw==}
+
resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
@@ -6628,10 +6683,10 @@ packages:
resolution: {integrity: sha512-RwXYtnt6za+5UO4IaLywN/6B95AlLqynPRUWRJxeJ/qufwkcLUbZNUxYtzT0uMpuraWhlNcGqPNGkTnZr4BGBw==}
engines: {node: '>= 20'}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-pK9LJtOS534bmUwdwLpGD9qL52DeqVWSInrXFMNqrvWLbbAhuIPAlRup3UbsjFOMqCC/p3MmmX7uXV7ZTkcFfQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-L0Rh+O61F2FV3+Xc3iGqeW5Tp0fs41VXy0hth84UCcMZGqlTjM1n5PUDqdaJD2xmQ/jZY3SJ9k7A2IKpKZRT8A==}
peerDependencies:
- vitest: 4.1.11
+ vitest: 5.0.0
'@vitest/[email protected]':
resolution: {integrity: sha512-U5isuChJ58H1M6oRGaIotYbH2gM1rhzKUjtiarqpLNG/3+fzXIXs5RyTLrYQJmQPnXbvIMPFvI9z8ufpFZc8lg==}
@@ -6652,11 +6707,24 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-Io0yyORnB6sikFlt8QW5K7slY4OjqNX9jmJQ02QDda8lyM6B5oNgVWoSoKPac8/kgnCUzuHQKrSLtu/uOqqrig==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-VX2x5vNJXET47KAFzwERI+KRMtTTCSWTfSMKsW7JsUsXV4psq++e3DvZpuTDOpHcxytiDs6p2nhVb2tVDiiUYw==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-k3DJZ8LhMBK9NS4SclF1ASD3OgXEWDorbIcPTRDK0/Zae6fRvu+fJRxtFdLfHsa9Y24beCdPnoNZ4LviTNstfA==}
+ engines: {node: '>=22'}
+
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-sSwnQN40rt2TiJeW30tBhMKi+6oTZkD3OzdzHAl7o5NJzWtp//sCN2abHfEXQV9dfwTto8Fu+nyQRygcQt/pjA==}
+ engines: {node: '>=22'}
+
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-1EOLRfsTMnyAr3+kEAsP4o9dhaDlGPpD7H5iLBBeq//YpNB1VIahkPhB+eRp9N2Dkfw8oySROjE3yf9XDeaIkQ==}
+ engines: {node: '>=22'}
+
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-3/9S3YuBDg2X2+gM40jUTfwV66w8LrDUF/YPdqVElDwh/541cKSb8A7Eqd0N/Fza1FXeMp6XGzilLDEMOhk6Eg==}
+ engines: {node: '>=22'}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-2XJVD55d1o5AZous5CCGKS74g/riOj9odEt2bQpCVZeblHyHdnMeFl4jl0XjU21stf4mbjUkew2eXQZt65g5CQ==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-66PGTMIiVJP3t4a5yxU9qPtf7MdTBs8jmToMvy+HVflB3Yy13WJZTtPePdvU+wjRV02SKK5doLbSA6o9pwOmiA==}
peerDependencies:
msw: ^2.4.9
vite: ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -6669,27 +6737,15 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-IVNZik8IVRJRTr9fxlitMKeJeXFFFN0JaB9PHPGQ8NKQbGpfjlTx9zO4RefN8gp7eqjNy8nyK3NZmBzOPeIxtA==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-yiZzPbGTS9Sr/JpFl8zHrcIkAofNbFV6k21vIgQN/cY/oxZeXhJv5sc/MBJ5jFKWmWs+oJHw0UXLZjmf931+Vw==}
-
- '@vitest/[email protected]':
- resolution: {integrity: sha512-LztvUgdwMNJMIkj3hQnnxiC2Xy1zNxq928W/xhjCLaNCzqTZOudjwbQf6v9IntZGPw132i2Lq2rgTRZHD3JHNw==}
-
- '@vitest/[email protected]':
- resolution: {integrity: sha512-pN7ikn1ON7h8ee4gIAp4AzyK+zBtJPzVbqOgu5LCEh4VaJVbPQcgYQYJIMGQPXVeJJq1fnfazis7a5pFNPahog==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-vAfasCOe6AIK70iP5UD11Ac4siNUNJ9i/9PZ3NKx07sG6sUxeag1LWdNrMWeKKYBLlzuK+Gn65Yd5nyL6ds+nw==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-apNa/prQy2qCeywhnixOHPRCgGNhvg7T4Dapfl1GahLp/R+uhBm5cPyFoNVyqsNd2h1nJxL6BqqdIjiABL60YA==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-uy+luWBAPw9XfthoHi5AkfHUnuPYEESjl0p/r+meoBnU8bxg5GDQ3Ey8MjcJ6sqahkL4PFyrvfMJJBw7LbU06g==}
'@vitest/[email protected]':
resolution: {integrity: sha512-fB2V0JFrQSMsCo9HiSq3Ezpdv4iYaXRG1Sx8edX3MwxfyNn83mKiGzOcH+Fkxt4MHxr3y42fQi1oeAInqgX2QA==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-zTCVGpyFsGWBhllOyKlTw/vnr6D9qxsfSDyfbyZmTyjHw5N/VuvzHpHoQjm2ZJzn4RJgx5w4r7V0er69CmLgPQ==}
-
resolution: {integrity: sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==}
@@ -8466,9 +8522,6 @@ packages:
resolution: {integrity: sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==}
- resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
-
resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
engines: {node: '>=12'}
@@ -8523,6 +8576,9 @@ packages:
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
engines: {node: '>=6'}
+ resolution: {integrity: sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==}
+
resolution: {integrity: sha512-NkJQA7oZ4YHQhd2+H3BoRFKF3d/XNsiKpHZCQEMH9pDX27hQQLsTyOocyRgaIVtf8gHX3Nt3LPkR4e5EdtPAGQ==}
engines: {node: ^22.18.0 || >=24.0.0}
@@ -8749,18 +8805,6 @@ packages:
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
- resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
- engines: {node: '>=8'}
-
- resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
- engines: {node: '>=10'}
-
- resolution: {integrity: sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==}
- engines: {node: '>=8'}
-
resolution: {integrity: sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==}
engines: {node: '>= 0.4'}
@@ -8802,6 +8846,9 @@ packages:
resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}
engines: {node: '>= 0.8'}
+ resolution: {integrity: sha512-lM/UBzQmfJRo9ABXbPWemivdCW8V2G8FHaHdypQaIy523snUjog0W71ayWXTjiR+ixeMyVHN2XcpnTd/liPg/Q==}
+
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
@@ -9039,8 +9086,11 @@ packages:
resolution: {integrity: sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==}
- resolution: {integrity: sha512-pVKE4UdSQ7DvHzivsCIFx2BJn1mHG6KsyrFcaxFx6tONdneEuThrDx0Cj3AMg58KyN4pzYT+LHOotxDQDjNvkw==}
+ resolution: {integrity: sha512-Bpb0W2TbLKOZ7vJnOUnVRGq3WL2p+ISV29M6hYPL1AFCpyKZpdr5ytiXoTSSxRVhg8YW7f65+6gbG8WG6PCa/g==}
+
+ resolution: {integrity: sha512-llBEhWm1SacoRwgHUoQJYtwp4PBLF4faQi5TCpIGyGs9n4y5+juI0tDgyKIfpqxckRHaHzouUEph3THklWh03w==}
resolution: {integrity: sha512-ayF7iT+44LXdxJLTrTd3TLQpFDDvPCBxXxbv+pMUSuHA5Q8zyAfwkRP6aHHwNVFBUFWtxAHqwNJxF8vMZLAbVg==}
@@ -9050,10 +9100,6 @@ packages:
resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
- engines: {node: '>=10'}
-
resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
@@ -9563,6 +9609,10 @@ packages:
resolution: {integrity: sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==}
engines: {node: '>=12'}
+ resolution: {integrity: sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==}
+ engines: {node: '>=12'}
+
resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
engines: {node: '>=0.10.0'}
@@ -10533,8 +10583,9 @@ packages:
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
- resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
+ resolution: {integrity: sha512-9APumHG7r4yOk4X4WlkmE71aZcv1gvin1czO3OQ1U9iJcFA5Ja/ygyb0vPOVHTthFozUYs8CLoLUlM8grb2lTQ==}
+ engines: {node: '>=20.0.0'}
resolution: {integrity: sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==}
@@ -10892,23 +10943,23 @@ packages:
yaml:
optional: true
- resolution: {integrity: sha512-fhACrNXUidIbGSBr5FlbuBkO7VWC1ZyLl0DO4CU2DrQoAPxX84Ysxs+HeGQpii5lZWV1Q4gBZTTu49mF+A6Edw==}
- engines: {node: ^20.0.0 || ^22.0.0 || >=24.0.0}
+ resolution: {integrity: sha512-gpsMNoRhMjMktVxPtstOH4/PJuPyovVaMDr4oDilXaGH1EcqM2OE96SoHT2VIQ6fTGtTjqmHDrEu2X9RQiXf8Q==}
+ engines: {node: ^22.12.0 || ^24.0.0 || >=26.0.0}
hasBin: true
peerDependencies:
'@edge-runtime/vm': '*'
'@opentelemetry/api': ^1.9.0
- '@types/node': ^20.0.0 || ^22.0.0 || >=24.0.0
- '@vitest/browser-playwright': 4.1.11
- '@vitest/browser-preview': 4.1.11
- '@vitest/browser-webdriverio': 4.1.11
- '@vitest/coverage-istanbul': 4.1.11
- '@vitest/coverage-v8': 4.1.11
- '@vitest/ui': 4.1.11
+ '@types/node': ^22.0.0 || >=24.0.0
+ '@vitest/browser-playwright': 5.0.0
+ '@vitest/browser-preview': 5.0.0
+ '@vitest/browser-webdriverio': ^5.0.0-beta.5 || >=5.0.0
+ '@vitest/coverage-istanbul': 5.0.0
+ '@vitest/coverage-v8': 5.0.0
+ '@vitest/ui': 5.0.0
happy-dom: '*'
jsdom: '*'
- vite: ^6.0.0 || ^7.0.0 || ^8.0.0
+ vite: ^6.4.0 || ^7.0.0 || ^8.0.0
peerDependenciesMeta:
'@edge-runtime/vm':
optional: true
@@ -11202,7 +11253,7 @@ snapshots:
'@amamo/verso-linux-x64': 1.2.0
'@amamo/verso-win32-x64': 1.2.0
dependencies:
'@antfu/install-pkg': 1.1.0
'@clack/prompts': 1.7.0
@@ -11212,7 +11263,7 @@ snapshots:
'@stylistic/eslint-plugin': 5.10.0([email protected]([email protected])([email protected]))
ansis: 4.3.1
cac: 7.0.0
@@ -11299,10 +11350,17 @@ snapshots:
js-tokens: 4.0.0
picocolors: 1.1.1
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/helper-validator-identifier': 8.0.4
+ js-tokens: 10.0.0
+
'@babel/[email protected]': {}
'@babel/[email protected]': {}
+ '@babel/[email protected]': {}
+
dependencies:
'@babel/code-frame': 7.29.0
@@ -11343,10 +11401,29 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/code-frame': 8.0.0
+ '@babel/generator': 8.0.0
+ '@babel/helper-compilation-targets': 8.0.0
+ '@babel/helpers': 8.0.0
+ '@babel/parser': 8.0.4
+ '@babel/template': 8.0.0
+ '@babel/traverse': 8.0.4
+ '@babel/types': 8.0.4
+ '@types/gensync': 1.0.5
+ convert-source-map: 2.0.0
+ empathic: 2.0.1
+ gensync: 1.0.0-beta.2
+ import-meta-resolve: 4.2.0
+ json5: 2.2.3
+ obug: 2.1.4
+ semver: 7.8.5
+
dependencies:
- '@babel/parser': 7.29.7
- '@babel/types': 7.29.7
+ '@babel/parser': 7.29.8
+ '@babel/types': 7.29.8
'@jridgewell/gen-mapping': 0.3.13
'@jridgewell/trace-mapping': 0.3.31
jsesc: 3.1.0
@@ -11359,6 +11436,15 @@ snapshots:
'@jridgewell/trace-mapping': 0.3.31
jsesc: 3.1.0
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/parser': 8.0.4
+ '@babel/types': 8.0.4
+ '@jridgewell/gen-mapping': 0.3.13
+ '@jridgewell/trace-mapping': 0.3.31
+ '@types/jsesc': 2.5.1
+ jsesc: 3.1.0
+
dependencies:
'@babel/compat-data': 7.29.0
@@ -11375,10 +11461,20 @@ snapshots:
lru-cache: 5.1.1
semver: 6.3.1
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/compat-data': 8.0.0
+ '@babel/helper-validator-option': 8.0.0
+ browserslist: 4.28.8
+ lru-cache: 11.5.2
+ semver: 7.8.5
+
'@babel/[email protected]': {}
'@babel/[email protected]': {}
+ '@babel/[email protected]': {}
+
dependencies:
'@babel/traverse': 7.29.7([email protected])
@@ -11415,40 +11511,51 @@ snapshots:
'@babel/[email protected]': {}
+ '@babel/[email protected]': {}
+
'@babel/[email protected]': {}
'@babel/[email protected]': {}
+ '@babel/[email protected]': {}
+
'@babel/[email protected]': {}
'@babel/[email protected]': {}
+ '@babel/[email protected]': {}
+
dependencies:
'@babel/template': 7.28.6
- '@babel/types': 7.29.7
+ '@babel/types': 7.29.8
dependencies:
'@babel/template': 7.29.7
'@babel/types': 7.29.8
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/template': 8.0.0
+ '@babel/types': 8.0.4
+
dependencies:
- '@babel/types': 7.29.7
+ '@babel/types': 7.29.8
dependencies:
'@babel/types': 7.29.0
- '@babel/[email protected]':
- dependencies:
- '@babel/types': 7.29.7
-
dependencies:
'@babel/types': 7.29.8
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/types': 8.0.4
+
'@babel/[email protected]': {}
'@babel/[email protected]': {}
@@ -11458,8 +11565,8 @@ snapshots:
dependencies:
'@babel/code-frame': 7.29.0
- '@babel/parser': 7.29.7
- '@babel/types': 7.29.7
+ '@babel/parser': 7.29.8
+ '@babel/types': 7.29.8
dependencies:
@@ -11467,14 +11574,20 @@ snapshots:
'@babel/parser': 7.29.8
'@babel/types': 7.29.8
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/code-frame': 8.0.0
+ '@babel/parser': 8.0.4
+ '@babel/types': 8.0.4
+
dependencies:
'@babel/code-frame': 7.29.0
'@babel/generator': 7.29.7
'@babel/helper-globals': 7.28.0
- '@babel/parser': 7.29.7
+ '@babel/parser': 7.29.8
'@babel/template': 7.28.6
- '@babel/types': 7.29.7
+ '@babel/types': 7.29.8
debug: 4.4.3([email protected])
transitivePeerDependencies:
- supports-color
@@ -11491,6 +11604,16 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/code-frame': 8.0.0
+ '@babel/generator': 8.0.0
+ '@babel/helper-globals': 8.0.0
+ '@babel/parser': 8.0.4
+ '@babel/template': 8.0.0
+ '@babel/types': 8.0.4
+ obug: 2.1.4
+
dependencies:
'@babel/helper-string-parser': 7.27.1
@@ -11506,6 +11629,11 @@ snapshots:
'@babel/helper-string-parser': 7.29.7
'@babel/helper-validator-identifier': 7.29.7
+ '@babel/[email protected]':
+ dependencies:
+ '@babel/helper-string-parser': 8.0.0
+ '@babel/helper-validator-identifier': 8.0.4
+
'@bramus/[email protected]':
dependencies:
css-tree: 3.2.1
@@ -12424,6 +12552,8 @@ snapshots:
'@jridgewell/[email protected]': {}
+ '@jridgewell/[email protected]': {}
+
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/resolve-uri': 3.1.2
@@ -13375,8 +13505,6 @@ snapshots:
'@sindresorhus/[email protected]': {}
- '@standard-schema/[email protected]': {}
-
dependencies:
'@mdx-js/react': 3.1.1(@types/[email protected])([email protected])
@@ -13693,8 +13821,8 @@ snapshots:
dependencies:
- '@babel/parser': 7.29.7
- '@babel/types': 7.29.7
+ '@babel/parser': 7.29.8
+ '@babel/types': 7.29.8
'@types/babel__generator': 7.27.0
'@types/babel__template': 7.4.4
'@types/babel__traverse': 7.28.0
@@ -13710,7 +13838,7 @@ snapshots:
dependencies:
- '@babel/types': 7.29.7
+ '@babel/types': 7.29.8
dependencies:
@@ -13741,12 +13869,16 @@ snapshots:
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
dependencies:
'@types/unist': 3.0.3
'@types/[email protected]': {}
+ '@types/[email protected]': {}
+
'@types/[email protected]': {}
'@types/[email protected]': {}
@@ -13976,23 +14108,20 @@ snapshots:
'@vercel/cli-exec': 1.0.1
jose: 5.10.0
dependencies:
- '@babel/core': 7.29.7([email protected])
- '@istanbuljs/schema': 0.1.6
'@jridgewell/gen-mapping': 0.3.13
'@jridgewell/trace-mapping': 0.3.31
- istanbul-lib-coverage: 3.2.2
- istanbul-lib-report: 3.0.1
- istanbul-reports: 3.2.0
- magicast: 0.5.3
+ '@vitest/istanbul-lib-coverage': 1.0.1
+ '@vitest/istanbul-lib-instrument': 1.0.1
+ '@vitest/istanbul-lib-report': 1.0.1
+ '@vitest/istanbul-lib-source-maps': 1.0.1
+ magicast: 0.5.4
obug: 2.1.4
tinyrainbow: 3.1.1
- transitivePeerDependencies:
- - supports-color
dependencies:
'@typescript-eslint/scope-manager': 8.65.0
@@ -14000,7 +14129,7 @@ snapshots:
optionalDependencies:
typescript: 6.0.3
transitivePeerDependencies:
- supports-color
@@ -14012,28 +14141,41 @@ snapshots:
chai: 5.3.3
tinyrainbow: 2.0.0
- '@vitest/[email protected]':
+ '@vitest/[email protected]': {}
+
+ '@vitest/[email protected]':
dependencies:
- '@standard-schema/spec': 1.1.0
- '@types/chai': 5.2.3
- '@vitest/spy': 4.1.11
- '@vitest/utils': 4.1.11
- chai: 6.2.2
- tinyrainbow: 3.1.1
+ '@babel/core': 8.0.1
+ '@babel/parser': 8.0.4
+ '@istanbuljs/schema': 0.1.6
+ '@jridgewell/trace-mapping': 0.3.31
+ '@vitest/istanbul-lib-coverage': 1.0.1
+
+ '@vitest/[email protected]':
+ dependencies:
+ '@vitest/istanbul-lib-coverage': 1.0.1
+ '@vitest/[email protected]':
dependencies:
- '@vitest/spy': 4.1.11
+ '@jridgewell/trace-mapping': 0.3.31
+ '@vitest/istanbul-lib-coverage': 1.0.1
+ obug: 2.1.4
+
+ dependencies:
+ '@jridgewell/trace-mapping': 0.3.31
+ '@vitest/spy': 5.0.0
estree-walker: 3.0.3
- magic-string: 0.30.21
+ magic-string: 1.2.3
optionalDependencies:
dependencies:
- '@vitest/spy': 4.1.11
+ '@jridgewell/trace-mapping': 0.3.31
+ '@vitest/spy': 5.0.0
estree-walker: 3.0.3
- magic-string: 0.30.21
+ magic-string: 1.2.3
optionalDependencies:
@@ -14041,27 +14183,11 @@ snapshots:
dependencies:
tinyrainbow: 2.0.0
- '@vitest/[email protected]':
- dependencies:
- tinyrainbow: 3.1.1
-
- '@vitest/[email protected]':
- dependencies:
- '@vitest/utils': 4.1.11
- pathe: 2.0.3
-
- '@vitest/[email protected]':
- dependencies:
- '@vitest/pretty-format': 4.1.11
- '@vitest/utils': 4.1.11
- magic-string: 0.30.21
- pathe: 2.0.3
-
'@vitest/[email protected]':
dependencies:
tinyspy: 4.0.4
- '@vitest/[email protected]': {}
+ '@vitest/[email protected]': {}
'@vitest/[email protected]':
dependencies:
@@ -14069,12 +14195,6 @@ snapshots:
loupe: 3.2.1
tinyrainbow: 2.0.0
- '@vitest/[email protected]':
- dependencies:
- '@vitest/pretty-format': 4.1.11
- convert-source-map: 2.0.0
- tinyrainbow: 3.1.1
-
dependencies:
'@volar/source-map': 2.4.28
@@ -16053,8 +16173,6 @@ snapshots:
-
dependencies:
camel-case: 4.1.2
@@ -16106,6 +16224,8 @@ snapshots:
parent-module: 1.0.1
resolve-from: 4.0.0
+
@@ -16319,19 +16439,6 @@ snapshots:
-
- dependencies:
- istanbul-lib-coverage: 3.2.2
- make-dir: 4.0.0
- supports-color: 7.2.0
-
- dependencies:
- html-escaper: 2.0.2
- istanbul-lib-report: 3.0.1
-
dependencies:
define-data-property: 1.1.4
@@ -16399,6 +16506,8 @@ snapshots:
+
@@ -16610,7 +16719,11 @@ snapshots:
dependencies:
'@jridgewell/sourcemap-codec': 1.5.5
+ dependencies:
+ '@jridgewell/sourcemap-codec': 1.6.0
+
dependencies:
'@babel/parser': 7.29.8
'@babel/types': 7.29.8
@@ -16626,10 +16739,6 @@ snapshots:
dependencies:
semver: 6.3.1
- dependencies:
- semver: 7.8.5
-
@@ -17370,6 +17479,8 @@ snapshots:
+
@@ -17814,7 +17925,7 @@ snapshots:
dependencies:
'@babel/core': 7.29.7([email protected])
'@babel/traverse': 7.29.7([email protected])
- '@babel/types': 7.29.7
+ '@babel/types': 7.29.8
'@types/babel__core': 7.20.5
'@types/babel__traverse': 7.28.0
'@types/doctrine': 0.0.9
@@ -18567,7 +18678,7 @@ snapshots:
@@ -18928,121 +19039,97 @@ snapshots:
tsx: 4.22.4
yaml: 2.9.0
dependencies:
- '@vitest/expect': 4.1.11
- '@vitest/pretty-format': 4.1.11
- '@vitest/runner': 4.1.11
- '@vitest/snapshot': 4.1.11
- '@vitest/spy': 4.1.11
- '@vitest/utils': 4.1.11
+ '@types/chai': 5.2.3
+ chai: 6.2.2
es-module-lexer: 2.3.2
expect-type: 1.4.0
- magic-string: 0.30.21
+ magic-string: 1.2.3
obug: 2.1.4
- pathe: 2.0.3
- picomatch: 4.0.5
+ picomatch: 4.0.7
std-env: 4.2.0
- tinybench: 2.9.0
+ tinybench: 6.1.4
tinyexec: 1.3.0
tinyglobby: 0.2.17
- tinyrainbow: 3.1.1
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 26.1.2
- '@vitest/coverage-istanbul': 4.1.11([email protected])([email protected])
+ '@vitest/coverage-istanbul': 5.0.0([email protected])
happy-dom: 20.11.6
jsdom: 29.1.1
transitivePeerDependencies:
- msw
dependencies:
- '@vitest/expect': 4.1.11
- '@vitest/pretty-format': 4.1.11
- '@vitest/runner': 4.1.11
- '@vitest/snapshot': 4.1.11
- '@vitest/spy': 4.1.11
- '@vitest/utils': 4.1.11
+ '@types/chai': 5.2.3
+ chai: 6.2.2
es-module-lexer: 2.3.2
expect-type: 1.4.0
- magic-string: 0.30.21
+ magic-string: 1.2.3
obug: 2.1.4
- pathe: 2.0.3
- picomatch: 4.0.5
+ picomatch: 4.0.7
std-env: 4.2.0
- tinybench: 2.9.0
+ tinybench: 6.1.4
tinyexec: 1.3.0
tinyglobby: 0.2.17
- tinyrainbow: 3.1.1
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 26.1.2
- '@vitest/coverage-istanbul': 4.1.11([email protected])([email protected])
+ '@vitest/coverage-istanbul': 5.0.0([email protected])
happy-dom: 20.11.6
jsdom: 29.1.1
transitivePeerDependencies:
- msw
dependencies:
- '@vitest/expect': 4.1.11
- '@vitest/pretty-format': 4.1.11
- '@vitest/runner': 4.1.11
- '@vitest/snapshot': 4.1.11
- '@vitest/spy': 4.1.11
- '@vitest/utils': 4.1.11
+ '@types/chai': 5.2.3
+ chai: 6.2.2
es-module-lexer: 2.3.2
expect-type: 1.4.0
- magic-string: 0.30.21
+ magic-string: 1.2.3
obug: 2.1.4
- pathe: 2.0.3
- picomatch: 4.0.5
+ picomatch: 4.0.7
std-env: 4.2.0
- tinybench: 2.9.0
+ tinybench: 6.1.4
tinyexec: 1.3.0
tinyglobby: 0.2.17
- tinyrainbow: 3.1.1
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 26.2.0
- '@vitest/coverage-istanbul': 4.1.11([email protected])([email protected])
+ '@vitest/coverage-istanbul': 5.0.0([email protected])
happy-dom: 20.11.6
jsdom: 29.1.1
transitivePeerDependencies:
- msw
dependencies:
- '@vitest/expect': 4.1.11
- '@vitest/pretty-format': 4.1.11
- '@vitest/runner': 4.1.11
- '@vitest/snapshot': 4.1.11
- '@vitest/spy': 4.1.11
- '@vitest/utils': 4.1.11
+ '@types/chai': 5.2.3
+ chai: 6.2.2
es-module-lexer: 2.3.2
expect-type: 1.4.0
- magic-string: 0.30.21
+ magic-string: 1.2.3
obug: 2.1.4
- pathe: 2.0.3
- picomatch: 4.0.5
+ picomatch: 4.0.7
std-env: 4.2.0
- tinybench: 2.9.0
+ tinybench: 6.1.4
tinyexec: 1.3.0
tinyglobby: 0.2.17
- tinyrainbow: 3.1.1
why-is-node-running: 2.3.0
optionalDependencies:
'@types/node': 26.2.0
- '@vitest/coverage-istanbul': 4.1.11([email protected])([email protected])
+ '@vitest/coverage-istanbul': 5.0.0([email protected])
happy-dom: 20.11.6
jsdom: 29.1.1
transitivePeerDependencies:
diff --git a/tests/formula-integration/package.json b/tests/formula-integration/package.json
index ac6450e13f..87715725ef 100644
--- a/tests/formula-integration/package.json
+++ b/tests/formula-integration/package.json
@@ -19,6 +19,6 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^6.0.3",
- "vitest": "^4.1.11"
+ "vitest": "^5.0.0"
}
}