@fluid-app/fluid-cli-theme-dev 0.1.910 → 0.1.911

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 (2) hide show
  1. package/README.md +30 -0
  2. package/package.json +2 -2
package/README.md CHANGED
@@ -493,6 +493,36 @@ replace the widget.
493
493
  after publishing, since Fluid may rewrite keys; pull to take staging's
494
494
  version.
495
495
 
496
+ ### Publishing when a teammate published first
497
+
498
+ `fluid theme staging publish` sends every theme file it publishes (all but
499
+ the paths it skips and lists, such as files attached to a template), so it
500
+ would put this checkout's copy of each of those back on staging. To keep that from undoing a
501
+ teammate's work by accident, each successful publish records the staging
502
+ revision and the files it published in `.fluid-theme/staging-baseline.json`.
503
+ The next publish from the same directory compares staging with that record
504
+ first. When files changed on staging since then and this checkout has them
505
+ differently, the publish is refused with `staging_moved`, names those files
506
+ and the current revision, and changes nothing:
507
+
508
+ ```text
509
+ Staging has changes you don't have (revision 12). Publishing would replace them. Get those changes first, or publish with --force to replace them.
510
+ - sections/hero_section/index.liquid
511
+ ```
512
+
513
+ - Bring their changes into this checkout and publish again; once your copies
514
+ match staging's, nothing is replaced and the check passes.
515
+ - `--replace-at <revision>` replaces them on purpose, only while staging is
516
+ still at that revision. If someone published again meanwhile, the check
517
+ runs again and names the new files. Mist's **Replace anyway** uses this.
518
+ - `--force` replaces them whatever the revision.
519
+
520
+ Paths are matched however a resource's path is spelled, so a case or
521
+ resource-kind difference doesn't hide a file. With no record (a new checkout,
522
+ or the file deleted), there is nothing to compare and the publish isn't
523
+ checked. With `--json`, the refusal's `error.type` is `staging_moved` and
524
+ `error.paths` lists the files.
525
+
496
526
  ### Promoting staging to live
497
527
 
498
528
  `fluid theme staging promote` copies exactly what staging serves onto the
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fluid-app/fluid-cli-theme-dev",
3
- "version": "0.1.910",
3
+ "version": "0.1.911",
4
4
  "description": "Fluid CLI plugin for theme developer workflows — dev server, push, pull, init, crawl, compare",
5
5
  "files": [
6
6
  "dist",
@@ -21,7 +21,7 @@
21
21
  "access": "public"
22
22
  },
23
23
  "dependencies": {
24
- "@fluid-app/fluid-cli": "0.1.547",
24
+ "@fluid-app/fluid-cli": "0.1.548",
25
25
  "chalk": "^5.6.2",
26
26
  "chokidar": "^4.0.0",
27
27
  "commander": "^12.0.0",