Skip to content

Commit

Permalink
Update @evolu/common peer dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
steida committed Nov 30, 2023
1 parent 05938b1 commit 59ec99c
Show file tree
Hide file tree
Showing 14 changed files with 706 additions and 699 deletions.
5 changes: 5 additions & 0 deletions .changeset/few-bikes-remain.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@evolu/common": patch
---

Update @evolu/common peer dependencies
4 changes: 2 additions & 2 deletions apps/native/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
"clean": "rm -rf .turbo .expo node_modules"
},
"dependencies": {
"@effect/schema": "^0.50.0",
"@effect/schema": "^0.51.0",
"@evolu/react-native": "workspace:*",
"@react-native-community/netinfo": "9.3.10",
"buffer": "^6.0.3",
"crypto-browserify": "^3.12.0",
"effect": "2.0.0-next.56",
"effect": "2.0.0-next.57",
"events": "^3.3.0",
"expo": "^49.0.21",
"expo-sqlite": "~11.3.3",
Expand Down
2 changes: 1 addition & 1 deletion apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"devDependencies": {
"@evolu/tsconfig": "workspace:*",
"@types/node": "^20.10.0",
"@types/node": "^20.10.1",
"ts-node": "^10.9.1",
"typescript": "^5.3.2"
},
Expand Down
6 changes: 3 additions & 3 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"clean": "rm -rf .turbo .next node_modules"
},
"dependencies": {
"@effect/schema": "^0.50.0",
"@effect/schema": "^0.51.0",
"@evolu/common": "workspace:*",
"@evolu/react": "workspace:*",
"clsx": "^2.0.0",
"effect": "2.0.0-next.56",
"effect": "2.0.0-next.57",
"next": "14.0.3",
"nextra": "^2.13.2",
"nextra-theme-docs": "^2.13.2",
Expand All @@ -23,7 +23,7 @@
},
"devDependencies": {
"@evolu/tsconfig": "workspace:*",
"@types/node": "^20.10.0",
"@types/node": "^20.10.1",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"autoprefixer": "^10.4.16",
Expand Down
2 changes: 1 addition & 1 deletion packages/evolu-common-web/src/DbWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const SyncWorkerLive = Layer.effect(
// It's a separated because it's imported dynamically and by Web Worker.
export const dbWorker = Effect.provide(
DbWorker,
Layer.use(
Layer.provide(
DbWorkerLive,
Layer.mergeAll(SqliteLive, Bip39Live, NanoIdLive, SyncWorkerLive),
),
Expand Down
2 changes: 1 addition & 1 deletion packages/evolu-common-web/src/SyncWorker.worker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { SyncLockLive } from "./PlatformLive.js";

const syncWorker = Effect.provide(
SyncWorker,
Layer.use(
Layer.provide(
SyncWorkerLive,
Layer.mergeAll(SyncLockLive, FetchLive, SecretBoxLive),
),
Expand Down
4 changes: 2 additions & 2 deletions packages/evolu-common-web/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ export const parseMnemonic: (

/** Evolu for web platform. */
export const EvoluWebLive = EvoluCommonLive.pipe(
Layer.use(Layer.merge(DbWorkerLive, AppStateLive)),
Layer.use(Layer.merge(PlatformNameLive, FlushSyncLive)),
Layer.provide(Layer.merge(DbWorkerLive, AppStateLive)),
Layer.provide(Layer.merge(PlatformNameLive, FlushSyncLive)),
);
8 changes: 4 additions & 4 deletions packages/evolu-common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@
"nanoid": "^5.0.3"
},
"devDependencies": {
"@effect/schema": "0.50.0",
"@effect/schema": "0.51.0",
"@evolu/tsconfig": "workspace:*",
"@protobuf-ts/plugin": "^2.9.1",
"@protobuf-ts/protoc": "^2.9.1",
"array-shuffle": "^3.0.0",
"better-sqlite3": "^9.1.1",
"effect": "2.0.0-next.56",
"effect": "2.0.0-next.57",
"eslint": "^8.54.0",
"eslint-config-evolu": "workspace:*",
"typescript": "^5.3.2",
"vitest": "^0.34.6"
},
"peerDependencies": {
"@effect/schema": "0.50.0",
"effect": "2.0.0-next.56"
"@effect/schema": "0.51.0",
"effect": "2.0.0-next.57"
},
"publishConfig": {
"access": "public"
Expand Down
2 changes: 1 addition & 1 deletion packages/evolu-common/src/DbWorker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ export const mutationsToNewMessages = (
),
),
),
ReadonlyArray.flatten,
(a) => a.flat(),
ReadonlyArray.dedupeWith(NewMessageEquivalence),
);

Expand Down
10 changes: 5 additions & 5 deletions packages/evolu-common/src/Evolu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -755,13 +755,13 @@ const EvoluCommon = Layer.effect(
});
}),
).pipe(
Layer.use(Layer.mergeAll(LoadQueryLive, OnQueryLive, MutateLive)),
Layer.use(LoadingPromiseLive),
Layer.use(SubscribedQueriesLive),
Layer.use(Layer.merge(RowsStoreLive, OnCompletesLive)),
Layer.provide(Layer.mergeAll(LoadQueryLive, OnQueryLive, MutateLive)),
Layer.provide(LoadingPromiseLive),
Layer.provide(SubscribedQueriesLive),
Layer.provide(Layer.merge(RowsStoreLive, OnCompletesLive)),
);

