diff --git a/packages/libro-common/src/mana-core/application/application-state.ts b/packages/libro-common/src/mana-core/application/application-state.ts index 7abfe171..4d1f5434 100644 --- a/packages/libro-common/src/mana-core/application/application-state.ts +++ b/packages/libro-common/src/mana-core/application/application-state.ts @@ -1,7 +1,6 @@ -import { prop } from '@difizen/mana-observable'; - import type { Event } from '../../mana-common/index.js'; import { Emitter, Deferred } from '../../mana-common/index.js'; +import { prop } from '../../mana-observable/index.js'; import { inject, singleton } from '../../mana-syringe/index.js'; import { DebugService } from '../common/debug'; diff --git a/packages/libro-common/src/mana-core/command/command-registry.ts b/packages/libro-common/src/mana-core/command/command-registry.ts index 2a59e6e2..b06eb289 100644 --- a/packages/libro-common/src/mana-core/command/command-registry.ts +++ b/packages/libro-common/src/mana-core/command/command-registry.ts @@ -1,11 +1,10 @@ -import { prop } from '@difizen/mana-observable'; - import { Emitter, WaitUntilEvent, Disposable, DisposableCollection, } from '../../mana-common/index.js'; +import { prop } from '../../mana-observable/index.js'; import type { Contribution } from '../../mana-syringe/index.js'; import { Syringe } from '../../mana-syringe/index.js'; import { contrib, singleton } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/components/context.tsx b/packages/libro-common/src/mana-core/components/context.tsx index ec1309fb..74cff2d8 100644 --- a/packages/libro-common/src/mana-core/components/context.tsx +++ b/packages/libro-common/src/mana-core/components/context.tsx @@ -1,4 +1,4 @@ -import { ObservableContext } from '@difizen/mana-observable'; +import { ObservableContext } from '../../mana-observable/index.js'; import type { Syringe } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/components/hooks.tsx b/packages/libro-common/src/mana-core/components/hooks.tsx index 8f635b36..b2a3fc92 100644 --- a/packages/libro-common/src/mana-core/components/hooks.tsx +++ b/packages/libro-common/src/mana-core/components/hooks.tsx @@ -1,4 +1,4 @@ -import { ObservableContext } from '@difizen/mana-observable'; +import { ObservableContext } from '../../mana-observable/index.js'; import type { Syringe } from '../../mana-syringe/index.js'; import { GlobalContainer } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/components/root-view-render.tsx b/packages/libro-common/src/mana-core/components/root-view-render.tsx index be365184..d8fe3629 100644 --- a/packages/libro-common/src/mana-core/components/root-view-render.tsx +++ b/packages/libro-common/src/mana-core/components/root-view-render.tsx @@ -1,4 +1,4 @@ -import { useInject } from '@difizen/mana-observable'; +import { useInject } from '../../mana-observable/index.js'; import { ViewManager, ViewRender } from '../view'; diff --git a/packages/libro-common/src/mana-core/configuration/configuration-provider.ts b/packages/libro-common/src/mana-core/configuration/configuration-provider.ts index a1f074e6..301e6518 100644 --- a/packages/libro-common/src/mana-core/configuration/configuration-provider.ts +++ b/packages/libro-common/src/mana-core/configuration/configuration-provider.ts @@ -1,5 +1,5 @@ import type { MaybePromise } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { singleton, Syringe } from '../../mana-syringe/index.js'; import type { ConfigurationNode } from './configuration-protocol'; diff --git a/packages/libro-common/src/mana-core/configuration/configuration-service.ts b/packages/libro-common/src/mana-core/configuration/configuration-service.ts index 7179d6ed..5bfde5b1 100644 --- a/packages/libro-common/src/mana-core/configuration/configuration-service.ts +++ b/packages/libro-common/src/mana-core/configuration/configuration-service.ts @@ -1,5 +1,5 @@ import { Emitter } from '../../mana-common/index.js'; -import { getOrigin } from '@difizen/mana-observable'; +import { getOrigin } from '../../mana-observable/index.js'; import type { Contribution } from '../../mana-syringe/index.js'; import { contrib, inject, singleton } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/configuration/hooks.ts b/packages/libro-common/src/mana-core/configuration/hooks.ts index cb2c9570..342d3e19 100644 --- a/packages/libro-common/src/mana-core/configuration/hooks.ts +++ b/packages/libro-common/src/mana-core/configuration/hooks.ts @@ -1,4 +1,4 @@ -import { useInject } from '@difizen/mana-observable'; +import { useInject } from '../../mana-observable/index.js'; import { useCallback, useEffect, useState } from 'react'; import type { ConfigurationNode } from './configuration-protocol'; diff --git a/packages/libro-common/src/mana-core/configuration/validation.ts b/packages/libro-common/src/mana-core/configuration/validation.ts index 1fe6815e..297b8c87 100644 --- a/packages/libro-common/src/mana-core/configuration/validation.ts +++ b/packages/libro-common/src/mana-core/configuration/validation.ts @@ -1,4 +1,4 @@ -import { getOrigin } from '@difizen/mana-observable'; +import { getOrigin } from '../../mana-observable/index.js'; import { singleton } from '../../mana-syringe/index.js'; import Ajv from 'ajv'; diff --git a/packages/libro-common/src/mana-core/context/data-context.tsx b/packages/libro-common/src/mana-core/context/data-context.tsx index 5c5d553d..a69f03ee 100644 --- a/packages/libro-common/src/mana-core/context/data-context.tsx +++ b/packages/libro-common/src/mana-core/context/data-context.tsx @@ -1,4 +1,8 @@ -import { getOrigin, ObservableContext, useInject } from '@difizen/mana-observable'; +import { + getOrigin, + ObservableContext, + useInject, +} from '../../mana-observable/index.js'; import * as React from 'react'; import type { ManaContext } from '../module'; diff --git a/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts b/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts index 12fb07f0..1ff1ef7d 100644 --- a/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts +++ b/packages/libro-common/src/mana-core/keybinding/vs/contextKeyService.ts @@ -7,7 +7,7 @@ import type { Emitter, Event } from '../../mana-common/index.js'; import { Iterable } from '../../mana-common/index.js'; import { PauseableEmitter } from '../../mana-common/index.js'; import { objects } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { inject, injectable, singleton } from '../../mana-syringe/index.js'; import type { CommandRegistry } from '../../command/index'; diff --git a/packages/libro-common/src/mana-core/menu/default-menu-node.ts b/packages/libro-common/src/mana-core/menu/default-menu-node.ts index 209f77fb..f32dff14 100644 --- a/packages/libro-common/src/mana-core/menu/default-menu-node.ts +++ b/packages/libro-common/src/mana-core/menu/default-menu-node.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import type { Disposable, Event } from '../../mana-common/index.js'; import { Emitter } from '../../mana-common/index.js'; -import { getOrigin, prop } from '@difizen/mana-observable'; +import { getOrigin, prop } from '../../mana-observable/index.js'; import { inject, transient } from '../../mana-syringe/index.js'; import { CommandRegistry } from '../command/command-registry'; diff --git a/packages/libro-common/src/mana-core/theme/theme-service.ts b/packages/libro-common/src/mana-core/theme/theme-service.ts index 7dc93417..64d9f2f0 100644 --- a/packages/libro-common/src/mana-core/theme/theme-service.ts +++ b/packages/libro-common/src/mana-core/theme/theme-service.ts @@ -1,7 +1,7 @@ import type { Event } from '../../mana-common/index.js'; import { isPromiseLike } from '../../mana-common/index.js'; import { Emitter, Disposable, objects } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { singleton } from '../../mana-syringe/index.js'; import { localStorageService } from '../common'; diff --git a/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts b/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts index 74f6ee73..7c99bc79 100644 --- a/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts +++ b/packages/libro-common/src/mana-core/toolbar/default-toolbar-item.ts @@ -1,6 +1,6 @@ import type { Event } from '../../mana-common/index.js'; import { Emitter } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { inject } from '../../mana-syringe/index.js'; import { transient } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts b/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts index 5f35c7b0..670f7001 100644 --- a/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts +++ b/packages/libro-common/src/mana-core/toolbar/toolbar-registry.ts @@ -1,5 +1,5 @@ import { Emitter } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import type { Contribution } from '../../mana-syringe/index.js'; import { contrib, inject, singleton, Syringe } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/view/default-slot-view.tsx b/packages/libro-common/src/mana-core/view/default-slot-view.tsx index bba6b62e..46b012da 100644 --- a/packages/libro-common/src/mana-core/view/default-slot-view.tsx +++ b/packages/libro-common/src/mana-core/view/default-slot-view.tsx @@ -1,6 +1,12 @@ /* eslint-disable @typescript-eslint/unified-signatures */ import { Disposable, DisposableCollection } from '../../mana-common/index.js'; -import { equals, getOrigin, Notifier, prop, useInject } from '@difizen/mana-observable'; +import { + equals, + getOrigin, + Notifier, + prop, + useInject, +} from '../../mana-observable/index.js'; import { inject, transient } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/default-view.tsx b/packages/libro-common/src/mana-core/view/default-view.tsx index e35feba2..62105cd1 100644 --- a/packages/libro-common/src/mana-core/view/default-view.tsx +++ b/packages/libro-common/src/mana-core/view/default-view.tsx @@ -1,6 +1,6 @@ import type { Event } from '../../mana-common/index.js'; import { DisposableCollection, Emitter } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { transient } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/portal-slot-view.tsx b/packages/libro-common/src/mana-core/view/portal-slot-view.tsx index 4f3597fd..ed920947 100644 --- a/packages/libro-common/src/mana-core/view/portal-slot-view.tsx +++ b/packages/libro-common/src/mana-core/view/portal-slot-view.tsx @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/unified-signatures */ import { Disposable, DisposableCollection } from '../../mana-common/index.js'; -import { equals, getOrigin, prop, useInject } from '@difizen/mana-observable'; +import { equals, getOrigin, prop, useInject } from '../../mana-observable/index.js'; import { inject, transient } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/root-view.tsx b/packages/libro-common/src/mana-core/view/root-view.tsx index 08b628d3..dbd8bef1 100644 --- a/packages/libro-common/src/mana-core/view/root-view.tsx +++ b/packages/libro-common/src/mana-core/view/root-view.tsx @@ -1,5 +1,5 @@ import { timeout } from '../../mana-common/index.js'; -import { prop, useInject } from '@difizen/mana-observable'; +import { prop, useInject } from '../../mana-observable/index.js'; import { inject, singleton } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/slot-view-manager.ts b/packages/libro-common/src/mana-core/view/slot-view-manager.ts index 443ac8c4..a81674d9 100644 --- a/packages/libro-common/src/mana-core/view/slot-view-manager.ts +++ b/packages/libro-common/src/mana-core/view/slot-view-manager.ts @@ -2,7 +2,7 @@ import type { Newable } from '../../mana-common/index.js'; import { Emitter } from '../../mana-common/index.js'; import { Deferred } from '../../mana-common/index.js'; import { Disposable, Priority } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { contrib, inject, singleton } from '../../mana-syringe/index.js'; import type { Contribution } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/view/slot.tsx b/packages/libro-common/src/mana-core/view/slot.tsx index b596be9c..2bee9142 100644 --- a/packages/libro-common/src/mana-core/view/slot.tsx +++ b/packages/libro-common/src/mana-core/view/slot.tsx @@ -1,5 +1,5 @@ import type { Newable } from '../../mana-common/index.js'; -import { useInject, getOrigin } from '@difizen/mana-observable'; +import { useInject, getOrigin } from '../../mana-observable/index.js'; import type { ReactNode } from 'react'; import { useEffect } from 'react'; import { memo } from 'react'; diff --git a/packages/libro-common/src/mana-core/view/title.tsx b/packages/libro-common/src/mana-core/view/title.tsx index d1300d62..2d2538a3 100644 --- a/packages/libro-common/src/mana-core/view/title.tsx +++ b/packages/libro-common/src/mana-core/view/title.tsx @@ -1,4 +1,4 @@ -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { transient } from '../../mana-syringe/index.js'; import type * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/utils.tsx b/packages/libro-common/src/mana-core/view/utils.tsx index bf5b852f..e154ed26 100644 --- a/packages/libro-common/src/mana-core/view/utils.tsx +++ b/packages/libro-common/src/mana-core/view/utils.tsx @@ -1,4 +1,4 @@ -import { getOrigin } from '@difizen/mana-observable'; +import { getOrigin } from '../../mana-observable/index.js'; import React from 'react'; /** * hack diff --git a/packages/libro-common/src/mana-core/view/view-container.tsx b/packages/libro-common/src/mana-core/view/view-container.tsx index 6d38b149..c4923fcd 100644 --- a/packages/libro-common/src/mana-core/view/view-container.tsx +++ b/packages/libro-common/src/mana-core/view/view-container.tsx @@ -1,4 +1,4 @@ -import { ObservableContext, useInject } from '@difizen/mana-observable'; +import { ObservableContext, useInject } from '../../mana-observable/index.js'; import type { Syringe } from '../../mana-syringe/index.js'; import * as React from 'react'; diff --git a/packages/libro-common/src/mana-core/view/view-context.tsx b/packages/libro-common/src/mana-core/view/view-context.tsx index ee1a28d4..75a2e4ef 100644 --- a/packages/libro-common/src/mana-core/view/view-context.tsx +++ b/packages/libro-common/src/mana-core/view/view-context.tsx @@ -1,4 +1,4 @@ -import { getOrigin, ObservableContext } from '@difizen/mana-observable'; +import { getOrigin, ObservableContext } from '../../mana-observable/index.js'; import * as React from 'react'; import type { ManaContext } from '../module'; diff --git a/packages/libro-common/src/mana-core/view/view-manager.ts b/packages/libro-common/src/mana-core/view/view-manager.ts index 05c2113d..f4136edf 100644 --- a/packages/libro-common/src/mana-core/view/view-manager.ts +++ b/packages/libro-common/src/mana-core/view/view-manager.ts @@ -7,7 +7,7 @@ import type { } from '../../mana-common/index.js'; import { DisposableCollection } from '../../mana-common/index.js'; import { Priority, Emitter } from '../../mana-common/index.js'; -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import type { Contribution } from '../../mana-syringe/index.js'; import { contrib, inject, singleton } from '../../mana-syringe/index.js'; diff --git a/packages/libro-common/src/mana-core/view/view-meta.ts b/packages/libro-common/src/mana-core/view/view-meta.ts index f282f66c..a706d5c1 100644 --- a/packages/libro-common/src/mana-core/view/view-meta.ts +++ b/packages/libro-common/src/mana-core/view/view-meta.ts @@ -1,4 +1,4 @@ -import { getOrigin } from '@difizen/mana-observable'; +import { getOrigin } from '../../mana-observable/index.js'; import type { ManaContext } from '../module'; diff --git a/packages/libro-common/src/mana-core/view/view-render.tsx b/packages/libro-common/src/mana-core/view/view-render.tsx index 814a0f39..9f72d8f7 100644 --- a/packages/libro-common/src/mana-core/view/view-render.tsx +++ b/packages/libro-common/src/mana-core/view/view-render.tsx @@ -1,4 +1,4 @@ -import { useInject } from '@difizen/mana-observable'; +import { useInject } from '../../mana-observable/index.js'; import type { ReactNode } from 'react'; import { memo } from 'react'; diff --git a/packages/libro-common/src/mana-core/view/view-storage.ts b/packages/libro-common/src/mana-core/view/view-storage.ts index bdfe2c8f..c6e8ea0c 100644 --- a/packages/libro-common/src/mana-core/view/view-storage.ts +++ b/packages/libro-common/src/mana-core/view/view-storage.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { prop } from '@difizen/mana-observable'; +import { prop } from '../../mana-observable/index.js'; import { inject, singleton } from '../../mana-syringe/index.js'; import { DebugService, StorageService } from '../common';