maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(sterni/nix/html): make <html> also emit doctype

Browse source 
This makes the awkward withDoctype utility obsolete which is much nicer.
Technically, this is a BREAKING CHANGE since it was possible to create
valid documents without an <html> tag before:

    withDoctype (lib.concatStrings [ (<head> { } …) (<body> { } …) ])

I don't think this usecase is worth preserving since this can just be
written as

    <html> { } [ (<head> { } …) (<body> { } …) ]

and omitting the <html> tag is not recommended since it should be used
to set the language of the document (which we didn't in the example
above).

Change-Id: Idc5104ce88fe8bee965c076229b79387915c3605
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12907
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2024-12-25 00:53:08 +01:00 • committed by clbot
parent 9fa198f9ae
commit d47c7fa12b
5 changed files with 20 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
users/tazjin/cursed/responder.nix
View file

@ -4,7 +4,6 @@ let
inherit (depot.users.sterni.nix.html)
__findFile
esc
withDoctype
;
# CGI envvars: https://www.instanet.com/cgi/env.html
@ -24,7 +23,7 @@ let
default = let {
hasQuery = if builtins.length (builtins.attrNames query) > 0 then "?" else "";
body = (withDoctype (<html> { lang = "en"; } [
body = <html> { lang = "en"; } [
(<head> { } [
(<title> { } "some cursed nix")
])
@ -33,7 +32,7 @@ let
(<p> { } [ method " " path hasQuery rawQuery ])
(<p> { } (builtins.toJSON query))
])
]));
];
};
greeter = withDoctype (<html> { lang = "en"; } [