/** EvoluCommonLive has only platform independent side-effects. */
export const EvoluCommonLive = EvoluCommon.pipe(
Layer.use(Layer.merge(TimeLive, NanoIdLive)),
Layer.provide(Layer.merge(TimeLive, NanoIdLive)),
);
10 changes: 6 additions & 4 deletions packages/evolu-react-native/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,11 @@ const EvoluNativeLive: Layer.Layer<
never,
Evolu<Schema>
> = EvoluCommonLive.pipe(
Layer.use(Layer.mergeAll(FlushSyncLive, AppStateLive, DbWorkerLive)),
Layer.use(Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive)),
Layer.use(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive)),
Layer.provide(Layer.mergeAll(FlushSyncLive, AppStateLive, DbWorkerLive)),
Layer.provide(
Layer.mergeAll(Bip39Live, NanoIdLive, SqliteLive, SyncWorkerLive),
),
Layer.provide(Layer.mergeAll(SecretBoxLive, SyncLockLive, FetchLive)),
);

/**
Expand Down Expand Up @@ -88,7 +90,7 @@ const EvoluNativeLive: Layer.Layer<
* ```
*/
export const create = EvoluReactLive.pipe(
Layer.use(EvoluNativeLive),
Layer.provide(EvoluNativeLive),
makeCreateEvoluReact,
);

Expand Down
2 changes: 1 addition & 1 deletion packages/evolu-react/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ export * from "@evolu/common/public";
* ```
*/
export const create = EvoluReactLive.pipe(
Layer.use(EvoluWebLive),
Layer.provide(EvoluWebLive),
makeCreateEvoluReact,
);
4 changes: 2 additions & 2 deletions packages/evolu-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"better-sqlite3": "^9.1.1",
"body-parser": "^1.20.2",
"cors": "^2.8.5",
"effect": "2.0.0-next.56",
"effect": "2.0.0-next.57",
"express": "^4.18.2"
},
"devDependencies": {
Expand All @@ -40,7 +40,7 @@
"@types/body-parser": "^1.19.5",
"@types/cors": "^2.8.17",
"@types/express": "^4.17.21",
"@types/node": "^20.10.0",
"@types/node": "^20.10.1",
"eslint": "^8.54.0",
"eslint-config-evolu": "workspace:*",
"typescript": "^5.3.2",
Expand Down
Loading

1 comment on commit 59ec99c

@vercel
Copy link

@vercel vercel bot commented on 59ec99c Nov 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

evolu – ./

www.evolu.dev
evolu-git-main-evolu.vercel.app
evolu-evolu.vercel.app
evolu.vercel.app
evolu.dev

Please sign in to comment.