flet-cli 0.82.3.dev7907__tar.gz → 0.82.3.dev7921__tar.gz

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.82.3.dev7907
+Version: 0.82.3.dev7921
 Summary: Flet CLI
 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==0.82.3.dev7907
+Requires-Dist: flet==0.82.3.dev7921
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "flet-cli"
-version = "0.82.3.dev7907"
+version = "0.82.3.dev7921"
 description = "Flet CLI"
 authors = [{ name = "Appveyor Systems Inc.", email = "hello@flet.dev" }]
 license = "Apache-2.0"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "flet==0.82.3.dev7907",
+    "flet==0.82.3.dev7921",
     "watchdog >=4.0.0",
     "packaging >=25.0",
     "qrcode >=7.4.2",

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/src/flet_cli/commands/build_base.py

@@ -1,4 +1,5 @@
 import argparse
+import copy
 import glob
 import os
 import platform
@@ -7,7 +8,6 @@ from pathlib import Path
 from typing import Optional, cast
 
 import yaml
-from packaging import version
 from packaging.requirements import Requirement
 from rich.panel import Panel
 from rich.table import Column, Table
@@ -33,7 +33,10 @@ from flet_cli.utils.project_dependencies import (
 )
 from flet_cli.utils.pyproject_toml import load_pyproject_toml
 
-DEFAULT_TEMPLATE_URL = "gh:flet-dev/flet-build-template"
+DEFAULT_TEMPLATE_URL = (
+    "https://github.com/flet-dev/flet/releases/download/"
+    "v{version}/flet-build-template.zip"
+)
 
 
 class BaseBuildCommand(BaseFlutterCommand):
@@ -1141,18 +1144,32 @@ class BaseBuildCommand(BaseFlutterCommand):
             self.build_dir / ".hash" / f"template-{'2' if second_pass else '1'}"
         )
 
