Merging upstream version 0.58+dfsg.
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
parent
89d0b37226
commit
76e3993124
5 changed files with 13 additions and 8 deletions
|
@ -1,7 +1,12 @@
|
|||
<h1>
|
||||
<img src="https://github.com/jpsca/jinjax/raw/main/jinjax-logo.png" height="50" align="top">
|
||||
<img src="https://github.com/jpsca/jinjax/raw/main/docs/jinjax-logo.png" height="50" align="top">
|
||||
</h1>
|
||||
|
||||
<p>
|
||||
<img alt="python: 3.11, 3.12, 3.13, 3.14" src="https://github.com/jpsca/jinjax/raw/main/docs/python.svg">
|
||||
<img alt="license: MIT" src="https://github.com/jpsca/jinjax/raw/main/docs/license.svg">
|
||||
</p>
|
||||
|
||||
From chaos to clarity: The power of components in your server-side-rendered Python web app.
|
||||
|
||||
**Documentation:** https://jinjax.scaletti.dev/
|
||||
|
|
|
@ -4,7 +4,7 @@ requires = ["setuptools"]
|
|||
|
||||
[project]
|
||||
name = "jinjax"
|
||||
version = "0.57"
|
||||
version = "0.58"
|
||||
description = "Replace your HTML templates with Python server-Side components"
|
||||
authors = [
|
||||
{name = "Juan Pablo Scaletti", email = "juanpablo@jpscaletti.com"},
|
||||
|
|
|
@ -596,7 +596,7 @@ class Catalog:
|
|||
html_js.append(f'<script type="module" src="{full_url}"></script>')
|
||||
rendered_urls.add(full_url)
|
||||
|
||||
return Markup("\n".join(sorted(html_css) + sorted(html_js)))
|
||||
return Markup("\n".join(html_css + html_js))
|
||||
|
||||
# Private
|
||||
|
||||
|
|
|
@ -61,14 +61,14 @@ def test_render_assets(catalog, folder, autoescape, undefined):
|
|||
assert (
|
||||
"""
|
||||
<html>
|
||||
<link rel="stylesheet" href="https://somewhere.com/style.css">
|
||||
<link rel="stylesheet" href="/static/components/card.css">
|
||||
<link rel="stylesheet" href="/static/components/greeting.css">
|
||||
<link rel="stylesheet" href="http://example.com/super.css">
|
||||
<link rel="stylesheet" href="https://somewhere.com/style.css">
|
||||
<script type="module" src="https://somewhere.com/blabla.js"></script>
|
||||
<script type="module" src="/static/components/shared.js"></script>
|
||||
<script type="module" src="/static/components/card.js"></script>
|
||||
<script type="module" src="/static/components/greeting.js"></script>
|
||||
<script type="module" src="/static/components/shared.js"></script>
|
||||
<script type="module" src="https://somewhere.com/blabla.js"></script>
|
||||
<section class="card">
|
||||
<div class="greeting [&_a]:flex">Hello</div>
|
||||
<button type="button">Close</button>
|
||||
|
@ -199,8 +199,8 @@ def test_auto_load_assets_with_same_name(catalog, folder, autoescape, undefined)
|
|||
<link rel="stylesheet" href="/static/components/Page.css">
|
||||
<link rel="stylesheet" href="/static/components/common/Form.css">
|
||||
<script type="module" src="/static/components/Page.js"></script>
|
||||
<script type="module" src="/static/components/common/Form.js"></script>
|
||||
<script type="module" src="/static/components/shared.js"></script>
|
||||
<script type="module" src="/static/components/common/Form.js"></script>
|
||||
<form></form>
|
||||
""".strip()
|
||||
|
||||
|
|
2
uv.lock
generated
2
uv.lock
generated
|
@ -229,7 +229,7 @@ wheels = [
|
|||
|
||||
[[package]]
|
||||
name = "jinjax"
|
||||
version = "0.57"
|
||||
version = "0.58"
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "jinja2" },
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue