Skip to content

Commit a2a691a

Browse files
committed
Merge branch 'main' into lendemor/adjust_rechart_types
2 parents 945575b + 12fc9f6 commit a2a691a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1404
-662
lines changed

β€Ž.gitignoreβ€Ž

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ reflex.db
2020
.env.*
2121
node_modules
2222
package-lock.json
23-
*.pyi
23+
*.pyi
24+
.pre-commit-config.yaml

β€Ž.pre-commit-config.yamlβ€Ž

Lines changed: 0 additions & 48 deletions
This file was deleted.

β€Žpyi_hashes.jsonβ€Ž

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"reflex/__init__.pyi": "8a6d2350e96659846436792a5c7b772b",
2+
"reflex/__init__.pyi": "d7767c4fe815246a4409359da60aac25",
33
"reflex/components/__init__.pyi": "76ba0a12cd3a7ba5ab6341a3ae81551f",
44
"reflex/components/base/__init__.pyi": "e9aaf47be1e1977eacee97b880c8f7de",
55
"reflex/components/base/app_wrap.pyi": "1d0e224e2d4b0538b19c0a038284e9b2",
@@ -25,13 +25,13 @@
2525
"reflex/components/datadisplay/code.pyi": "651fc3d417b998eb1c3d072328f505d0",
2626
"reflex/components/datadisplay/dataeditor.pyi": "601c59f3ced6ab94fcf5527b90472a4f",
2727
"reflex/components/datadisplay/shiki_code_block.pyi": "ac16fd6c23eef7ce0185437ecf2d529d",
28-
"reflex/components/el/__init__.pyi": "09042a2db5e0637e99b5173430600522",
28+
"reflex/components/el/__init__.pyi": "f07f5957ca4dc3d95ffdc2ddb75fe2f8",
2929
"reflex/components/el/element.pyi": "323cfb5d67d8ccb58ac36c7cc7641dc3",
30-
"reflex/components/el/elements/__init__.pyi": "280ed457675f3720e34b560a3f617739",
30+
"reflex/components/el/elements/__init__.pyi": "baeddd04d4d3a82799420b2a6df368f6",
3131
"reflex/components/el/elements/base.pyi": "697cd6716e3b1127b35299435c3d4e69",
32-
"reflex/components/el/elements/forms.pyi": "7e067419808bca05125de4967d284935",
32+
"reflex/components/el/elements/forms.pyi": "21d7135b513bac72fd63b44c945932a5",
3333
"reflex/components/el/elements/inline.pyi": "ab31eec758f1cff8a9d51bf0935b9fca",
34-
"reflex/components/el/elements/media.pyi": "ac99654959ed26b7b7d0f3dafa0ea2ab",
34+
"reflex/components/el/elements/media.pyi": "c191a9e00223a97e26a0d6ab99a1919b",
3535
"reflex/components/el/elements/metadata.pyi": "eda94a3283bae6a9b61b4cb1e20c1dbd",
3636
"reflex/components/el/elements/other.pyi": "960bdac0bb9bf6b3cffd241f9b66c0fc",
3737
"reflex/components/el/elements/scripts.pyi": "ac3b8bfbd7777f33fb2c6aa109a5c627",
@@ -56,7 +56,7 @@
5656
"reflex/components/radix/primitives/progress.pyi": "98b4add410a80a353ab503ad577169c2",
5757
"reflex/components/radix/primitives/slider.pyi": "573837a7d8d90deaf57c911faffed254",
5858
"reflex/components/radix/themes/__init__.pyi": "a15f9464ad99f248249ffa8e6deea4cf",
59-
"reflex/components/radix/themes/base.pyi": "1f0740d3165100c24e6bb4792aa81571",
59+
"reflex/components/radix/themes/base.pyi": "526db93a3f52bb00ad220f8744eba797",
6060
"reflex/components/radix/themes/color_mode.pyi": "f7515dccd1e315dc28a3cbbe2eabe7ff",
6161
"reflex/components/radix/themes/components/__init__.pyi": "87bb9ffff641928562da1622d2ca5993",
6262
"reflex/components/radix/themes/components/alert_dialog.pyi": "9f19bcdb4588a7f76596d142a0ac0950",
@@ -115,7 +115,7 @@
115115
"reflex/components/react_player/react_player.pyi": "40db798bcb7fa40207d24f49722135ae",
116116
"reflex/components/react_player/video.pyi": "22d84a7f57be13ece90cb30536d76c7d",
117117
"reflex/components/recharts/__init__.pyi": "a060a4abcd018165bc499173e723cf9e",
118-
"reflex/components/recharts/cartesian.pyi": "651bfad3d5037cbef8309acc74b5f28e",
118+
"reflex/components/recharts/cartesian.pyi": "601e1acb0ad6bd93ce371d763220aabe",
119119
"reflex/components/recharts/charts.pyi": "2f0a39f9c02de83d9e2d97763b4411af",
120120
"reflex/components/recharts/general.pyi": "06d0e97776cc82b946fed465ab36fba4",
121121
"reflex/components/recharts/polar.pyi": "77ca6e0d992f5d5c0479de73db4f71ba",

