diff --git a/lerna.json b/lerna.json index cbd6818..b14ea71 100644 --- a/lerna.json +++ b/lerna.json @@ -1,16 +1,14 @@ { - "packages": [ - "packages/*" - ], - "npmClient": "yarn", - "useWorkspaces": true, - "version": "0.14.2", - "command": { - "publish": { - "allowBranch": "master", - "registry": "https://registry.npmjs.org/", - "message": "chore: bump versions after release", - "yes": true - } - } + "packages": ["packages/*"], + "npmClient": "yarn", + "useWorkspaces": true, + "version": "0.14.2", + "command": { + "publish": { + "allowBranch": ["master", "0.15.x"], + "registry": "https://registry.npmjs.org/", + "message": "chore: bump versions after release", + "yes": true + } + } } diff --git a/packages/cache/src/key-memo/index.ts b/packages/cache/src/key-memo/index.ts index 19d1e05..45538de 100644 --- a/packages/cache/src/key-memo/index.ts +++ b/packages/cache/src/key-memo/index.ts @@ -1,10 +1,10 @@ import { Map as IM } from "immutable" import type { Atom } from "@rixio/atom" import { SimpleCache } from "@rixio/lens" -import { byKeyImmutable } from "@rixio/lens/build/lenses/by-key-immutable" import type { Observable } from "rxjs" import { Subject } from "rxjs" import { first } from "rxjs/operators" +import { byKeyImmutableFactory } from "@rixio/atom" import type { CacheState, KeyEvent, ListDataLoader } from "../domain" import { CacheIdle, createErrorKeyEvent, createAddKeyEvent } from "../domain" import { Batcher } from "../utils/batcher" @@ -22,7 +22,7 @@ export interface KeyMemo { export class KeyMemoImpl implements KeyMemo { private readonly _batch: Batcher private readonly _results = new Subject<[K, V | Error]>() - private readonly _lensFactory = byKeyImmutable>(() => CacheIdle.create()) + private readonly _lensFactory = byKeyImmutableFactory>(() => CacheIdle.create()) private readonly _events = new Subject>() readonly events: Observable> = this._events