max / makenotwork

Take the makeover 0.33 and quasi 0.48 cascade Pins only for the server; `Field::unit` is additive and no described screen here measures anything yet. magicmirror's and mnw-cli's locks pick up registry sources for the makeover crates, which had been sourceless under the cascade patch.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: Max Johnson <me@maxj.phd> · 2026-08-22 00:33 UTC

Signed with PGP, not checked

Commit: dcc7a15806510e6d1636a35cfaab7e5d535d4457

Parent: 33ed968

4 files changed, +126 insertions, -142 deletions

M magicmirror/Cargo.lock +45 -53

			@@ -1086,11 +1086,15 @@
1086	1086
1087	1087		[[package]]
1088	1088		name = "makeover-layout"
1089		-	version = "0.31.0"
	1089	+	version = "0.32.0"
	1090	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1091	+	checksum = "35c4934f537cbfb57946c0654ec579c874f80ea7465385bc65f6512c4550fefb"
1090	1092
1091	1093		[[package]]
1092	1094		name = "makeover-tui"
1093		-	version = "0.30.0"
	1095	+	version = "0.31.0"
	1096	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1097	+	checksum = "7adc76fc93feaf50618d78213900d25a46ea39b0f590871e38a624fab1722e7b"
1094	1098		dependencies = [
1095	1099		"makeover",
1096	1100		"makeover-layout",
			@@ -2899,65 +2903,17 @@
2899	2903		checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
2900	2904
2901	2905		[[patch.unused]]
2902		-	name = "docengine"
2903		-	version = "0.7.0"
2904		-
2905		-	[[patch.unused]]
2906		-	name = "quasi-axum"
2907		-	version = "0.29.0"
2908		-
2909		-	[[patch.unused]]
2910		-	name = "quasi-basics"
2911		-	version = "0.29.0"
2912		-
2913		-	[[patch.unused]]
2914		-	name = "quasi-http"
2915		-	version = "0.29.0"
2916		-
2917		-	[[patch.unused]]
2918		-	name = "quasi-immediate"
2919		-	version = "0.29.0"
2920		-
2921		-	[[patch.unused]]
2922		-	name = "quasi-router"
2923		-	version = "0.29.0"
2924		-
2925		-	[[patch.unused]]
2926		-	name = "quasi-store"
	2906	+	name = "quasi-type"
2927	2907		version = "0.1.0"
2928	2908
2929		-	[[patch.unused]]
2930		-	name = "quasi-tauri"
2931		-	version = "0.29.0"
2932		-
2933		-	[[patch.unused]]
2934		-	name = "quasi-webview"
2935		-	version = "0.29.0"
2936		-
2937	2909		[[patch.unused]]
2938	2910		name = "synckit-client"
2939		-	version = "0.8.0"
	2911	+	version = "0.8.1"
2940	2912
2941	2913		[[patch.unused]]
2942	2914		name = "synckit-config"
2943	2915		version = "0.2.0"
2944	2916
2945		-	[[patch.unused]]
2946		-	name = "makeover-build"
2947		-	version = "0.46.0"
2948		-
2949		-	[[patch.unused]]
2950		-	name = "makeover-immediate"
2951		-	version = "0.30.0"
2952		-
2953		-	[[patch.unused]]
2954		-	name = "makeover-touch"
2955		-	version = "0.22.0"
2956		-
2957		-	[[patch.unused]]
2958		-	name = "makeover-webview"
2959		-	version = "0.51.0"
2960		-
2961	2917		[[patch.unused]]
2962	2918		name = "kberg"
2963	2919		version = "0.1.0"
			@@ -2971,5 +2927,41 @@
2971	2927		version = "0.4.0"
2972	2928
2973	2929		[[patch.unused]]
2974		-	name = "quasi-type"
	2930	+	name = "quasi-axum"
	2931	+	version = "0.48.0"
	2932	+
	2933	+	[[patch.unused]]
	2934	+	name = "quasi-basics"
	2935	+	version = "0.48.0"
	2936	+
	2937	+	[[patch.unused]]
	2938	+	name = "quasi-http"
	2939	+	version = "0.48.0"
	2940	+
	2941	+	[[patch.unused]]
	2942	+	name = "quasi-immediate"
	2943	+	version = "0.48.0"
	2944	+
	2945	+	[[patch.unused]]
	2946	+	name = "quasi-notifs"
	2947	+	version = "0.48.0"
	2948	+
	2949	+	[[patch.unused]]
	2950	+	name = "quasi-router"
	2951	+	version = "0.48.0"
	2952	+
	2953	+	[[patch.unused]]
	2954	+	name = "quasi-store"
2975	2955		version = "0.1.0"
	2956	+
	2957	+	[[patch.unused]]
	2958	+	name = "quasi-tauri"
	2959	+	version = "0.48.0"
	2960	+
	2961	+	[[patch.unused]]
	2962	+	name = "quasi-webview"
	2963	+	version = "0.48.0"
	2964	+
	2965	+	[[patch.unused]]
	2966	+	name = "docengine"
	2967	+	version = "0.7.0"

M mnw-cli/Cargo.lock +45 -53

			@@ -1830,11 +1830,15 @@
1830	1830
1831	1831		[[package]]
1832	1832		name = "makeover-layout"
1833		-	version = "0.31.0"
	1833	+	version = "0.32.0"
	1834	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1835	+	checksum = "35c4934f537cbfb57946c0654ec579c874f80ea7465385bc65f6512c4550fefb"
1834	1836
1835	1837		[[package]]
1836	1838		name = "makeover-tui"
1837		-	version = "0.30.0"
	1839	+	version = "0.31.0"
	1840	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	1841	+	checksum = "7adc76fc93feaf50618d78213900d25a46ea39b0f590871e38a624fab1722e7b"
1838	1842		dependencies = [
1839	1843		"makeover",
1840	1844		"makeover-layout",
			@@ -3456,7 +3460,7 @@
3456	3460
3457	3461		[[package]]
3458	3462		name = "synckit-client"
3459		-	version = "0.8.0"
	3463	+	version = "0.8.1"
3460	3464		dependencies = [
3461	3465		"argon2 0.5.3",
3462	3466		"base64",
			@@ -4761,61 +4765,13 @@
4761	4765		name = "quasi-type"
4762	4766		version = "0.1.0"
4763	4767
4764		-	[[patch.unused]]
4765		-	name = "docengine"
4766		-	version = "0.7.0"
4767		-
4768		-	[[patch.unused]]
4769		-	name = "makeover-build"
4770		-	version = "0.46.0"
4771		-
4772		-	[[patch.unused]]
4773		-	name = "makeover-immediate"
4774		-	version = "0.30.0"
4775		-
4776		-	[[patch.unused]]
4777		-	name = "makeover-touch"
4778		-	version = "0.22.0"
4779		-
4780		-	[[patch.unused]]
4781		-	name = "makeover-webview"
4782		-	version = "0.51.0"
4783		-
4784	4768		[[patch.unused]]
4785	4769		name = "synckit-config"
4786	4770		version = "0.2.0"
4787	4771
4788	4772		[[patch.unused]]
4789		-	name = "quasi-axum"
4790		-	version = "0.29.0"
4791		-
4792		-	[[patch.unused]]
4793		-	name = "quasi-basics"
4794		-	version = "0.29.0"
4795		-
4796		-	[[patch.unused]]
4797		-	name = "quasi-http"
4798		-	version = "0.29.0"
4799		-
4800		-	[[patch.unused]]
4801		-	name = "quasi-immediate"
4802		-	version = "0.29.0"
4803		-
4804		-	[[patch.unused]]
4805		-	name = "quasi-router"
4806		-	version = "0.29.0"
4807		-
4808		-	[[patch.unused]]
4809		-	name = "quasi-store"
4810		-	version = "0.1.0"
4811		-
4812		-	[[patch.unused]]
4813		-	name = "quasi-tauri"
4814		-	version = "0.29.0"
4815		-
4816		-	[[patch.unused]]
4817		-	name = "quasi-webview"
4818		-	version = "0.29.0"
	4773	+	name = "docengine"
	4774	+	version = "0.7.0"
4819	4775
4820	4776		[[patch.unused]]
4821	4777		name = "kberg"
			@@ -4832,3 +4788,39 @@
4832	4788		[[patch.unused]]
4833	4789		name = "tagtree"
4834	4790		version = "0.4.0"
	4791	+
	4792	+	[[patch.unused]]
	4793	+	name = "quasi-axum"
	4794	+	version = "0.48.0"
	4795	+
	4796	+	[[patch.unused]]
	4797	+	name = "quasi-basics"
	4798	+	version = "0.48.0"
	4799	+
	4800	+	[[patch.unused]]
	4801	+	name = "quasi-http"
	4802	+	version = "0.48.0"
	4803	+
	4804	+	[[patch.unused]]
	4805	+	name = "quasi-immediate"
	4806	+	version = "0.48.0"
	4807	+
	4808	+	[[patch.unused]]
	4809	+	name = "quasi-notifs"
	4810	+	version = "0.48.0"
	4811	+
	4812	+	[[patch.unused]]
	4813	+	name = "quasi-router"
	4814	+	version = "0.48.0"
	4815	+
	4816	+	[[patch.unused]]
	4817	+	name = "quasi-store"
	4818	+	version = "0.1.0"
	4819	+
	4820	+	[[patch.unused]]
	4821	+	name = "quasi-tauri"
	4822	+	version = "0.48.0"
	4823	+
	4824	+	[[patch.unused]]
	4825	+	name = "quasi-webview"
	4826	+	version = "0.48.0"

M server/Cargo.lock +28 -28

			@@ -2865,7 +2865,7 @@
2865	2865		checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
2866	2866		dependencies = [
2867	2867		"libc",
2868		-	"windows-sys 0.52.0",
	2868	+	"windows-sys 0.61.2",
2869	2869		]
2870	2870
2871	2871		[[package]]
			@@ -3650,7 +3650,7 @@
3650	3650		checksum = "1a791e6620676a875f362f3156ed213e73ca099a09bf992c18812abe65cc37b1"
3651	3651		dependencies = [
3652	3652		"bstr",
3653		-	"hashbrown 0.15.5",
	3653	+	"hashbrown 0.17.1",
3654	3654		]
3655	3655
3656	3656		[[package]]
			@@ -4801,7 +4801,7 @@
4801	4801		source = "registry+https://github.com/rust-lang/crates.io-index"
4802	4802		checksum = "82cb6a9f675da968c63b6208c641b9dca58fc0133ae53375736b1767b0cab8bd"
4803	4803		dependencies = [
4804		-	"windows-sys 0.59.0",
	4804	+	"windows-sys 0.61.2",
4805	4805		]
4806	4806
4807	4807		[[package]]
			@@ -5381,7 +5381,9 @@
5381	5381
5382	5382		[[package]]
5383	5383		name = "makeover-build"
5384		-	version = "0.48.0"
	5384	+	version = "0.49.0"
	5385	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	5386	+	checksum = "08975ffa5588135d21fbfb10ce0a70e5cd4da193e679a5f6a56160049ed0183b"
5385	5387		dependencies = [
5386	5388		"makeover",
5387	5389		"makeover-geometry",
			@@ -5396,11 +5398,15 @@
5396	5398
5397	5399		[[package]]
5398	5400		name = "makeover-layout"
5399		-	version = "0.32.0"
	5401	+	version = "0.33.0"
	5402	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	5403	+	checksum = "7ba9bae28e348ef6df04ddf04222703b5ea680ac2c978f0dce8679e2acbdc5a0"
5400	5404
5401	5405		[[package]]
5402	5406		name = "makeover-touch"
5403		-	version = "0.22.1"
	5407	+	version = "0.23.0"
	5408	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	5409	+	checksum = "0f6272302ba50183af43fe35064db861d77b4786ab6f8994ed9bb6c18c57bba0"
5404	5410		dependencies = [
5405	5411		"makeover-geometry",
5406	5412		"makeover-layout",
			@@ -5408,7 +5414,9 @@
5408	5414
5409	5415		[[package]]
5410	5416		name = "makeover-webview"
5411		-	version = "0.54.0"
	5417	+	version = "0.55.0"
	5418	+	source = "registry+https://github.com/rust-lang/crates.io-index"
	5419	+	checksum = "2cd308d279ece9665206044886d0da8762ce9eb81368e0f15a5afb8c0650cb41"
5412	5420		dependencies = [
5413	5421		"makeover-geometry",
5414	5422		"makeover-layout",
			@@ -5695,7 +5703,7 @@
5695	5703		source = "registry+https://github.com/rust-lang/crates.io-index"
5696	5704		checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
5697	5705		dependencies = [
5698		-	"windows-sys 0.59.0",
	5706	+	"windows-sys 0.61.2",
5699	5707		]
5700	5708
5701	5709		[[package]]
			@@ -6609,7 +6617,7 @@
6609	6617
6610	6618		[[package]]
6611	6619		name = "quasi-axum"
6612		-	version = "0.47.0"
	6620	+	version = "0.48.0"
6613	6621		dependencies = [
6614	6622		"axum",
6615	6623		"http 1.4.2",
			@@ -6620,7 +6628,7 @@
6620	6628
6621	6629		[[package]]
6622	6630		name = "quasi-basics"
6623		-	version = "0.47.0"
	6631	+	version = "0.48.0"
6624	6632		dependencies = [
6625	6633		"makeover-layout",
6626	6634		"quasi-router",
			@@ -6628,7 +6636,7 @@
6628	6636
6629	6637		[[package]]
6630	6638		name = "quasi-http"
6631		-	version = "0.47.0"
	6639	+	version = "0.48.0"
6632	6640		dependencies = [
6633	6641		"form_urlencoded",
6634	6642		"http 1.4.2",
			@@ -6637,7 +6645,7 @@
6637	6645
6638	6646		[[package]]
6639	6647		name = "quasi-router"
6640		-	version = "0.47.0"
	6648	+	version = "0.48.0"
6641	6649		dependencies = [
6642	6650		"makeover-layout",
6643	6651		]
			@@ -6660,7 +6668,7 @@
6660	6668
6661	6669		[[package]]
6662	6670		name = "quasi-webview"
6663		-	version = "0.47.0"
	6671	+	version = "0.48.0"
6664	6672		dependencies = [
6665	6673		"docengine",
6666	6674		"makeover-layout",
			@@ -7312,7 +7320,7 @@
7312	7320		"errno",
7313	7321		"libc",
7314	7322		"linux-raw-sys 0.12.1",
7315		-	"windows-sys 0.52.0",
	7323	+	"windows-sys 0.61.2",
7316	7324		]
7317	7325
7318	7326		[[package]]
			@@ -7392,7 +7400,7 @@
7392	7400		"security-framework 3.7.0",
7393	7401		"security-framework-sys",
7394	7402		"webpki-root-certs",
7395		-	"windows-sys 0.52.0",
	7403	+	"windows-sys 0.61.2",
7396	7404		]
7397	7405
7398	7406		[[package]]
			@@ -8518,7 +8526,7 @@
8518	8526		"getrandom 0.4.3",
8519	8527		"once_cell",
8520	8528		"rustix 1.1.4",
8521		-	"windows-sys 0.52.0",
	8529	+	"windows-sys 0.61.2",
8522	8530		]
8523	8531
8524	8532		[[package]]
			@@ -9944,7 +9952,7 @@
9944	9952		source = "registry+https://github.com/rust-lang/crates.io-index"
9945	9953		checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
9946	9954		dependencies = [
9947		-	"windows-sys 0.48.0",
	9955	+	"windows-sys 0.61.2",
9948	9956		]
9949	9957
9950	9958		[[package]]
			@@ -10744,21 +10752,13 @@
10744	10752		name = "painhours"
10745	10753		version = "0.1.0"
10746	10754
10747		-	[[patch.unused]]
10748		-	name = "makeover-immediate"
10749		-	version = "0.31.0"
10750		-
10751		-	[[patch.unused]]
10752		-	name = "makeover-tui"
10753		-	version = "0.31.0"
10754		-
10755	10755		[[patch.unused]]
10756	10756		name = "quasi-immediate"
10757		-	version = "0.47.0"
	10757	+	version = "0.48.0"
10758	10758
10759	10759		[[patch.unused]]
10760	10760		name = "quasi-notifs"
10761		-	version = "0.47.0"
	10761	+	version = "0.48.0"
10762	10762
10763	10763		[[patch.unused]]
10764	10764		name = "quasi-store"
			@@ -10766,7 +10766,7 @@
10766	10766
10767	10767		[[patch.unused]]
10768	10768		name = "quasi-tauri"
10769		-	version = "0.47.0"
	10769	+	version = "0.48.0"
10770	10770
10771	10771		[[patch.unused]]
10772	10772		name = "synckit-client"

M server/Cargo.toml +8 -8

			@@ -157,29 +157,29 @@
157	157		# through quasi beside its Askama equivalent, so the cost of describing a screen
158	158		# here is measured rather than argued. Not load-bearing for any shipped route.
159	159		# See wiki look-wave-2, tier G.
160		-	quasi-router = { git = "https://makenot.work/git/max/quasi.git", version = "0.47" }
	160	+	quasi-router = { git = "https://makenot.work/git/max/quasi.git", version = "0.48" }
161	161		# The description vocabulary quasi's screen types are built from. Pinned here
162	162		# rather than reached through quasi-router's re-export because a described
163	163		# screen names FieldKind and Tone directly; it has to track what quasi-router
164	164		# resolves or the two `layout::` paths are different crates.
165		-	makeover-layout = "0.32.0"
	165	+	makeover-layout = "0.33.0"
166	166		# The webview renderer's field emitter, called directly by
167	167		# `quasi::rich_field` so one markdown editor's markup comes from the same
168	168		# place a whole described screen's would. Pinned here rather than reached
169	169		# through quasi-webview for makeover-layout's reason: two `form::` paths from
170	170		# two resolutions are two crates, and the `data-format="markdown"` rules in
171	171		# `static/layout.css` are generated from this one.
172		-	makeover-webview = "0.54.0"
	172	+	makeover-webview = "0.55.0"
173	173		# For the request head the per-viewer state factory reads. axum re-exports it,
174	174		# but the factory's signature is quasi-axum's and names `http::request::Parts`.
175	175		http = "1.3.1"
176		-	quasi-axum = { git = "https://makenot.work/git/max/quasi.git", version = "0.47" }
177		-	quasi-webview = { git = "https://makenot.work/git/max/quasi.git", version = "0.47" }
	176	+	quasi-axum = { git = "https://makenot.work/git/max/quasi.git", version = "0.48" }
	177	+	quasi-webview = { git = "https://makenot.work/git/max/quasi.git", version = "0.48" }
178	178		# The first-party widget set. The carousel was proved here against three pages
179	179		# and then moved there; what is left in `quasi/widgets/carousel.rs` is the
180	180		# Askama glue. Not `makeover-basics`: a widget is an assembly of `Node`s, so it
181	181		# sits above quasi-router rather than inside the description suite.
182		-	quasi-basics = { git = "https://makenot.work/git/max/quasi.git", version = "0.47" }
	182	+	quasi-basics = { git = "https://makenot.work/git/max/quasi.git", version = "0.48" }
183	183
184	184		# Git source browser
185	185		gix = { version = "0.86", default-features = false, features = ["blame", "mailmap", "revision", "sha1", "max-performance-safe"] }
			@@ -250,7 +250,7 @@
250	250		# Emits static/geometry.css (makeover-geometry) and static/layout.css
251	251		# (makeover-webview). The same generator GO and BB run; only the output paths
252	252		# differ, since the server serves its stylesheets rather than bundling them.
253		-	makeover-build = "0.48.0"
	253	+	makeover-build = "0.49.0"
254	254		# Read directly for the embeds' own copy of the spacing layer, which they need
255	255		# because an iframe cannot link a stylesheet. makeover-build does not re-export
256	256		# it, so the pin lives here and has to track the one makeover-build resolves.
			@@ -273,7 +273,7 @@
273	273		# Written from the crate rather than copied into the repo for the reason the
274	274		# constants exist: a stale copy in a static directory is a silently dead bulk
275	275		# bar, and the version has to be the one the emitter agrees with.
276		-	quasi-webview = { git = "https://makenot.work/git/max/quasi.git", version = "0.47" }
	276	+	quasi-webview = { git = "https://makenot.work/git/max/quasi.git", version = "0.48" }
277	277
278	278		[dev-dependencies]
279	279		tower = { version = "0.5.3", features = ["util"] }