Skip to content

Commit

Permalink
Merge branch 'main' into build-hooks-package-with-vite
Browse files Browse the repository at this point in the history
  • Loading branch information
pvh authored Dec 9, 2023
2 parents d2ec026 + 4361fd0 commit 5d8bb5b
Show file tree
Hide file tree
Showing 29 changed files with 436 additions and 182 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ coverage
docs
stats.html
yarn-error.log
.DS_Store
wallaby.conf.cjs
12 changes: 6 additions & 6 deletions examples/react-counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "@automerge/automerge-repo-demo-counter",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/react-counter",
"private": true,
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"type": "module",
"scripts": {
"dev": "vite --open",
"preview": "vite preview"
},
"dependencies": {
"@automerge/automerge": "^2.1.0",
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-messagechannel": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.2",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.2",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-messagechannel": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.4",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.4",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.4",
"react": "^18.2.0",
"react-dom": "^18.2.0"
}
Expand Down
12 changes: 6 additions & 6 deletions examples/react-todo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "@automerge/automerge-repo-demo-todo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/react-todo",
"private": true,
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"type": "module",
"scripts": {
"dev": "vite --open",
"preview": "vite preview"
},
"dependencies": {
"@automerge/automerge": "^2.1.0",
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.2",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.2",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.4",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.4",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.4",
"@ibm/plex": "^6.1.1",
"autoprefixer": "^10.4.13",
"classnames": "^2.3.2",
Expand Down
8 changes: 4 additions & 4 deletions examples/react-use-awareness/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "automerge-use-awareness-example-project",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/react-use-awareness",
"private": true,
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"type": "module",
"scripts": {
"dev": "vite",
"preview": "vite preview"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.2",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.4",
"@automerge/automerge-repo-react-hooks": "^1.1.0-alpha.4",
"eventemitter3": "^5.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
12 changes: 6 additions & 6 deletions examples/svelte-counter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@automerge/automerge-repo-demo-counter-svelte",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/svelte-counter",
"private": true,
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -11,11 +11,11 @@
},
"dependencies": {
"@automerge/automerge": "^2.1.0",
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.2",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.2",
"@automerge/automerge-repo-svelte-store": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-broadcastchannel": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.4",
"@automerge/automerge-repo-storage-indexeddb": "^1.1.0-alpha.4",
"@automerge/automerge-repo-svelte-store": "^1.1.0-alpha.4",
"svelte": "^3.0.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions examples/sync-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@automerge/example-sync-server",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/sync-server",
"private": true,
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"main": "index.js",
"license": "MIT",
"type": "module",
Expand All @@ -11,9 +11,9 @@
},
"bin": "./src/index.js",
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.2",
"@automerge/automerge-repo-storage-nodefs": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"@automerge/automerge-repo-network-websocket": "^1.1.0-alpha.4",
"@automerge/automerge-repo-storage-nodefs": "^1.1.0-alpha.4",
"express": "^4.18.1",
"ws": "^8.7.0"
},
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"useNx": true,
"npmClient": "yarn",
"useWorkspaces": true,
"version": "1.1.0-alpha.2"
"version": "1.1.0-alpha.4"
}
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-monorepo",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "Automerge Repo monorepo",
"main": "packages/automerge-repo/dist/index.js",
"repository": "https://github.com/automerge/automerge-repo",
Expand All @@ -17,6 +17,7 @@
"start:syncserver": "cross-env DEBUG='WebsocketServer' yarn workspace @automerge/example-sync-server start",
"repocheck": "manypkg check",
"test": "vitest",
"test:log": "cross-env DEBUG='automerge-repo:*' vitest",
"test:coverage": "vitest --coverage",
"test:ui": "vitest --coverage --ui",
"watch": "lerna run watch --parallel --stream"
Expand All @@ -36,7 +37,7 @@
"arrowParens": "avoid"
},
"devDependencies": {
"@automerge/automerge": "2.1.8-alpha.1",
"@automerge/automerge": "^2.1.8-alpha.2",
"@manypkg/cli": "^0.21.0",
"@types/debug": "^4.1.7",
"@types/node": "^20.4.8",
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-network-broadcastchannel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-network-broadcastchannel",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "BroadcastChannel network adapter for Automerge Repo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-broadcastchannel",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"test": "vitest"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2"
"@automerge/automerge-repo": "^1.1.0-alpha.4"
},
"watch": {
"build": {
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-network-messagechannel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-network-messagechannel",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "MessageChannel network adapter for Automerge Repo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-messagechannel",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"test": "vitest"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2"
"@automerge/automerge-repo": "^1.1.0-alpha.4"
},
"watch": {
"build": {
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-network-websocket/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-network-websocket",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "isomorphic node/browser Websocket network adapter for Automerge Repo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-network-websocket",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -13,7 +13,7 @@
"test": "vitest"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"cbor-x": "^1.3.0",
"eventemitter3": "^5.0.1",
"isomorphic-ws": "^5.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-react-hooks/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-react-hooks",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "Hooks to access an Automerge Repo from your react app.",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-react-hooks",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@automerge/automerge": "^2.1.8-alpha.1",
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"eventemitter3": "^5.0.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-storage-indexeddb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-storage-indexeddb",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "IndexedDB storage adapter for Automerge Repo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-storage-indexeddb",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -12,7 +12,7 @@
"watch": "npm-watch"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2"
"@automerge/automerge-repo": "^1.1.0-alpha.4"
},
"watch": {
"build": {
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-storage-nodefs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-storage-nodefs",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "Simple Node filesystem storage adapter for Automerge Repo",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-storage-nodefs",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -12,7 +12,7 @@
"watch": "npm-watch"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2",
"@automerge/automerge-repo": "^1.1.0-alpha.4",
"rimraf": "^5.0.1"
},
"watch": {
Expand Down
4 changes: 2 additions & 2 deletions packages/automerge-repo-svelte-store/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo-svelte-store",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "A Svelte store containing your automerge documentsj",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo-svelte-store",
"license": "MIT",
Expand All @@ -15,7 +15,7 @@
"svelte": "^3.0.0"
},
"dependencies": {
"@automerge/automerge-repo": "^1.1.0-alpha.2"
"@automerge/automerge-repo": "^1.1.0-alpha.4"
},
"watch": {
"build": {
Expand Down
5 changes: 2 additions & 3 deletions packages/automerge-repo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@automerge/automerge-repo",
"version": "1.1.0-alpha.2",
"version": "1.1.0-alpha.4",
"description": "A repository object to manage a collection of automerge documents",
"repository": "https://github.com/automerge/automerge-repo/tree/master/packages/automerge-repo",
"author": "Peter van Hardenberg <[email protected]>",
Expand All @@ -13,7 +13,6 @@
"test:coverage": "c8 --reporter=lcov --reporter=html --reporter=text yarn test",
"test": "vitest",
"test:watch": "npm-watch test",
"test:log": "cross-env DEBUG='automerge-repo:*' yarn test",
"fuzz": "ts-node --esm --experimentalSpecifierResolution=node fuzz/fuzz.ts"
},
"browser": {
Expand All @@ -24,7 +23,7 @@
"vite": "^4.4.11"
},
"dependencies": {
"@automerge/automerge": "^2.1.8-alpha.1",
"@automerge/automerge": "^2.1.8-alpha.2",
"bs58check": "^3.0.1",
"cbor-x": "^1.3.0",
"debug": "^4.3.4",
Expand Down
Loading

0 comments on commit 5d8bb5b

Please sign in to comment.