-        template_url = (
-            self.options.template
-            or self.get_pyproject("tool.flet.template.url")
-            or DEFAULT_TEMPLATE_URL
+        template_url = self.options.template or self.get_pyproject(
+            "tool.flet.template.url"
         )
-        hash.update(template_url)
 
         template_ref = self.options.template_ref or self.get_pyproject(
             "tool.flet.template.ref"
         )
         if not template_ref:
-            template_ref = version.Version(flet.version.flet_version).base_version
+            template_ref = flet.version.flet_version
+
+        is_local_dev = False
+        if template_url:
+            # User-provided template (git repo or local path) — use checkout
+            checkout = template_ref
+        else:
+            # Check for local dev templates first (running from source checkout)
+            local_tpl = Path(__file__).resolve().parents[5] / "templates" / "build"
+            if local_tpl.is_dir():
+                template_url = str(local_tpl)
+                checkout = None
+                is_local_dev = True
+            else:
+                template_url = DEFAULT_TEMPLATE_URL.format(version=template_ref)
+                checkout = None
+
+        hash.update(template_url)
         hash.update(template_ref)
 
         template_dir = self.options.template_dir or self.get_pyproject(
@@ -1178,17 +1195,18 @@ class BaseBuildCommand(BaseFlutterCommand):
             # create a new Flutter bootstrap project directory, if non-existent
             if not second_pass:
                 self.flutter_dir.mkdir(parents=True, exist_ok=True)
-                self.update_status(
-                    "[bold blue]Creating app shell from "
-                    f'{template_url} with ref "{template_ref}"...'
-                )
+                status = f"[bold blue]Creating app shell from {template_url}"
+                if checkout:
+                    status += f' with ref "{template_ref}"'
+                status += "..."
+                self.update_status(status)
 
             try:
                 from cookiecutter.main import cookiecutter
 
                 cookiecutter(
                     template=template_url,
-                    checkout=template_ref,
+                    checkout=checkout,
                     directory=template_dir,
                     output_dir=str(self.flutter_dir.parent),
                     no_input=True,
@@ -1201,10 +1219,35 @@ class BaseBuildCommand(BaseFlutterCommand):
                 shutil.rmtree(self.flutter_dir)
                 self.cleanup(1, f"{e}")
 
+            # For local development, override flet dependency with path
+            if is_local_dev:
+                repo_root = flet.version.find_repo_root(Path(__file__).resolve().parent)
+                if repo_root:
+                    flet_pkg_path = str(repo_root / "packages" / "flet")
+                    pubspec = self.load_yaml(self.pubspec_path)
+                    pubspec["dependencies"]["flet"] = {"path": flet_pkg_path}
+                    pubspec.setdefault("dependency_overrides", {})["flet"] = {
+                        "path": flet_pkg_path
+                    }
+                    self.save_yaml(self.pubspec_path, pubspec)
+
             pyproject_pubspec = self.get_pyproject("tool.flet.flutter.pubspec")
 
             if pyproject_pubspec:
+                pyproject_pubspec = copy.deepcopy(pyproject_pubspec)
                 pubspec = self.load_yaml(self.pubspec_path)
+                # Replace individual dependency entries from pyproject rather
+                # than deep-merging them — a Dart dependency can only have one
+                # source, so merging {"path":…} with {"git":…} is invalid.
+                for section in (
+                    "dependencies",
+                    "dependency_overrides",
+                    "dev_dependencies",
+                ):
+                    if section in pyproject_pubspec:
+                        pubspec.setdefault(section, {}).update(
+                            pyproject_pubspec.pop(section)
+                        )
                 pubspec = merge_dict(pubspec, pyproject_pubspec)
                 self.save_yaml(self.pubspec_path, pubspec)
 

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/src/flet_cli/commands/create.py

@@ -3,7 +3,6 @@ import os
 import platform
 from pathlib import Path
 
-from packaging import version
 from rich.console import Console
 from rich.style import Style
 
@@ -14,6 +13,11 @@ from flet_cli.commands.base import BaseCommand
 error_style = Style(color="red1", bold=True)
 console = Console(log_path=False)
 
+DEFAULT_APP_TEMPLATE_URL = (
+    "https://github.com/flet-dev/flet/releases/download/"
+    "v{version}/flet-app-templates.zip"
+)
+
 
 class Command(BaseCommand):
     """
@@ -99,7 +103,16 @@ class Command(BaseCommand):
 
         template_ref = options.template_ref
         if not template_ref:
-            template_ref = version.Version(flet.version.flet_version).base_version
+            template_ref = flet.version.flet_version
+
+        # Resolve template source: local dev, or zip from GitHub release
+        local_tpl = Path(__file__).resolve().parents[5] / "templates" / "app"
+        if local_tpl.is_dir():
+            template_url = str(local_tpl)
+            checkout = None
+        else:
+            template_url = DEFAULT_APP_TEMPLATE_URL.format(version=template_ref)
+            checkout = None
 
         out_dir = Path(options.output_directory).resolve()
         template_data["out_dir"] = out_dir.name
@@ -115,8 +128,8 @@ class Command(BaseCommand):
         # print("Template data:", template_data)
         try:
             cookiecutter(
-                "gh:flet-dev/flet-app-templates",
-                checkout=template_ref,
+                template_url,
+                checkout=checkout,
                 directory=options.template,
                 output_dir=str(out_dir.parent),
                 no_input=True,

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/src/flet_cli/commands/run.py

@@ -397,7 +397,10 @@ class Handler(FileSystemEventHandler):
             line = line.rstrip("\r\n")
             if line.startswith(self.page_url_prefix):
                 if not self.page_url:
-                    self.page_url = line[len(self.page_url_prefix) + 1 :]
+                    parts = line[len(self.page_url_prefix) + 1 :].split(" ", 1)
+                    self.page_url = parts[0]
+                    if len(parts) > 1 and parts[1] == "flet_app_hidden":
+                        self.hidden = True
                     if (
                         self.page_url.startswith("http")
                         and not self.ios

flet_cli-0.82.3.dev7921/src/flet_cli/version.py

@@ -0,0 +1 @@
+version = "0.82.3.dev7921"

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/src/flet_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 0.82.3.dev7907
+Version: 0.82.3.dev7921
 Summary: Flet CLI
 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==0.82.3.dev7907
+Requires-Dist: flet==0.82.3.dev7921
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-0.82.3.dev7907 → flet_cli-0.82.3.dev7921}/src/flet_cli.egg-info/requires.txt

@@ -1,4 +1,4 @@
-flet==0.82.3.dev7907
+flet==0.82.3.dev7921
 watchdog>=4.0.0
 packaging>=25.0
 qrcode>=7.4.2

flet_cli-0.82.3.dev7907/src/flet_cli/version.py

@@ -1 +0,0 @@
-version = "0.82.3.dev7907"