@fluid-app/fluid-cli-theme-dev 0.1.37 → 0.1.38
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/README.md +12 -0
- package/dist/index.mjs +422 -128
- package/dist/index.mjs.map +1 -1
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -54,8 +54,15 @@ fluid theme push --theme "My Theme" # By name
|
|
|
54
54
|
fluid theme push --theme 42 # By ID
|
|
55
55
|
fluid theme push --publish # Push and publish
|
|
56
56
|
fluid theme push --nodelete # Keep remote files not present locally
|
|
57
|
+
fluid theme push --auto-baseline # First push without a baseline: record
|
|
58
|
+
# the server's current state as the
|
|
59
|
+
# baseline, then push only local diffs
|
|
57
60
|
```
|
|
58
61
|
|
|
62
|
+
Pushing into an existing theme requires a local baseline (recorded by `pull`, or migrated from a checksum-era `.fluid-theme.json`). Without one, push refuses so it can't silently clobber the server. `--auto-baseline` instead records the server's current state as the baseline — no local file is modified, files identical to the server aren't re-uploaded, and files that exist only on the server are never deleted — then pushes what differs locally. Mist Desktop's one-click Publish uses this flag.
|
|
63
|
+
|
|
64
|
+
Files containing unresolved `<<<<<<< / ======= / >>>>>>>` conflict markers are never uploaded; push lists them and exits (with a machine-readable `FLUID_THEME_PUSH_BLOCKED code=conflict_markers files=…` line under `--auto-baseline`).
|
|
65
|
+
|
|
59
66
|
### `fluid theme pull`
|
|
60
67
|
|
|
61
68
|
Download a remote theme to your local directory:
|
|
@@ -64,8 +71,13 @@ Download a remote theme to your local directory:
|
|
|
64
71
|
fluid theme pull # Interactive theme selection
|
|
65
72
|
fluid theme pull --theme "My Theme" # By name or ID
|
|
66
73
|
fluid theme pull --nodelete # Keep local files not present on remote
|
|
74
|
+
fluid theme pull --resolve remote # Auto-resolve conflicts to the server's
|
|
75
|
+
# side (or `--resolve local` to keep
|
|
76
|
+
# yours) instead of writing markers
|
|
67
77
|
```
|
|
68
78
|
|
|
79
|
+
By default, conflicting edits (changed locally _and_ on the server since the last sync) are written with git-style conflict markers for you to resolve. For non-interactive use, `--resolve local` keeps your side of each conflicting hunk and `--resolve remote` takes the server's; before any auto-resolution overwrites local content, the pre-merge working tree is committed to the theme's shadow history (`.fluid-theme/repo`) so the discarded side stays restorable.
|
|
80
|
+
|
|
69
81
|
### `fluid theme init`
|
|
70
82
|
|
|
71
83
|
Scaffold a new theme from the base template:
|