flet-cli 1.1.0.dev2__py3-none-any.whl → 1.1.0.dev3__py3-none-any.whl

flet_cli/commands/build_base.py

@@ -1886,6 +1886,13 @@ class BaseBuildCommand(BaseFlutterCommand):
         assert self.build_dir
         assert self.pubspec_path
 
+        # A deleted extension in build/flutter-packages would make this build
+        # fail before it could reinstall it: start over with a fresh project,
+        # fresh packages, and regenerated icons and splash images.
+        if not second_pass and self._flutter_packages_missing():
+            for stamp in ("template-1", "template-2", "package", "icons", "splashes"):
+                (self.build_dir / ".hash" / stamp).unlink(missing_ok=True)
+
         hash = HashStamp(
             self.build_dir / ".hash" / f"template-{'2' if second_pass else '1'}"
         )
@@ -2399,6 +2406,38 @@ class BaseBuildCommand(BaseFlutterCommand):
                 return AssetSpec(ico_sizes=sizes)
         return None
 
+    def _flutter_packages_missing(self) -> bool:
+        """
+        Whether the Flutter project depends on an extension that is gone.
+
+        The previous build's `pubspec.yaml` lists the Flutter packages of the
+        app's extensions by their path in `build/flutter-packages`. If one of
+        them was deleted since, resolving that `pubspec.yaml` fails, and it is
+        resolved before the packages could be installed again, so the build
+        can't recover on its own. The build then starts over: the Flutter
+        project is rendered again, which also restores the template's icons
+        and splash images, so those are generated again too.
+
+        Returns:
+            `True` when a dependency's path is inside `build/flutter-packages`
+                and has no `pubspec.yaml`.
+        """
+
+        assert self.pubspec_path
+        assert self.build_dir
+
+        if not os.path.exists(self.pubspec_path):
+            return False
+        pubspec = self.load_yaml(self.pubspec_path) or {}
+        packages_dir = (self.build_dir / "flutter-packages").resolve()
+        for dependency in (pubspec.get("dependencies") or {}).values():
+            if not isinstance(dependency, dict) or "path" not in dependency:
+                continue
+            path = (Path(self.pubspec_path).parent / dependency["path"]).resolve()
+            if packages_dir in path.parents and not (path / "pubspec.yaml").exists():
+                return True
+        return False
+
     def _site_packages_missing(self) -> bool:
         """
         Whether any required platform package directory has no package files.
@@ -2947,17 +2986,17 @@ class BaseBuildCommand(BaseFlutterCommand):
             for arg in package_args:
                 hash.update(arg)
 
-            if not dev_packages_configured:
-                if not hash.has_changed() and not self._site_packages_missing():
-                    package_args.append("--skip-site-packages")
-                    # serious_python skips copying Flutter packages to the temp dir
-                    # under --skip-site-packages, so register_flutter_extensions must
-                    # keep (not wipe) the permanent flutter-packages copy from the
-                    # previous build.
-                    self.site_packages_skipped = True
-                else:
-                    if self.flutter_packages_dir.exists():
-                        shutil.rmtree(self.flutter_packages_dir, ignore_errors=True)
+            if (
+                not dev_packages_configured
+                and not hash.has_changed()
+                and not self._site_packages_missing()
+            ):
+                package_args.append("--skip-site-packages")
+                # serious_python skips copying Flutter packages to the temp dir
+                # under --skip-site-packages, so register_flutter_extensions must
+                # keep (not wipe) the permanent flutter-packages copy from the
+                # previous build.
+                self.site_packages_skipped = True
 
             package_result = self.run(
                 package_args,

flet_cli/commands/flutter_base.py

@@ -187,6 +187,7 @@ class BaseFlutterCommand(BaseCommand):
         assert self.options
         self.required_flutter_version = version.Version(flet.version.flutter_version)
         if self.required_flutter_version == version.Version("0"):
+            self.skip_flutter_doctor = True
             self.cleanup(
                 1,
                 "Unable to determine the required Flutter SDK version. "

flet_cli/version.py

@@ -1 +1 @@
-version = "1.1.0.dev2"
+version = "1.1.0.dev3"

{flet_cli-1.1.0.dev2.dist-info → flet_cli-1.1.0.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-cli
-Version: 1.1.0.dev2
+Version: 1.1.0.dev3
 Summary: Flet CLI
 Author-email: "Appveyor Systems Inc." <hello@flet.dev>
 License-Expression: Apache-2.0
@@ -9,8 +9,8 @@ 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.1.0.dev2
-Requires-Dist: flet-platform-assets==1.1.0.dev2
+Requires-Dist: flet==1.1.0.dev3
+Requires-Dist: flet-platform-assets==1.1.0.dev3
 Requires-Dist: watchdog>=4.0.0
 Requires-Dist: packaging>=25.0
 Requires-Dist: qrcode>=7.4.2

{flet_cli-1.1.0.dev2.dist-info → flet_cli-1.1.0.dev3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 flet_cli/cli.py,sha256=TlUPz73bL6rcSQBBH05uAljU9f-ZsuefEKYR-SbdPbE,10115
-flet_cli/version.py,sha256=dDBF7DByCLLxsQMLSsO_YNMhEP_dCSWn9QCX_1B_36g,23
+flet_cli/version.py,sha256=J9gkrr2DZzVgtgCaJtHPOoQElIbRKqfeLxHSlnA9Fj4,23
 flet_cli/__pyinstaller/__init__.py,sha256=1MZKXQG20CRYCGCPzbbO3o-rUJMKm0q_ck9_jDSuTgU,177
 flet_cli/__pyinstaller/config.py,sha256=LRzpGt1QzSBWtE3zPWo2nA2Hf3ppMHv0LQnpi-dwGDk,245
 flet_cli/__pyinstaller/extensions.py,sha256=-HfOQmkVbOezpGFvi6bwGx0owl6DA9ji5flzIT_mUEw,5611
@@ -12,14 +12,14 @@ flet_cli/__pyinstaller/win_utils.py,sha256=yZixKh6Pq1ou8oNmhE_j7kuSSjN-BaQSvAhFh
 flet_cli/__pyinstaller/rthooks/pyi_rth_localhost_fletd.py,sha256=O8lAxkHmNaXaZNzP-3VTuUhuglYwgJtzaeIKQa2neGU,2379
 flet_cli/commands/base.py,sha256=6MTAuA7kKdaKIZI4AyWPM1TJfFCxmRj7kc7z2h6E_4k,3496
 flet_cli/commands/build.py,sha256=FCt95Smfyvch8xuvUmgNT7frI_3KKIbnN_YZ_iJs-sk,36725
-flet_cli/commands/build_base.py,sha256=FS3z2ebfAxP_CiZFoVrwX18HnunBRo-MrrWaev1Y0bk,164651
+flet_cli/commands/build_base.py,sha256=9HADmZGWNzxtWro4RHG1fl_LANWi7t3-MUs0vIIYbvA,166432
 flet_cli/commands/clean.py,sha256=fIRr1ktoE9wzO0R-lAq985zbCH1dX6Sao5VyXiJxiOY,2250
 flet_cli/commands/create.py,sha256=i0-DEGlE4mOpP1lGxfuv7Iea131ukdNP5SQupcS8Eug,11317
 flet_cli/commands/debug.py,sha256=pZH4Lsn9nLET4Zet9XwJweCA8rQyt2fIF-srH5XO7JM,6699
 flet_cli/commands/devices.py,sha256=mYUOk93EnpS9FvZnTUjCL58P0jHA6FD8HoudFGqF1go,7777
 flet_cli/commands/doctor.py,sha256=uG2xUAT_FASB9cnLD9G83NTYdP9iuKhaHyQLjMB_E4c,1051
 flet_cli/commands/emulators.py,sha256=IVMCRCI-nXfD51H_ApV8GZhpmpDrhC8s61uaXPGVarI,13039
-flet_cli/commands/flutter_base.py,sha256=hKIx8grGOls_685ik-Vg_XPKkOQGltbYQw0IMQ6TgNA,26456
+flet_cli/commands/flutter_base.py,sha256=18H3ofgsnSeCfaZZwPemYLNEtPLr_v46QlP_bVPUQG8,26500
 flet_cli/commands/mcp.py,sha256=AVEnf6YjICqoBQPKqBaHp27KHXxFVjH-IRpAi6dSjcM,2065
 flet_cli/commands/options.py,sha256=CD7Fw2CtUeuVrtM_oR1_OrAcMKF2EhRUoPuX9_3IsW8,2543
 flet_cli/commands/pack.py,sha256=Zlha-j10JJ1tMKY5VrZHZBAEJsIPQS8-huMoqMkPkkY,30387
@@ -50,8 +50,8 @@ flet_cli/utils/pyodide.py,sha256=RhumXYuovPxgLbu99pNNhVb9SRvBvhLGiUMtb9WxC5U,505
 flet_cli/utils/pyproject_toml.py,sha256=o4fAWKXMyK8vdnAO41BLI7Lt3ohMlVdlwrpaifq30Cs,1408
 flet_cli/utils/python_versions.py,sha256=eYfblWYTD2_PiiAK43euVVg1NaaxsIh_6H8J7CcnbcM,8129
 flet_cli/utils/template_cache.py,sha256=Lf_iuk30zTfaNFbRmrc8s07w1yE-PYjdovZztoiuPzc,1596
-flet_cli-1.1.0.dev2.dist-info/METADATA,sha256=4uRUm4j_gjDHkbS-Z8b8T16t5pxcJTS8cmMPkSDo9uU,1588
-flet_cli-1.1.0.dev2.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-flet_cli-1.1.0.dev2.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
-flet_cli-1.1.0.dev2.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
-flet_cli-1.1.0.dev2.dist-info/RECORD,,
+flet_cli-1.1.0.dev3.dist-info/METADATA,sha256=o3nI90-svGDAGDDiyB0K55VEiKGvqUoUH3LhCQRt1us,1588
+flet_cli-1.1.0.dev3.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+flet_cli-1.1.0.dev3.dist-info/entry_points.txt,sha256=UZFR426y3mfr0wgikEFPbZ6wtGwfgykif9Obw6R7Wnc,65
+flet_cli-1.1.0.dev3.dist-info/top_level.txt,sha256=4_BPVAJpcNofDe3XMxajlZLBNWzWqKhRynNSBCYTKVQ,9
+flet_cli-1.1.0.dev3.dist-info/RECORD,,