β€Žpyproject.tomlβ€Ž

Lines changed: 54 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "reflex"
3-
version = "0.7.13dev1"
3+
version = "0.7.14dev1"
44
description = "Web apps in pure Python."
55
license.text = "Apache-2.0"
66
authors = [
@@ -73,7 +73,7 @@ artifacts = ["*.pyi"]
7373

7474
[tool.hatch.build.hooks.custom]
7575
path = "scripts/hatch_build.py"
76-
dependencies = ["plotly", "ruff"]
76+
dependencies = ["plotly", "ruff", "pre_commit", "toml"]
7777
require-runtime-dependencies = true
7878

7979
[tool.pyright]
@@ -149,7 +149,7 @@ dev = [
149149
"pillow >=11",
150150
"playwright >=1.51",
151151
"plotly >=6.0",
152-
"pre-commit >=4.2",
152+
"pre-commit ==4.2.0",
153153
"psycopg[binary] >=3.2",
154154
"pyright >=1.1.400",
155155
"pytest >=8.3",
@@ -165,6 +165,7 @@ dev = [
165165
"ruff >=0.11",
166166
"selenium >=4.31",
167167
"starlette-admin >=0.14",
168+
"toml >=0.10.2",
168169
"uvicorn >=0.34.0",
169170
]
170171

@@ -206,3 +207,53 @@ exclude_also = [
206207

207208
[tool.coverage.html]
208209
directory = "coverage_html_report"
210+
211+
[tool.pre-commit]
212+
fail_fast = true
213+
214+
[[tool.pre-commit.repos]]
215+
repo = "https://github.com/astral-sh/ruff-pre-commit"
216+
rev = "v0.11.11"
217+
hooks = [
218+
{ id = "ruff-format", args = [
219+
"reflex",
220+
"tests",
221+
] },
222+
{ id = "ruff", args = [
223+
"--fix",
224+
"--exit-non-zero-on-fix",
225+
], exclude = "^integration/benchmarks/" },
226+
]
227+
228+
[[tool.pre-commit.repos]]
229+
repo = "https://github.com/codespell-project/codespell"
230+
rev = "v2.4.1"
231+
hooks = [
232+
{ id = "codespell", args = [
233+
"reflex",
234+
], additional_dependencies = [
235+
"tomli",
236+
] },
237+
]
238+
239+
# Run pyi check before pyright because pyright can fail if pyi files are wrong.
240+
[[tool.pre-commit.repos]]
241+
repo = "local"
242+
hooks = [
243+
{ id = "update-pyi-files", name = "update-pyi-files", always_run = true, language = "system", require_serial = true, description = "Update pyi files as needed", entry = "python3 scripts/make_pyi.py" },
244+
]
245+
246+
[[tool.pre-commit.repos]]
247+
repo = "https://github.com/RobertCraigie/pyright-python"
248+
rev = "v1.1.401"
249+
hooks = [{ id = "pyright", args = ["reflex", "tests"], language = "system" }]
250+
251+
[[tool.pre-commit.repos]]
252+
repo = "https://github.com/terrencepreilly/darglint"
253+
rev = "v1.8.1"
254+
hooks = [{ id = "darglint", exclude = "^reflex/reflex.py" }]
255+
256+
[[tool.pre-commit.repos]]
257+
repo = "https://github.com/pre-commit/mirrors-prettier"
258+
rev = "f62a70a3a7114896b062de517d72829ea1c884b6"
259+
hooks = [{ id = "prettier", require_serial = true }]

β€Žreflex/.templates/jinja/app/rxconfig.py.jinja2β€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ import reflex as rx
22

33
config = rx.Config(
44
app_name="{{ app_name }}",
5+
plugins=[rx.plugins.TailwindV3Plugin()],
56
)

β€Žreflex/.templates/jinja/web/tailwind.config.js.jinja2β€Ž

Lines changed: 0 additions & 66 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module.exports = {
22
plugins: {
33
"postcss-import": {},
4-
tailwindcss: {},
54
autoprefixer: {},
65
},
76
};

β€Žreflex/.templates/web/styles/tailwind.cssβ€Ž

Lines changed: 0 additions & 6 deletions
This file was deleted.

β€Žreflex/__init__.pyβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@
361361
"vars",
362362
"config",
363363
"compiler",
364+
"plugins",
364365
}
365366
_SUBMOD_ATTRS: dict = _MAPPING
366367
getattr, __dir__, __all__ = lazy_loader.attach(

0 commit comments

Comments
Β (0)