flet-web 1.0.0.dev0__tar.gz → 1.0.1__tar.gz

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 1.0.0.dev0
+Version: 1.0.1
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.0.0.dev0
+Requires-Dist: flet==1.0.1
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: uvicorn[standard]>=0.35.0
 
@@ -19,3 +19,7 @@ Requires-Dist: uvicorn[standard]>=0.35.0
 [![docstring coverage](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)
 
 This package contains a compiled Flutter Flet web client.
+
+> **[Try Flet online in Flet Studio](https://studio.flet.dev)**
+>
+> Write, run, and share Flet web apps right in your browser. No local setup required. Write your own Python code or get help from the AI agent.

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/README.md

@@ -4,3 +4,7 @@
 [![docstring coverage](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)
 
 This package contains a compiled Flutter Flet web client.
+
+> **[Try Flet online in Flet Studio](https://studio.flet.dev)**
+>
+> Write, run, and share Flet web apps right in your browser. No local setup required. Write your own Python code or get help from the AI agent.

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-web"
-version = "1.0.0.dev0"
+version = "1.0.1"
 description = "Flet web client in Flutter."
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==1.0.0.dev0",
+    "flet==1.0.1",
     "fastapi >=0.115.12",
     "uvicorn[standard] >=0.35.0"
 ]

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/src/flet_web/fastapi/flet_static_files.py

@@ -177,7 +177,10 @@ class FletStaticFiles(StaticFiles):
 
         # "standard" web files
         web_dir = get_package_web_dir()
-        logger.info(f"Web root: {web_dir}")
+        if os.getenv("FLET_WEB_PATH"):
+            logger.info(f"Web root set via FLET_WEB_PATH: {web_dir}")
+        else:
+            logger.info(f"Web root: {web_dir}")
 
         if not os.path.exists(web_dir):
             raise RuntimeError(f"Web root path not found: {web_dir}")

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/src/flet_web/patch_index.py

@@ -16,6 +16,7 @@ def patch_index_html(
     pyodide_pre: bool = False,
     pyodide_script_path: str = "",
     pyodide_version: Optional[str] = None,
+    app_package_url: Optional[str] = None,
     web_renderer: WebRenderer = WebRenderer.AUTO,
     route_url_strategy: RouteUrlStrategy = RouteUrlStrategy.PATH,
     no_cdn: bool = False,
@@ -33,9 +34,16 @@ def patch_index_html(
         websocket_endpoint_path: Optional websocket endpoint path.
         app_name: Optional app name used for page title and iOS web-app title meta.
         app_description: Optional app description meta content.
-        pyodide: Whether to enable Pyodide mode in injected runtime config.
+        pyodide: Whether the page should run Python in the browser. Written to
+            the injected config either way, because a page carries whichever
+            mode it was generated for — `flet build web` bakes Pyodide in — and
+            serving that client from a Flet server has to turn it back off.
         pyodide_pre: Whether pre-release micropip packages are allowed.
         pyodide_script_path: Path to Python entry script for Pyodide apps.
+        app_package_url: URL of the archive holding the app's Python code,
+            relative to the page. Written to the injected config, because a
+            page names whichever archive it was generated for while a
+            publisher writes its own.
         web_renderer: Web renderer mode for the frontend runtime.
         route_url_strategy: URL strategy used by frontend routing.
         no_cdn: Whether CDN asset loading should be disabled.
@@ -49,18 +57,25 @@ def patch_index_html(
         base_url = base_href.strip("/").strip()
         base_url = "/" if base_url == "" else f"/{base_url}/"
 
-    index = index.replace(
-        '<base href="/">',
-        f'<base href="{base_url}">',
+    index = re.sub(
+        r"(<base\b[^>]*\bhref\s*=\s*)([\"'])[^\"']*\2",
+        lambda match: f"{match[1]}{match[2]}{base_url}{match[2]}",
+        index,
+        count=1,
+        flags=re.IGNORECASE,
     )
 
     app_config = []
 
-    if pyodide and pyodide_script_path:
+    run_in_browser = bool(pyodide and pyodide_script_path)
+    app_config.append(f"flet.pyodide = {str(run_in_browser).lower()};")
+
+    if run_in_browser:
         module_name = Path(pyodide_script_path).stem
-        app_config.append("flet.pyodide = true;")
         app_config.append(f"flet.micropipIncludePre = {str(pyodide_pre).lower()};")
         app_config.append(f'flet.pythonModuleName = "{module_name}";')
+        if app_package_url:
+            app_config.append(f'flet.appPackageUrl = "{app_package_url}";')
 
     # Pin the Pyodide runtime URL for this build. The web client used to fall
     # back to a hardcoded CDN URL when not in no-cdn mode; with multi-version

flet_web-1.0.1/src/flet_web/version.py

@@ -0,0 +1 @@
+version = "1.0.1"

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/src/flet_web.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-web
-Version: 1.0.0.dev0
+Version: 1.0.1
 Summary: Flet web client in Flutter.
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/flet-dev/flet
 Project-URL: Documentation, https://flet.dev/docs
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: flet==1.0.0.dev0
+Requires-Dist: flet==1.0.1
 Requires-Dist: fastapi>=0.115.12
 Requires-Dist: uvicorn[standard]>=0.35.0
 
@@ -19,3 +19,7 @@ Requires-Dist: uvicorn[standard]>=0.35.0
 [![docstring coverage](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)](https://flet.dev/docs/assets/badges/docs-coverage/flet-web.svg)
 
 This package contains a compiled Flutter Flet web client.
+
+> **[Try Flet online in Flet Studio](https://studio.flet.dev)**
+>
+> Write, run, and share Flet web apps right in your browser. No local setup required. Write your own Python code or get help from the AI agent.

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/src/flet_web.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ src/flet_web/fastapi/flet_static_files.py
 src/flet_web/fastapi/flet_upload.py
 src/flet_web/fastapi/oauth_state.py
 src/flet_web/fastapi/serve_fastapi_web_app.py
-tests/test_loading_logo.py
+tests/test_loading_logo.py
+tests/test_patch_index.py

{flet_web-1.0.0.dev0 → flet_web-1.0.1}/src/flet_web.egg-info/requires.txt

@@ -1,3 +1,3 @@
-flet==1.0.0.dev0
+flet==1.0.1
 fastapi>=0.115.12
 uvicorn[standard]>=0.35.0

flet_web-1.0.1/tests/test_patch_index.py

@@ -0,0 +1,34 @@
+from html.parser import HTMLParser
+from urllib.parse import urljoin
+
+import pytest
+
+from flet_web.patch_index import patch_index_html
+
+
+class BaseParser(HTMLParser):
+    def handle_starttag(self, tag, attrs):
+        if tag == "base":
+            self.href = dict(attrs)["href"]
+
+
+@pytest.mark.parametrize(
+    "base_tag",
+    ['<base href="/">', '<base href="/deployed/">', "<base href='/deployed/'>"],
+)
+@pytest.mark.parametrize("mount_path", ["/", "/apps/demo/"])
+def test_client_scripts_resolve_under_server_mount(tmp_path, base_tag, mount_path):
+    index = tmp_path / "index.html"
+    index.write_text(
+        f"<html><head>{base_tag}<!-- fletAppConfig --></head>"
+        '<body><script src="flutter_bootstrap.js"></script></body></html>',
+        encoding="utf-8",
+    )
+
+    patch_index_html(str(index), base_href=mount_path)
+
+    parser = BaseParser()
+    parser.feed(index.read_text(encoding="utf-8"))
+    assert urljoin(parser.href, "flutter_bootstrap.js") == (
+        mount_path + "flutter_bootstrap.js"
+    )

flet_web-1.0.0.dev0/src/flet_web/version.py

@@ -1 +0,0 @@
-version = "1.0.0.dev0"