Skip to content

Commit

Permalink
chore(deps): update rsapi
Browse files Browse the repository at this point in the history
  • Loading branch information
andelf committed Jun 26, 2023
1 parent 2374c0b commit 9349f1a
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 51 deletions.
1 change: 0 additions & 1 deletion ios/App/App/FsWatcher.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class FsWatcher: CAPPlugin, PollingWatcherDelegate {
return
}
// NOTE: Event in js {dir path content stat{mtime}}
print("url \(url) rel \(baseUrl)")
switch event {
case .Unlink:
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"@capawesome/capacitor-background-task": "^2.0.0",
"@excalidraw/excalidraw": "0.12.0",
"@hugotomazi/capacitor-navigation-bar": "^2.0.0",
"@logseq/capacitor-file-sync": "0.0.27",
"@logseq/capacitor-file-sync": "0.0.30",
"@logseq/diff-merge": "^0.0.2",
"@logseq/react-tweet-embed": "1.3.1-1",
"@radix-ui/colors": "^0.1.8",
Expand Down
2 changes: 1 addition & 1 deletion resources/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"https-proxy-agent": "5.0.0",
"@sentry/electron": "2.5.1",
"posthog-js": "1.10.2",
"@logseq/rsapi": "0.0.71",
"@logseq/rsapi": "0.0.73",
"electron-deeplink": "1.0.10",
"abort-controller": "3.0.0",
"fastify": "latest",
Expand Down
1 change: 0 additions & 1 deletion src/main/frontend/fs/node.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@
(ipc/ipc "rename" old-path new-path))
;; copy with overwrite, without confirmation
(copy! [_this repo old-path new-path]
(prn ::copy-file old-path new-path)
(ipc/ipc "copyFile" repo old-path new-path))
(stat [_this fpath]
(-> (ipc/ipc "stat" fpath)
Expand Down
3 changes: 0 additions & 3 deletions src/main/frontend/fs/sync.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -856,7 +856,6 @@
(let [token (<! (<get-token this))]
(<! (p->c (ipc/ipc "update-local-files" graph-uuid base-path filepaths token))))))
(<fetch-remote-files [this graph-uuid base-path filepaths]
(println "fetch-remote-files" graph-uuid base-path filepaths)
(go
(<! (<rsapi-cancel-all-requests))
(let [token (<! (<get-token this))]
Expand Down Expand Up @@ -957,7 +956,6 @@
:filePaths filepaths'
:token token})))))))
(<fetch-remote-files [this graph-uuid base-path filepaths]
(js/console.error "mobile <fetch-remote-files")
(go
(let [token (<! (<get-token this))
r (<! (<retry-rsapi
Expand Down Expand Up @@ -1592,7 +1590,6 @@
(fs/unlink! repo (path/path-join repo-dir base-file) {}))
;; base-content != current-content, merge, do not delete
(p/let [merged-content (diff-merge/three-way-merge base-content "" current-content format)]
(prn "local changed, merge deletion")
(fs/write-file! repo repo-dir current-change-file merged-content {:skip-compare? true})
(file-handler/alter-file repo current-change-file merged-content {:re-render-root? true
:from-disk? true
Expand Down
80 changes: 40 additions & 40 deletions static/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -400,47 +400,47 @@
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.71.tgz#daf9437f60b595a93f8126ba69c1a46bd0f5a7fa"
integrity sha512-SFZPnIXGrpIJhGAirobv1gLUVCxRvfud1ZkVKgfDCNmvByuYZ/OUIPYSG+OKY0HzyiIhVFLbRD25/+XxlD4hQg==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.71.tgz#7c8cfb23886943f3184922d5e8d64b22c52a6262"
integrity sha512-JvhZ/ZSJwaDELtocvVRMBXeNOwvUB3+uQSRIwXu5P1/6wqnyNtH+3CR8v8b/gwdY1lzGGG/S4bP/IksaeiwLUA==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.71.tgz#53a2002febf8e6da1da2eb1b7151d4236ee0911a"
integrity sha512-a7mdN6Ot1M+H0Gaem6eQMaGo+S/6J6dhwlu8gOuQvy7hcTCWND34NhZ05KgMxWZIfOUK7sqhWc5ghTcHJloBCg==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.71.tgz#f8e0eced5e6631af4263ac1a80735ada8adab02c"
integrity sha512-VE1fE3LrEYcIF5mC79wq0kCYB6kOjFpNjyLumxCzf1WawRFGNaxmpyCMIXG0raLq2fj7YZX7VnM+/ge3IIS5PQ==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.71.tgz#e1ca0eb21f24731823a800a9c1c2463ef2d728f4"
integrity sha512-OkYV+ANFJqRCJoDI+KI2pYduUXTi9+ZM05RV58GUpPlKGWC/0RYBnc0IlvaBV/ke/eba5++yKYxXTyjMMpEqfg==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.71.tgz#9b1c2c4f561626150c3ae851a7ec0c473f83840f"
integrity sha512-LS4h6sn/R/A/DCgEDs+g9mPcFTgJ1COmW7r7eKXxB/9WWsezdTqS8rpSBts5GaTxwq/hABGYY7MgXQ0hufHP3A==

"@logseq/[email protected].71":
version "0.0.71"
resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.71.tgz#a711809f691c7819e6b85a0b658cd618712daeed"
integrity sha512-MmQJCmw4NrTQoyX22tqOu2c2uURtqD/zSQ64tbHvSUUIOUQZyADfQtUhyc5wgyesc7pCTu0j5IA+tnGuOa4pbQ==
"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-arm64/-/rsapi-darwin-arm64-0.0.73.tgz#4753f05e2dc70f37a31dfb7440e9b2601acb7696"
integrity sha512-TvFwh3/fnwRAZwourk1UUgptcNN7FqmOcL07F373M2rWhTIOba/u1eBwjW9wNMRcXtgLWacaXzBmC4ENvAKDpg==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-darwin-x64/-/rsapi-darwin-x64-0.0.73.tgz#44180532e3ccf62a7fe597e385ee85a700b14bea"
integrity sha512-tnOSgQ1qgerwDTnR5v1TMbHnVXVabzZf9i3bxon0y9ItwlIY7j7OW80+1AfNoHu9Fbo/e+3bFg5Muq3/Gm7Yrw==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-freebsd-x64/-/rsapi-freebsd-x64-0.0.73.tgz#3ff4f720eb05d9ffd32a5391ddf33034a05f42e0"
integrity sha512-YAjggQHzVCZYhXDybR/37Y5czTQbYDE5A5piwsg09Xt4/m5REFSVKqdeQpnOb2LX7wBGbnPxMhsg6QUV/y/eHA==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-arm64-gnu/-/rsapi-linux-arm64-gnu-0.0.73.tgz#1f423e296ca69e6e92a06afbb25f9f2f0e452b69"
integrity sha512-t5W9SBraKYU2iGPzBgUhSzVPtH98RwuE1tLW2MpAJh0QNb2DI4/axbc9nrC1IVc1dqAmTkuL8GGGN80VONisUA==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-linux-x64-gnu/-/rsapi-linux-x64-gnu-0.0.73.tgz#d33e621d7ea24089a9b863809e6dfbe4362443d5"
integrity sha512-WidDZv4mnG6Ys90KYLzJl0fwMWj/kEItGHjfR3FoDAVKkvu3mezNDWCsd+I2kMrh1dlIpPqcP+BJ9evI4Gbwkw==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi-win32-x64-msvc/-/rsapi-win32-x64-msvc-0.0.73.tgz#7734187c1b56da6373c947680a65b21551134bec"
integrity sha512-YQTE4ZMtlrbuDVfD/6DWtnsiC2uUZpNDqcy6LIN6Ui98yeZ88ktOsEV/lQJF4+4cAflrzW7Xr8ejl2SWSdX6EQ==

"@logseq/[email protected].73":
version "0.0.73"
resolved "https://registry.yarnpkg.com/@logseq/rsapi/-/rsapi-0.0.73.tgz#b02fc017bb12df3afa0fce60ba13e1b01bbf4342"
integrity sha512-ppQCCzc1pAgqlxkYg2CprcU5RTz01fWqba9lhEVg2FpeF9l8IVVCXhbBIUnWPEFTqkoySiwXpMU8kbkTgvEPIg==
optionalDependencies:
"@logseq/rsapi-darwin-arm64" "0.0.71"
"@logseq/rsapi-darwin-x64" "0.0.71"
"@logseq/rsapi-freebsd-x64" "0.0.71"
"@logseq/rsapi-linux-arm64-gnu" "0.0.71"
"@logseq/rsapi-linux-x64-gnu" "0.0.71"
"@logseq/rsapi-win32-x64-msvc" "0.0.71"
"@logseq/rsapi-darwin-arm64" "0.0.73"
"@logseq/rsapi-darwin-x64" "0.0.73"
"@logseq/rsapi-freebsd-x64" "0.0.73"
"@logseq/rsapi-linux-arm64-gnu" "0.0.73"
"@logseq/rsapi-linux-x64-gnu" "0.0.73"
"@logseq/rsapi-win32-x64-msvc" "0.0.73"

"@malept/cross-spawn-promise@^1.0.0", "@malept/cross-spawn-promise@^1.1.0":
version "1.1.1"
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -487,10 +487,10 @@
"@jridgewell/resolve-uri" "^3.0.3"
"@jridgewell/sourcemap-codec" "^1.4.10"

"@logseq/[email protected].27":
version "0.0.27"
resolved "https://registry.yarnpkg.com/@logseq/capacitor-file-sync/-/capacitor-file-sync-0.0.27.tgz#01f499943769dbeebd681f290ef86000d3b078b5"
integrity sha512-6gqKElG5qpN7HzEPMO1lpfJLhu7+xdMRB5DbJQdXwK5Di0XGsNGU7wu38quJVLeRFJJmbp1oNxdjHemIeTAAMw==
"@logseq/[email protected].30":
version "0.0.30"
resolved "https://registry.yarnpkg.com/@logseq/capacitor-file-sync/-/capacitor-file-sync-0.0.30.tgz#9441ad5689f6139acbc7444530b11e0648a586b3"
integrity sha512-rrk4CdSyS8y1M3WgqkFtdtoP3YWRhuaaQOPtO18roOTztbwdu/w7/+uEt7RDVcV92rwCjhCeg4yaTxbmgWwFYw==

"@logseq/diff-merge@^0.0.2":
version "0.0.2"
Expand Down

0 comments on commit 9349f1a

Please sign in to comment.