braidfs 0.0.24 → 0.0.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/README.md +4 -1
  2. package/index.js +1 -1
  3. package/package.json +2 -2
package/README.md CHANGED
@@ -1,6 +1,9 @@
1
1
  # braidfs
2
- Proxy braid collaborative text pages as editable files on disk.
3
2
 
3
+ Sync Braid URLs and website as files on disk.
4
+
5
+ Like Dropbox (file sync), plus Google Docs (collaborative editing), all over
6
+ HTTP.
4
7
 
5
8
  ## Installation
6
9
 
package/index.js CHANGED
@@ -336,7 +336,7 @@ async function proxy_url(url) {
336
336
  // console.log(`update: ${JSON.stringify(update, null, 4)}`)
337
337
  if (update.version.length == 0) return;
338
338
 
339
- await braid_text.put(url, { ...update, peer })
339
+ await braid_text.put(url, { ...update, peer, merge_type: 'dt' })
340
340
 
341
341
  signal_file_needs_writing()
342
342
  })
package/package.json CHANGED
@@ -1,13 +1,13 @@
1
1
  {
2
2
  "name": "braidfs",
3
- "version": "0.0.24",
3
+ "version": "0.0.25",
4
4
  "description": "braid technology synchronizing files and webpages",
5
5
  "author": "Braid Working Group",
6
6
  "repository": "braid-org/braidfs",
7
7
  "homepage": "https://braid.org",
8
8
  "dependencies": {
9
9
  "braid-http": "^0.3.20",
10
- "braid-text": "^0.0.27",
10
+ "braid-text": "^0.0.29",
11
11
  "chokidar": "^3.6.0"
12
12
  },
13
13
  "bin": {