Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V5.2 #94

Merged
merged 85 commits into from
Jan 17, 2024
Merged

V5.2 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
38b3dc2
add createTeam
HerbCaudill Dec 25, 2023
6b336f0
use createTeam in syncServer tests
HerbCaudill Dec 25, 2023
d58d634
factor out registerTeam
HerbCaudill Dec 25, 2023
4edf893
servers -> server
HerbCaudill Dec 25, 2023
9a4cccc
update readmes
HerbCaudill Dec 25, 2023
3826d9a
add todos tests
HerbCaudill Dec 26, 2023
0411949
fix test:pw
HerbCaudill Dec 26, 2023
4909ef2
link:, not file:
HerbCaudill Dec 26, 2023
f40b522
straighten out playwright scripts
HerbCaudill Dec 27, 2023
7398e2d
enable parallel cypress tests; straighten out scripts
HerbCaudill Dec 27, 2023
417643a
only set up debug logging if env variable is set
HerbCaudill Dec 27, 2023
67eabfc
remove describe blocks
HerbCaudill Dec 27, 2023
6705c15
test: server is already registered
HerbCaudill Dec 28, 2023
07079e1
add team before registering with server
HerbCaudill Dec 28, 2023
0eda2e8
todo demo: minimize waits
HerbCaudill Dec 28, 2023
b764501
add support for anonymous shares
HerbCaudill Dec 28, 2023
357b2dc
comment
HerbCaudill Dec 28, 2023
0c73b2e
remove unused types
HerbCaudill Dec 28, 2023
9d11334
add eslint exception
HerbCaudill Dec 28, 2023
e6ffa0c
move auth provider config type to AuthProvider.ts
HerbCaudill Dec 28, 2023
13cca74
refer to shares as public (rather than anonymous) and private
HerbCaudill Dec 28, 2023
934e769
remove unused stuff from demo main.tsx
HerbCaudill Dec 28, 2023
5c9d2f5
remove old stress test
HerbCaudill Dec 28, 2023
fa70955
move addPublicShare method
HerbCaudill Dec 28, 2023
4a1429c
add comment
HerbCaudill Dec 28, 2023
185dce1
exchange shareIds
HerbCaudill Dec 29, 2023
5c84632
todos demo: package.json: fix version & repo
HerbCaudill Dec 31, 2023
7ab961d
use local automerge-repo
HerbCaudill Dec 31, 2023
d70be89
create team: remove unused imports
HerbCaudill Dec 31, 2023
357275a
AuthProvider: createPublicShare & registerPublicShare
HerbCaudill Dec 31, 2023
eedfe46
authNetworkAdapter: emit ready
HerbCaudill Dec 31, 2023
e37aa47
AuthProvider: update public share tests
HerbCaudill Dec 31, 2023
898df56
syncserver.test: wip
HerbCaudill Dec 31, 2023
5faf965
log: fix user/device matcher
HerbCaudill Jan 1, 2024
e31c711
test setup: randomize storage directory name
HerbCaudill Jan 1, 2024
1e1be3f
use unhashed shareIds for now
HerbCaudill Jan 1, 2024
e65bdd5
use authProvider.createTeam
HerbCaudill Jan 1, 2024
fd1bad3
comments
HerbCaudill Jan 1, 2024
1cdb360
cleanup
HerbCaudill Jan 1, 2024
a650a9b
reorganize log scripts
HerbCaudill Jan 1, 2024
643062d
fix flaky test
HerbCaudill Jan 2, 2024
40183e3
anonymous connection: log prefix
HerbCaudill Jan 2, 2024
def0d06
comments
HerbCaudill Jan 2, 2024
d70b3da
don't await or we might miss the connected event
HerbCaudill Jan 2, 2024
77c726d
remove only
HerbCaudill Jan 2, 2024
35f5d3c
tweak logging utils
HerbCaudill Jan 4, 2024
ae1a0c7
imports
HerbCaudill Jan 4, 2024
83df4b6
pass userStuff to authenticated, not repo
HerbCaudill Jan 4, 2024
c4c15e9
remove timeouts
HerbCaudill Jan 4, 2024
ebfcbd8
pause(1) before sendJoinMessage
HerbCaudill Jan 4, 2024
58e1cb8
eliminate a few unnecessary join messages
HerbCaudill Jan 4, 2024
131afc5
hash shareIds
HerbCaudill Jan 12, 2024
fe9bfcb
tweak log script
HerbCaudill Jan 7, 2024
8ffac65
fix uncontrolled input warning
HerbCaudill Jan 7, 2024
646f7cd
rearrange layout
HerbCaudill Jan 7, 2024
16039e9
add team name heading
HerbCaudill Jan 7, 2024
ca4c221
focus styling
HerbCaudill Jan 7, 2024
982e71a
spacing
HerbCaudill Jan 7, 2024
88c24e6
refactor pw tests
HerbCaudill Jan 11, 2024
fb2cd85
larger h4
HerbCaudill Jan 11, 2024
7f87062
remove commented-out code
HerbCaudill Jan 11, 2024
2025e2f
use truncated teamIds as shareIds
HerbCaudill Jan 12, 2024
a450d8a
demo font
HerbCaudill Jan 12, 2024
402b24b
fix dev:syncserver:log
HerbCaudill Jan 13, 2024
3092238
demo sync server: don't clear storage when starting up
HerbCaudill Jan 13, 2024
ed24a01
throw if context is null or undefined
HerbCaudill Jan 13, 2024
e80c2dc
update member list when team is updated
HerbCaudill Jan 13, 2024
b6e1637
revert not clearing storage on sync server
HerbCaudill Jan 14, 2024
3e4becc
FirstUseSetup: autofocus 'join a team'
HerbCaudill Jan 14, 2024
4688df5
import type
HerbCaudill Jan 14, 2024
794e74f
remove userId from device invitation type
HerbCaudill Jan 14, 2024
a5c7681
playwright app: add device invitations
HerbCaudill Jan 14, 2024
f91cbbc
add device tests
HerbCaudill Jan 14, 2024
79e3960
remove unused
HerbCaudill Jan 14, 2024
836b8b0
wire up device invitations (all tests passing)
HerbCaudill Jan 14, 2024
ed3e6c4
rename util files from tsx to ts
HerbCaudill Jan 15, 2024
6f7434a
refactor JoinAsDevice/JoinAsMember
HerbCaudill Jan 15, 2024
2805acf
convert to arrow function
HerbCaudill Jan 15, 2024
6751075
delete unused component
HerbCaudill Jan 15, 2024
c137e00
createRepoWithAuth: comments
HerbCaudill Jan 15, 2024
8010484
imports
HerbCaudill Jan 15, 2024
8f57022
consolidate JoinAsDevice & JoinAsMember into single component
HerbCaudill Jan 15, 2024
1d4553e
get rid of redux
HerbCaudill Jan 15, 2024
e3b046f
use published automerge-repo
HerbCaudill Jan 15, 2024
0e560f0
refactor first use stuff
HerbCaudill Jan 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.cache
.dev-sync-server-data
.DS_Store
.flaky
.logs
.nx
.pnp
.pnp.js
Expand All @@ -20,7 +22,6 @@ dist
node_modules
package-lock.json
pnpm-works
runner-results
yalc.lock
yarn.lock
.flaky
.logs
yarn.lock
29 changes: 13 additions & 16 deletions demos/automerge-repo-todos/package.json
Original file line number Diff line number Diff line change
@@ -1,49 +1,46 @@
{
"name": "@localfirst/automerge-repo-todos",
"repository": "https://github.com/automerge/automerge-repo/tree/master/examples/react-todo",
"repository": "https://github.com/local-first-web/auth/tree/main/demos/automerge-repo-todos",
"private": true,
"version": "1.1.0-alpha.7",
"version": "5.1.1",
"type": "module",
"scripts": {
"dev": "run-p dev:open dev:syncserver",
"dev": "run-p dev:open dev:syncserver:log",
"dev:start": "vite --port 3000",
"dev:open": "pnpm dev:start --open",
"dev:syncserver": "cross-env DEBUG=localfirst*,automerge* NODE_ENV=development node ./syncserver.js",
"dev:syncserver": "cross-env NODE_ENV=development node ./syncserver.js",
"dev:syncserver:log": "cross-env DEBUG=localfirst*,automerge* pnpm dev:syncserver",
"preview": "vite preview",
"test:pw": "cross-env DEBUG=* run-p dev:start dev:syncserver test:pw:exec",
"test:pw:exec": "playwright test ./test/auth.test.ts --project=chromium",
"test:pw:ui": "cross-env PLAYWRIGHT_UI=1 run-p dev:start dev:syncserver test:pw:exec:ui",
"test:pw:exec:ui": "pnpm test:pw:exec --ui"
"test:pw": "playwright test --project=chromium",
"test:pw:log": "cross-env DEBUG=localfirst*,automerge* pnpm test:pw"
},
"dependencies": {
"@automerge/automerge": "^2.1.9",
"@automerge/automerge-repo": "file:../../../../automerge/automerge-repo/packages/automerge-repo",
"@automerge/automerge-repo-network-broadcastchannel": "1.1.0-alpha.7",
"@automerge/automerge-repo-network-websocket": "1.1.0-alpha.7",
"@automerge/automerge-repo-react-hooks": "1.1.0-alpha.7",
"@automerge/automerge-repo-storage-indexeddb": "1.1.0-alpha.7",
"@automerge/automerge-repo": "v1.1.0-alpha.7",
"@automerge/automerge-repo-network-broadcastchannel": "v1.1.0-alpha.7",
"@automerge/automerge-repo-network-websocket": "v1.1.0-alpha.7",
"@automerge/automerge-repo-react-hooks": "v1.1.0-alpha.7",
"@automerge/automerge-repo-storage-indexeddb": "v1.1.0-alpha.7",
"@ibm/plex": "^6.1.1",
"@localfirst/auth": "workspace:*",
"@localfirst/auth-provider-automerge-repo": "workspace:*",
"@localfirst/auth-shared": "workspace:*",
"@localfirst/auth-syncserver": "workspace:*",
"@localfirst/crypto": "workspace:*",
"@reduxjs/toolkit": "^1.9.2",
"@uidotdev/usehooks": "^2.4.1",
"autoprefixer": "^10.4.13",
"classnames": "^2.3.2",
"clipboard": "^2.0.11",
"postcss": "^8.4.21",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-redux": "^8.0.5",
"ua-parser-js": "^1.0.37"
},
"devDependencies": {
"@playwright/test": "^1.40.1",
"@types/node": "^18.18.13",
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.9",
"@types/react-redux": "^7.1.32",
"@types/ua-parser-js": "^0.7.39",
"@vitejs/plugin-react": "^4.2.1",
"tailwindcss": "^3.3.7",
Expand Down
26 changes: 12 additions & 14 deletions demos/automerge-repo-todos/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,16 @@ export default defineConfig({
{ name: 'webkit', use: { ...devices['Desktop Safari'] } },
],

webServer: isPlaywrightUI
? []
: [
{
command: 'pnpm dev:start',
url: 'http://localhost:3000',
reuseExistingServer: false,
},
{
command: 'pnpm dev:syncserver',
url: 'http://localhost:3030',
reuseExistingServer: false,
},
],
webServer: [
{
command: 'pnpm dev:start',
url: 'http://localhost:3000',
reuseExistingServer: false,
},
{
command: 'pnpm dev:syncserver',
url: 'http://localhost:3030',
reuseExistingServer: false,
},
],
})
191 changes: 0 additions & 191 deletions demos/automerge-repo-todos/scripts/flaky.js

This file was deleted.

Loading
Loading