flet 0.20.0.dev2211__tar.gz → 0.20.0.dev2221__tar.gz

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flet
-Version: 0.20.0.dev2211
+Version: 0.20.0.dev2221
 Summary: Flet for Python - easily build interactive multi-platform apps in Python
 License: Apache-2.0
 Author: Appveyor Systems Inc.
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: cookiecutter (>=2.4.0,<3.0.0)
-Requires-Dist: flet-runtime (==0.20.0.dev2211)
+Requires-Dist: flet-runtime (==0.20.0.dev2221)
 Requires-Dist: packaging (>=23.1,<24.0)
 Requires-Dist: qrcode (>=7.4.2,<8.0.0)
 Requires-Dist: typing-extensions (>=4.6.2,<5.0.0) ; python_version < "3.8"

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "flet"
-version = "0.20.0.dev2211"
+version = "0.20.0.dev2221"
 description = "Flet for Python - easily build interactive multi-platform apps in Python"
 authors = ["Appveyor Systems Inc. <hello@flet.dev>"]
 license = "Apache-2.0"
@@ -16,7 +16,7 @@ repository = "https://github.com/flet-dev/flet"
 documentation = "https://flet.dev/docs"
 
 [tool.poetry.dependencies]
-flet-runtime = "0.20.0.dev2211"
+flet-runtime = "0.20.0.dev2221"
 python = "^3.7"
 typing-extensions = { version = "^4.6.2", python = "<3.8" }
 websocket-client = "^1.5.2"

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/src/flet/cli/commands/build.py

@@ -16,6 +16,7 @@ import yaml
 from flet.cli.commands.base import BaseCommand
 from flet_core.utils import random_string, slugify
 from flet_runtime.utils import calculate_file_hash, copy_tree, is_windows
+from packaging import version
 from rich import print
 
 if is_windows():
@@ -362,7 +363,7 @@ class Command(BaseCommand):
         if not template_url:
             template_url = DEFAULT_TEMPLATE_URL
             if flet.version.version and not template_ref:
-                template_ref = flet.version.version
+                template_ref = version.Version(flet.version.version).base_version
 
         # create Flutter project from a template
         print("Creating Flutter bootstrap project...", end="")

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/src/flet/cli/commands/create.py

@@ -1,8 +1,10 @@
 import argparse
 from pathlib import Path
 
+import flet.version
 from flet.cli.commands.base import BaseCommand
 from flet_core.utils import slugify
+from packaging import version
 from rich import print
 
 
@@ -43,6 +45,10 @@ class Command(BaseCommand):
 
         template_data = {"template_name": options.template}
 
+        template_ref = None
+        if flet.version.version:
+            template_ref = version.Version(flet.version.version).base_version
+
         out_dir = Path(options.output_directory).resolve()
         template_data["out_dir"] = out_dir.name
 
@@ -57,6 +63,7 @@ class Command(BaseCommand):
         # print("Template data:", template_data)
         cookiecutter(
             f"gh:flet-dev/flet-app-templates",
+            checkout=template_ref,
             directory=options.template,
             output_dir=str(out_dir.parent),
             no_input=True,

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/src/flet/cli/commands/pack.py

@@ -114,17 +114,54 @@ class Command(BaseCommand):
             action="store_true",
             help="Using this option creates a Manifest that will request elevation upon application start.(Windows)",
         )
+        parser.add_argument(
+            "-y",
+            "--yes",
+            dest="non_interactive",
+            default=False,
+            action="store_true",
+            help="Non-interactive mode.",
+        )
 
     def handle(self, options: argparse.Namespace) -> None:
+        is_dir_not_empty = lambda dir: os.path.isdir(dir) and len(os.listdir(dir)) != 0
+
         # delete "build" directory
         build_dir = os.path.join(os.getcwd(), "build")
-        if os.path.exists(build_dir):
-            shutil.rmtree(build_dir, ignore_errors=True)
+        if is_dir_not_empty(build_dir):
+            if options.non_interactive:
+                shutil.rmtree(build_dir, ignore_errors=True)
+            else:
+                delete_dir_prompt = input(
+                    f'Do you want to delete "build" directory? (y/n) '
+                )
+                if not delete_dir_prompt.lower() == "n":
+                    shutil.rmtree(build_dir, ignore_errors=True)
+                else:
+                    print('Failing... "build" directory must be empty to proceed.')
+                    exit(1)
+
+        # delete "dist" directory or DISTPATH directory
+        # if --distpath cli option is specified
+        if options.distpath:
+            dist_dir = os.path.join(os.getcwd(), options.distpath)
+        else:
+            dist_dir = os.path.join(os.getcwd(), "dist")
 
-        # delete "dist" directory
-        dist_dir = os.path.join(os.getcwd(), "dist")
-        if os.path.exists(dist_dir):
-            shutil.rmtree(dist_dir, ignore_errors=True)
+        if is_dir_not_empty(dist_dir):
+            if options.non_interactive:
+                shutil.rmtree(dist_dir, ignore_errors=True)
+            else:
+                delete_dir_prompt = input(
+                    f'Do you want to delete "{os.path.basename(dist_dir)}" directory? (y/n) '
+                )
+                if not delete_dir_prompt.lower() == "n":
+                    shutil.rmtree(dist_dir, ignore_errors=True)
+                else:
+                    print(
+                        f'Failing... DISTPATH "{os.path.basename(dist_dir)}" directory must be empty to proceed.'
+                    )
+                    exit(1)
 
         try:
             import PyInstaller.__main__

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/src/flet/web/flutter_service_worker.js

@@ -17,7 +17,7 @@ const RESOURCES = {"assets/AssetManifest.json": "d9150da08bcab79647bb00a0700488d
 "favicon.png": "302ac04c14db027d016d1fe74c6a80a0",
 "manifest.json": "7909dae66a9203092dc86b5a6162e79c",
 "flutter.js": "7d69e653079438abfbb24b82a655b0a4",
-"main.dart.js": "8fca0324a93b9700bbde9880d940d586",
+"main.dart.js": "8101edde66c7c5bad0209322e23a1f62",
 "version.json": "3fea9d9c7b4ca6955aa03e762e0d2e13",
 "icons/apple-touch-icon-192.png": "8cf0d5162941f467a77f023c414a1812",
 "icons/icon-maskable-512.png": "aa798e6d780ff109da17c3a98d5f2619",
@@ -34,8 +34,8 @@ const RESOURCES = {"assets/AssetManifest.json": "d9150da08bcab79647bb00a0700488d
 "canvaskit/chromium/canvaskit.wasm": "143af6ff368f9cd21c863bfa4274c406",
 "canvaskit/chromium/canvaskit.js": "0ae8bbcc58155679458a0f7a00f66873",
 "python-worker.js": "62a4865b3d41771b39660076485879be",
-"index.html": "5692d07e56992acf94a6c61edac7d0e3",
-"/": "5692d07e56992acf94a6c61edac7d0e3"};
+"index.html": "1fb7c5d1c914efd5a3504f3c33c54f89",
+"/": "1fb7c5d1c914efd5a3504f3c33c54f89"};
 // The application shell files that are downloaded before a service worker can
 // start.
 const CORE = ["main.dart.js",

{flet-0.20.0.dev2211 → flet-0.20.0.dev2221}/src/flet/web/index.html

@@ -37,7 +37,7 @@
 
   <script>
     // The value below is injected by flutter build, do not touch.
-    const serviceWorkerVersion = "919388047";
+    const serviceWorkerVersion = "3302277507";
   </script>
   <!-- This script adds the flutter initialization JS code -->
   <script src="flutter.js" defer></script>