Commit 350066a
## Summary
Fixes #4443 — `spacetime dev` ignores both `--module-path` CLI flag and
`module-path` in `spacetime.json` for the file watcher, always watching
`<project-path>/spacetimedb/` instead.
## Root Cause
Two bugs:
1. **Config's `module-path` never applied to `spacetimedb_dir`**: When
`spacetime.json` contains `module-path`, the recovery prompt is
correctly skipped (the code checks for its existence), but the value is
never used to update `spacetimedb_dir`. It stays as
`project_dir/spacetimedb`.
2. **Hardcoded fallback in `determine_publish_configs()`**: When there
are no publish targets in config (no `database` key or `children`), the
fallback creates a publish config entry with `module-path:
"spacetimedb"` hardcoded. This propagates to `extract_watch_dirs()`
(file watcher) and the publish loop, overriding any CLI or config value.
## Fix
1. After loading config, resolve `spacetimedb_dir` from config's
`module-path` in `additional_fields` when CLI did not provide
`--module-path`.
2. Pass the resolved `spacetimedb_dir` to `determine_publish_configs()`
as `default_module_path` so the fallback uses the correct path instead
of hardcoding `"spacetimedb"`.
## Testing
- All 5 existing `determine_publish_configs` tests pass
- Added new test
`test_determine_publish_configs_fallback_uses_provided_module_path` that
verifies the fallback uses the provided path
---------
Co-authored-by: clockwork-labs-bot <clockwork-labs-bot@users.noreply.github.com>
Co-authored-by: Zeke Foppa <196249+bfops@users.noreply.github.com>
1 parent 9f47647 commit 350066a
1 file changed
Lines changed: 57 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
290 | 290 | | |
291 | 291 | | |
292 | 292 | | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
293 | 306 | | |
294 | 307 | | |
295 | 308 | | |
| |||
365 | 378 | | |
366 | 379 | | |
367 | 380 | | |
| 381 | + | |
368 | 382 | | |
369 | 383 | | |
370 | 384 | | |
| |||
470 | 484 | | |
471 | 485 | | |
472 | 486 | | |
| 487 | + | |
473 | 488 | | |
474 | 489 | | |
475 | 490 | | |
| |||
846 | 861 | | |
847 | 862 | | |
848 | 863 | | |
| 864 | + | |
849 | 865 | | |
850 | 866 | | |
851 | 867 | | |
| |||
869 | 885 | | |
870 | 886 | | |
871 | 887 | | |
872 | | - | |
| 888 | + | |
873 | 889 | | |
874 | 890 | | |
875 | 891 | | |
| |||
1728 | 1744 | | |
1729 | 1745 | | |
1730 | 1746 | | |
1731 | | - | |
1732 | | - | |
| 1747 | + | |
| 1748 | + | |
| 1749 | + | |
| 1750 | + | |
| 1751 | + | |
| 1752 | + | |
| 1753 | + | |
| 1754 | + | |
| 1755 | + | |
| 1756 | + | |
1733 | 1757 | | |
1734 | 1758 | | |
1735 | 1759 | | |
| |||
1748 | 1772 | | |
1749 | 1773 | | |
1750 | 1774 | | |
| 1775 | + | |
1751 | 1776 | | |
1752 | 1777 | | |
1753 | 1778 | | |
| |||
1783 | 1808 | | |
1784 | 1809 | | |
1785 | 1810 | | |
| 1811 | + | |
1786 | 1812 | | |
1787 | 1813 | | |
1788 | 1814 | | |
| |||
1814 | 1840 | | |
1815 | 1841 | | |
1816 | 1842 | | |
| 1843 | + | |
1817 | 1844 | | |
1818 | 1845 | | |
1819 | 1846 | | |
| |||
1825 | 1852 | | |
1826 | 1853 | | |
1827 | 1854 | | |
| 1855 | + | |
| 1856 | + | |
| 1857 | + | |
| 1858 | + | |
| 1859 | + | |
| 1860 | + | |
| 1861 | + | |
| 1862 | + | |
| 1863 | + | |
| 1864 | + | |
| 1865 | + | |
| 1866 | + | |
| 1867 | + | |
| 1868 | + | |
| 1869 | + | |
| 1870 | + | |
| 1871 | + | |
| 1872 | + | |
| 1873 | + | |
| 1874 | + | |
| 1875 | + | |
| 1876 | + | |
| 1877 | + | |
| 1878 | + | |
| 1879 | + | |
| 1880 | + | |
| 1881 | + | |
1828 | 1882 | | |
1829 | 1883 | | |
1830 | 1884 | | |
| |||
0 commit comments