@lapis-notes/workspace 0.3.0 → 0.3.1
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.
- package/CHANGELOG.md +20 -0
- package/README.md +2 -2
- package/dist/file-conflicts/ConflictReview.svelte +8 -0
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,25 @@
|
|
|
1
1
|
# @lapis-notes/workspace
|
|
2
2
|
|
|
3
|
+
## 0.3.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#44](https://github.com/lapismd/lapis-notes/pull/44)
|
|
8
|
+
[`f2373ba`](https://github.com/lapismd/lapis-notes/commit/f2373baf79db19267f3422895ce321ef1fa3c78d)
|
|
9
|
+
Thanks [@stevejuma](https://github.com/stevejuma)! - Point package
|
|
10
|
+
documentation to the canonical specification and remove stale package-local
|
|
11
|
+
and pre-consolidation specification links.
|
|
12
|
+
|
|
13
|
+
- [#47](https://github.com/lapismd/lapis-notes/pull/47)
|
|
14
|
+
[`6f315ba`](https://github.com/lapismd/lapis-notes/commit/6f315baef2bd2f0bb4942927d4e19b9e0eb2a15d)
|
|
15
|
+
Thanks [@stevejuma](https://github.com/stevejuma)! - Restore explicit
|
|
16
|
+
disk-version acceptance in the shared retained conflict review, including
|
|
17
|
+
preserving deletion through the captured guarded writer decision.
|
|
18
|
+
- Updated dependencies
|
|
19
|
+
[[`f2373ba`](https://github.com/lapismd/lapis-notes/commit/f2373baf79db19267f3422895ce321ef1fa3c78d)]:
|
|
20
|
+
- @lapis-notes/api@0.2.1
|
|
21
|
+
- @lapis-notes/ui@0.1.5
|
|
22
|
+
|
|
3
23
|
## 0.3.0
|
|
4
24
|
|
|
5
25
|
### Minor Changes
|
package/README.md
CHANGED
|
@@ -36,5 +36,5 @@ pnpm --filter @lapis-notes/workspace test
|
|
|
36
36
|
|
|
37
37
|
## References
|
|
38
38
|
|
|
39
|
-
- [
|
|
40
|
-
- [Canonical spec](../../spec/src/
|
|
39
|
+
- [Workspace contract](../../spec/src/workspace-shell.md)
|
|
40
|
+
- [Canonical spec](../../spec/src/workspace-shell.md)
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import { MergeEditor } from "@lapismd/design-core/diff";
|
|
3
3
|
import { Button } from "@lapismd/design-core/shadcn/button";
|
|
4
4
|
import FileCheckIcon from "@lucide/svelte/icons/file-check";
|
|
5
|
+
import Undo2Icon from "@lucide/svelte/icons/undo-2";
|
|
5
6
|
import ConflictReviewControls from "./ConflictReviewControls.svelte";
|
|
6
7
|
import RefreshCwIcon from "@lucide/svelte/icons/refresh-cw";
|
|
7
8
|
import type {
|
|
@@ -76,6 +77,13 @@
|
|
|
76
77
|
{/if}
|
|
77
78
|
</div>
|
|
78
79
|
<div class="actions">
|
|
80
|
+
<Button
|
|
81
|
+
variant="ghost"
|
|
82
|
+
disabled={disabled || conflict.external === undefined}
|
|
83
|
+
onclick={() => model.recover(conflict.path, "use-external")}
|
|
84
|
+
>
|
|
85
|
+
<Undo2Icon aria-hidden="true" />Use disk version
|
|
86
|
+
</Button>
|
|
79
87
|
<Button
|
|
80
88
|
variant="outline"
|
|
81
89
|
disabled={disabled ||
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lapis-notes/workspace",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.1",
|
|
4
4
|
"description": "Lapis Notes workspace shell backed by design-core",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -38,10 +38,10 @@
|
|
|
38
38
|
}
|
|
39
39
|
},
|
|
40
40
|
"dependencies": {
|
|
41
|
-
"@lapis-notes/api": "^0.2.
|
|
41
|
+
"@lapis-notes/api": "^0.2.1",
|
|
42
42
|
"@lapismd/design-core": "^0.7.0",
|
|
43
43
|
"@lucide/svelte": "^0.523.0",
|
|
44
|
-
"@lapis-notes/ui": "^0.1.
|
|
44
|
+
"@lapis-notes/ui": "^0.1.5"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"svelte": "^5.0.0"
|