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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
feat(core): univer support override dependencies (#2050)
Wenzhao Hucfad0da04abb
diff --git a/common/shared/vite/auto-externalize-dependency-plugin.js b/common/shared/vite/auto-externalize-dependency-plugin.jsindex 60994f5820..5daec0ee67 100644--- a/common/shared/vite/auto-externalize-dependency-plugin.js+++ b/common/shared/vite/auto-externalize-dependency-plugin.js@@ -11,7 +11,7 @@ exports.autoExternalizeDependency = function autoExternalizeDependency() {'@wendellhu/redi': {global: '@wendellhu/redi',name: '@wendellhu/redi',- version: '0.13.0',+ version: '^0.13.1',},'@wendellhu/redi/react-bindings': {global: '@wendellhu/redi/react-bindings',diff --git a/common/storybook/package.json b/common/storybook/package.jsonindex b08efc8115..d57125c966 100644--- a/common/storybook/package.json+++ b/common/storybook/package.json@@ -30,7 +30,7 @@"@univerjs/core": "workspace:*","@univerjs/design": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","css-loader": "^6.10.0","less-loader": "^12.2.0","storybook": "8.0.9",diff --git a/examples/package.json b/examples/package.jsonindex 04ee7dcb0d..75b295d4bf 100644--- a/examples/package.json+++ b/examples/package.json@@ -37,7 +37,7 @@"@univerjs/slides-ui": "workspace:*","@univerjs/ui": "workspace:*","@univerjs/uniscript": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","monaco-editor": "0.47.0","react": "^18.2.0",diff --git a/packages/core/package.json b/packages/core/package.jsonindex b4dc09edff..3ea32f3879 100644--- a/packages/core/package.json+++ b/packages/core/package.json@@ -64,7 +64,7 @@"build": "tsc && vite build"},"peerDependencies": {- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -76,7 +76,7 @@"devDependencies": {"@types/numeral": "^2.0.5","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/core/src/index.ts b/packages/core/src/index.tsindex c069b8a3f0..b93cdda5cd 100644--- a/packages/core/src/index.ts+++ b/packages/core/src/index.ts@@ -117,6 +117,7 @@ export type { IComposeInterceptors, IInterceptor, InterceptorHandler } from './cexport { composeInterceptors, createInterceptorKey, InterceptorManager } from './common/interceptor';export { normalizeTextRuns } from './docs/data-model/apply-utils/common';export type { PluginCtor } from './services/plugin/plugin';+export { type DependencyOverride, mergeOverrideWithDependencies } from './services/plugin/plugin-override';export { Range } from './sheets/range';export { Styles } from './sheets/styles';export {diff --git a/packages/core/src/services/plugin/plugin-override.ts b/packages/core/src/services/plugin/plugin-override.tsnew file mode 100644index 0000000000..fefb2f390b--- /dev/null+++ b/packages/core/src/services/plugin/plugin-override.ts@@ -0,0 +1,51 @@+/**+ * Copyright 2023-present DreamNum Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++/* eslint-disable ts/no-explicit-any */++import type { Dependency, DependencyItem, IdentifierDecorator } from '@wendellhu/redi';++/**+ * Overrides the dependencies definited in the plugin. Only dependencies that are identified by `IdentifierDecorator` can be overridden.+ * If you override a dependency with `null`, the original dependency will be removed.+ */+export type DependencyOverride = [identifier: IdentifierDecorator<any>, DependencyItem<any> | null][];++export function mergeOverrideWithDependencies(dependencies: Dependency[], override?: DependencyOverride): Dependency[] {+ if (!override) {+ return dependencies;+ }++ const result: Dependency[] = [];+ for (const dependency of dependencies) {+ if (dependency.length === 1) {+ result.push(dependency);+ continue;+ }++ const overrideItem = override.find(([identifier]) => identifier === dependency[0]);+ if (overrideItem) {+ if (overrideItem[1] === null) {+ continue;+ }+ result.push([dependency[0], overrideItem[1]]);+ } else {+ result.push(dependency);+ }+ }++ return result;+}diff --git a/packages/core/src/types/interfaces/i-univer-data.ts b/packages/core/src/types/interfaces/i-univer-data.tsindex 01a7e7c29f..11aa48b46d 100644--- a/packages/core/src/types/interfaces/i-univer-data.ts+++ b/packages/core/src/types/interfaces/i-univer-data.ts@@ -15,6 +15,7 @@*/import type { LogLevel } from '../../services/log/log.service';+import type { DependencyOverride } from '../../services/plugin/plugin-override';import type { IStyleSheet } from '../../services/theme/theme.service';import type { ILocales } from '../../shared/locale';import type { LocaleType } from '../enum';@@ -25,19 +26,6 @@ export interface IUniverData {locales: ILocales;logLevel: LogLevel;id: string;-}--/**- * Toolbar Observer generic interface, convenient for plug-ins to define their own types- */-export interface UIObserver<T = string> {- /**- * fontSize, fontFamily,color...- */- name: string;- /**- * fontSize:number, fontFamily:string ...- */- value?: T;+ override?: DependencyOverride;}diff --git a/packages/core/src/univer.ts b/packages/core/src/univer.tsindex ab16ae86e2..20ae4058fd 100644--- a/packages/core/src/univer.ts+++ b/packages/core/src/univer.ts@@ -47,6 +47,8 @@ import type { UnitModel, UnitType } from './common/unit';import { UniverInstanceType } from './common/unit';import { PluginService } from './services/plugin/plugin.service';import type { Plugin, PluginCtor } from './services/plugin/plugin';+import type { DependencyOverride } from './services/plugin/plugin-override';+import { mergeOverrideWithDependencies } from './services/plugin/plugin-override';export class Univer {private _startedTypes = new Set<UnitType>();@@ -66,7 +68,7 @@ export class Univer {* @param parentInjector An optional parent injector of the Univer injector. For more information, see https://redi.wendell.fun/docs/hierarchy.*/constructor(config: Partial<IUniverData> = {}, parentInjector?: Injector) {- const injector = this._injector = createUniverInjector(parentInjector);+ const injector = this._injector = createUniverInjector(parentInjector, config?.override);const { theme, locale, locales, logLevel } = config;@@ -159,8 +161,8 @@ export class Univer {}}-function createUniverInjector(parentInjector?: Injector) {- const dependencies: Dependency[] = ([+function createUniverInjector(parentInjector?: Injector, override?: DependencyOverride) {+ const dependencies: Dependency[] = mergeOverrideWithDependencies([[ErrorService],[LocaleService],[ThemeService],@@ -168,6 +170,8 @@ function createUniverInjector(parentInjector?: Injector) {[LifecycleInitializerService],[UniverPermissionService],[PluginService],++ // abstract services[IUniverInstanceService, { useClass: UniverInstanceService }],[IPermissionService, { useClass: PermissionService }],[ILogService, { useClass: DesktopLogService, lazy: true }],@@ -178,7 +182,7 @@ function createUniverInjector(parentInjector?: Injector) {[IFloatingObjectManagerService, { useClass: FloatingObjectManagerService, lazy: true }],[IResourceManagerService, { useClass: ResourceManagerService, lazy: true }],[IResourceLoaderService, { useClass: ResourceLoaderService, lazy: true }],- ]);+ ], override);return parentInjector ? parentInjector.createChild(dependencies) : new Injector(dependencies);}diff --git a/packages/data-validation/package.json b/packages/data-validation/package.jsonindex 3570b4f69f..8c955036a7 100644--- a/packages/data-validation/package.json+++ b/packages/data-validation/package.json@@ -64,7 +64,7 @@"peerDependencies": {"@univerjs/core": "workspace:*","@univerjs/sheets": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -76,7 +76,7 @@"@univerjs/protocol": "^0.1.14","@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.jsonindex dc20a21d4e..1e5e63d1f0 100644--- a/packages/docs-ui/package.json+++ b/packages/docs-ui/package.json@@ -71,7 +71,7 @@"@univerjs/docs": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"},@@ -83,7 +83,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/docs/package.json b/packages/docs/package.jsonindex 4f436ca89b..a061dcdace 100644--- a/packages/docs/package.json+++ b/packages/docs/package.json@@ -65,14 +65,14 @@"peerDependencies": {"@univerjs/core": "workspace:*","@univerjs/engine-render": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"devDependencies": {"@univerjs/core": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/engine-formula/package.json b/packages/engine-formula/package.jsonindex 112f6b4713..ea689f142c 100644--- a/packages/engine-formula/package.json+++ b/packages/engine-formula/package.json@@ -64,7 +64,7 @@},"peerDependencies": {"@univerjs/core": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -75,7 +75,7 @@"@types/big.js": "^6.2.2","@univerjs/core": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/engine-render/package.json b/packages/engine-render/package.jsonindex 04865c3611..dcf8aa9005 100644--- a/packages/engine-render/package.json+++ b/packages/engine-render/package.json@@ -64,7 +64,7 @@},"peerDependencies": {"@univerjs/core": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -75,7 +75,7 @@"@types/opentype.js": "^1.3.8","@univerjs/core": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/facade/package.json b/packages/facade/package.jsonindex 368158cdf2..7734331266 100644--- a/packages/facade/package.json+++ b/packages/facade/package.json@@ -71,7 +71,7 @@"@univerjs/sheets-formula": "workspace:*","@univerjs/sheets-numfmt": "workspace:*","@univerjs/sheets-ui": "workspace:*",- "@wendellhu/redi": "0.13.0"+ "@wendellhu/redi": "^0.13.1"},"devDependencies": {"@univerjs/core": "workspace:*",@@ -86,7 +86,7 @@"@univerjs/sheets-numfmt": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","jsdom": "^24.0.0","rxjs": "^7.8.1","typescript": "^5.4.5",diff --git a/packages/find-replace/package.json b/packages/find-replace/package.jsonindex e21d12dc4e..0013ef927f 100644--- a/packages/find-replace/package.json+++ b/packages/find-replace/package.json@@ -70,7 +70,7 @@"@univerjs/design": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"},@@ -85,7 +85,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/image/package.json b/packages/image/package.jsonindex 5112094abc..a1229faa25 100644--- a/packages/image/package.json+++ b/packages/image/package.json@@ -63,7 +63,7 @@"peerDependencies": {"@univerjs/core": "workspace:*","@univerjs/engine-render": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -76,7 +76,7 @@"@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/network/package.json b/packages/network/package.jsonindex be6cb44ec4..d437723c10 100644--- a/packages/network/package.json+++ b/packages/network/package.json@@ -63,13 +63,13 @@},"peerDependencies": {"@univerjs/core": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"devDependencies": {"@univerjs/core": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/rpc/package.json b/packages/rpc/package.jsonindex 069fd781ae..d82b85271b 100644--- a/packages/rpc/package.json+++ b/packages/rpc/package.json@@ -60,13 +60,13 @@},"peerDependencies": {"@univerjs/core": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"devDependencies": {"@univerjs/core": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.jsonindex b4410036db..38d02b163a 100644--- a/packages/sheets-conditional-formatting-ui/package.json+++ b/packages/sheets-conditional-formatting-ui/package.json@@ -74,7 +74,7 @@"@univerjs/sheets-conditional-formatting": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",@@ -101,7 +101,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","less": "^4.2.0","react": "^18.2.0",diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.jsonindex 244ba3ed0e..902fea2cc4 100644--- a/packages/sheets-conditional-formatting/package.json+++ b/packages/sheets-conditional-formatting/package.json@@ -68,7 +68,7 @@"@univerjs/engine-formula": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/sheets": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -82,7 +82,7 @@"@univerjs/icons-svg": "^0.1.44","@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","sharp": "^0.33.3","typescript": "^5.4.5",diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.jsonindex 72912a6438..f05c60db7f 100644--- a/packages/sheets-data-validation/package.json+++ b/packages/sheets-data-validation/package.json@@ -68,7 +68,7 @@"@univerjs/sheets-formula": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"@@ -88,7 +88,7 @@"@univerjs/sheets-formula": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","less": "^4.2.0","react": "^18.2.0",diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.jsonindex 376074ad25..129d62adf2 100644--- a/packages/sheets-find-replace/package.json+++ b/packages/sheets-find-replace/package.json@@ -68,7 +68,7 @@"@univerjs/find-replace": "workspace:*","@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"devDependencies": {@@ -79,7 +79,7 @@"@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.jsonindex e9eeff38f0..493897b593 100644--- a/packages/sheets-formula/package.json+++ b/packages/sheets-formula/package.json@@ -68,7 +68,7 @@"@univerjs/sheets-numfmt": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"},@@ -88,7 +88,7 @@"@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*","@vitejs/plugin-react": "^4.2.1",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.jsonindex 23c06f9d69..07e39691e7 100644--- a/packages/sheets-numfmt/package.json+++ b/packages/sheets-numfmt/package.json@@ -74,7 +74,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"},@@ -92,7 +92,7 @@"@univerjs/sheets": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.jsonindex d0a2cc143a..e1ffd9eb65 100644--- a/packages/sheets-ui/package.json+++ b/packages/sheets-ui/package.json@@ -75,7 +75,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/sheets": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"@@ -94,7 +94,7 @@"@univerjs/shared": "workspace:*","@univerjs/sheets": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","less": "^4.2.0","react": "^18.2.0",diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.jsonindex 2639e7b74e..98fab1849d 100644--- a/packages/sheets-zen-editor/package.json+++ b/packages/sheets-zen-editor/package.json@@ -71,7 +71,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"@@ -87,7 +87,7 @@"@univerjs/shared": "workspace:*","@univerjs/sheets-ui": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","less": "^4.2.0","react": "^18.2.0",diff --git a/packages/sheets/package.json b/packages/sheets/package.jsonindex 437a01da64..765b1668db 100644--- a/packages/sheets/package.json+++ b/packages/sheets/package.json@@ -66,7 +66,7 @@"@univerjs/core": "workspace:*","@univerjs/engine-formula": "workspace:*","@univerjs/engine-render": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"dependencies": {@@ -77,7 +77,7 @@"@univerjs/engine-formula": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.jsonindex 9cba915d64..744dd0d94b 100644--- a/packages/slides-ui/package.json+++ b/packages/slides-ui/package.json@@ -70,7 +70,7 @@"@univerjs/engine-render": "workspace:*","@univerjs/slides": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","react": "^16.9.0 || ^17.0.0 || ^18.0.0"},"devDependencies": {@@ -81,7 +81,7 @@"@univerjs/shared": "workspace:*","@univerjs/slides": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","react": "^18.2.0","rxjs": "^7.8.1",diff --git a/packages/slides/package.json b/packages/slides/package.jsonindex ca81be45c3..1fb5cebbef 100644--- a/packages/slides/package.json+++ b/packages/slides/package.json@@ -62,14 +62,14 @@"peerDependencies": {"@univerjs/core": "workspace:*","@univerjs/engine-render": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": ">=7.0.0"},"devDependencies": {"@univerjs/core": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","rxjs": "^7.8.1","typescript": "^5.4.5","vite": "^5.2.10",diff --git a/packages/ui/package.json b/packages/ui/package.jsonindex 3a88d3a4e3..5c6dc5a224 100644--- a/packages/ui/package.json+++ b/packages/ui/package.json@@ -70,7 +70,7 @@"@univerjs/design": "workspace:*","@univerjs/engine-formula": "workspace:*","@univerjs/engine-render": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": ">=2.0.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",@@ -96,7 +96,7 @@"@univerjs/engine-formula": "workspace:*","@univerjs/engine-render": "workspace:*","@univerjs/shared": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","clsx": "^2.1.1","less": "^4.2.0","react": "^18.2.0",diff --git a/packages/uniscript/package.json b/packages/uniscript/package.jsonindex f07d31f17e..f92d23a1d9 100644--- a/packages/uniscript/package.json+++ b/packages/uniscript/package.json@@ -70,7 +70,7 @@"@univerjs/design": "workspace:*","@univerjs/facade": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "0.13.0",+ "@wendellhu/redi": "^0.13.1","monaco-editor": ">=0.44.0","react": "^16.9.0 || ^17.0.0 || ^18.0.0","rxjs": ">=7.0.0"@@ -82,7 +82,7 @@"@univerjs/facade": "workspace:*","@univerjs/shared": "workspace:*","@univerjs/ui": "workspace:*",- "@wendellhu/redi": "^0.13.0",+ "@wendellhu/redi": "^0.13.1","less": "^4.2.0","monaco-editor": "0.47.0","rxjs": "^7.8.1",diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex d460575d20..f435d870b7 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -162,8 +162,8 @@ importers:specifier: workspace:*version: link:../../packages/ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1css-loader:specifier: ^6.10.0@@ -268,8 +268,8 @@ importers:specifier: workspace:*version: link:../packages/uniscript'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -348,8 +348,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -382,8 +382,8 @@ importers:specifier: workspace:*version: link:../sheets'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -506,8 +506,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -545,8 +545,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -585,8 +585,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -638,8 +638,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -692,8 +692,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1jsdom:specifier: ^24.0.0version: 24.0.0@@ -741,8 +741,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -787,8 +787,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -817,8 +817,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -841,8 +841,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -875,8 +875,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -918,8 +918,8 @@ importers:specifier: workspace:*version: link:../sheets'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -997,8 +997,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -1061,8 +1061,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -1109,8 +1109,8 @@ importers:specifier: workspace:*version: link:../sheets-ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -1167,8 +1167,8 @@ importers:specifier: ^4.2.1version: 4.2.1([email protected](@types/[email protected])([email protected])([email protected])([email protected]))'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -1225,8 +1225,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -1286,8 +1286,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -1338,8 +1338,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -1374,8 +1374,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1rxjs:specifier: ^7.8.1version: 7.8.1@@ -1413,8 +1413,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -1484,8 +1484,8 @@ importers:specifier: workspace:*version: link:../../common/shared'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1clsx:specifier: ^2.1.1version: 2.1.1@@ -1536,8 +1536,8 @@ importers:specifier: workspace:*version: link:../ui'@wendellhu/redi':- specifier: ^0.13.0- version: 0.13.0+ specifier: ^0.13.1+ version: 0.13.1less:specifier: ^4.2.0version: 4.2.0@@ -3524,6 +3524,9 @@ packages:'@types/[email protected]':resolution: {integrity: sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==}+ '@types/[email protected]':+ resolution: {integrity: sha512-SjDvI/x3zsZnOkYZ3lCt9lOZWZLB2jIlNKz+LBgCtDurK0JZcwucxYHn1w2BJkD34dgX9Tjnak0txtq4WTggEA==}+'@types/[email protected]':resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}@@ -3843,12 +3846,18 @@ packages:'@vitest/[email protected]':resolution: {integrity: sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==}+'@vitest/[email protected]':resolution: {integrity: sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==}'@vitest/[email protected]':resolution: {integrity: sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==}+ '@vitest/[email protected]':+ resolution: {integrity: sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==}+'@vitest/[email protected]':resolution: {integrity: sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==}@@ -3943,8 +3952,8 @@ packages:'@webassemblyjs/[email protected]':resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==}- '@wendellhu/[email protected]':- resolution: {integrity: sha512-ZqMpzpMYdBLfDyMxRVxfX0JR5x9rljKiMxdFVcVgoPf2AbkjzFcyWTT92gQspSZauweM3fjrx/ZeO4H4DPTAEA==}+ '@wendellhu/[email protected]':+ resolution: {integrity: sha512-u3KvOC6w5tU9Gx8Ich3FH+4TjFVUAFz+Gso5hDbWmctEnUSfnVEZoJAemX3RzqKc8XU9UDK4W/sOHtOfmLPP7g==}'@xtuc/[email protected]':resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}@@ -11318,7 +11327,7 @@ snapshots:'@storybook/core-events': 8.0.9'@storybook/global': 5.0.0'@storybook/preview-api': 8.0.9- '@vitest/utils': 1.5.0+ '@vitest/utils': 1.4.0util: 0.12.5@@ -11495,7 +11504,7 @@ snapshots:'@testing-library/jest-dom': 6.4.2([email protected](@types/[email protected])([email protected])([email protected])([email protected])([email protected])([email protected]))'@testing-library/user-event': 14.5.2(@testing-library/[email protected])'@vitest/expect': 1.3.1- '@vitest/spy': 1.5.0+ '@vitest/spy': 1.4.0util: 0.12.5transitivePeerDependencies:- '@jest/globals'@@ -11729,7 +11738,7 @@ snapshots:'@types/[email protected]':dependencies:- '@types/eslint': 8.56.10+ '@types/eslint': 8.56.7'@types/estree': 1.0.5'@types/[email protected]':@@ -11737,6 +11746,11 @@ snapshots:'@types/estree': 1.0.5'@types/json-schema': 7.0.15+ '@types/[email protected]':+ dependencies:+ '@types/estree': 1.0.5+ '@types/json-schema': 7.0.15+'@types/[email protected]': {}'@types/[email protected]': {}@@ -12152,6 +12166,10 @@ snapshots:dependencies:tinyspy: 2.2.1+ '@vitest/[email protected]':+ dependencies:+ tinyspy: 2.2.1+'@vitest/[email protected]':dependencies:tinyspy: 2.2.1@@ -12163,6 +12181,13 @@ snapshots:loupe: 2.3.7pretty-format: 29.7.0+ '@vitest/[email protected]':+ dependencies:+ diff-sequences: 29.6.3+ estree-walker: 3.0.3+ loupe: 2.3.7+ pretty-format: 29.7.0+'@vitest/[email protected]':dependencies:diff-sequences: 29.6.3@@ -12326,7 +12351,7 @@ snapshots:'@webassemblyjs/ast': 1.12.1'@xtuc/long': 4.2.2- '@wendellhu/[email protected]': {}+ '@wendellhu/[email protected]': {}'@xtuc/[email protected]': {}