From 3e101271bcc63b312bf46fa14db7babf5c9421c8 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 4 Aug 2025 13:06:08 +0800
Subject: [PATCH 001/105] Update the build logic to support toolkit config and
 pyscript.toml merging

---
 src/briefcase/platforms/web/static.py | 41 +++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index fdbed8028..149d79612 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -3,6 +3,7 @@
 import sys
 import webbrowser
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
+from importlib.resources import files
 from pathlib import Path
 from typing import Any
 from zipfile import ZipFile
@@ -131,6 +132,34 @@ def build_app(self, app: AppConfig, **kwargs):
         """
         self.console.info("Building web project...", prefix=app.app_name)
 
+        deploy_path = files("toga_web.deploy")
+        deploy_config_path = deploy_path / "config.toml"
+        deploy_pyscript_path = deploy_path / "pyscript.toml"
+
+        if deploy_config_path.exists():
+            try:
+                with deploy_config_path.open("rb") as f:
+                    deploy_config = tomllib.load(f)
+            except tomllib.TOMLDecodeError as e:
+                raise BriefcaseConfigError(f"Invalid config.toml: {e}") from e
+        else:
+            deploy_config = {}
+
+        if "backend" in deploy_config and deploy_config["backend"] != "pyscript":
+            raise BriefcaseConfigError(
+                "Only 'pyscript' backend is currently supported for web static builds."
+            )
+
+        if deploy_pyscript_path.exists():
+            try:
+                extra_pyscript_toml = deploy_pyscript_path.read_text(encoding="utf-8")
+            except Exception as e:
+                raise BriefcaseConfigError(
+                    f"Unable to read deploy/pyscript.toml: {e}"
+                ) from e
+        else:
+            extra_pyscript_toml = ""
+
         if self.wheel_path(app).exists():
             with self.console.wait_bar("Removing old wheels..."):
                 self.tools.shutil.rmtree(self.wheel_path(app))
@@ -218,6 +247,18 @@ def build_app(self, app: AppConfig, **kwargs):
             except AttributeError:
                 pass
 
+            # Parse any deploy pyscript.toml content, and merge it into
+            # the overall content
+            try:
+                extra = tomllib.loads(extra_pyscript_toml)
+                config.update(extra)
+            except tomllib.TOMLDecodeError as e:
+                raise BriefcaseConfigError(
+                    f"Deploy pyscript.toml content isn't valid TOML: {e}"
+                ) from e
+            except AttributeError:
+                pass
+
             # Write the final configuration.
             with (self.project_path(app) / "pyscript.toml").open("wb") as f:
                 tomli_w.dump(config, f)

From 107f1e685808260da3bbd6ae09641a29ad70c9fc Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 11 Aug 2025 11:38:29 +0800
Subject: [PATCH 002/105] Added functions to gather backend configuration files

Draft to replace code loading pyscript.toml from the web-template files with a process to gather them from toga_web or 3rd party GUI toolkit
---
 src/briefcase/platforms/web/static.py | 179 +++++++++++++++++++-------
 1 file changed, 131 insertions(+), 48 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 149d79612..4aa5fc189 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -1,4 +1,5 @@
 import errno
+import shutil
 import subprocess
 import sys
 import webbrowser
@@ -46,8 +47,11 @@ def project_path(self, app):
     def binary_path(self, app):
         return self.bundle_path(app) / "www/index.html"
 
+    def static_path(self, app):
+        return self.project_path(app) / "static"
+
     def wheel_path(self, app):
-        return self.project_path(app) / "static/wheels"
+        return self.static_path(app) / "wheels"
 
     def distribution_path(self, app):
         return self.dist_path / f"{app.formal_name}-{app.version}.web.zip"
@@ -125,6 +129,93 @@ def _process_wheel(self, wheelfile, css_file):
                     )
                     css_file.write(wheel.read(filename).decode("utf-8"))
 
+    def _gather_backend_config(self, wheels):
+        """Processes multiple wheels to gather a config.toml and a base pyscript.toml file.
+
+        :param wheels: A list of wheel files to be scanned.
+        """
+        config_counter = 0
+        pyscript_config = None
+
+        for wheelfile in wheels:
+            with ZipFile(wheelfile) as wheel:
+                for filename in wheel.namelist():
+                    path = Path(filename)
+                    if (
+                        len(path.parts) > 1
+                        and path.parts[1] == "deploy"
+                        and path.suffix == ".toml"
+                        and path.name == "config"
+                    ):
+                        self.console.info(f"    Found {filename}")
+                        config_counter += 1
+                        # Raise an error if more than one configuration file is supplied.
+                        if config_counter > 1:
+                            raise BriefcaseConfigError(
+                                "Only 1 backend configuration file can be supplied."
+                            )
+                        # Check which backend type is used. Raise error if no backend is present in config.toml
+                        with wheel.open(filename) as config_file:
+                            config_data = tomllib.load(config_file)
+
+                            if "backend" in config_data:
+                                backend = config_data.get("backend")
+
+                                # Currently, only pyscript is supported, will raise an error if another backend is found.
+                                if backend != "pyscript":
+                                    raise BriefcaseConfigError(
+                                        "Only 'pyscript' backend is currently supported for web static builds."
+                                    )
+
+                                pyscript_config = self._gather_backend_config_file(wheel, backend, path)
+
+                            else:
+                                raise BriefcaseConfigError(
+                                    'No backend was provided in config.toml file.'
+                                )
+        # Return a blank pyscript config if no configuration file is found.
+        if (
+            config_counter == 0
+            and pyscript_config is None
+        ):
+            pyscript_config = {}
+
+        return pyscript_config
+
+    def _gather_backend_config_file(self, wheel, backend, path):
+        """Find backend config file (eg: pyscript.toml) from a wheel and save it to project pyscript.toml if found.
+
+        :param wheel: Wheel file to scan for configuration file.
+        :param backend: The backend type as a String (eg "pyscript")
+        :param path: Path to the wheels configuration file (config.toml). This should be in the same directory as the backend configuration file.
+        """
+        backend_counter = 0
+        backend_config = None
+        deploy_dir = path.parent
+
+        for deploy_file in wheel.namelist():
+            deploy_parent = Path(deploy_file).parent
+            if (
+                deploy_parent == deploy_dir
+                and Path(deploy_file).name == f"{backend}.toml"
+            ):
+                backend_counter += 1
+                # Raise an error if more than one pyscript.toml file is found.
+                if backend_counter > 1:
+                    raise BriefcaseConfigError(
+                        "Only 1 pyscript configuration file can be supplied."
+                    )
+                # Save pyscript config file.
+                else:
+                    try:
+                        with wheel.open(deploy_file) as pyscript_file:
+                            backend_config = tomllib.load(pyscript_file)
+                    except tomllib.TOMLDecodeError as e:
+                        raise BriefcaseConfigError(
+                            f"pyscript.toml content isn't valid TOML: {e}"
+                        ) from e
+        return backend_config
+
     def build_app(self, app: AppConfig, **kwargs):
         """Build the static web deployment for the application.
 
@@ -132,33 +223,33 @@ def build_app(self, app: AppConfig, **kwargs):
         """
         self.console.info("Building web project...", prefix=app.app_name)
 
-        deploy_path = files("toga_web.deploy")
-        deploy_config_path = deploy_path / "config.toml"
-        deploy_pyscript_path = deploy_path / "pyscript.toml"
-
-        if deploy_config_path.exists():
-            try:
-                with deploy_config_path.open("rb") as f:
-                    deploy_config = tomllib.load(f)
-            except tomllib.TOMLDecodeError as e:
-                raise BriefcaseConfigError(f"Invalid config.toml: {e}") from e
-        else:
-            deploy_config = {}
-
-        if "backend" in deploy_config and deploy_config["backend"] != "pyscript":
-            raise BriefcaseConfigError(
-                "Only 'pyscript' backend is currently supported for web static builds."
-            )
-
-        if deploy_pyscript_path.exists():
-            try:
-                extra_pyscript_toml = deploy_pyscript_path.read_text(encoding="utf-8")
-            except Exception as e:
-                raise BriefcaseConfigError(
-                    f"Unable to read deploy/pyscript.toml: {e}"
-                ) from e
-        else:
-            extra_pyscript_toml = ""
+        # deploy_path = files("toga_web.deploy")
+        # deploy_config_path = deploy_path / "config.toml"
+        # deploy_pyscript_path = deploy_path / "pyscript.toml"
+
+        # if deploy_config_path.exists():
+        #     try:
+        #         with deploy_config_path.open("rb") as f:
+        #             deploy_config = tomllib.load(f)
+        #     except tomllib.TOMLDecodeError as e:
+        #         raise BriefcaseConfigError(f"Invalid config.toml: {e}") from e
+        # else:
+        #     deploy_config = {}
+
+        # if "backend" in deploy_config and deploy_config["backend"] != "pyscript":
+        #     raise BriefcaseConfigError(
+        #         "Only 'pyscript' backend is currently supported for web static builds."
+        #     )
+
+        # if deploy_pyscript_path.exists():
+        #     try:
+        #         extra_pyscript_toml = deploy_pyscript_path.read_text(encoding="utf-8")
+        #     except Exception as e:
+        #         raise BriefcaseConfigError(
+        #             f"Unable to read deploy/pyscript.toml: {e}"
+        #         ) from e
+        # else:
+        #     extra_pyscript_toml = ""
 
         if self.wheel_path(app).exists():
             with self.console.wait_bar("Removing old wheels..."):
@@ -217,15 +308,7 @@ def build_app(self, app: AppConfig, **kwargs):
         with self.console.wait_bar("Writing Pyscript configuration file..."):
             # Load any pre-existing pyscript.toml provided by the template. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
-            try:
-                with (self.project_path(app) / "pyscript.toml").open("rb") as f:
-                    config = tomllib.load(f)
-            except tomllib.TOMLDecodeError as e:
-                raise BriefcaseConfigError(
-                    f"pyscript.toml content isn't valid TOML: {e}"
-                ) from e
-            except FileNotFoundError:
-                config = {}
+            config = self._gather_backend_config(self.wheel_path(app).glob("*.whl"))
 
             # Add the packages declaration to the existing pyscript.toml.
             # Ensure that we're using Unix path separators, as the content
@@ -247,17 +330,17 @@ def build_app(self, app: AppConfig, **kwargs):
             except AttributeError:
                 pass
 
-            # Parse any deploy pyscript.toml content, and merge it into
-            # the overall content
-            try:
-                extra = tomllib.loads(extra_pyscript_toml)
-                config.update(extra)
-            except tomllib.TOMLDecodeError as e:
-                raise BriefcaseConfigError(
-                    f"Deploy pyscript.toml content isn't valid TOML: {e}"
-                ) from e
-            except AttributeError:
-                pass
+            # # Parse any deploy pyscript.toml content, and merge it into
+            # # the overall content
+            # try:
+            #     extra = tomllib.loads(extra_pyscript_toml)
+            #     config.update(extra)
+            # except tomllib.TOMLDecodeError as e:
+            #     raise BriefcaseConfigError(
+            #         f"Deploy pyscript.toml content isn't valid TOML: {e}"
+            #     ) from e
+            # except AttributeError:
+            #     pass
 
             # Write the final configuration.
             with (self.project_path(app) / "pyscript.toml").open("wb") as f:

From eed7ec4fb47af5b20a679d4299ffc395163211d9 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 11 Aug 2025 13:39:39 +0800
Subject: [PATCH 003/105] If statement logic fix

---
 src/briefcase/platforms/web/static.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 4aa5fc189..7bef0f467 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -144,8 +144,7 @@ def _gather_backend_config(self, wheels):
                     if (
                         len(path.parts) > 1
                         and path.parts[1] == "deploy"
-                        and path.suffix == ".toml"
-                        and path.name == "config"
+                        and path.name == "config.toml"
                     ):
                         self.console.info(f"    Found {filename}")
                         config_counter += 1

From 07c14f3d42fe4c450a721cb9dc5b2a3ad0d288d3 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 4 Aug 2025 13:09:18 +0800
Subject: [PATCH 004/105] Added _process_wheel function from PR#1285

---
 src/briefcase/platforms/web/static.py | 45 ++++++++++++++++-----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 7bef0f467..8f96f5007 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -106,28 +106,37 @@ def _process_wheel(self, wheelfile, css_file):
         final project.
 
         :param wheelfile: The path to the wheel file to be processed.
-        :param css_file: A file handle, opened for write/append, to which any extracted
-            CSS content will be appended.
+        :param inserts: The insert collection of html for the app
+        :param static_path: The location where static content should be unpacked
         """
-        package = " ".join(wheelfile.name.split("-")[:2])
+        parts = wheelfile.name.split("-")
+        package_name = parts[0]
+        package_version = parts[1]
+        package_key = f"{package_name} {package_version}"
+
+        if (static_path / package_name).exists():
+            self.tools.shutil.rmtree(static_path / package_name)
+
         with ZipFile(wheelfile) as wheel:
             for filename in wheel.namelist():
                 path = Path(filename)
-                # Any CSS file in a `static` folder is appended
-                if (
-                    len(path.parts) > 1
-                    and path.parts[1] == "static"
-                    and path.suffix == ".css"
-                ):
-                    self.console.info(f"    Found {filename}")
-                    css_file.write(
-                        "\n/*******************************************************\n"
-                    )
-                    css_file.write(f" * {package}::{'/'.join(path.parts[2:])}\n")
-                    css_file.write(
-                        " *******************************************************/\n\n"
-                    )
-                    css_file.write(wheel.read(filename).decode("utf-8"))
+                if len(path.parts) > 1:
+                    if path.parts[1] == "inserts":
+                        source = str(Path(*path.parts[2:]))
+                        content = wheel.read(filename).decode("utf-8")
+                        if ":" in path.name:
+                            target, insert = source.split(":")
+                            self.logger.info(
+                                f"  {source}: Adding {insert} insert for {target}"
+                            )
+                        else:
+                            target = path.suffix[1:].upper()
+                            insert = source
+                            self.logger.info(f"    {source}: Adding {target} insert")
+
+                        insert.setdefault(target, {}).setdefault(insert, {})[
+                            
+                        ]
 
     def _gather_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml file.

From 251914fab641e23ead5b671f770a5fc20195ab43 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 4 Aug 2025 13:37:01 +0800
Subject: [PATCH 005/105] Additional _process_wheel content from PR#1285

---
 src/briefcase/platforms/web/static.py | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8f96f5007..aef63a2ef 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -101,10 +101,18 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def _process_wheel(self, wheelfile, css_file):
+    def _process_wheel(self, wheelfile, static_path):
         """Process a wheel, extracting any content that needs to be compiled into the
         final project.
 
+        Extracted content is received in two forms:
+        * inserts - html content to be inserted into existing html files.
+        * static - content to be copied as a whole. Content in a ``static``
+            folder inside the wheel is copied as-is to the static folder,
+            namespaced by the package name of the wheel.
+
+        Any pre-existing static content for the wheel will be deleted.
+
         :param wheelfile: The path to the wheel file to be processed.
         :param inserts: The insert collection of html for the app
         :param static_path: The location where static content should be unpacked
@@ -135,8 +143,14 @@ def _process_wheel(self, wheelfile, css_file):
                             self.logger.info(f"    {source}: Adding {target} insert")
 
                         insert.setdefault(target, {}).setdefault(insert, {})[
-                            
-                        ]
+                            package_key
+                        ] = content
+                    elif path.parts[1] == "static":
+                        content = wheel.read(filename)
+                        outfilename = static_path / package_name / Path(*path.parts[2:])
+                        outfilename.parent.mkdir(parents=True, exist_ok=True)
+                        with outfilename.open("wb") as f:
+                            f.write(content)
 
     def _gather_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml file.

From ac2a30ad012fc88952f7b592e937d1f7e134a540 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 4 Aug 2025 20:29:04 +0800
Subject: [PATCH 006/105] Added _merge_insert_content and _write_inserts
 functions from PR#1285

---
 src/briefcase/platforms/web/static.py | 281 ++++++++++++++++++--------
 1 file changed, 202 insertions(+), 79 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index aef63a2ef..be144468f 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -3,6 +3,7 @@
 import subprocess
 import sys
 import webbrowser
+import re
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
 from importlib.resources import files
 from pathlib import Path
@@ -51,7 +52,7 @@ def static_path(self, app):
         return self.project_path(app) / "static"
 
     def wheel_path(self, app):
-        return self.static_path(app) / "wheels"
+        return self.static_path / "wheels"
 
     def distribution_path(self, app):
         return self.dist_path / f"{app.formal_name}-{app.version}.web.zip"
@@ -101,20 +102,142 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def _process_wheel(self, wheelfile, static_path):
+    def _merge_insert_content(self, inserts, key, path):
+        """Merge multi-file insert content into a single insert file.
+
+        Rewrites the inserts, removing the entry for ``key``,
+        producing a merged entry for ``path`` that has a single
+        ``key`` insert.
+        This is used to merge multiple contributed CSS files into
+        a single CSS insert.
+
+        :param inserts: All inserts
+        :param key: The key to merge
+        :param path: The path for the merge insert.
+        """
+
+        try:
+            original = inserts.pop(key)
+        except KeyError:
+            # No merging
+            pass
+        else:
+            merged = {}
+            for filename, package_inserts in original.items():
+                for package, css in package_inserts.items():
+                    try:
+                        old_css = merged[package]
+                    except KeyError:
+                        old_css = ""
+
+                    full_css = f"{old_css}/********** {filename} **********/\n{css}\n"
+                    merged[package] = full_css
+
+            # Preserve the merged content as a single insert
+            inserts[path] = {key: merged}
+
+    def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
+        """Write inserts into an existing file.
+
+        This function looks for start and end markers in the named file and
+        replaces the content inside the markers with the inserted content.
+
+        Multiple formats of insert marker are inspected to accommodate HTML
+        and CSS/JS comment conventions:
+        * HTML: ``<!--@@ insert:start @@-->`` and ``<!--@@ insert:end @@-->``
+        * CSS/JS: ``/*@@ insert:start @@*/`` and ``/*@@ insert:end @@*/``
+
+        :param app: The application whose ``pyscript.toml`` is being written.
+        :param filename: The file whose insert is to be written.
+        :param inserts: The inserts for the file. A 2 level dictionary, keyed by
+            the name of the insert to add, and then package that contributed the
+            insert.
+        """
+        # Read the current content
+        target_path = self.project_path(app) / filename
+        if not target_path.exists():
+            self.console.warning(f"  Target {filename} not found; skipping inserts.")
+            return
+
+        with target_path.open("r", encoding="utf-8") as f:
+            file_text = f.read()
+
+        for insert in sorted(inserts.keys()):
+            packages = inserts[insert]
+
+            html_banner = (
+                "<!--------------------------------------------------\n"
+                " * {package}\n"
+                " -------------------------------------------------->\n"
+                "{content}"
+            )
+            css_banner = (
+                "/**************************************************\n"
+                " * {package}\n"
+                " *************************************************/\n"
+                "{content}"
+            )
+
+            marker_styles = [
+                # HTML
+                (
+                    r"<!--@@ {insert}:start @@-->.*?<!--@@ {insert}:end @@-->",
+                    r"<!--@@ {insert}:start @@-->\n{content}<!--@@ {insert}:end @@-->",
+                    "html",
+                ),
+                # CSS/JS
+                (
+                    r"/\*@@ {insert}:start @@\*/.*?/\*@@ {insert}:end @@\*/",
+                    r"/*@@ {insert}:start @@*/\n{content}/*@@ {insert}:end @@*/",
+                    "css",
+                ),
+            ]
+
+            html_body = "\n".join(
+                html_banner.format(package=pkg, content=packages[pkg])
+                for pkg in sorted(packages.keys())
+            )
+            css_body = "\n".join(
+                css_banner.format(package=pkg, content=packages[pkg])
+                for pkg in sorted(packages.keys())
+            )
+
+            replaced = False
+            for pattern_tmpl, repl_tmpl, kind in marker_styles:
+                pattern = re.compile(
+                    pattern_tmpl.format(nsert=insert), flags=re.MULTILINE | re.DOTALL
+                )
+                if pattern.search(file_text):
+                    body = html_body if kind == "html" else css_body
+                    file_text = pattern.sub(
+                        repl_tmpl.format(insert=insert, content=body),
+                        file_text,
+                    )
+                    replaced = True
+                    break
+
+            if not replaced:
+                self.console.warning(
+                    f"  Slot '{insert}' markers not found in {filename}; skipping."
+                )
+
+        with target_path.open("w", encoding="utf-8") as f:
+            f.write(file_text)
+
+    def _process_wheel(self, wheelfile, inserts, static_path):
         """Process a wheel, extracting any content that needs to be compiled into the
         final project.
 
-        Extracted content is received in two forms:
-        * inserts - html content to be inserted into existing html files.
-        * static - content to be copied as a whole. Content in a ``static``
-            folder inside the wheel is copied as-is to the static folder,
-            namespaced by the package name of the wheel.
+        Extracted content comes in two forms:
+        * inserts - pieces of content that will be inserted into existing files
+        * static - content that will be copied wholesale. Any content in a ``static``
+          folder inside the wheel will be copied as-is to the static folder,
+          namespaced by the package name of the wheel.
 
         Any pre-existing static content for the wheel will be deleted.
 
         :param wheelfile: The path to the wheel file to be processed.
-        :param inserts: The insert collection of html for the app
+        :param inserts: The inserts collection for the app
         :param static_path: The location where static content should be unpacked
         """
         parts = wheelfile.name.split("-")
@@ -122,35 +245,64 @@ def _process_wheel(self, wheelfile, static_path):
         package_version = parts[1]
         package_key = f"{package_name} {package_version}"
 
-        if (static_path / package_name).exists():
-            self.tools.shutil.rmtree(static_path / package_name)
+        # Purge any existing extracted static files for this wheel
+        pkg_static_root = static_path / package_name
+        if pkg_static_root.exists():
+            self.tools.shutil.rmtree(pkg_static_root)
 
         with ZipFile(wheelfile) as wheel:
             for filename in wheel.namelist():
                 path = Path(filename)
-                if len(path.parts) > 1:
-                    if path.parts[1] == "inserts":
-                        source = str(Path(*path.parts[2:]))
-                        content = wheel.read(filename).decode("utf-8")
-                        if ":" in path.name:
-                            target, insert = source.split(":")
-                            self.logger.info(
-                                f"  {source}: Adding {insert} insert for {target}"
-                            )
-                        else:
-                            target = path.suffix[1:].upper()
-                            insert = source
-                            self.logger.info(f"    {source}: Adding {target} insert")
-
-                        insert.setdefault(target, {}).setdefault(insert, {})[
-                            package_key
-                        ] = content
-                    elif path.parts[1] == "static":
-                        content = wheel.read(filename)
-                        outfilename = static_path / package_name / Path(*path.parts[2:])
-                        outfilename.parent.mkdir(parents=True, exist_ok=True)
-                        with outfilename.open("wb") as f:
-                            f.write(content)
+                if len(path.parts) < 2:
+                    continue
+
+                is_inserts = (path.parts[1] == "inserts") or (
+                    len(path.parts) >= 3
+                    and path.parts[1] == "deploy"
+                    and path.parts[2] == "inserts"
+                )
+                if is_inserts and path.name:
+                    source = (
+                        str(Path(*path.parts[2:]))
+                        if path.parts[1] == "inserts"
+                        else str(Path(*path.parts[3:]))
+                    )
+                    if ":" not in path.name:
+                        self.console.warning(
+                            f"    {source}: missing ':<insert>'; skipping insert."
+                        )
+                        continue
+                    target, insert = source.split(":", 1)
+                    self.console.info(
+                        f"    {source}: Adding {insert} insert for {target}"
+                    )
+                    try:
+                        text = wheel.read(filename).decode("utf-8")
+                    except UnicodeDecodeError:
+                        self.console.warning(
+                            f"    {source}: non-UTF8 insert; skipping."
+                        )
+                        continue
+                    inserts.setdefault(target, {}).setdefault(insert, {})[
+                        package_key
+                    ] = text
+                    continue
+
+                is_static = (path.parts[1] == "static") or (
+                    len(path.parts) >= 3
+                    and path.parts[1] == "deploy"
+                    and path.parts[2] == "static"
+                )
+                if is_static:
+                    if filename.endswith("/"):
+                        continue
+                    rel_parts = (
+                        path.parts[2:] if path.parts[1] == "static" else path.parts[3:]
+                    )
+                    outfilename = pkg_static_root / Path(*rel_parts)
+                    outfilename.parent.mkdir(parents=True, exist_ok=True)
+                    with outfilename.open("wb") as f:
+                        f.write(wheel.read(filename))
 
     def _gather_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml file.
@@ -205,11 +357,13 @@ def _gather_backend_config(self, wheels):
         return pyscript_config
 
     def _gather_backend_config_file(self, wheel, backend, path):
-        """Find backend config file (eg: pyscript.toml) from a wheel and save it to project pyscript.toml if found.
+        """Find backend config file (eg: pyscript.toml) from a wheel and save it to
+        project pyscript.toml if found.
 
         :param wheel: Wheel file to scan for configuration file.
         :param backend: The backend type as a String (eg "pyscript")
-        :param path: Path to the wheels configuration file (config.toml). This should be in the same directory as the backend configuration file.
+        :param path: Path to the wheels configuration file (config.toml). This should be
+            in the same directory as the backend configuration file.
         """
         backend_counter = 0
         backend_config = None
@@ -245,34 +399,6 @@ def build_app(self, app: AppConfig, **kwargs):
         """
         self.console.info("Building web project...", prefix=app.app_name)
 
-        # deploy_path = files("toga_web.deploy")
-        # deploy_config_path = deploy_path / "config.toml"
-        # deploy_pyscript_path = deploy_path / "pyscript.toml"
-
-        # if deploy_config_path.exists():
-        #     try:
-        #         with deploy_config_path.open("rb") as f:
-        #             deploy_config = tomllib.load(f)
-        #     except tomllib.TOMLDecodeError as e:
-        #         raise BriefcaseConfigError(f"Invalid config.toml: {e}") from e
-        # else:
-        #     deploy_config = {}
-
-        # if "backend" in deploy_config and deploy_config["backend"] != "pyscript":
-        #     raise BriefcaseConfigError(
-        #         "Only 'pyscript' backend is currently supported for web static builds."
-        #     )
-
-        # if deploy_pyscript_path.exists():
-        #     try:
-        #         extra_pyscript_toml = deploy_pyscript_path.read_text(encoding="utf-8")
-        #     except Exception as e:
-        #         raise BriefcaseConfigError(
-        #             f"Unable to read deploy/pyscript.toml: {e}"
-        #         ) from e
-        # else:
-        #     extra_pyscript_toml = ""
-
         if self.wheel_path(app).exists():
             with self.console.wait_bar("Removing old wheels..."):
                 self.tools.shutil.rmtree(self.wheel_path(app))
@@ -352,18 +478,6 @@ def build_app(self, app: AppConfig, **kwargs):
             except AttributeError:
                 pass
 
-            # # Parse any deploy pyscript.toml content, and merge it into
-            # # the overall content
-            # try:
-            #     extra = tomllib.loads(extra_pyscript_toml)
-            #     config.update(extra)
-            # except tomllib.TOMLDecodeError as e:
-            #     raise BriefcaseConfigError(
-            #         f"Deploy pyscript.toml content isn't valid TOML: {e}"
-            #     ) from e
-            # except AttributeError:
-            #     pass
-
             # Write the final configuration.
             with (self.project_path(app) / "pyscript.toml").open("wb") as f:
                 tomli_w.dump(config, f)
@@ -377,14 +491,23 @@ def build_app(self, app: AppConfig, **kwargs):
                 sentinel=" ******************* Wheel contributed styles **********************/",
             )
 
-            # Extract static resources from packaged wheels
+            inserts: dict[str, dict[str, dict[str, str]]] = {}
+            static_root = self.static_path(app)
+
             for wheelfile in sorted(self.wheel_path(app).glob("*.whl")):
                 self.console.info(f"  Processing {wheelfile.name}...")
-                with briefcase_css_path.open("a", encoding="utf-8") as css_file:
-                    self._process_wheel(wheelfile, css_file=css_file)
+                self._process_wheel(
+                    wheelfile=wheelfile,
+                    inserts=inserts,
+                    static_path=static_root,
+                )
 
-        return {}
+            # Write inserts per target
+            for target in sorted(inserts.keys()):
+                self._write_inserts(app, Path(target), inserts[target])
 
+        return {}
+    
 
 class HTTPHandler(SimpleHTTPRequestHandler):
     """Convert any HTTP request into a path request on the static content folder."""

From 2ad86c2eda69301ca78e61cbd295da175584ed95 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 11 Aug 2025 16:30:01 +0800
Subject: [PATCH 007/105] Add phase 3 insert injection support with HTML & CSS
 markers

---
 src/briefcase/platforms/web/static.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index be144468f..b95b40dbf 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -1,9 +1,9 @@
 import errno
 import shutil
+import re
 import subprocess
 import sys
 import webbrowser
-import re
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
 from importlib.resources import files
 from pathlib import Path
@@ -52,7 +52,7 @@ def static_path(self, app):
         return self.project_path(app) / "static"
 
     def wheel_path(self, app):
-        return self.static_path / "wheels"
+        return self.static_path(app) / "wheels"
 
     def distribution_path(self, app):
         return self.dist_path / f"{app.formal_name}-{app.version}.web.zip"

From 48b47ad78b0a434124a5b40a785c5ca60bc4ff2c Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 18 Aug 2025 14:17:59 +0800
Subject: [PATCH 008/105] More specific configuration file exception and edits
 to pyscript.toml finding

_gather_backend_config_file function might be obsolete.
This now attempts to find pyscript.toml in the same directory as config.toml using wheel.open()
---
 src/briefcase/platforms/web/static.py | 78 ++++++++++++++-------------
 1 file changed, 41 insertions(+), 37 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index b95b40dbf..c4e2fbdca 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -310,6 +310,7 @@ def _gather_backend_config(self, wheels):
         :param wheels: A list of wheel files to be scanned.
         """
         config_counter = 0
+        config_package = None
         pyscript_config = None
 
         for wheelfile in wheels:
@@ -326,8 +327,11 @@ def _gather_backend_config(self, wheels):
                         # Raise an error if more than one configuration file is supplied.
                         if config_counter > 1:
                             raise BriefcaseConfigError(
-                                "Only 1 backend configuration file can be supplied."
+                                f"""Only 1 backend configuration file can be supplied.
+                                Initial config.toml found in package: {config_package}
+                                Duplicate config.toml found in package: {wheel.filename}"""
                             )
+                        config_package = wheel.filename
                         # Check which backend type is used. Raise error if no backend is present in config.toml
                         with wheel.open(filename) as config_file:
                             config_data = tomllib.load(config_file)
@@ -341,7 +345,15 @@ def _gather_backend_config(self, wheels):
                                         "Only 'pyscript' backend is currently supported for web static builds."
                                     )
 
-                                pyscript_config = self._gather_backend_config_file(wheel, backend, path)
+                                # Try to find pyscript.toml configuration file.
+                                try:
+                                    with wheel.open(f"{path.parent}/pyscript.toml") as pyscript_file:
+                                        pyscript_config = tomllib.load(pyscript_file)
+                                except KeyError:
+                                    raise BriefcaseConfigError(
+                                        f"Pyscript configuration file not found in package: {config_package}"
+                                    )
+                                # pyscript_config = self._gather_backend_config_file(wheel, backend, path)
 
                             else:
                                 raise BriefcaseConfigError(
@@ -356,41 +368,33 @@ def _gather_backend_config(self, wheels):
 
         return pyscript_config
 
-    def _gather_backend_config_file(self, wheel, backend, path):
-        """Find backend config file (eg: pyscript.toml) from a wheel and save it to
-        project pyscript.toml if found.
-
-        :param wheel: Wheel file to scan for configuration file.
-        :param backend: The backend type as a String (eg "pyscript")
-        :param path: Path to the wheels configuration file (config.toml). This should be
-            in the same directory as the backend configuration file.
-        """
-        backend_counter = 0
-        backend_config = None
-        deploy_dir = path.parent
-
-        for deploy_file in wheel.namelist():
-            deploy_parent = Path(deploy_file).parent
-            if (
-                deploy_parent == deploy_dir
-                and Path(deploy_file).name == f"{backend}.toml"
-            ):
-                backend_counter += 1
-                # Raise an error if more than one pyscript.toml file is found.
-                if backend_counter > 1:
-                    raise BriefcaseConfigError(
-                        "Only 1 pyscript configuration file can be supplied."
-                    )
-                # Save pyscript config file.
-                else:
-                    try:
-                        with wheel.open(deploy_file) as pyscript_file:
-                            backend_config = tomllib.load(pyscript_file)
-                    except tomllib.TOMLDecodeError as e:
-                        raise BriefcaseConfigError(
-                            f"pyscript.toml content isn't valid TOML: {e}"
-                        ) from e
-        return backend_config
+    # def _gather_backend_config_file(self, wheel, backend, path):
+    #     """Find backend config file (eg: pyscript.toml) from a wheel and save it to
+    #     project pyscript.toml if found.
+
+    #     :param wheel: Wheel file to scan for configuration file.
+    #     :param backend: The backend type as a String (eg "pyscript")
+    #     :param path: Path to the wheels configuration file (config.toml). This should be
+    #         in the same directory as the backend configuration file.
+    #     """
+    #     backend_config = None
+    #     deploy_dir = path.parent
+
+    #     for deploy_file in wheel.namelist():
+    #         deploy_parent = Path(deploy_file).parent
+    #         if (
+    #             deploy_parent == deploy_dir
+    #             and Path(deploy_file).name == "pyscript.toml"
+    #         ):
+    #             # Save pyscript config file.
+    #             try:
+    #                 with wheel.open(deploy_file) as pyscript_file:
+    #                     backend_config = tomllib.load(pyscript_file)
+    #             except tomllib.TOMLDecodeError as e:
+    #                 raise BriefcaseConfigError(
+    #                     f"pyscript.toml content isn't valid TOML: {e}"
+    #                 ) from e
+    #     return backend_config
 
     def build_app(self, app: AppConfig, **kwargs):
         """Build the static web deployment for the application.

From 2504757fffa8079bddd907033e4c9122437ebd13 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 18 Aug 2025 22:28:19 +0800
Subject: [PATCH 009/105] Address review comments in _write_inserts and wheel
 processing

---
 src/briefcase/platforms/web/static.py | 190 ++++++++++++++------------
 1 file changed, 99 insertions(+), 91 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index c4e2fbdca..8dd3b6cfd 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -1,11 +1,9 @@
 import errno
-import shutil
 import re
 import subprocess
 import sys
 import webbrowser
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
-from importlib.resources import files
 from pathlib import Path
 from typing import Any
 from zipfile import ZipFile
@@ -102,39 +100,39 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def _merge_insert_content(self, inserts, key, path):
-        """Merge multi-file insert content into a single insert file.
-
-        Rewrites the inserts, removing the entry for ``key``,
-        producing a merged entry for ``path`` that has a single
-        ``key`` insert.
-        This is used to merge multiple contributed CSS files into
-        a single CSS insert.
-
-        :param inserts: All inserts
-        :param key: The key to merge
-        :param path: The path for the merge insert.
-        """
-
-        try:
-            original = inserts.pop(key)
-        except KeyError:
-            # No merging
-            pass
-        else:
-            merged = {}
-            for filename, package_inserts in original.items():
-                for package, css in package_inserts.items():
-                    try:
-                        old_css = merged[package]
-                    except KeyError:
-                        old_css = ""
-
-                    full_css = f"{old_css}/********** {filename} **********/\n{css}\n"
-                    merged[package] = full_css
-
-            # Preserve the merged content as a single insert
-            inserts[path] = {key: merged}
+    # def _merge_insert_content(self, inserts, key, path):
+    #    """Merge multi-file insert content into a single insert file.
+
+    #    Rewrites the inserts, removing the entry for ``key``,
+    #    producing a merged entry for ``path`` that has a single
+    #    ``key`` insert.
+    #    This is used to merge multiple contributed CSS files into
+    #    a single CSS insert.
+
+    #    :param inserts: All inserts
+    #    :param key: The key to merge
+    #    :param path: The path for the merge insert.
+    #    """
+
+    #    try:
+    #        original = inserts.pop(key)
+    #    except KeyError:
+    # No merging
+    #        pass
+    #    else:
+    #        merged = {}
+    #        for filename, package_inserts in original.items():
+    #            for package, css in package_inserts.items():
+    #                try:
+    #                    old_css = merged[package]
+    #                except KeyError:
+    #                    old_css = ""
+
+    #                full_css = f"{old_css}/********** {filename} **********/\n{css}\n"
+    #                merged[package] = full_css
+
+    # Preserve the merged content as a single insert
+    #        inserts[path] = {key: merged}
 
     def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
         """Write inserts into an existing file.
@@ -153,18 +151,16 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
             the name of the insert to add, and then package that contributed the
             insert.
         """
-        # Read the current content
+        # Load file content, skip if file not found
         target_path = self.project_path(app) / filename
-        if not target_path.exists():
+        try:
+            file_text = target_path.read_text(encoding="utf-8")
+        except FileNotFoundError:
             self.console.warning(f"  Target {filename} not found; skipping inserts.")
             return
 
-        with target_path.open("r", encoding="utf-8") as f:
-            file_text = f.read()
-
-        for insert in sorted(inserts.keys()):
-            packages = inserts[insert]
-
+        # Each insert slot may have multiple package contributions
+        for insert, packages in inserts.items():
             html_banner = (
                 "<!--------------------------------------------------\n"
                 " * {package}\n"
@@ -178,6 +174,7 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
                 "{content}"
             )
 
+            # Marker patterns for HTML and CSS/JS
             marker_styles = [
                 # HTML
                 (
@@ -193,36 +190,42 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
                 ),
             ]
 
+            # Build bodies for HTML and CSS inserts
             html_body = "\n".join(
-                html_banner.format(package=pkg, content=packages[pkg])
-                for pkg in sorted(packages.keys())
+                html_banner.format(package=pkg, content=pkg_content.get("html", ""))
+                for pkg, pkg_content in (packages.items())
+                if pkg_content.get("html")
             )
             css_body = "\n".join(
-                css_banner.format(package=pkg, content=packages[pkg])
-                for pkg in sorted(packages.keys())
+                css_banner.format(package=pkg, content=pkg_content.get("css", ""))
+                for pkg, pkg_content in (packages.items())
+                if pkg_content.get("css")
             )
 
-            replaced = False
+            # Find first matching marker in file
+            matched_style = None
             for pattern_tmpl, repl_tmpl, kind in marker_styles:
                 pattern = re.compile(
-                    pattern_tmpl.format(nsert=insert), flags=re.MULTILINE | re.DOTALL
+                    pattern_tmpl.format(insert=insert),
+                    flags=re.MULTILINE | re.DOTALL,
                 )
-                if pattern.search(file_text):
-                    body = html_body if kind == "html" else css_body
-                    file_text = pattern.sub(
-                        repl_tmpl.format(insert=insert, content=body),
-                        file_text,
-                    )
-                    replaced = True
-                    break
-
-            if not replaced:
+                if matched_style is None and pattern.search(file_text):
+                    matched_style = (pattern, repl_tmpl, kind)
+
+            if matched_style is not None:
+                # Replace marker region with assembled body
+                pattern, repl_tmpl, kind = matched_style
+                body = html_body if kind == "html" else css_body
+                file_text = pattern.sub(
+                    repl_tmpl.format(insert=insert, content=body),
+                    file_text,
+                )
+            else:
                 self.console.warning(
                     f"  Slot '{insert}' markers not found in {filename}; skipping."
                 )
-
-        with target_path.open("w", encoding="utf-8") as f:
-            f.write(file_text)
+        # Save modified content
+        target_path.write_text(file_text, encoding="utf-8")
 
     def _process_wheel(self, wheelfile, inserts, static_path):
         """Process a wheel, extracting any content that needs to be compiled into the
@@ -245,7 +248,7 @@ def _process_wheel(self, wheelfile, inserts, static_path):
         package_version = parts[1]
         package_key = f"{package_name} {package_version}"
 
-        # Purge any existing extracted static files for this wheel
+        # Purge any old static files for this wheel
         pkg_static_root = static_path / package_name
         if pkg_static_root.exists():
             self.tools.shutil.rmtree(pkg_static_root)
@@ -256,12 +259,14 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                 if len(path.parts) < 2:
                     continue
 
+                # Detect "inserts" paths inside the wheel
                 is_inserts = (path.parts[1] == "inserts") or (
                     len(path.parts) >= 3
                     and path.parts[1] == "deploy"
                     and path.parts[2] == "inserts"
                 )
                 if is_inserts and path.name:
+                    # Derive target file and insert slot
                     source = (
                         str(Path(*path.parts[2:]))
                         if path.parts[1] == "inserts"
@@ -278,16 +283,26 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                     )
                     try:
                         text = wheel.read(filename).decode("utf-8")
-                    except UnicodeDecodeError:
-                        self.console.warning(
-                            f"    {source}: non-UTF8 insert; skipping."
-                        )
-                        continue
-                    inserts.setdefault(target, {}).setdefault(insert, {})[
-                        package_key
-                    ] = text
+                    except UnicodeDecodeError as e:
+                        raise BriefcaseCommandError(
+                            f"{source}: insert must be UTF-8 encoded"
+                        ) from e
+
+                    # Classify insert as HTML vs CSS/JS
+                    ext = Path(filename).suffix.lower()
+                    kind = "css" if ext in {".css", ".js"} else "html"
+
+                    # Ensure nested dict structure exists
+                    pkg_entry = (
+                        inserts.setdefault(target, {})
+                        .setdefault(insert, {})
+                        .setdefault(package_key, {"html": "", "css": ""})
+                    )
+                    # Append into the right bucket
+                    pkg_entry[kind] += text
                     continue
 
+                # Detect "static" paths inside the wheel
                 is_static = (path.parts[1] == "static") or (
                     len(path.parts) >= 3
                     and path.parts[1] == "deploy"
@@ -296,6 +311,7 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                 if is_static:
                     if filename.endswith("/"):
                         continue
+                    # Compute output path relative to static/
                     rel_parts = (
                         path.parts[2:] if path.parts[1] == "static" else path.parts[3:]
                     )
@@ -305,7 +321,8 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                         f.write(wheel.read(filename))
 
     def _gather_backend_config(self, wheels):
-        """Processes multiple wheels to gather a config.toml and a base pyscript.toml file.
+        """Processes multiple wheels to gather a config.toml and a base pyscript.toml
+        file.
 
         :param wheels: A list of wheel files to be scanned.
         """
@@ -345,25 +362,16 @@ def _gather_backend_config(self, wheels):
                                         "Only 'pyscript' backend is currently supported for web static builds."
                                     )
 
-                                # Try to find pyscript.toml configuration file.
-                                try:
-                                    with wheel.open(f"{path.parent}/pyscript.toml") as pyscript_file:
-                                        pyscript_config = tomllib.load(pyscript_file)
-                                except KeyError:
-                                    raise BriefcaseConfigError(
-                                        f"Pyscript configuration file not found in package: {config_package}"
-                                    )
-                                # pyscript_config = self._gather_backend_config_file(wheel, backend, path)
+                                pyscript_config = self._gather_backend_config_file(
+                                    wheel, backend, path
+                                )
 
                             else:
                                 raise BriefcaseConfigError(
-                                    'No backend was provided in config.toml file.'
+                                    "No backend was provided in config.toml file."
                                 )
         # Return a blank pyscript config if no configuration file is found.
-        if (
-            config_counter == 0
-            and pyscript_config is None
-        ):
+        if config_counter == 0 and pyscript_config is None:
             pyscript_config = {}
 
         return pyscript_config
@@ -482,7 +490,7 @@ def build_app(self, app: AppConfig, **kwargs):
             except AttributeError:
                 pass
 
-            # Write the final configuration.
+            # Write the final configuration
             with (self.project_path(app) / "pyscript.toml").open("wb") as f:
                 tomli_w.dump(config, f)
 
@@ -495,7 +503,7 @@ def build_app(self, app: AppConfig, **kwargs):
                 sentinel=" ******************* Wheel contributed styles **********************/",
             )
 
-            inserts: dict[str, dict[str, dict[str, str]]] = {}
+            inserts: dict[str, dict[str, dict[str, dict[str, str]]]] = {}
             static_root = self.static_path(app)
 
             for wheelfile in sorted(self.wheel_path(app).glob("*.whl")):
@@ -507,11 +515,11 @@ def build_app(self, app: AppConfig, **kwargs):
                 )
 
             # Write inserts per target
-            for target in sorted(inserts.keys()):
-                self._write_inserts(app, Path(target), inserts[target])
+            for target, target_inserts in inserts.items():
+                self._write_inserts(app, Path(target), target_inserts)
 
         return {}
-    
+
 
 class HTTPHandler(SimpleHTTPRequestHandler):
     """Convert any HTTP request into a path request on the static content folder."""

From 1a306c11d42b048b653395938c8650bf203692ad Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 19 Aug 2025 14:27:15 +0800
Subject: [PATCH 010/105] Address review comments

Refactor wheel processing, simplify deploy/* checks, drop unused cases, and sort inserts/packages for consistent output
---
 src/briefcase/platforms/web/static.py | 148 ++++++++------------------
 1 file changed, 45 insertions(+), 103 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8dd3b6cfd..f176cc5b4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -100,40 +100,6 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    # def _merge_insert_content(self, inserts, key, path):
-    #    """Merge multi-file insert content into a single insert file.
-
-    #    Rewrites the inserts, removing the entry for ``key``,
-    #    producing a merged entry for ``path`` that has a single
-    #    ``key`` insert.
-    #    This is used to merge multiple contributed CSS files into
-    #    a single CSS insert.
-
-    #    :param inserts: All inserts
-    #    :param key: The key to merge
-    #    :param path: The path for the merge insert.
-    #    """
-
-    #    try:
-    #        original = inserts.pop(key)
-    #    except KeyError:
-    # No merging
-    #        pass
-    #    else:
-    #        merged = {}
-    #        for filename, package_inserts in original.items():
-    #            for package, css in package_inserts.items():
-    #                try:
-    #                    old_css = merged[package]
-    #                except KeyError:
-    #                    old_css = ""
-
-    #                full_css = f"{old_css}/********** {filename} **********/\n{css}\n"
-    #                merged[package] = full_css
-
-    # Preserve the merged content as a single insert
-    #        inserts[path] = {key: merged}
-
     def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
         """Write inserts into an existing file.
 
@@ -145,6 +111,8 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
         * HTML: ``<!--@@ insert:start @@-->`` and ``<!--@@ insert:end @@-->``
         * CSS/JS: ``/*@@ insert:start @@*/`` and ``/*@@ insert:end @@*/``
 
+        Inserts and package contributions are processed in sorted order to ensure deterministic builds.
+
         :param app: The application whose ``pyscript.toml`` is being written.
         :param filename: The file whose insert is to be written.
         :param inserts: The inserts for the file. A 2 level dictionary, keyed by
@@ -159,8 +127,10 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
             self.console.warning(f"  Target {filename} not found; skipping inserts.")
             return
 
-        # Each insert slot may have multiple package contributions
-        for insert, packages in inserts.items():
+        # Each insert slot and its package contributions are processed in sorted order
+        for insert, packages in sorted(inserts.items()):
+            packages = inserts[insert]
+
             html_banner = (
                 "<!--------------------------------------------------\n"
                 " * {package}\n"
@@ -190,15 +160,15 @@ def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
                 ),
             ]
 
-            # Build bodies for HTML and CSS inserts
+            # Sort and build bodies for HTML and CSS inserts
             html_body = "\n".join(
                 html_banner.format(package=pkg, content=pkg_content.get("html", ""))
-                for pkg, pkg_content in (packages.items())
+                for pkg, pkg_content in sorted(packages.items())
                 if pkg_content.get("html")
             )
             css_body = "\n".join(
                 css_banner.format(package=pkg, content=pkg_content.get("css", ""))
-                for pkg, pkg_content in (packages.items())
+                for pkg, pkg_content in sorted(packages.items())
                 if pkg_content.get("css")
             )
 
@@ -255,32 +225,30 @@ def _process_wheel(self, wheelfile, inserts, static_path):
 
         with ZipFile(wheelfile) as wheel:
             for filename in wheel.namelist():
+                # Skip directories and shallow paths
+                if filename.endswith("/"):
+                    continue
                 path = Path(filename)
-                if len(path.parts) < 2:
+                parts = path.parts
+                if len(parts) < 3:
                     continue
 
-                # Detect "inserts" paths inside the wheel
-                is_inserts = (path.parts[1] == "inserts") or (
-                    len(path.parts) >= 3
-                    and path.parts[1] == "deploy"
-                    and path.parts[2] == "inserts"
-                )
-                if is_inserts and path.name:
-                    # Derive target file and insert slot
-                    source = (
-                        str(Path(*path.parts[2:]))
-                        if path.parts[1] == "inserts"
-                        else str(Path(*path.parts[3:]))
-                    )
-                    if ":" not in path.name:
+                # Handle inserts under deploy/inserts
+                if parts[:2] == ("deploy", "inserts"):
+                    source = str(Path(*parts[2:]))
+
+                    try:
+                        target, insert = source.split(":", 1)
+                    except ValueError:
                         self.console.warning(
                             f"    {source}: missing ':<insert>'; skipping insert."
                         )
                         continue
-                    target, insert = source.split(":", 1)
+
                     self.console.info(
                         f"    {source}: Adding {insert} insert for {target}"
                     )
+
                     try:
                         text = wheel.read(filename).decode("utf-8")
                     except UnicodeDecodeError as e:
@@ -289,8 +257,8 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                         ) from e
 
                     # Classify insert as HTML vs CSS/JS
-                    ext = Path(filename).suffix.lower()
-                    kind = "css" if ext in {".css", ".js"} else "html"
+                    t_ext = Path(target).suffix.lower()
+                    kind = "css" if t_ext in {".css", ".js"} else "html"
 
                     # Ensure nested dict structure exists
                     pkg_entry = (
@@ -299,26 +267,19 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                         .setdefault(package_key, {"html": "", "css": ""})
                     )
                     # Append into the right bucket
+                    if pkg_entry[kind]:
+                        pkg_entry[kind] += "\n"
                     pkg_entry[kind] += text
                     continue
 
-                # Detect "static" paths inside the wheel
-                is_static = (path.parts[1] == "static") or (
-                    len(path.parts) >= 3
-                    and path.parts[1] == "deploy"
-                    and path.parts[2] == "static"
-                )
-                if is_static:
-                    if filename.endswith("/"):
-                        continue
-                    # Compute output path relative to static/
-                    rel_parts = (
-                        path.parts[2:] if path.parts[1] == "static" else path.parts[3:]
-                    )
-                    outfilename = pkg_static_root / Path(*rel_parts)
+                # Handle static files under deploy/static
+                if parts[:2] == ("deploy", "static"):
+                    rel = Path(*parts[2:])
+                    outfilename = pkg_static_root / rel
                     outfilename.parent.mkdir(parents=True, exist_ok=True)
                     with outfilename.open("wb") as f:
                         f.write(wheel.read(filename))
+                    continue
 
     def _gather_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
@@ -349,6 +310,7 @@ def _gather_backend_config(self, wheels):
                                 Duplicate config.toml found in package: {wheel.filename}"""
                             )
                         config_package = wheel.filename
+
                         # Check which backend type is used. Raise error if no backend is present in config.toml
                         with wheel.open(filename) as config_file:
                             config_data = tomllib.load(config_file)
@@ -362,9 +324,17 @@ def _gather_backend_config(self, wheels):
                                         "Only 'pyscript' backend is currently supported for web static builds."
                                     )
 
-                                pyscript_config = self._gather_backend_config_file(
-                                    wheel, backend, path
-                                )
+                                # Try to find pyscript.toml configuration file.
+                                try:
+                                    with wheel.open(
+                                        f"{path.parent}/pyscript.toml"
+                                    ) as pyscript_file:
+                                        pyscript_config = tomllib.load(pyscript_file)
+                                except KeyError:
+                                    raise BriefcaseConfigError(
+                                        f"Pyscript configuration file not found in package: {config_package}"
+                                    )
+                                # pyscript_config = self._gather_backend_config_file(wheel, backend, path)
 
                             else:
                                 raise BriefcaseConfigError(
@@ -376,34 +346,6 @@ def _gather_backend_config(self, wheels):
 
         return pyscript_config
 
-    # def _gather_backend_config_file(self, wheel, backend, path):
-    #     """Find backend config file (eg: pyscript.toml) from a wheel and save it to
-    #     project pyscript.toml if found.
-
-    #     :param wheel: Wheel file to scan for configuration file.
-    #     :param backend: The backend type as a String (eg "pyscript")
-    #     :param path: Path to the wheels configuration file (config.toml). This should be
-    #         in the same directory as the backend configuration file.
-    #     """
-    #     backend_config = None
-    #     deploy_dir = path.parent
-
-    #     for deploy_file in wheel.namelist():
-    #         deploy_parent = Path(deploy_file).parent
-    #         if (
-    #             deploy_parent == deploy_dir
-    #             and Path(deploy_file).name == "pyscript.toml"
-    #         ):
-    #             # Save pyscript config file.
-    #             try:
-    #                 with wheel.open(deploy_file) as pyscript_file:
-    #                     backend_config = tomllib.load(pyscript_file)
-    #             except tomllib.TOMLDecodeError as e:
-    #                 raise BriefcaseConfigError(
-    #                     f"pyscript.toml content isn't valid TOML: {e}"
-    #                 ) from e
-    #     return backend_config
-
     def build_app(self, app: AppConfig, **kwargs):
         """Build the static web deployment for the application.
 
@@ -515,7 +457,7 @@ def build_app(self, app: AppConfig, **kwargs):
                 )
 
             # Write inserts per target
-            for target, target_inserts in inserts.items():
+            for target, target_inserts in sorted(inserts.items()):
                 self._write_inserts(app, Path(target), target_inserts)
 
         return {}

From 184e428147499e0812aa8d05c0d805fc89ab6bc4 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 25 Aug 2025 10:53:24 +0800
Subject: [PATCH 011/105] Addressing nesting issue in gather_backend_config

---
 src/briefcase/platforms/web/static.py | 89 ++++++++++++++-------------
 1 file changed, 47 insertions(+), 42 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f176cc5b4..6aa4f38fc 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -287,62 +287,67 @@ def _gather_backend_config(self, wheels):
 
         :param wheels: A list of wheel files to be scanned.
         """
-        config_counter = 0
         config_package = None
+        config_package_list = []
+        config_path = None
         pyscript_config = None
 
+        # Find packages containing a config.toml file.
         for wheelfile in wheels:
             with ZipFile(wheelfile) as wheel:
                 for filename in wheel.namelist():
                     path = Path(filename)
                     if (
-                        len(path.parts) > 1
+                        len(path.parts) == 3
                         and path.parts[1] == "deploy"
                         and path.name == "config.toml"
                     ):
                         self.console.info(f"    Found {filename}")
-                        config_counter += 1
-                        # Raise an error if more than one configuration file is supplied.
-                        if config_counter > 1:
-                            raise BriefcaseConfigError(
-                                f"""Only 1 backend configuration file can be supplied.
-                                Initial config.toml found in package: {config_package}
-                                Duplicate config.toml found in package: {wheel.filename}"""
-                            )
-                        config_package = wheel.filename
-
-                        # Check which backend type is used. Raise error if no backend is present in config.toml
-                        with wheel.open(filename) as config_file:
-                            config_data = tomllib.load(config_file)
-
-                            if "backend" in config_data:
-                                backend = config_data.get("backend")
-
-                                # Currently, only pyscript is supported, will raise an error if another backend is found.
-                                if backend != "pyscript":
-                                    raise BriefcaseConfigError(
-                                        "Only 'pyscript' backend is currently supported for web static builds."
-                                    )
-
-                                # Try to find pyscript.toml configuration file.
-                                try:
-                                    with wheel.open(
-                                        f"{path.parent}/pyscript.toml"
-                                    ) as pyscript_file:
-                                        pyscript_config = tomllib.load(pyscript_file)
-                                except KeyError:
-                                    raise BriefcaseConfigError(
-                                        f"Pyscript configuration file not found in package: {config_package}"
-                                    )
-                                # pyscript_config = self._gather_backend_config_file(wheel, backend, path)
-
-                            else:
-                                raise BriefcaseConfigError(
-                                    "No backend was provided in config.toml file."
-                                )
+                        config_package_list.append(wheelfile)
+                        config_path = path
+
         # Return a blank pyscript config if no configuration file is found.
-        if config_counter == 0 and pyscript_config is None:
+        if len(config_package_list) is 0:
             pyscript_config = {}
+        # Raise an error if more than one configuration file is supplied.
+        elif len(config_package_list) > 1:
+            raise BriefcaseConfigError(
+                f"""Only 1 backend configuration file can be supplied.
+                Initial config.toml found in package: {config_package}
+                Duplicate config.toml found in package: {wheel.filename}"""
+            )
+        # Gather a backend configuration file from the package.
+        # For now, is a pyscript.toml as no other backend is currently supported.
+        else:
+            with ZipFile(config_package_list[0]) as wheel:
+                filename = config_path.name
+                # Check which backend type is used.
+                with wheel.open(filename) as config_file:
+                    config_data = tomllib.load(config_file)
+
+                    if "backend" in config_data:
+                        backend = config_data.get("backend")
+
+                        # Currently, only pyscript is supported, will raise an error if another backend is found.
+                        if backend != "pyscript":
+                            raise BriefcaseConfigError(
+                                "Only 'pyscript' backend is currently supported for web static builds."
+                            )
+
+                        # Try to find pyscript.toml configuration file.
+                        try:
+                            with wheel.open(f"{path.parent}/pyscript.toml") as pyscript_file:
+                                pyscript_config = tomllib.load(pyscript_file)
+                        except KeyError:
+                            raise BriefcaseConfigError(
+                                f"Pyscript configuration file not found in package: {config_package}"
+                            )
+
+                    # Raise error if no backend is present in config.toml
+                    else:
+                        raise BriefcaseConfigError(
+                            "No backend was provided in config.toml file."
+                        )
 
         return pyscript_config
 

From 6ac471254d180886256ef50dcf48f47257244fd2 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 26 Aug 2025 08:41:48 +0800
Subject: [PATCH 012/105] function name and visibility changes

---
 src/briefcase/platforms/web/static.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 6aa4f38fc..7e6495bdf 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -100,7 +100,7 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def _write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
+    def write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
         """Write inserts into an existing file.
 
         This function looks for start and end markers in the named file and
@@ -281,7 +281,7 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                         f.write(wheel.read(filename))
                     continue
 
-    def _gather_backend_config(self, wheels):
+    def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
         file.
 
@@ -415,7 +415,7 @@ def build_app(self, app: AppConfig, **kwargs):
         with self.console.wait_bar("Writing Pyscript configuration file..."):
             # Load any pre-existing pyscript.toml provided by the template. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
-            config = self._gather_backend_config(self.wheel_path(app).glob("*.whl"))
+            config = self.extract_backend_config(self.wheel_path(app).glob("*.whl"))
 
             # Add the packages declaration to the existing pyscript.toml.
             # Ensure that we're using Unix path separators, as the content
@@ -463,7 +463,7 @@ def build_app(self, app: AppConfig, **kwargs):
 
             # Write inserts per target
             for target, target_inserts in sorted(inserts.items()):
-                self._write_inserts(app, Path(target), target_inserts)
+                self.write_inserts(app, Path(target), target_inserts)
 
         return {}
 

From b5eaa824dc0afc7c32fffc238dc0a9e18b95d75f Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 26 Aug 2025 09:08:51 +0800
Subject: [PATCH 013/105] write_inserts dict type annotation

---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 7e6495bdf..3be662078 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -100,7 +100,7 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def write_inserts(self, app: AppConfig, filename: Path, inserts: dict):
+    def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[str, str]]):
         """Write inserts into an existing file.
 
         This function looks for start and end markers in the named file and

From 99b3aedf12e4dbc067fb17d9cd6bd05435561605 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 26 Aug 2025 09:10:56 +0800
Subject: [PATCH 014/105] pattern defined outside of loop

---
 src/briefcase/platforms/web/static.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 3be662078..4ab6a8634 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -174,11 +174,11 @@ def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[s
 
             # Find first matching marker in file
             matched_style = None
+            pattern = re.compile(
+                pattern_tmpl.format(insert=insert),
+                flags=re.MULTILINE | re.DOTALL,
+            )
             for pattern_tmpl, repl_tmpl, kind in marker_styles:
-                pattern = re.compile(
-                    pattern_tmpl.format(insert=insert),
-                    flags=re.MULTILINE | re.DOTALL,
-                )
                 if matched_style is None and pattern.search(file_text):
                     matched_style = (pattern, repl_tmpl, kind)
 

From 7790ceb2856e9cfa9ba08192d21602b6079fb0d8 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 26 Aug 2025 09:23:40 +0800
Subject: [PATCH 015/105] remove continues from loop in _process_wheel

---
 src/briefcase/platforms/web/static.py | 94 +++++++++++++--------------
 1 file changed, 44 insertions(+), 50 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 4ab6a8634..0f8ab60e3 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -226,60 +226,54 @@ def _process_wheel(self, wheelfile, inserts, static_path):
         with ZipFile(wheelfile) as wheel:
             for filename in wheel.namelist():
                 # Skip directories and shallow paths
-                if filename.endswith("/"):
-                    continue
                 path = Path(filename)
                 parts = path.parts
-                if len(parts) < 3:
-                    continue
-
-                # Handle inserts under deploy/inserts
-                if parts[:2] == ("deploy", "inserts"):
-                    source = str(Path(*parts[2:]))
-
-                    try:
-                        target, insert = source.split(":", 1)
-                    except ValueError:
-                        self.console.warning(
-                            f"    {source}: missing ':<insert>'; skipping insert."
-                        )
-                        continue
+                if (len(parts) >= 3 and not (filename.endswith("/"))):
+                    # Handle inserts under deploy/inserts
+                    if parts[:2] == ("deploy", "inserts"):
+                        source = str(Path(*parts[2:]))
 
-                    self.console.info(
-                        f"    {source}: Adding {insert} insert for {target}"
-                    )
+                        try:
+                            target, insert = source.split(":", 1)
+                        except ValueError:
+                            self.console.warning(
+                                f"    {source}: missing ':<insert>'; skipping insert."
+                            )
+                            continue
 
-                    try:
-                        text = wheel.read(filename).decode("utf-8")
-                    except UnicodeDecodeError as e:
-                        raise BriefcaseCommandError(
-                            f"{source}: insert must be UTF-8 encoded"
-                        ) from e
-
-                    # Classify insert as HTML vs CSS/JS
-                    t_ext = Path(target).suffix.lower()
-                    kind = "css" if t_ext in {".css", ".js"} else "html"
-
-                    # Ensure nested dict structure exists
-                    pkg_entry = (
-                        inserts.setdefault(target, {})
-                        .setdefault(insert, {})
-                        .setdefault(package_key, {"html": "", "css": ""})
-                    )
-                    # Append into the right bucket
-                    if pkg_entry[kind]:
-                        pkg_entry[kind] += "\n"
-                    pkg_entry[kind] += text
-                    continue
-
-                # Handle static files under deploy/static
-                if parts[:2] == ("deploy", "static"):
-                    rel = Path(*parts[2:])
-                    outfilename = pkg_static_root / rel
-                    outfilename.parent.mkdir(parents=True, exist_ok=True)
-                    with outfilename.open("wb") as f:
-                        f.write(wheel.read(filename))
-                    continue
+                        self.console.info(
+                            f"    {source}: Adding {insert} insert for {target}"
+                        )
+
+                        try:
+                            text = wheel.read(filename).decode("utf-8")
+                        except UnicodeDecodeError as e:
+                            raise BriefcaseCommandError(
+                                f"{source}: insert must be UTF-8 encoded"
+                            ) from e
+
+                        # Classify insert as HTML vs CSS/JS
+                        t_ext = Path(target).suffix.lower()
+                        kind = "css" if t_ext in {".css", ".js"} else "html"
+
+                        # Ensure nested dict structure exists
+                        pkg_entry = (
+                            inserts.setdefault(target, {})
+                            .setdefault(insert, {})
+                            .setdefault(package_key, {"html": "", "css": ""})
+                        )
+                        # Append into the right bucket
+                        if pkg_entry[kind]:
+                            pkg_entry[kind] += "\n"
+                        pkg_entry[kind] += text
+
+                    # Handle static files under deploy/static
+                    elif parts[:2] == ("deploy", "static"):
+                        rel = Path(*parts[2:])
+                        outfilename = pkg_static_root / rel
+                        outfilename.parent.mkdir(parents=True, exist_ok=True)
+                        with outfilename.open("wb") as f:
+                            f.write(wheel.read(filename))
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From d1f9f74419c33a2c9362b3a17859d93d6080606a Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 26 Aug 2025 10:18:52 +0800
Subject: [PATCH 016/105] find pyscript.toml logic fix

---
 src/briefcase/platforms/web/static.py | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 0f8ab60e3..c61ecd27a 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -283,7 +283,7 @@ def extract_backend_config(self, wheels):
         """
         config_package = None
         config_package_list = []
-        config_path = None
+        config_filename = None
         pyscript_config = None
 
         # Find packages containing a config.toml file.
@@ -298,10 +298,10 @@ def extract_backend_config(self, wheels):
                     ):
                         self.console.info(f"    Found {filename}")
                         config_package_list.append(wheelfile)
-                        config_path = path
+                        config_filename = filename
 
         # Return a blank pyscript config if no configuration file is found.
-        if len(config_package_list) is 0:
+        if len(config_package_list) == 0:
             pyscript_config = {}
         # Raise an error if more than one configuration file is supplied.
         elif len(config_package_list) > 1:
@@ -314,9 +314,8 @@ def extract_backend_config(self, wheels):
         # For now, is a pyscript.toml as no other backend is currently supported.
         else:
             with ZipFile(config_package_list[0]) as wheel:
-                filename = config_path.name
                 # Check which backend type is used.
-                with wheel.open(filename) as config_file:
+                with wheel.open(config_filename) as config_file:
                     config_data = tomllib.load(config_file)
 
                     if "backend" in config_data:
@@ -328,13 +327,13 @@ def extract_backend_config(self, wheels):
                                 "Only 'pyscript' backend is currently supported for web static builds."
                             )
 
-                        # Try to find pyscript.toml configuration file.
+                        pyscript_path = config_filename.replace("config.toml", "pyscript.toml")
                         try:
-                            with wheel.open(f"{path.parent}/pyscript.toml") as pyscript_file:
+                            with wheel.open(pyscript_path) as pyscript_file:
                                 pyscript_config = tomllib.load(pyscript_file)
                         except KeyError:
                             raise BriefcaseConfigError(
-                                f"Pyscript configuration file not found in package: {config_package}"
+                                f"Pyscript configuration file not found in package: {config_package_list[0]}"
                             )
 
                     # Raise error if no backend is present in config.toml

From a520633e901558e20e6859b205f3e7c4b53b2c36 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 26 Aug 2025 10:25:16 +0800
Subject: [PATCH 017/105] Address review comments

Refactor web static build to remove fragile type inference, apply all marker styles per file and streamline wheel processing
---
 src/briefcase/platforms/web/static.py | 108 +++++++++++++-------------
 1 file changed, 53 insertions(+), 55 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index c61ecd27a..349c47bc0 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -128,9 +128,7 @@ def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[s
             return
 
         # Each insert slot and its package contributions are processed in sorted order
-        for insert, packages in sorted(inserts.items()):
-            packages = inserts[insert]
-
+        for insert, pkg_contribs in sorted(inserts.items()):
             html_banner = (
                 "<!--------------------------------------------------\n"
                 " * {package}\n"
@@ -144,6 +142,19 @@ def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[s
                 "{content}"
             )
 
+            # Build bodies from the same contributions
+            html_body = "\n".join(
+                html_banner.format(package=pkg, content=text)
+                for pkg, text in sorted(pkg_contribs.items())
+                if text
+            )
+            css_body = "\n".join(
+                css_banner.format(package=pkg, content=text)
+                for pkg, text in sorted(pkg_contribs.items())
+                if text
+            )
+            body_map = {"html": html_body, "css": css_body}
+
             # Marker patterns for HTML and CSS/JS
             marker_styles = [
                 # HTML
@@ -160,44 +171,31 @@ def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[s
                 ),
             ]
 
-            # Sort and build bodies for HTML and CSS inserts
-            html_body = "\n".join(
-                html_banner.format(package=pkg, content=pkg_content.get("html", ""))
-                for pkg, pkg_content in sorted(packages.items())
-                if pkg_content.get("html")
-            )
-            css_body = "\n".join(
-                css_banner.format(package=pkg, content=pkg_content.get("css", ""))
-                for pkg, pkg_content in sorted(packages.items())
-                if pkg_content.get("css")
-            )
-
-            # Find first matching marker in file
-            matched_style = None
-            pattern = re.compile(
-                pattern_tmpl.format(insert=insert),
-                flags=re.MULTILINE | re.DOTALL,
-            )
+            # Apply all matching marker styles
+            any_match = False
             for pattern_tmpl, repl_tmpl, kind in marker_styles:
-                if matched_style is None and pattern.search(file_text):
-                    matched_style = (pattern, repl_tmpl, kind)
-
-            if matched_style is not None:
-                # Replace marker region with assembled body
-                pattern, repl_tmpl, kind = matched_style
-                body = html_body if kind == "html" else css_body
-                file_text = pattern.sub(
-                    repl_tmpl.format(insert=insert, content=body),
-                    file_text,
+                pattern = re.compile(
+                    pattern_tmpl.format(insert=insert),
+                    flags=re.MULTILINE | re.DOTALL,
                 )
-            else:
+                if pattern.search(file_text):
+                    file_text = pattern.sub(
+                        repl_tmpl.format(insert=insert, content=body_map.get(kind, "")),
+                        file_text,
+                    )
+                    any_match = True
+
+            if not any_match:
                 self.console.warning(
                     f"  Slot '{insert}' markers not found in {filename}; skipping."
                 )
+
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 
-    def _process_wheel(self, wheelfile, inserts, static_path):
+    def _process_wheel(
+        self, wheelfile, inserts: dict[str, dict[str, dict[str, str]]], static_path
+    ):
         """Process a wheel, extracting any content that needs to be compiled into the
         final project.
 
@@ -252,28 +250,28 @@ def _process_wheel(self, wheelfile, inserts, static_path):
                                 f"{source}: insert must be UTF-8 encoded"
                             ) from e
 
-                        # Classify insert as HTML vs CSS/JS
-                        t_ext = Path(target).suffix.lower()
-                        kind = "css" if t_ext in {".css", ".js"} else "html"
+                    # Store raw contribution text per package
+                    pkg_map = (
+                    inserts
+                    .setdefault(target, {})
+                    .setdefault(insert, {})
+                    )
+                    # Append if the same package contributes multiple files for the same slot
+                    if package_key in pkg_map and pkg_map[package_key]:
+                        pkg_map[package_key] += "\n" + text
+                    else:
+                        pkg_map[package_key] = text
 
-                        # Ensure nested dict structure exists
-                        pkg_entry = (
-                            inserts.setdefault(target, {})
-                            .setdefault(insert, {})
-                            .setdefault(package_key, {"html": "", "css": ""})
-                        )
-                        # Append into the right bucket
-                        if pkg_entry[kind]:
-                            pkg_entry[kind] += "\n"
-                        pkg_entry[kind] += text
-
-                    # Handle static files under deploy/static
-                    elif parts[:2] == ("deploy", "static"):
-                        rel = Path(*parts[2:])
-                        outfilename = pkg_static_root / rel
-                        outfilename.parent.mkdir(parents=True, exist_ok=True)
-                        with outfilename.open("wb") as f:
-                            f.write(wheel.read(filename))
+                    continue
+
+                # Handle static files under deploy/static
+                if parts[:2] == ("deploy", "static"):
+                    rel = Path(*parts[2:])
+                    outfilename = pkg_static_root / rel
+                    outfilename.parent.mkdir(parents=True, exist_ok=True)
+                    with outfilename.open("wb") as f:
+                        f.write(wheel.read(filename))
+                    continue
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
@@ -443,7 +441,7 @@ def build_app(self, app: AppConfig, **kwargs):
                 sentinel=" ******************* Wheel contributed styles **********************/",
             )
 
-            inserts: dict[str, dict[str, dict[str, dict[str, str]]]] = {}
+            inserts: dict[str, dict[str, dict[str, str]]] = {}
             static_root = self.static_path(app)
 
             for wheelfile in sorted(self.wheel_path(app).glob("*.whl")):

From 920a95f230f5837ea3ca025ef598961007eac9ed Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 26 Aug 2025 12:18:26 +0800
Subject: [PATCH 018/105] Minor code update

---
 src/briefcase/platforms/web/static.py | 30 +++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 349c47bc0..608e44367 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -100,7 +100,9 @@ def _trim_file(self, path, sentinel):
             for line in content:
                 f.write(line)
 
-    def write_inserts(self, app: AppConfig, filename: Path, inserts: dict[str,dict[str, str]]):
+    def write_inserts(
+        self, app: AppConfig, filename: Path, inserts: dict[str, dict[str, str]]
+    ):
         """Write inserts into an existing file.
 
         This function looks for start and end markers in the named file and
@@ -226,7 +228,7 @@ def _process_wheel(
                 # Skip directories and shallow paths
                 path = Path(filename)
                 parts = path.parts
-                if (len(parts) >= 3 and not (filename.endswith("/"))):
+                if len(parts) >= 3 and not (filename.endswith("/")):
                     # Handle inserts under deploy/inserts
                     if parts[:2] == ("deploy", "inserts"):
                         source = str(Path(*parts[2:]))
@@ -250,19 +252,15 @@ def _process_wheel(
                                 f"{source}: insert must be UTF-8 encoded"
                             ) from e
 
-                    # Store raw contribution text per package
-                    pkg_map = (
-                    inserts
-                    .setdefault(target, {})
-                    .setdefault(insert, {})
-                    )
-                    # Append if the same package contributes multiple files for the same slot
-                    if package_key in pkg_map and pkg_map[package_key]:
-                        pkg_map[package_key] += "\n" + text
-                    else:
-                        pkg_map[package_key] = text
+                        # Store raw contribution text per package
+                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                        # Append if the same package contributes multiple files for the same slot
+                        if package_key in pkg_map and pkg_map[package_key]:
+                            pkg_map[package_key] += "\n" + text
+                        else:
+                            pkg_map[package_key] = text
 
-                    continue
+                        continue
 
                 # Handle static files under deploy/static
                 if parts[:2] == ("deploy", "static"):
@@ -325,7 +323,9 @@ def extract_backend_config(self, wheels):
                                 "Only 'pyscript' backend is currently supported for web static builds."
                             )
 
-                        pyscript_path = config_filename.replace("config.toml", "pyscript.toml")
+                        pyscript_path = config_filename.replace(
+                            "config.toml", "pyscript.toml"
+                        )
                         try:
                             with wheel.open(pyscript_path) as pyscript_file:
                                 pyscript_config = tomllib.load(pyscript_file)

From 6c1aa2a208cd95615662f37ee57374cf999c43d0 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 26 Aug 2025 13:11:45 +0800
Subject: [PATCH 019/105] Optimise write_inserts by pre-compiling regex
 patterns outside the loop

---
 src/briefcase/platforms/web/static.py | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 608e44367..134be7f48 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -173,13 +173,22 @@ def write_inserts(
                 ),
             ]
 
+            # Pre-compile patterns once per insert
+            compiled_markers = [
+                (
+                    re.compile(
+                        pattern_tmpl.format(insert=insert),
+                        flags=re.MULTILINE | re.DOTALL,
+                    ),
+                    repl_tmpl,
+                    kind,
+                )
+                for (pattern_tmpl, repl_tmpl, kind) in marker_styles
+            ]
+
             # Apply all matching marker styles
             any_match = False
-            for pattern_tmpl, repl_tmpl, kind in marker_styles:
-                pattern = re.compile(
-                    pattern_tmpl.format(insert=insert),
-                    flags=re.MULTILINE | re.DOTALL,
-                )
+            for pattern, repl_tmpl, kind in compiled_markers:
                 if pattern.search(file_text):
                     file_text = pattern.sub(
                         repl_tmpl.format(insert=insert, content=body_map.get(kind, "")),
@@ -192,6 +201,11 @@ def write_inserts(
                     f"  Slot '{insert}' markers not found in {filename}; skipping."
                 )
 
+                if not any_match:
+                    self.console.warning(
+                        f"  Slot '{insert}' markers not found in {filename}; skipping."
+                    )
+
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 

From c882bee018bc94bd71c54d6bd0f86ee79548968c Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 26 Aug 2025 13:19:06 +0800
Subject: [PATCH 020/105] Minor typo fix

---
 src/briefcase/platforms/web/static.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 134be7f48..c2fe833dc 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -201,11 +201,6 @@ def write_inserts(
                     f"  Slot '{insert}' markers not found in {filename}; skipping."
                 )
 
-                if not any_match:
-                    self.console.warning(
-                        f"  Slot '{insert}' markers not found in {filename}; skipping."
-                    )
-
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 

From 19e673b423e577669c3bec3640d66cb7d718495b Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 2 Sep 2025 10:02:22 +0800
Subject: [PATCH 021/105] Remove continues in process_wheel

---
 src/briefcase/platforms/web/static.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index c2fe833dc..b00cdf43c 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -269,16 +269,13 @@ def _process_wheel(
                         else:
                             pkg_map[package_key] = text
 
-                        continue
-
                 # Handle static files under deploy/static
-                if parts[:2] == ("deploy", "static"):
+                elif parts[:2] == ("deploy", "static"):
                     rel = Path(*parts[2:])
                     outfilename = pkg_static_root / rel
                     outfilename.parent.mkdir(parents=True, exist_ok=True)
                     with outfilename.open("wb") as f:
                         f.write(wheel.read(filename))
-                    continue
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From a618536741a73d9f4434e8d3bee5e5d7edf9a301 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 2 Sep 2025 10:09:01 +0800
Subject: [PATCH 022/105] remove continue from process_wheel

---
 src/briefcase/platforms/web/static.py | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index b00cdf43c..8b61f811d 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -244,30 +244,30 @@ def _process_wheel(
 
                         try:
                             target, insert = source.split(":", 1)
+
+                            self.console.info(
+                                f"    {source}: Adding {insert} insert for {target}"
+                            )
+
+                            try:
+                                text = wheel.read(filename).decode("utf-8")
+                            except UnicodeDecodeError as e:
+                                raise BriefcaseCommandError(
+                                    f"{source}: insert must be UTF-8 encoded"
+                                ) from e
+
+                            # Store raw contribution text per package
+                            pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                            # Append if the same package contributes multiple files for the same slot
+                            if package_key in pkg_map and pkg_map[package_key]:
+                                pkg_map[package_key] += "\n" + text
+                            else:
+                                pkg_map[package_key] = text
+
                         except ValueError:
                             self.console.warning(
                                 f"    {source}: missing ':<insert>'; skipping insert."
                             )
-                            continue
-
-                        self.console.info(
-                            f"    {source}: Adding {insert} insert for {target}"
-                        )
-
-                        try:
-                            text = wheel.read(filename).decode("utf-8")
-                        except UnicodeDecodeError as e:
-                            raise BriefcaseCommandError(
-                                f"{source}: insert must be UTF-8 encoded"
-                            ) from e
-
-                        # Store raw contribution text per package
-                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                        # Append if the same package contributes multiple files for the same slot
-                        if package_key in pkg_map and pkg_map[package_key]:
-                            pkg_map[package_key] += "\n" + text
-                        else:
-                            pkg_map[package_key] = text
 
                 # Handle static files under deploy/static
                 elif parts[:2] == ("deploy", "static"):

From e295e86ca653ced913b19b0a204c4571b9f288aa Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Tue, 2 Sep 2025 10:12:40 +0800
Subject: [PATCH 023/105] fix indentation issue with if-elif condition

---
 src/briefcase/platforms/web/static.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8b61f811d..634eeb776 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -269,13 +269,13 @@ def _process_wheel(
                                 f"    {source}: missing ':<insert>'; skipping insert."
                             )
 
-                # Handle static files under deploy/static
-                elif parts[:2] == ("deploy", "static"):
-                    rel = Path(*parts[2:])
-                    outfilename = pkg_static_root / rel
-                    outfilename.parent.mkdir(parents=True, exist_ok=True)
-                    with outfilename.open("wb") as f:
-                        f.write(wheel.read(filename))
+                    # Handle static files under deploy/static
+                    elif parts[:2] == ("deploy", "static"):
+                        rel = Path(*parts[2:])
+                        outfilename = pkg_static_root / rel
+                        outfilename.parent.mkdir(parents=True, exist_ok=True)
+                        with outfilename.open("wb") as f:
+                            f.write(wheel.read(filename))
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From 7e664a16b2317269bacbd199eac0e45aa8c38c18 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 2 Sep 2025 16:21:17 +0800
Subject: [PATCH 024/105] fix conditional logic error and update to match new
 insert content name format

---
 src/briefcase/platforms/web/static.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 634eeb776..8c4908989 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -239,11 +239,15 @@ def _process_wheel(
                 parts = path.parts
                 if len(parts) >= 3 and not (filename.endswith("/")):
                     # Handle inserts under deploy/inserts
-                    if parts[:2] == ("deploy", "inserts"):
+                    if (
+                        parts[1] == "deploy"
+                        and parts[2] == "inserts"
+                    ):
                         source = str(Path(*parts[2:]))
+                        self.console.info(f"    Found {filename}")
 
                         try:
-                            target, insert = source.split(":", 1)
+                            insert, target = parts[-1].split(".", 1)
 
                             self.console.info(
                                 f"    {source}: Adding {insert} insert for {target}"
@@ -270,7 +274,11 @@ def _process_wheel(
                             )
 
                     # Handle static files under deploy/static
-                    elif parts[:2] == ("deploy", "static"):
+                    elif (
+                        parts[1] == "deploy"
+                        and parts[2] == "static"
+                    ):
+                        self.console.info(f"    Found {filename}")
                         rel = Path(*parts[2:])
                         outfilename = pkg_static_root / rel
                         outfilename.parent.mkdir(parents=True, exist_ok=True)

From b1c06b9014535baaf5a87fb1959fc10ccd49e1ec Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 2 Sep 2025 16:31:31 +0800
Subject: [PATCH 025/105] removed unused line

---
 src/briefcase/platforms/web/static.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8c4908989..a2020f670 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -243,7 +243,6 @@ def _process_wheel(
                         parts[1] == "deploy"
                         and parts[2] == "inserts"
                     ):
-                        source = str(Path(*parts[2:]))
                         self.console.info(f"    Found {filename}")
 
                         try:

From 0130acbb2f39c2c5b970a43d83f29cb9fcea0db3 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 2 Sep 2025 16:50:32 +0800
Subject: [PATCH 026/105] remove reference to source

---
 src/briefcase/platforms/web/static.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index a2020f670..bf35b9061 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -249,14 +249,14 @@ def _process_wheel(
                             insert, target = parts[-1].split(".", 1)
 
                             self.console.info(
-                                f"    {source}: Adding {insert} insert for {target}"
+                                f"    {filename}: Adding {insert} insert for {target}"
                             )
 
                             try:
                                 text = wheel.read(filename).decode("utf-8")
                             except UnicodeDecodeError as e:
                                 raise BriefcaseCommandError(
-                                    f"{source}: insert must be UTF-8 encoded"
+                                    f"{filename}: insert must be UTF-8 encoded"
                                 ) from e
 
                             # Store raw contribution text per package

From f3e37c1c6bb024679ba49f0d70cf13c1c73a7754 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Wed, 3 Sep 2025 14:00:50 +0800
Subject: [PATCH 027/105] Functionality to insert pyscript version in
 index.html

---
 src/briefcase/platforms/web/static.py | 46 +++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index bf35b9061..8bc7a8288 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -204,6 +204,38 @@ def write_inserts(
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 
+    def write_pyscript_version(self, app: AppConfig, filename: Path, pyscript_version: str):
+        """Write pyscript version into an existing html file.
+
+        This function looks for markers in the named file and replaces the 
+        markers with the pyscript version.
+        
+        The markers are in pyscript declartions within the html.
+
+        * Marker: ``<!--@@ pyscript_version @@-->``
+        * Example: ``<link rel="stylesheet" href="https://pyscript.net/releases/<!--@@ pyscript_version @@-->/core.css">``
+
+        Pyscript versions are processed in sorted order to ensure deterministic builds.
+
+        :param app: The application being written.
+        :param filename: The html file whose pyscript version is to be written.
+        :param pyscript_version: The pyscript version number to be inserted.
+        """
+        # Load file content, skip if file not found
+        target_path = self.project_path(app) / filename
+        try:
+            file_text = target_path.read_text(encoding="utf-8")
+        except FileNotFoundError:
+            raise BriefcaseConfigError(f"{filename} not found; pyscript version could not be inserted.")
+        
+        marker = "<!--@@ pyscript_version @@-->"
+        if marker in file_text:
+            file_text = file_text.replace(marker, pyscript_version)
+        else:
+            raise BriefcaseConfigError(f"No pyscript markers found in {filename}; pyscript may not be configured correctly.")
+        
+        target_path.write_text(file_text, encoding="utf-8")
+
     def _process_wheel(
         self, wheelfile, inserts: dict[str, dict[str, dict[str, str]]], static_path
     ):
@@ -293,6 +325,7 @@ def extract_backend_config(self, wheels):
         config_package = None
         config_package_list = []
         config_filename = None
+        pyscript_version = "2024.11.1"
         pyscript_config = None
 
         # Find packages containing a config.toml file.
@@ -335,6 +368,11 @@ def extract_backend_config(self, wheels):
                             raise BriefcaseConfigError(
                                 "Only 'pyscript' backend is currently supported for web static builds."
                             )
+                        
+                        # Get pyscript version from config.toml. Use default if not present.
+
+                        if "version" in config_data:
+                            pyscript_version = config_data.get("version")
 
                         pyscript_path = config_filename.replace(
                             "config.toml", "pyscript.toml"
@@ -353,7 +391,7 @@ def extract_backend_config(self, wheels):
                             "No backend was provided in config.toml file."
                         )
 
-        return pyscript_config
+        return pyscript_config, pyscript_version
 
     def build_app(self, app: AppConfig, **kwargs):
         """Build the static web deployment for the application.
@@ -419,7 +457,7 @@ def build_app(self, app: AppConfig, **kwargs):
         with self.console.wait_bar("Writing Pyscript configuration file..."):
             # Load any pre-existing pyscript.toml provided by the template. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
-            config = self.extract_backend_config(self.wheel_path(app).glob("*.whl"))
+            config, pyscript_version = self.extract_backend_config(self.wheel_path(app).glob("*.whl"))
 
             # Add the packages declaration to the existing pyscript.toml.
             # Ensure that we're using Unix path separators, as the content
@@ -447,6 +485,10 @@ def build_app(self, app: AppConfig, **kwargs):
 
         self.console.info("Compile static web content from wheels")
         with self.console.wait_bar("Compiling static web content from wheels..."):
+
+            # Add pyscript_version to index.html
+            self.write_pyscript_version(app, Path("index.html"), pyscript_version)
+
             # Trim previously compiled content out of briefcase.css
             briefcase_css_path = self.project_path(app) / "static/css/briefcase.css"
             self._trim_file(

From 6416bd1a0a595191a17e1fc287c9e6db9cd7109c Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 8 Sep 2025 16:38:49 +0800
Subject: [PATCH 028/105] Update /static handling

Refactor process_wheel method to restore legacy '/static' CSS insert handling and handle CSS files from both legacy and deploy/inserts paths. Adds a warning when legacy '/static' CSS is detected. All CSS files are now added to static/css/briefcase.css with banner comments.
---
 src/briefcase/platforms/web/static.py | 177 ++++++++++++++++----------
 1 file changed, 110 insertions(+), 67 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8bc7a8288..cc4d375fd 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -204,13 +204,15 @@ def write_inserts(
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 
-    def write_pyscript_version(self, app: AppConfig, filename: Path, pyscript_version: str):
+    def write_pyscript_version(
+        self, app: AppConfig, filename: Path, pyscript_version: str
+    ):
         """Write pyscript version into an existing html file.
 
-        This function looks for markers in the named file and replaces the 
+        This function looks for markers in the named file and replaces the
         markers with the pyscript version.
-        
-        The markers are in pyscript declartions within the html.
+
+        The markers are in pyscript declarations within the html.
 
         * Marker: ``<!--@@ pyscript_version @@-->``
         * Example: ``<link rel="stylesheet" href="https://pyscript.net/releases/<!--@@ pyscript_version @@-->/core.css">``
@@ -226,95 +228,135 @@ def write_pyscript_version(self, app: AppConfig, filename: Path, pyscript_versio
         try:
             file_text = target_path.read_text(encoding="utf-8")
         except FileNotFoundError:
-            raise BriefcaseConfigError(f"{filename} not found; pyscript version could not be inserted.")
-        
+            raise BriefcaseConfigError(
+                f"{filename} not found; pyscript version could not be inserted."
+            )
+
         marker = "<!--@@ pyscript_version @@-->"
         if marker in file_text:
             file_text = file_text.replace(marker, pyscript_version)
         else:
-            raise BriefcaseConfigError(f"No pyscript markers found in {filename}; pyscript may not be configured correctly.")
-        
+            raise BriefcaseConfigError(
+                f"No pyscript markers found in {filename}; pyscript may not be configured correctly."
+            )
+
         target_path.write_text(file_text, encoding="utf-8")
 
     def _process_wheel(
         self, wheelfile, inserts: dict[str, dict[str, dict[str, str]]], static_path
     ):
-        """Process a wheel, extracting any content that needs to be compiled into the
-        final project.
-
-        Extracted content comes in two forms:
-        * inserts - pieces of content that will be inserted into existing files
-        * static - content that will be copied wholesale. Any content in a ``static``
-          folder inside the wheel will be copied as-is to the static folder,
-          namespaced by the package name of the wheel.
+        name_parts = wheelfile.name.split("-")
+        package_key = f"{name_parts[0]} {name_parts[1]}"
 
-        Any pre-existing static content for the wheel will be deleted.
-
-        :param wheelfile: The path to the wheel file to be processed.
-        :param inserts: The inserts collection for the app
-        :param static_path: The location where static content should be unpacked
-        """
-        parts = wheelfile.name.split("-")
-        package_name = parts[0]
-        package_version = parts[1]
-        package_key = f"{package_name} {package_version}"
-
-        # Purge any old static files for this wheel
-        pkg_static_root = static_path / package_name
-        if pkg_static_root.exists():
-            self.tools.shutil.rmtree(pkg_static_root)
+        # Warning flag for legacy CSS
+        legacy_css_warning = False
 
         with ZipFile(wheelfile) as wheel:
-            for filename in wheel.namelist():
+            for filename in sorted(wheel.namelist()):
                 # Skip directories and shallow paths
                 path = Path(filename)
                 parts = path.parts
-                if len(parts) >= 3 and not (filename.endswith("/")):
-                    # Handle inserts under deploy/inserts
+
+                if not (filename.endswith("/") or len(parts) < 2):
                     if (
-                        parts[1] == "deploy"
-                        and parts[2] == "inserts"
+                        len(parts) > 1
+                        and parts[1] == "static"
+                        and path.suffix == ".css"
                     ):
                         self.console.info(f"    Found {filename}")
 
-                        try:
-                            insert, target = parts[-1].split(".", 1)
-
-                            self.console.info(
-                                f"    {filename}: Adding {insert} insert for {target}"
+                        if not legacy_css_warning:
+                            self.console.warning(
+                                f"    {wheelfile.name}: legacy '/static' CSS detected; "
+                                "treating as insert into briefcase.css; this legacy handling will be removed in the future."
                             )
+                            legacy_css_warning = True
 
+                        try:
+                            css_text = wheel.read(filename).decode("utf-8")
+                        except UnicodeDecodeError as e:
+                            raise BriefcaseCommandError(
+                                f"{filename}: CSS content must be UTF-8 encoded"
+                            ) from e
+
+                        # legacy banner text/format
+                        rel_inside = "/".join(path.parts[2:])
+                        css_payload = (
+                            "\n/*******************************************************\n"
+                            f" * {package_key}::{rel_inside}\n"
+                            " *******************************************************/\n\n"
+                        ) + css_text
+
+                        # Funnel into CSS insert slot
+                        target = "static/css/briefcase.css"
+                        insert = "CSS"
+                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                        if package_key in pkg_map and pkg_map[package_key]:
+                            pkg_map[package_key] += "\n" + css_payload
+                        else:
+                            pkg_map[package_key] = css_payload
+
+                    # New deploy/inserts handling
+                    elif (
+                        len(parts) >= 3
+                        and parts[1] == "deploy"
+                        and parts[2] == "inserts"
+                    ):
+                        self.console.info(f"    Found {filename}")
+                        basename = parts[-1]
+
+                        # HTML inserts first
+                        if not basename.endswith(".css"):
                             try:
-                                text = wheel.read(filename).decode("utf-8")
+                                insert, target = basename.split(".", 1)
+                                self.console.info(
+                                    f"    {filename}: Adding {insert} insert for {target}"
+                                )
+                                try:
+                                    text = wheel.read(filename).decode("utf-8")
+                                except UnicodeDecodeError as e:
+                                    raise BriefcaseCommandError(
+                                        f"{filename}: insert must be UTF-8 encoded"
+                                    ) from e
+
+                                pkg_map = inserts.setdefault(target, {}).setdefault(
+                                    insert, {}
+                                )
+                                if package_key in pkg_map and pkg_map[package_key]:
+                                    pkg_map[package_key] += "\n" + text
+                                else:
+                                    pkg_map[package_key] = text
+
+                            except ValueError:
+                                self.console.debug(
+                                    f"    {filename}: not an <insert>.<target> name; skipping generic insert handling."
+                                )
+
+                        # CSS inserts
+                        if basename.endswith(".css"):
+                            try:
+                                css_text = wheel.read(filename).decode("utf-8")
                             except UnicodeDecodeError as e:
                                 raise BriefcaseCommandError(
                                     f"{filename}: insert must be UTF-8 encoded"
                                 ) from e
 
-                            # Store raw contribution text per package
-                            pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                            # Append if the same package contributes multiple files for the same slot
+                            rel_inside = "/".join(parts[3:]) or basename
+                            css_payload = (
+                                "\n/*******************************************************\n"
+                                f" * {package_key}::{rel_inside}\n"
+                                " *******************************************************/\n\n"
+                            ) + css_text
+
+                            target = "static/css/briefcase.css"
+                            insert = "CSS"
+                            pkg_map = inserts.setdefault(target, {}).setdefault(
+                                insert, {}
+                            )
                             if package_key in pkg_map and pkg_map[package_key]:
-                                pkg_map[package_key] += "\n" + text
+                                pkg_map[package_key] += "\n" + css_payload
                             else:
-                                pkg_map[package_key] = text
-
-                        except ValueError:
-                            self.console.warning(
-                                f"    {source}: missing ':<insert>'; skipping insert."
-                            )
-
-                    # Handle static files under deploy/static
-                    elif (
-                        parts[1] == "deploy"
-                        and parts[2] == "static"
-                    ):
-                        self.console.info(f"    Found {filename}")
-                        rel = Path(*parts[2:])
-                        outfilename = pkg_static_root / rel
-                        outfilename.parent.mkdir(parents=True, exist_ok=True)
-                        with outfilename.open("wb") as f:
-                            f.write(wheel.read(filename))
+                                pkg_map[package_key] = css_payload
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
@@ -368,7 +410,7 @@ def extract_backend_config(self, wheels):
                             raise BriefcaseConfigError(
                                 "Only 'pyscript' backend is currently supported for web static builds."
                             )
-                        
+
                         # Get pyscript version from config.toml. Use default if not present.
 
                         if "version" in config_data:
@@ -457,7 +499,9 @@ def build_app(self, app: AppConfig, **kwargs):
         with self.console.wait_bar("Writing Pyscript configuration file..."):
             # Load any pre-existing pyscript.toml provided by the template. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
-            config, pyscript_version = self.extract_backend_config(self.wheel_path(app).glob("*.whl"))
+            config, pyscript_version = self.extract_backend_config(
+                self.wheel_path(app).glob("*.whl")
+            )
 
             # Add the packages declaration to the existing pyscript.toml.
             # Ensure that we're using Unix path separators, as the content
@@ -485,7 +529,6 @@ def build_app(self, app: AppConfig, **kwargs):
 
         self.console.info("Compile static web content from wheels")
         with self.console.wait_bar("Compiling static web content from wheels..."):
-
             # Add pyscript_version to index.html
             self.write_pyscript_version(app, Path("index.html"), pyscript_version)
 

From 0029857d5981f9713ff1edc7550ffd9f6cdadf12 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 8 Sep 2025 16:57:10 +0800
Subject: [PATCH 029/105] Update the docstring and the inline comments of the
 process_wheel method

---
 src/briefcase/platforms/web/static.py | 33 +++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index cc4d375fd..8820883f1 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -245,6 +245,23 @@ def write_pyscript_version(
     def _process_wheel(
         self, wheelfile, inserts: dict[str, dict[str, dict[str, str]]], static_path
     ):
+        """Process a wheel to collect insert and style content for the final project.
+
+        Scans the wheel for:
+        * Legacy CSS – `.css` files under ``static/`` are appended to the
+        ``briefcase.css`` insert slot with a deprecation warning.
+        * HTML inserts – HTML header files under ``deploy/inserts/<insert>.<target>``
+        are added to the corresponding insert slot for the target file.
+        * CSS inserts – Any `.css` under ``deploy/inserts/`` is appended to
+        the ``briefcase.css`` insert slot.
+
+        Inserts are grouped by ``<package_name> <version>`` for ordering and
+        provenance. All content must be UTF-8 encoded.
+
+        :param wheelfile: Path to the wheel file.
+        :param inserts: Nested dict of inserts keyed by target - insert - package.
+        :param static_path: Path for static content.
+        """
         name_parts = wheelfile.name.split("-")
         package_key = f"{name_parts[0]} {name_parts[1]}"
 
@@ -258,13 +275,15 @@ def _process_wheel(
                 parts = path.parts
 
                 if not (filename.endswith("/") or len(parts) < 2):
+                    # Legacy CSS handling
                     if (
                         len(parts) > 1
                         and parts[1] == "static"
-                        and path.suffix == ".css"
+                        and path.suffix.lower == ".css"
                     ):
                         self.console.info(f"    Found {filename}")
 
+                        # Show deprecation warning once per wheel
                         if not legacy_css_warning:
                             self.console.warning(
                                 f"    {wheelfile.name}: legacy '/static' CSS detected; "
@@ -279,7 +298,7 @@ def _process_wheel(
                                 f"{filename}: CSS content must be UTF-8 encoded"
                             ) from e
 
-                        # legacy banner text/format
+                        # Wrap CSS with a source banner showing package and file
                         rel_inside = "/".join(path.parts[2:])
                         css_payload = (
                             "\n/*******************************************************\n"
@@ -287,7 +306,7 @@ def _process_wheel(
                             " *******************************************************/\n\n"
                         ) + css_text
 
-                        # Funnel into CSS insert slot
+                        # Add CSS content to briefcase.css insert slot
                         target = "static/css/briefcase.css"
                         insert = "CSS"
                         pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
@@ -305,9 +324,10 @@ def _process_wheel(
                         self.console.info(f"    Found {filename}")
                         basename = parts[-1]
 
-                        # HTML inserts first
+                        # HTML/other inserts
                         if not basename.endswith(".css"):
                             try:
+                                # Split filename into <insert> slot and <target>
                                 insert, target = basename.split(".", 1)
                                 self.console.info(
                                     f"    {filename}: Adding {insert} insert for {target}"
@@ -319,9 +339,11 @@ def _process_wheel(
                                         f"{filename}: insert must be UTF-8 encoded"
                                     ) from e
 
+                                # Store insert under the correct target and slot
                                 pkg_map = inserts.setdefault(target, {}).setdefault(
                                     insert, {}
                                 )
+                                # Append if package already contributed to this slot
                                 if package_key in pkg_map and pkg_map[package_key]:
                                     pkg_map[package_key] += "\n" + text
                                 else:
@@ -341,6 +363,7 @@ def _process_wheel(
                                     f"{filename}: insert must be UTF-8 encoded"
                                 ) from e
 
+                            # Wrap CSS with a source banner showing package and file
                             rel_inside = "/".join(parts[3:]) or basename
                             css_payload = (
                                 "\n/*******************************************************\n"
@@ -348,11 +371,13 @@ def _process_wheel(
                                 " *******************************************************/\n\n"
                             ) + css_text
 
+                            # Add CSS content to briefcase.css insert slot
                             target = "static/css/briefcase.css"
                             insert = "CSS"
                             pkg_map = inserts.setdefault(target, {}).setdefault(
                                 insert, {}
                             )
+                            # Append if package already has content for this slot
                             if package_key in pkg_map and pkg_map[package_key]:
                                 pkg_map[package_key] += "\n" + css_payload
                             else:

From 6a08c52ee3d7908e3e3d6ba414533a62833e9dc8 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 9 Sep 2025 11:22:36 +0800
Subject: [PATCH 030/105] Apply one-arg-per-line style to long function defs

---
 src/briefcase/platforms/web/static.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 8820883f1..ca61f46e4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -243,7 +243,10 @@ def write_pyscript_version(
         target_path.write_text(file_text, encoding="utf-8")
 
     def _process_wheel(
-        self, wheelfile, inserts: dict[str, dict[str, dict[str, str]]], static_path
+        self,
+        wheelfile,
+        inserts: dict[str, dict[str, dict[str, str]]],
+        static_path,
     ):
         """Process a wheel to collect insert and style content for the final project.
 

From bd1ea40ee6833bdafcf396c625df7bb109296113 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Tue, 9 Sep 2025 11:30:44 +0800
Subject: [PATCH 031/105] Apply one-arg-per-line style to long function defs

---
 src/briefcase/platforms/web/static.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index ca61f46e4..7d65b7fed 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -101,7 +101,10 @@ def _trim_file(self, path, sentinel):
                 f.write(line)
 
     def write_inserts(
-        self, app: AppConfig, filename: Path, inserts: dict[str, dict[str, str]]
+        self, 
+        app: AppConfig, 
+        filename: Path, 
+        inserts: dict[str, dict[str, str]]
     ):
         """Write inserts into an existing file.
 
@@ -205,7 +208,10 @@ def write_inserts(
         target_path.write_text(file_text, encoding="utf-8")
 
     def write_pyscript_version(
-        self, app: AppConfig, filename: Path, pyscript_version: str
+        self, 
+        app: AppConfig, 
+        filename: Path, 
+        pyscript_version: str
     ):
         """Write pyscript version into an existing html file.
 

From 7c8cb8fd893db584fde2b21115a1c2b4de43ef2f Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 15 Sep 2025 11:38:05 +0800
Subject: [PATCH 032/105] Change pyscript insertion to non-destructive

---
 src/briefcase/platforms/web/static.py | 31 +++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 7d65b7fed..824a46b2d 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -101,9 +101,9 @@ def _trim_file(self, path, sentinel):
                 f.write(line)
 
     def write_inserts(
-        self, 
-        app: AppConfig, 
-        filename: Path, 
+        self,
+        app: AppConfig,
+        filename: Path,
         inserts: dict[str, dict[str, str]]
     ):
         """Write inserts into an existing file.
@@ -208,9 +208,9 @@ def write_inserts(
         target_path.write_text(file_text, encoding="utf-8")
 
     def write_pyscript_version(
-        self, 
-        app: AppConfig, 
-        filename: Path, 
+        self,
+        app: AppConfig,
+        filename: Path,
         pyscript_version: str
     ):
         """Write pyscript version into an existing html file.
@@ -238,9 +238,22 @@ def write_pyscript_version(
                 f"{filename} not found; pyscript version could not be inserted."
             )
 
-        marker = "<!--@@ pyscript_version @@-->"
-        if marker in file_text:
-            file_text = file_text.replace(marker, pyscript_version)
+        marker = r"<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
+        insertion = f"""<!--@@ PyScript:start @@-->
+        <script type="module">
+            // Hide the splash screen when the page is ready.
+            import {{ hooks }} from "https://pyscript.net/releases/{pyscript_version}/core.js";
+            hooks.main.onReady.add(() => {{
+                document.getElementById("briefcase-splash").classList.add("hidden");
+            }});
+        </script>
+
+        <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
+        <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
+        <!--@@ PyScript:end @@-->"""
+        insertion = insertion.replace("pyscript_version", pyscript_version)
+        if re.search(marker, file_text, flags=re.DOTALL):
+            file_text = re.sub(marker, insertion, file_text, flags=re.DOTALL)
         else:
             raise BriefcaseConfigError(
                 f"No pyscript markers found in {filename}; pyscript may not be configured correctly."

From 3905608d6668c944b82fb57d35fe5e282cef4e63 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 15 Sep 2025 12:59:46 +0800
Subject: [PATCH 033/105] Simplify process_wheel by removing redundant guard
 and fix .lower() call

---
 src/briefcase/platforms/web/static.py | 172 ++++++++++++--------------
 1 file changed, 79 insertions(+), 93 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 824a46b2d..f199ddd7f 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -101,10 +101,7 @@ def _trim_file(self, path, sentinel):
                 f.write(line)
 
     def write_inserts(
-        self,
-        app: AppConfig,
-        filename: Path,
-        inserts: dict[str, dict[str, str]]
+        self, app: AppConfig, filename: Path, inserts: dict[str, dict[str, str]]
     ):
         """Write inserts into an existing file.
 
@@ -208,10 +205,7 @@ def write_inserts(
         target_path.write_text(file_text, encoding="utf-8")
 
     def write_pyscript_version(
-        self,
-        app: AppConfig,
-        filename: Path,
-        pyscript_version: str
+        self, app: AppConfig, filename: Path, pyscript_version: str
     ):
         """Write pyscript version into an existing html file.
 
@@ -265,7 +259,6 @@ def _process_wheel(
         self,
         wheelfile,
         inserts: dict[str, dict[str, dict[str, str]]],
-        static_path,
     ):
         """Process a wheel to collect insert and style content for the final project.
 
@@ -296,32 +289,92 @@ def _process_wheel(
                 path = Path(filename)
                 parts = path.parts
 
-                if not (filename.endswith("/") or len(parts) < 2):
-                    # Legacy CSS handling
-                    if (
-                        len(parts) > 1
-                        and parts[1] == "static"
-                        and path.suffix.lower == ".css"
-                    ):
-                        self.console.info(f"    Found {filename}")
+                # Legacy CSS handling
+                if (
+                    len(parts) > 1
+                    and parts[1] == "static"
+                    and path.suffix.lower() == ".css"
+                ):
+                    self.console.info(f"    Found {filename}")
+
+                    # Show deprecation warning once per wheel
+                    if not legacy_css_warning:
+                        self.console.warning(
+                            f"    {wheelfile.name}: legacy '/static' CSS detected; "
+                            "treating as insert into briefcase.css; this legacy handling will be removed in the future."
+                        )
+                        legacy_css_warning = True
+
+                    try:
+                        css_text = wheel.read(filename).decode("utf-8")
+                    except UnicodeDecodeError as e:
+                        raise BriefcaseCommandError(
+                            f"{filename}: CSS content must be UTF-8 encoded"
+                        ) from e
+
+                    # Wrap CSS with a source banner showing package and file
+                    rel_inside = "/".join(path.parts[2:])
+                    css_payload = (
+                        "\n/*******************************************************\n"
+                        f" * {package_key}::{rel_inside}\n"
+                        " *******************************************************/\n\n"
+                    ) + css_text
+
+                    # Add CSS content to briefcase.css insert slot
+                    target = "static/css/briefcase.css"
+                    insert = "CSS"
+                    pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                    if package_key in pkg_map and pkg_map[package_key]:
+                        pkg_map[package_key] += "\n" + css_payload
+                    else:
+                        pkg_map[package_key] = css_payload
+
+                # New deploy/inserts handling
+                elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
+                    self.console.info(f"    Found {filename}")
+                    basename = parts[-1]
+
+                    # HTML/other inserts
+                    if not basename.endswith(".css"):
+                        try:
+                            # Split filename into <insert> slot and <target>
+                            insert, target = basename.split(".", 1)
+                            self.console.info(
+                                f"    {filename}: Adding {insert} insert for {target}"
+                            )
+                            try:
+                                text = wheel.read(filename).decode("utf-8")
+                            except UnicodeDecodeError as e:
+                                raise BriefcaseCommandError(
+                                    f"{filename}: insert must be UTF-8 encoded"
+                                ) from e
+
+                            # Store insert under the correct target and slot
+                            pkg_map = inserts.setdefault(target, {}).setdefault(
+                                insert, {}
+                            )
+                            # Append if package already contributed to this slot
+                            if package_key in pkg_map and pkg_map[package_key]:
+                                pkg_map[package_key] += "\n" + text
+                            else:
+                                pkg_map[package_key] = text
 
-                        # Show deprecation warning once per wheel
-                        if not legacy_css_warning:
-                            self.console.warning(
-                                f"    {wheelfile.name}: legacy '/static' CSS detected; "
-                                "treating as insert into briefcase.css; this legacy handling will be removed in the future."
+                        except ValueError:
+                            self.console.debug(
+                                f"    {filename}: not an <insert>.<target> name; skipping generic insert handling."
                             )
-                            legacy_css_warning = True
 
+                    # CSS inserts
+                    if basename.endswith(".css"):
                         try:
                             css_text = wheel.read(filename).decode("utf-8")
                         except UnicodeDecodeError as e:
                             raise BriefcaseCommandError(
-                                f"{filename}: CSS content must be UTF-8 encoded"
+                                f"{filename}: insert must be UTF-8 encoded"
                             ) from e
 
                         # Wrap CSS with a source banner showing package and file
-                        rel_inside = "/".join(path.parts[2:])
+                        rel_inside = "/".join(parts[3:]) or basename
                         css_payload = (
                             "\n/*******************************************************\n"
                             f" * {package_key}::{rel_inside}\n"
@@ -332,79 +385,12 @@ def _process_wheel(
                         target = "static/css/briefcase.css"
                         insert = "CSS"
                         pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                        # Append if package already has content for this slot
                         if package_key in pkg_map and pkg_map[package_key]:
                             pkg_map[package_key] += "\n" + css_payload
                         else:
                             pkg_map[package_key] = css_payload
 
-                    # New deploy/inserts handling
-                    elif (
-                        len(parts) >= 3
-                        and parts[1] == "deploy"
-                        and parts[2] == "inserts"
-                    ):
-                        self.console.info(f"    Found {filename}")
-                        basename = parts[-1]
-
-                        # HTML/other inserts
-                        if not basename.endswith(".css"):
-                            try:
-                                # Split filename into <insert> slot and <target>
-                                insert, target = basename.split(".", 1)
-                                self.console.info(
-                                    f"    {filename}: Adding {insert} insert for {target}"
-                                )
-                                try:
-                                    text = wheel.read(filename).decode("utf-8")
-                                except UnicodeDecodeError as e:
-                                    raise BriefcaseCommandError(
-                                        f"{filename}: insert must be UTF-8 encoded"
-                                    ) from e
-
-                                # Store insert under the correct target and slot
-                                pkg_map = inserts.setdefault(target, {}).setdefault(
-                                    insert, {}
-                                )
-                                # Append if package already contributed to this slot
-                                if package_key in pkg_map and pkg_map[package_key]:
-                                    pkg_map[package_key] += "\n" + text
-                                else:
-                                    pkg_map[package_key] = text
-
-                            except ValueError:
-                                self.console.debug(
-                                    f"    {filename}: not an <insert>.<target> name; skipping generic insert handling."
-                                )
-
-                        # CSS inserts
-                        if basename.endswith(".css"):
-                            try:
-                                css_text = wheel.read(filename).decode("utf-8")
-                            except UnicodeDecodeError as e:
-                                raise BriefcaseCommandError(
-                                    f"{filename}: insert must be UTF-8 encoded"
-                                ) from e
-
-                            # Wrap CSS with a source banner showing package and file
-                            rel_inside = "/".join(parts[3:]) or basename
-                            css_payload = (
-                                "\n/*******************************************************\n"
-                                f" * {package_key}::{rel_inside}\n"
-                                " *******************************************************/\n\n"
-                            ) + css_text
-
-                            # Add CSS content to briefcase.css insert slot
-                            target = "static/css/briefcase.css"
-                            insert = "CSS"
-                            pkg_map = inserts.setdefault(target, {}).setdefault(
-                                insert, {}
-                            )
-                            # Append if package already has content for this slot
-                            if package_key in pkg_map and pkg_map[package_key]:
-                                pkg_map[package_key] += "\n" + css_payload
-                            else:
-                                pkg_map[package_key] = css_payload
-
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
         file.

From 36ec34b99ec35a71a8ce6367735139ed626efd51 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 15 Sep 2025 13:47:40 +0800
Subject: [PATCH 034/105] Remove duplicate CSS headers

Remove duplicate CSS headers and use a unique key per CSS file to avoid collisions
---
 src/briefcase/platforms/web/static.py | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f199ddd7f..54e6419ab 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -312,22 +312,14 @@ def _process_wheel(
                             f"{filename}: CSS content must be UTF-8 encoded"
                         ) from e
 
-                    # Wrap CSS with a source banner showing package and file
                     rel_inside = "/".join(path.parts[2:])
-                    css_payload = (
-                        "\n/*******************************************************\n"
-                        f" * {package_key}::{rel_inside}\n"
-                        " *******************************************************/\n\n"
-                    ) + css_text
+                    contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
 
                     # Add CSS content to briefcase.css insert slot
                     target = "static/css/briefcase.css"
                     insert = "CSS"
                     pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                    if package_key in pkg_map and pkg_map[package_key]:
-                        pkg_map[package_key] += "\n" + css_payload
-                    else:
-                        pkg_map[package_key] = css_payload
+                    pkg_map[contrib_key] = css_text
 
                 # New deploy/inserts handling
                 elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
@@ -375,21 +367,13 @@ def _process_wheel(
 
                         # Wrap CSS with a source banner showing package and file
                         rel_inside = "/".join(parts[3:]) or basename
-                        css_payload = (
-                            "\n/*******************************************************\n"
-                            f" * {package_key}::{rel_inside}\n"
-                            " *******************************************************/\n\n"
-                        ) + css_text
+                        contrib_key = f"{package_key} (deploy CSS: {rel_inside})"
 
                         # Add CSS content to briefcase.css insert slot
                         target = "static/css/briefcase.css"
                         insert = "CSS"
                         pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                        # Append if package already has content for this slot
-                        if package_key in pkg_map and pkg_map[package_key]:
-                            pkg_map[package_key] += "\n" + css_payload
-                        else:
-                            pkg_map[package_key] = css_payload
+                        pkg_map[contrib_key] = css_text
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From e03a754163776ba8832b37278b0fef43f9f60707 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 09:19:21 +0800
Subject: [PATCH 035/105] Simplified if-else failure logic in
 extract_backend_config

---
 src/briefcase/platforms/web/static.py | 48 +++++++++++++--------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 54e6419ab..47e37200d 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -412,44 +412,42 @@ def extract_backend_config(self, wheels):
                 Duplicate config.toml found in package: {wheel.filename}"""
             )
         # Gather a backend configuration file from the package.
-        # For now, is a pyscript.toml as no other backend is currently supported.
+        # For now, this is a pyscript.toml as no other backend is currently supported.
         else:
             with ZipFile(config_package_list[0]) as wheel:
                 # Check which backend type is used.
                 with wheel.open(config_filename) as config_file:
                     config_data = tomllib.load(config_file)
 
-                    if "backend" in config_data:
-                        backend = config_data.get("backend")
-
-                        # Currently, only pyscript is supported, will raise an error if another backend is found.
-                        if backend != "pyscript":
-                            raise BriefcaseConfigError(
-                                "Only 'pyscript' backend is currently supported for web static builds."
-                            )
-
-                        # Get pyscript version from config.toml. Use default if not present.
+                    # Fail if no backend is present in config.toml
+                    if "backend" not in config_data:
+                        raise BriefcaseConfigError(
+                            "No backend was provided in config.toml file."
+                        )
 
-                        if "version" in config_data:
-                            pyscript_version = config_data.get("version")
+                    backend = config_data.get("backend")
 
-                        pyscript_path = config_filename.replace(
-                            "config.toml", "pyscript.toml"
+                    # Currently, only pyscript is supported. Warn if another backend is found.
+                    if backend is not "pyscript":
+                        self.console.warning(
+                            "Only 'pyscript' backend is currently supported for web static builds."
+                            "This project may not work correctly."
                         )
-                        try:
-                            with wheel.open(pyscript_path) as pyscript_file:
-                                pyscript_config = tomllib.load(pyscript_file)
-                        except KeyError:
-                            raise BriefcaseConfigError(
-                                f"Pyscript configuration file not found in package: {config_package_list[0]}"
-                            )
 
-                    # Raise error if no backend is present in config.toml
-                    else:
+                    # Get pyscript version from config.toml. Use default if not present.
+                    pyscript_version = config_data.get("version", pyscript_version)
+
+                    # Extract pyscript.toml
+                    pyscript_path = config_filename.replace("config.toml", "pyscript.toml")
+                    try:
+                        with wheel.open(pyscript_path) as pyscript_file:
+                            pyscript_config = tomllib.load(pyscript_file)
+                    except KeyError:
                         raise BriefcaseConfigError(
-                            "No backend was provided in config.toml file."
+                            f"Pyscript configuration file not found in package: {config_package_list[0]}"
                         )
 
+
         return pyscript_config, pyscript_version
 
     def build_app(self, app: AppConfig, **kwargs):

From 5ad56fe37623d85667aaffaa2bbb4899bfc1e9a2 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 09:43:35 +0800
Subject: [PATCH 036/105] Change failures to warnings in
 write_pryscript_version for backwards compatibility.

---
 src/briefcase/platforms/web/static.py | 31 +++++++++++++++------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 47e37200d..d0c334904 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -209,30 +209,29 @@ def write_pyscript_version(
     ):
         """Write pyscript version into an existing html file.
 
-        This function looks for markers in the named file and replaces the
-        markers with the pyscript version.
+        This function looks for markers in the named file and appends
+        pyscript definitions between the markers.
 
-        The markers are in pyscript declarations within the html.
-
-        * Marker: ``<!--@@ pyscript_version @@-->``
-        * Example: ``<link rel="stylesheet" href="https://pyscript.net/releases/<!--@@ pyscript_version @@-->/core.css">``
-
-        Pyscript versions are processed in sorted order to ensure deterministic builds.
+        * Start: <!--@@ PyScript:start @@-->
+        * End:   <!--@@ PyScript:end @@-->
 
         :param app: The application being written.
         :param filename: The html file whose pyscript version is to be written.
         :param pyscript_version: The pyscript version number to be inserted.
         """
-        # Load file content, skip if file not found
+        # Load file content. Raise a warning if the file is not found
         target_path = self.project_path(app) / filename
         try:
             file_text = target_path.read_text(encoding="utf-8")
         except FileNotFoundError:
-            raise BriefcaseConfigError(
-                f"{filename} not found; pyscript version could not be inserted."
+            self.console.warning(
+                f"Target {filename} not found in {target_path}; skipping pyscript insertion."
+                "This project may not work correctly."
             )
 
         marker = r"<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
+
+        # PyScript definitions for insertion:
         insertion = f"""<!--@@ PyScript:start @@-->
         <script type="module">
             // Hide the splash screen when the page is ready.
@@ -245,12 +244,16 @@ def write_pyscript_version(
         <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
         <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
         <!--@@ PyScript:end @@-->"""
-        insertion = insertion.replace("pyscript_version", pyscript_version)
+
+        # Replace content between markers with PyScript definition insertions.
         if re.search(marker, file_text, flags=re.DOTALL):
             file_text = re.sub(marker, insertion, file_text, flags=re.DOTALL)
+        # Warning if no markers were found.
+        # NOTE: this is likely due to using an older version of the Web Template.
         else:
-            raise BriefcaseConfigError(
-                f"No pyscript markers found in {filename}; pyscript may not be configured correctly."
+            self.console.warning(
+                f"No pyscript markers found in {filename}; PyScript may not be configured correctly."
+                "Please ensure you are using the latest version of Briefcase Static Web Template"
             )
 
         target_path.write_text(file_text, encoding="utf-8")

From 58a0da08a48b5ebbe200a624fff91609917546b0 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 09:48:11 +0800
Subject: [PATCH 037/105] enforce one-arg-per-line formatting

---
 src/briefcase/platforms/web/static.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index d0c334904..ce3d75e90 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -101,7 +101,10 @@ def _trim_file(self, path, sentinel):
                 f.write(line)
 
     def write_inserts(
-        self, app: AppConfig, filename: Path, inserts: dict[str, dict[str, str]]
+        self,
+        app: AppConfig,
+        filename: Path,
+        inserts: dict[str, dict[str, str]],
     ):
         """Write inserts into an existing file.
 
@@ -205,7 +208,10 @@ def write_inserts(
         target_path.write_text(file_text, encoding="utf-8")
 
     def write_pyscript_version(
-        self, app: AppConfig, filename: Path, pyscript_version: str
+        self,
+        app: AppConfig,
+        filename: Path,
+        pyscript_version: str,
     ):
         """Write pyscript version into an existing html file.
 

From 926d28856846c44dd430430c8db8237e7e2692c7 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 17:39:27 +0800
Subject: [PATCH 038/105] Minor edits

edited comment to match updated process
removed duplicate console logging.
---
 src/briefcase/platforms/web/static.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index ce3d75e90..1c88fc40e 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -521,7 +521,7 @@ def build_app(self, app: AppConfig, **kwargs):
                 ) from e
 
         with self.console.wait_bar("Writing Pyscript configuration file..."):
-            # Load any pre-existing pyscript.toml provided by the template. If the file
+            # Load any pre-existing pyscript.toml provided by a GUI Toolkit. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
             config, pyscript_version = self.extract_backend_config(
                 self.wheel_path(app).glob("*.whl")
@@ -551,7 +551,6 @@ def build_app(self, app: AppConfig, **kwargs):
             with (self.project_path(app) / "pyscript.toml").open("wb") as f:
                 tomli_w.dump(config, f)
 
-        self.console.info("Compile static web content from wheels")
         with self.console.wait_bar("Compiling static web content from wheels..."):
             # Add pyscript_version to index.html
             self.write_pyscript_version(app, Path("index.html"), pyscript_version)

From 482a169e3c3d3bcf15168b54f7f2192df901c52c Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 18:41:30 +0800
Subject: [PATCH 039/105] Further simplify nested if-else logic within
 extract_backend_config()

---
 src/briefcase/platforms/web/static.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 1c88fc40e..31dfbe437 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -424,20 +424,19 @@ def extract_backend_config(self, wheels):
         # For now, this is a pyscript.toml as no other backend is currently supported.
         else:
             with ZipFile(config_package_list[0]) as wheel:
-                # Check which backend type is used.
                 with wheel.open(config_filename) as config_file:
                     config_data = tomllib.load(config_file)
 
+                    # Gather backend type from config.toml
+                    backend = config_data.get("backend", None)
+
                     # Fail if no backend is present in config.toml
-                    if "backend" not in config_data:
+                    if backend is None:
                         raise BriefcaseConfigError(
                             "No backend was provided in config.toml file."
                         )
-
-                    backend = config_data.get("backend")
-
                     # Currently, only pyscript is supported. Warn if another backend is found.
-                    if backend is not "pyscript":
+                    elif backend is not "pyscript":
                         self.console.warning(
                             "Only 'pyscript' backend is currently supported for web static builds."
                             "This project may not work correctly."

From 0a9f76c5b1af99bb19247710014c9ef41617e22d Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Tue, 16 Sep 2025 19:12:31 +0800
Subject: [PATCH 040/105] remove unused static_path variable

---
 src/briefcase/platforms/web/static.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 31dfbe437..6a47f1d86 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -284,7 +284,6 @@ def _process_wheel(
 
         :param wheelfile: Path to the wheel file.
         :param inserts: Nested dict of inserts keyed by target - insert - package.
-        :param static_path: Path for static content.
         """
         name_parts = wheelfile.name.split("-")
         package_key = f"{name_parts[0]} {name_parts[1]}"
@@ -436,7 +435,7 @@ def extract_backend_config(self, wheels):
                             "No backend was provided in config.toml file."
                         )
                     # Currently, only pyscript is supported. Warn if another backend is found.
-                    elif backend is not "pyscript":
+                    elif backend != "pyscript":
                         self.console.warning(
                             "Only 'pyscript' backend is currently supported for web static builds."
                             "This project may not work correctly."
@@ -569,7 +568,6 @@ def build_app(self, app: AppConfig, **kwargs):
                 self._process_wheel(
                     wheelfile=wheelfile,
                     inserts=inserts,
-                    static_path=static_root,
                 )
 
             # Write inserts per target

From 3cfbfc78ba0c7c73c0de31dd98bbe090b0df4735 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 17 Sep 2025 14:08:36 +0800
Subject: [PATCH 041/105] Unify wheel insert handling and escape slot regex

Use full insert path to avoid filename collisions in write_inserts, and treat CSS like any other insert in process_wheel
---
 src/briefcase/platforms/web/static.py | 112 +++++++++++---------------
 1 file changed, 47 insertions(+), 65 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 6a47f1d86..0f238cde8 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -113,12 +113,12 @@ def write_inserts(
 
         Multiple formats of insert marker are inspected to accommodate HTML
         and CSS/JS comment conventions:
-        * HTML: ``<!--@@ insert:start @@-->`` and ``<!--@@ insert:end @@-->``
-        * CSS/JS: ``/*@@ insert:start @@*/`` and ``/*@@ insert:end @@*/``
+        * HTML: `<!--@@ insert:start @@--> and <!--@@ insert:end @@-->
+        * CSS/JS: `/*@@ insert:start @@*/ and /*@@ insert:end @@*/
 
         Inserts and package contributions are processed in sorted order to ensure deterministic builds.
 
-        :param app: The application whose ``pyscript.toml`` is being written.
+        :param app: The application whose `pyscript.toml is being written.
         :param filename: The file whose insert is to be written.
         :param inserts: The inserts for the file. A 2 level dictionary, keyed by
             the name of the insert to add, and then package that contributed the
@@ -160,33 +160,26 @@ def write_inserts(
             )
             body_map = {"html": html_body, "css": css_body}
 
-            # Marker patterns for HTML and CSS/JS
-            marker_styles = [
-                # HTML
+            slot = re.escape(insert)
+
+            # Build the compiled patterns directly once per slot
+            compiled_markers = [
                 (
-                    r"<!--@@ {insert}:start @@-->.*?<!--@@ {insert}:end @@-->",
+                    re.compile(
+                        rf"<!--@@ {slot}:start @@-->.*?<!--@@ {slot}:end @@-->",
+                        flags=re.MULTILINE | re.DOTALL,
+                    ),
                     r"<!--@@ {insert}:start @@-->\n{content}<!--@@ {insert}:end @@-->",
                     "html",
                 ),
-                # CSS/JS
-                (
-                    r"/\*@@ {insert}:start @@\*/.*?/\*@@ {insert}:end @@\*/",
-                    r"/*@@ {insert}:start @@*/\n{content}/*@@ {insert}:end @@*/",
-                    "css",
-                ),
-            ]
-
-            # Pre-compile patterns once per insert
-            compiled_markers = [
                 (
                     re.compile(
-                        pattern_tmpl.format(insert=insert),
+                        rf"/\*@@ {slot}:start @@\*/.*?/\*@@ {slot}:end @@\*/",
                         flags=re.MULTILINE | re.DOTALL,
                     ),
-                    repl_tmpl,
-                    kind,
-                )
-                for (pattern_tmpl, repl_tmpl, kind) in marker_styles
+                    r"/*@@ {insert}:start @@*/\n{content}/*@@ {insert}:end @@*/",
+                    "css",
+                ),
             ]
 
             # Apply all matching marker styles
@@ -272,15 +265,11 @@ def _process_wheel(
         """Process a wheel to collect insert and style content for the final project.
 
         Scans the wheel for:
-        * Legacy CSS – `.css` files under ``static/`` are appended to the
-        ``briefcase.css`` insert slot with a deprecation warning.
-        * HTML inserts – HTML header files under ``deploy/inserts/<insert>.<target>``
-        are added to the corresponding insert slot for the target file.
-        * CSS inserts – Any `.css` under ``deploy/inserts/`` is appended to
-        the ``briefcase.css`` insert slot.
-
-        Inserts are grouped by ``<package_name> <version>`` for ordering and
-        provenance. All content must be UTF-8 encoded.
+        * Legacy CSS – .css files under `static/ are appended to the
+        `briefcase.css insert slot with a deprecation warning.
+        * Deploy inserts – Any files under `deploy/inserts/<insert>.<target>
+        (HTML, CSS, JS, etc.) are added to the corresponding insert slot for
+        the target file.
 
         :param wheelfile: Path to the wheel file.
         :param inserts: Nested dict of inserts keyed by target - insert - package.
@@ -327,18 +316,30 @@ def _process_wheel(
                     target = "static/css/briefcase.css"
                     insert = "CSS"
                     pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                    pkg_map[contrib_key] = css_text
+                    if contrib_key in pkg_map and pkg_map[contrib_key]:
+                        pkg_map[contrib_key] += "\n" + css_text
+                    else:
+                        pkg_map[contrib_key] = css_text
 
                 # New deploy/inserts handling
                 elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
                     self.console.info(f"    Found {filename}")
-                    basename = parts[-1]
+                    rel_inside = "/".join(parts[3:])
 
-                    # HTML/other inserts
-                    if not basename.endswith(".css"):
+                    if not rel_inside or rel_inside.endswith("/"):
+                        self.console.debug(
+                            f"    {filename}: skipping, not a valid insert file."
+                        )
+                    else:
                         try:
-                            # Split filename into <insert> slot and <target>
-                            insert, target = basename.split(".", 1)
+                            dot_idx = rel_inside.index(".")
+                            insert = rel_inside[:dot_idx]
+                            target = rel_inside[dot_idx + 1 :]
+                        except ValueError:
+                            self.console.debug(
+                                f"    {filename}: skipping, filename must match '<insert>.<target>'."
+                            )
+                        else:
                             self.console.info(
                                 f"    {filename}: Adding {insert} insert for {target}"
                             )
@@ -349,39 +350,20 @@ def _process_wheel(
                                     f"{filename}: insert must be UTF-8 encoded"
                                 ) from e
 
-                            # Store insert under the correct target and slot
+                            contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
+
                             pkg_map = inserts.setdefault(target, {}).setdefault(
                                 insert, {}
                             )
-                            # Append if package already contributed to this slot
                             if package_key in pkg_map and pkg_map[package_key]:
                                 pkg_map[package_key] += "\n" + text
                             else:
                                 pkg_map[package_key] = text
 
-                        except ValueError:
-                            self.console.debug(
-                                f"    {filename}: not an <insert>.<target> name; skipping generic insert handling."
-                            )
-
-                    # CSS inserts
-                    if basename.endswith(".css"):
-                        try:
-                            css_text = wheel.read(filename).decode("utf-8")
-                        except UnicodeDecodeError as e:
-                            raise BriefcaseCommandError(
-                                f"{filename}: insert must be UTF-8 encoded"
-                            ) from e
-
-                        # Wrap CSS with a source banner showing package and file
-                        rel_inside = "/".join(parts[3:]) or basename
-                        contrib_key = f"{package_key} (deploy CSS: {rel_inside})"
-
-                        # Add CSS content to briefcase.css insert slot
-                        target = "static/css/briefcase.css"
-                        insert = "CSS"
-                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                        pkg_map[contrib_key] = css_text
+                else:
+                    self.console.debug(
+                        f"    {filename}: skipping, not a supported insert."
+                    )
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml
@@ -445,7 +427,9 @@ def extract_backend_config(self, wheels):
                     pyscript_version = config_data.get("version", pyscript_version)
 
                     # Extract pyscript.toml
-                    pyscript_path = config_filename.replace("config.toml", "pyscript.toml")
+                    pyscript_path = config_filename.replace(
+                        "config.toml", "pyscript.toml"
+                    )
                     try:
                         with wheel.open(pyscript_path) as pyscript_file:
                             pyscript_config = tomllib.load(pyscript_file)
@@ -454,7 +438,6 @@ def extract_backend_config(self, wheels):
                             f"Pyscript configuration file not found in package: {config_package_list[0]}"
                         )
 
-
         return pyscript_config, pyscript_version
 
     def build_app(self, app: AppConfig, **kwargs):
@@ -561,7 +544,6 @@ def build_app(self, app: AppConfig, **kwargs):
             )
 
             inserts: dict[str, dict[str, dict[str, str]]] = {}
-            static_root = self.static_path(app)
 
             for wheelfile in sorted(self.wheel_path(app).glob("*.whl")):
                 self.console.info(f"  Processing {wheelfile.name}...")

From a124d40da57403ee552a1d8aaaf51b07c256d398 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 17 Sep 2025 19:56:41 +0800
Subject: [PATCH 042/105] Indent insertion content and markers within
 write_inserts()

---
 src/briefcase/platforms/web/static.py | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 0f238cde8..f5760d71d 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -7,6 +7,7 @@
 from pathlib import Path
 from typing import Any
 from zipfile import ZipFile
+from textwrap import indent
 
 from briefcase.console import Console
 from briefcase.exceptions import (
@@ -113,12 +114,12 @@ def write_inserts(
 
         Multiple formats of insert marker are inspected to accommodate HTML
         and CSS/JS comment conventions:
-        * HTML: `<!--@@ insert:start @@--> and <!--@@ insert:end @@-->
-        * CSS/JS: `/*@@ insert:start @@*/ and /*@@ insert:end @@*/
+        * HTML: `<!--@@ insert:start @@--> and <!--@@ insert:end @@-->`
+        * CSS/JS: `/*@@ insert:start @@*/ and /*@@ insert:end @@*/`
 
         Inserts and package contributions are processed in sorted order to ensure deterministic builds.
 
-        :param app: The application whose `pyscript.toml is being written.
+        :param app: The application whose `pyscript.toml` is being written.
         :param filename: The file whose insert is to be written.
         :param inserts: The inserts for the file. A 2 level dictionary, keyed by
             the name of the insert to add, and then package that contributed the
@@ -166,18 +167,18 @@ def write_inserts(
             compiled_markers = [
                 (
                     re.compile(
-                        rf"<!--@@ {slot}:start @@-->.*?<!--@@ {slot}:end @@-->",
+                        rf"(^\s*)<!--@@ {slot}:start @@-->.*?<!--@@ {slot}:end @@-->",
                         flags=re.MULTILINE | re.DOTALL,
                     ),
-                    r"<!--@@ {insert}:start @@-->\n{content}<!--@@ {insert}:end @@-->",
+                    r"{indent}<!--@@ {insert}:start @@-->\n{content}{indent}<!--@@ {insert}:end @@-->",
                     "html",
                 ),
                 (
                     re.compile(
-                        rf"/\*@@ {slot}:start @@\*/.*?/\*@@ {slot}:end @@\*/",
+                        rf"(^\s*)/\*@@ {slot}:start @@\*/.*?/\*@@ {slot}:end @@\*/",
                         flags=re.MULTILINE | re.DOTALL,
                     ),
-                    r"/*@@ {insert}:start @@*/\n{content}/*@@ {insert}:end @@*/",
+                    r"{indent}/*@@ {insert}:start @@*/\n{content}{indent}/*@@ {insert}:end @@*/",
                     "css",
                 ),
             ]
@@ -185,9 +186,13 @@ def write_inserts(
             # Apply all matching marker styles
             any_match = False
             for pattern, repl_tmpl, kind in compiled_markers:
-                if pattern.search(file_text):
+                # Search for pattern within file.
+                pattern_found = pattern.search(file_text)
+                if pattern_found:
+                    # Indent content to align with markers.
+                    indented_content = indent(body_map.get(kind, ""), pattern_found.group(1))
                     file_text = pattern.sub(
-                        repl_tmpl.format(insert=insert, content=body_map.get(kind, "")),
+                        repl_tmpl.format(indent=pattern_found.group(1), insert=insert, content=indented_content),
                         file_text,
                     )
                     any_match = True

From 1e8814c7fdd209b969a9c63bf4bff5e7e378b239 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 17 Sep 2025 21:04:11 +0800
Subject: [PATCH 043/105] Apply matching indentation to write_pyscript_version

---
 src/briefcase/platforms/web/static.py | 48 ++++++++++++++++-----------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f5760d71d..771a92ae4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -7,7 +7,7 @@
 from pathlib import Path
 from typing import Any
 from zipfile import ZipFile
-from textwrap import indent
+from textwrap import indent, dedent
 
 from briefcase.console import Console
 from briefcase.exceptions import (
@@ -167,7 +167,7 @@ def write_inserts(
             compiled_markers = [
                 (
                     re.compile(
-                        rf"(^\s*)<!--@@ {slot}:start @@-->.*?<!--@@ {slot}:end @@-->",
+                        rf"(^[ \t]*)<!--@@ {slot}:start @@-->.*?<!--@@ {slot}:end @@-->",
                         flags=re.MULTILINE | re.DOTALL,
                     ),
                     r"{indent}<!--@@ {insert}:start @@-->\n{content}{indent}<!--@@ {insert}:end @@-->",
@@ -175,7 +175,7 @@ def write_inserts(
                 ),
                 (
                     re.compile(
-                        rf"(^\s*)/\*@@ {slot}:start @@\*/.*?/\*@@ {slot}:end @@\*/",
+                        rf"(^[ \t]*)/\*@@ {slot}:start @@\*/.*?/\*@@ {slot}:end @@\*/",
                         flags=re.MULTILINE | re.DOTALL,
                     ),
                     r"{indent}/*@@ {insert}:start @@*/\n{content}{indent}/*@@ {insert}:end @@*/",
@@ -230,28 +230,36 @@ def write_pyscript_version(
         except FileNotFoundError:
             self.console.warning(
                 f"Target {filename} not found in {target_path}; skipping pyscript insertion."
-                "This project may not work correctly."
+                "PyScript may not be configured correctly. This project may not work correctly."
             )
 
-        marker = r"<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
-
         # PyScript definitions for insertion:
-        insertion = f"""<!--@@ PyScript:start @@-->
-        <script type="module">
-            // Hide the splash screen when the page is ready.
-            import {{ hooks }} from "https://pyscript.net/releases/{pyscript_version}/core.js";
-            hooks.main.onReady.add(() => {{
-                document.getElementById("briefcase-splash").classList.add("hidden");
-            }});
-        </script>
-
-        <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
-        <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
-        <!--@@ PyScript:end @@-->"""
+        content = (f"""\
+            <!--@@ PyScript:start @@-->
+            <script type="module">
+                // Hide the splash screen when the page is ready.
+                import {{ hooks }} from "https://pyscript.net/releases/{pyscript_version}/core.js";
+                hooks.main.onReady.add(() => {{
+                    document.getElementById("briefcase-splash").classList.add("hidden");
+                }});
+            </script>
+
+            <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
+            <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
+            <!--@@ PyScript:end @@-->
+            """
+        )
 
         # Replace content between markers with PyScript definition insertions.
-        if re.search(marker, file_text, flags=re.DOTALL):
-            file_text = re.sub(marker, insertion, file_text, flags=re.DOTALL)
+        marker = r"(^[ \t]*)<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
+        marker_found = re.search(marker, file_text, flags=re.DOTALL | re.MULTILINE)
+
+        if marker_found:
+            indented_content = indent(
+                dedent(content),
+                marker_found.group(1),
+            )
+            file_text = re.sub(marker, indented_content, file_text, flags=re.DOTALL | re.MULTILINE)
         # Warning if no markers were found.
         # NOTE: this is likely due to using an older version of the Web Template.
         else:

From 5689006be7f37b604f52d2c7aa96bf08c5ffebb4 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 19 Sep 2025 09:48:10 +0800
Subject: [PATCH 044/105] Update insert handling for `filename.filetype~insert`
 file name convention

---
 src/briefcase/platforms/web/static.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 771a92ae4..67560e959 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -280,7 +280,7 @@ def _process_wheel(
         Scans the wheel for:
         * Legacy CSS – .css files under `static/ are appended to the
         `briefcase.css insert slot with a deprecation warning.
-        * Deploy inserts – Any files under `deploy/inserts/<insert>.<target>
+        * Deploy inserts – Any files under `deploy/inserts/<target>~<insert>
         (HTML, CSS, JS, etc.) are added to the corresponding insert slot for
         the target file.
 
@@ -345,12 +345,12 @@ def _process_wheel(
                         )
                     else:
                         try:
-                            dot_idx = rel_inside.index(".")
-                            insert = rel_inside[:dot_idx]
-                            target = rel_inside[dot_idx + 1 :]
+                            dot_idx = rel_inside.index("~")
+                            target = rel_inside[:dot_idx]
+                            insert = rel_inside[dot_idx + 1 :]
                         except ValueError:
                             self.console.debug(
-                                f"    {filename}: skipping, filename must match '<insert>.<target>'."
+                                f"    {filename}: skipping, filename must match '<target>~<insert>'."
                             )
                         else:
                             self.console.info(

From 0117229127a08e539d37623517e7f5b57a682afc Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Sat, 20 Sep 2025 09:29:51 +0800
Subject: [PATCH 045/105] Minor update in process_wheel docstring

---
 src/briefcase/platforms/web/static.py | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 67560e959..d1908dcac 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -5,9 +5,9 @@
 import webbrowser
 from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
 from pathlib import Path
+from textwrap import dedent, indent
 from typing import Any
 from zipfile import ZipFile
-from textwrap import indent, dedent
 
 from briefcase.console import Console
 from briefcase.exceptions import (
@@ -190,9 +190,15 @@ def write_inserts(
                 pattern_found = pattern.search(file_text)
                 if pattern_found:
                     # Indent content to align with markers.
-                    indented_content = indent(body_map.get(kind, ""), pattern_found.group(1))
+                    indented_content = indent(
+                        body_map.get(kind, ""), pattern_found.group(1)
+                    )
                     file_text = pattern.sub(
-                        repl_tmpl.format(indent=pattern_found.group(1), insert=insert, content=indented_content),
+                        repl_tmpl.format(
+                            indent=pattern_found.group(1),
+                            insert=insert,
+                            content=indented_content,
+                        ),
                         file_text,
                     )
                     any_match = True
@@ -234,7 +240,7 @@ def write_pyscript_version(
             )
 
         # PyScript definitions for insertion:
-        content = (f"""\
+        content = f"""\
             <!--@@ PyScript:start @@-->
             <script type="module">
                 // Hide the splash screen when the page is ready.
@@ -248,7 +254,6 @@ def write_pyscript_version(
             <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
             <!--@@ PyScript:end @@-->
             """
-        )
 
         # Replace content between markers with PyScript definition insertions.
         marker = r"(^[ \t]*)<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
@@ -259,7 +264,9 @@ def write_pyscript_version(
                 dedent(content),
                 marker_found.group(1),
             )
-            file_text = re.sub(marker, indented_content, file_text, flags=re.DOTALL | re.MULTILINE)
+            file_text = re.sub(
+                marker, indented_content, file_text, flags=re.DOTALL | re.MULTILINE
+            )
         # Warning if no markers were found.
         # NOTE: this is likely due to using an older version of the Web Template.
         else:
@@ -284,6 +291,10 @@ def _process_wheel(
         (HTML, CSS, JS, etc.) are added to the corresponding insert slot for
         the target file.
 
+        Insert content is grouped by ``<package_name> <version>`` (with an
+        extra suffix for legacy CSS) to preserve ordering and provenance.
+        All content must be UTF-8 encoded, non-UTF-8 files raise an error.
+
         :param wheelfile: Path to the wheel file.
         :param inserts: Nested dict of inserts keyed by target - insert - package.
         """

From 30bf837305427dddcfc2c3f91eed5e756ed1bb82 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 20 Sep 2025 18:13:46 +0800
Subject: [PATCH 046/105] Remove pyscript.toml from conftest.py

---
 tests/platforms/web/static/conftest.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/tests/platforms/web/static/conftest.py b/tests/platforms/web/static/conftest.py
index d71fd25d4..1a87029dc 100644
--- a/tests/platforms/web/static/conftest.py
+++ b/tests/platforms/web/static/conftest.py
@@ -19,15 +19,6 @@ def first_app_generated(first_app_config, tmp_path):
     # Create index.html
     create_file(bundle_path / "www/index.html", "<html></html>")
 
-    # Create the initial pyscript.toml
-    create_file(
-        bundle_path / "www/pyscript.toml",
-        """
-existing-key-1 = "value-1"
-existing-key-2 = 2
-""",
-    )
-
     # Create the initial briefcase.css
     create_file(
         bundle_path / "www/static/css/briefcase.css",
@@ -50,12 +41,6 @@ def first_app_generated(first_app_config, tmp_path):
 def first_app_built(first_app_generated, tmp_path):
     bundle_path = tmp_path / "base_path/build/first-app/web/static"
 
-    # Create pyscript.toml
-    create_file(
-        bundle_path / "www/pyscript.toml",
-        'packages = ["dummy-1.2.3-py3-none-all.whl"]',
-    )
-
     # Create an app wheel
     create_wheel(bundle_path / "www/static/wheels")
 

From 84cd196341be8feac00392a312a1f0519e72ec53 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 20 Sep 2025 18:16:44 +0800
Subject: [PATCH 047/105] initial mock pyscript.toml extraction from wheels and
 remove template pyscript tests

tests removed for template related pyscript.toml tests will need to reconfigured for wheel supplied pyscript.toml test cases
---
 tests/platforms/web/static/test_build.py | 78 +++++++++---------------
 1 file changed, 28 insertions(+), 50 deletions(-)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index cb927e9c4..7d533faab 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -47,6 +47,22 @@ def mock_run(*args, **kwargs):
                 "first_app",
                 extra_content=[
                     ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+"""
+                    ),
+                    (
+                        "dependency/deploy/pyscript.toml",
+                        """
+existing-key-1 = "value-1"
+existing-key-2 = 2
+"""
+                    ),
                 ],
             )
         elif args[0][5] == "pip":
@@ -195,6 +211,12 @@ def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_
         bundle_path / "www/static/wheels"
     )
 
+    # Mock extracting pyscript.toml from a wheel.
+    build_command.extract_backend_config = lambda _: (
+        {"existing-key-1": "value-1", "existing-key-2": 2},
+        "2024.11.1"
+    )
+
     # Build the web app.
     build_command.build_app(first_app_generated)
 
@@ -212,56 +234,6 @@ def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_
         }
 
 
-def test_build_app_no_template_pyscript_toml(
-    build_command, first_app_generated, tmp_path
-):
-    """An app whose template doesn't provide pyscript.toml gets a basic config."""
-    # Remove the templated pyscript.toml
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-    (bundle_path / "www/pyscript.toml").unlink()
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
-    build_command.build_app(first_app_generated)
-
-    # Pyscript.toml has been written with only the packages content
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [],
-        }
-
-
-def test_build_app_invalid_template_pyscript_toml(
-    build_command, first_app_generated, tmp_path
-):
-    """An app with an invalid pyscript.toml raises an error."""
-    # Re-write an invalid templated pyscript.toml
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-    (bundle_path / "www/pyscript.toml").unlink()
-    create_file(
-        bundle_path / "www/pyscript.toml",
-        """
-This is not valid toml.
-""",
-    )
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Building the web app raises an error
-    with pytest.raises(
-        BriefcaseConfigError,
-        match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
-    ):
-        build_command.build_app(first_app_generated)
-
-
 def test_build_app_invalid_extra_pyscript_toml_content(
     build_command, first_app_generated, tmp_path
 ):
@@ -370,6 +342,12 @@ def mock_run(*args, **kwargs):
         bundle_path / "www/static/wheels"
     )
 
+    # Mock extracting pyscript.toml from a wheel.
+    build_command.extract_backend_config = lambda _: (
+        {"existing-key-1": "value-1", "existing-key-2": 2},
+        "2024.11.1"
+    )
+
     # Build the web app.
     build_command.build_app(first_app_generated)
 

From 7bd14813c132e0be454587c66892ef341d9a7b15 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 22 Sep 2025 17:19:04 +0800
Subject: [PATCH 048/105] Define HTML/CSS banners as module level constants

---
 src/briefcase/platforms/web/static.py | 32 ++++++++++++++-------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index d1908dcac..bc12ce387 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -35,6 +35,21 @@
 )
 from briefcase.config import AppConfig
 
+# Module level banner templates (Constants used in write_inserts)
+HTML_BANNER = (
+    "<!--------------------------------------------------\n"
+    " * {package}\n"
+    " -------------------------------------------------->\n"
+    "{content}"
+)
+
+CSS_BANNER = (
+    "/**************************************************\n"
+    " * {package}\n"
+    " *************************************************/\n"
+    "{content}"
+)
+
 
 class StaticWebMixin:
     output_format = "static"
@@ -135,27 +150,14 @@ def write_inserts(
 
         # Each insert slot and its package contributions are processed in sorted order
         for insert, pkg_contribs in sorted(inserts.items()):
-            html_banner = (
-                "<!--------------------------------------------------\n"
-                " * {package}\n"
-                " -------------------------------------------------->\n"
-                "{content}"
-            )
-            css_banner = (
-                "/**************************************************\n"
-                " * {package}\n"
-                " *************************************************/\n"
-                "{content}"
-            )
-
             # Build bodies from the same contributions
             html_body = "\n".join(
-                html_banner.format(package=pkg, content=text)
+                HTML_BANNER.format(package=pkg, content=text)
                 for pkg, text in sorted(pkg_contribs.items())
                 if text
             )
             css_body = "\n".join(
-                css_banner.format(package=pkg, content=text)
+                CSS_BANNER.format(package=pkg, content=text)
                 for pkg, text in sorted(pkg_contribs.items())
                 if text
             )

From af516a36c38e8db1e83b8490b0b1689176114714 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 22 Sep 2025 17:39:46 +0800
Subject: [PATCH 049/105] convert write_pyscript_version
 to_write_pyscript_insert

---
 src/briefcase/platforms/web/static.py | 60 +++++++--------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index d1908dcac..e5b9db805 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -211,37 +211,26 @@ def write_inserts(
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 
-    def write_pyscript_version(
+    def _write_pyscript_insert(
         self,
-        app: AppConfig,
         filename: Path,
         pyscript_version: str,
+        inserts: dict[str, dict[str, dict[str, str]]],
     ):
         """Write pyscript version into an existing html file.
 
-        This function looks for markers in the named file and appends
-        pyscript definitions between the markers.
-
-        * Start: <!--@@ PyScript:start @@-->
-        * End:   <!--@@ PyScript:end @@-->
+        This function creates an insert for PyScript.
 
-        :param app: The application being written.
         :param filename: The html file whose pyscript version is to be written.
         :param pyscript_version: The pyscript version number to be inserted.
+        :param inserts: Nested dict of inserts keyed by target - insert - package.
         """
-        # Load file content. Raise a warning if the file is not found
-        target_path = self.project_path(app) / filename
-        try:
-            file_text = target_path.read_text(encoding="utf-8")
-        except FileNotFoundError:
-            self.console.warning(
-                f"Target {filename} not found in {target_path}; skipping pyscript insertion."
-                "PyScript may not be configured correctly. This project may not work correctly."
-            )
+        package_key = "briefcase"
+        target = filename
+        insert = "Python"
 
         # PyScript definitions for insertion:
-        content = f"""\
-            <!--@@ PyScript:start @@-->
+        content = dedent(f"""\
             <script type="module">
                 // Hide the splash screen when the page is ready.
                 import {{ hooks }} from "https://pyscript.net/releases/{pyscript_version}/core.js";
@@ -252,30 +241,12 @@ def write_pyscript_version(
 
             <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
             <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
-            <!--@@ PyScript:end @@-->
-            """
+            """)
 
-        # Replace content between markers with PyScript definition insertions.
-        marker = r"(^[ \t]*)<!--@@ PyScript:start @@-->.*<!--@@ PyScript:end @@-->"
-        marker_found = re.search(marker, file_text, flags=re.DOTALL | re.MULTILINE)
-
-        if marker_found:
-            indented_content = indent(
-                dedent(content),
-                marker_found.group(1),
-            )
-            file_text = re.sub(
-                marker, indented_content, file_text, flags=re.DOTALL | re.MULTILINE
-            )
-        # Warning if no markers were found.
-        # NOTE: this is likely due to using an older version of the Web Template.
-        else:
-            self.console.warning(
-                f"No pyscript markers found in {filename}; PyScript may not be configured correctly."
-                "Please ensure you are using the latest version of Briefcase Static Web Template"
-            )
-
-        target_path.write_text(file_text, encoding="utf-8")
+        pkg_map = inserts.setdefault(target, {}).setdefault(
+                            insert, {}
+                        )
+        pkg_map[package_key] = content
 
     def _process_wheel(
         self,
@@ -557,8 +528,6 @@ def build_app(self, app: AppConfig, **kwargs):
                 tomli_w.dump(config, f)
 
         with self.console.wait_bar("Compiling static web content from wheels..."):
-            # Add pyscript_version to index.html
-            self.write_pyscript_version(app, Path("index.html"), pyscript_version)
 
             # Trim previously compiled content out of briefcase.css
             briefcase_css_path = self.project_path(app) / "static/css/briefcase.css"
@@ -576,6 +545,9 @@ def build_app(self, app: AppConfig, **kwargs):
                     inserts=inserts,
                 )
 
+            # Add pyscript insertion to inserts.
+            self._write_pyscript_insert("index.html", pyscript_version, inserts)
+
             # Write inserts per target
             for target, target_inserts in sorted(inserts.items()):
                 self.write_inserts(app, Path(target), target_inserts)

From 1c79f9b0f707d786768f7ae612462ab7d671a1c9 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Mon, 22 Sep 2025 19:10:17 +0800
Subject: [PATCH 050/105] Use split(~) with validation for insert filenames in
 process_wheel

---
 src/briefcase/platforms/web/static.py | 52 +++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index d878dc0d9..786b7dfe8 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -245,9 +245,7 @@ def _write_pyscript_insert(
             <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
             """)
 
-        pkg_map = inserts.setdefault(target, {}).setdefault(
-                            insert, {}
-                        )
+        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
         pkg_map[package_key] = content
 
     def _process_wheel(
@@ -328,34 +326,37 @@ def _process_wheel(
                             f"    {filename}: skipping, not a valid insert file."
                         )
                     else:
-                        try:
-                            dot_idx = rel_inside.index("~")
-                            target = rel_inside[:dot_idx]
-                            insert = rel_inside[dot_idx + 1 :]
-                        except ValueError:
+                        if "~" not in rel_inside:
                             self.console.debug(
                                 f"    {filename}: skipping, filename must match '<target>~<insert>'."
                             )
                         else:
-                            self.console.info(
-                                f"    {filename}: Adding {insert} insert for {target}"
-                            )
                             try:
-                                text = wheel.read(filename).decode("utf-8")
-                            except UnicodeDecodeError as e:
-                                raise BriefcaseCommandError(
-                                    f"{filename}: insert must be UTF-8 encoded"
-                                ) from e
-
-                            contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
-
-                            pkg_map = inserts.setdefault(target, {}).setdefault(
-                                insert, {}
-                            )
-                            if package_key in pkg_map and pkg_map[package_key]:
-                                pkg_map[package_key] += "\n" + text
+                                target, insert = rel_inside.split("~")
+                            except ValueError:
+                                self.console.debug(
+                                    f"    {filename}: skipping, filename must match '<target>~<insert>'."
+                                )
                             else:
-                                pkg_map[package_key] = text
+                                self.console.info(
+                                    f"    {filename}: Adding {insert} insert for {target}"
+                                )
+                                try:
+                                    text = wheel.read(filename).decode("utf-8")
+                                except UnicodeDecodeError as e:
+                                    raise BriefcaseCommandError(
+                                        f"{filename}: insert must be UTF-8 encoded"
+                                    ) from e
+
+                                contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
+
+                                pkg_map = inserts.setdefault(target, {}).setdefault(
+                                    insert, {}
+                                )
+                                if package_key in pkg_map and pkg_map[package_key]:
+                                    pkg_map[package_key] += "\n" + text
+                                else:
+                                    pkg_map[package_key] = text
 
                 else:
                     self.console.debug(
@@ -530,7 +531,6 @@ def build_app(self, app: AppConfig, **kwargs):
                 tomli_w.dump(config, f)
 
         with self.console.wait_bar("Compiling static web content from wheels..."):
-
             # Trim previously compiled content out of briefcase.css
             briefcase_css_path = self.project_path(app) / "static/css/briefcase.css"
             self._trim_file(

From 181523e1a165f9fca4bf88e71d89b6ab14b2bed1 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Thu, 25 Sep 2025 13:08:13 +0800
Subject: [PATCH 051/105] Update fixtures with new insert markers and config
 handling in conftest.py

---
 tests/platforms/web/static/conftest.py | 27 +++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/platforms/web/static/conftest.py b/tests/platforms/web/static/conftest.py
index 1a87029dc..f7981933d 100644
--- a/tests/platforms/web/static/conftest.py
+++ b/tests/platforms/web/static/conftest.py
@@ -16,13 +16,34 @@ def first_app_generated(first_app_config, tmp_path):
 """,
     )
 
-    # Create index.html
-    create_file(bundle_path / "www/index.html", "<html></html>")
+    # Create index.html with insert markers
+    create_file(
+        bundle_path / "www/index.html",
+        """<!doctype html>
+<html>
+  <head>
+    <!--@@ head:start @@-->
+    <!--@@ head:end @@-->
+    <!--@@ Python:start @@-->
+    <!--@@ Python:end @@-->
+  </head>
+  <body>
+    <div id="briefcase-splash"></div>
 
-    # Create the initial briefcase.css
+    <!--@@ body-end:start @@-->
+    <!--@@ body-end:end @@-->
+  </body>
+</html>
+""",
+    )
+
+    # Create the initial briefcase.css with CSS insert markers
     create_file(
         bundle_path / "www/static/css/briefcase.css",
         """
+/*@@ CSS:start @@*/
+/*@@ CSS:end @@*/
+
 #pyconsole {
   display: None;
 }

From 8b3a4b2c8839e544a3a1b7c107173f0c971b5b7b Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sun, 28 Sep 2025 15:16:51 +0800
Subject: [PATCH 052/105] Conftest.py css markers moved below sentinel banner

---
 tests/platforms/web/static/conftest.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/platforms/web/static/conftest.py b/tests/platforms/web/static/conftest.py
index f7981933d..43eb5c914 100644
--- a/tests/platforms/web/static/conftest.py
+++ b/tests/platforms/web/static/conftest.py
@@ -41,14 +41,14 @@ def first_app_generated(first_app_config, tmp_path):
     create_file(
         bundle_path / "www/static/css/briefcase.css",
         """
-/*@@ CSS:start @@*/
-/*@@ CSS:end @@*/
-
 #pyconsole {
   display: None;
 }
 /*******************************************************************
- ******************** Wheel contributed styles ********************/
+******************** Wheel contributed styles ********************/
+/*@@ CSS:start @@*/
+/*@@ CSS:end @@*/
+
 """,
     )
 

From fa2eb1e8945b8049904f2198624678108b96452e Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 11:43:10 +0800
Subject: [PATCH 053/105] check pyscript insertions in index.html for
 test_build_app

---
 tests/platforms/web/static/test_build.py | 40 ++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 7d533faab..1f9a5e56e 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -148,6 +148,46 @@ def mock_run(*args, **kwargs):
             ],
         }
 
+    # index.html has insertions
+    with (bundle_path / "www/index.html").open(encoding="utf-8") as f:
+        assert (
+            f.read()
+            == "\n".join(
+                [
+                    "<!doctype html>",
+                    "<html>",
+                    "  <head>",
+                    "    <!--@@ head:start @@-->",
+                    "    <!--@@ head:end @@-->",
+                    "    <!--@@ Python:start @@-->",
+                    "    <!--------------------------------------------------",
+                    "     * briefcase",
+                    "     -------------------------------------------------->",
+                    "    <script type=\"module\">",
+                    "        // Hide the splash screen when the page is ready.",
+                    "        import { hooks } from \"https://pyscript.net/releases/2024.11.1/core.js\";",
+                    "        hooks.main.onReady.add(() => {",
+                    "            document.getElementById(\"briefcase-splash\").classList.add(\"hidden\");",
+                    "        });",
+                    "    </script>",
+                    "",
+                    "    <link rel=\"stylesheet\" href=\"https://pyscript.net/releases/2024.11.1/core.css\">",
+                    "    <script type=\"module\" src=\"https://pyscript.net/releases/2024.11.1/core.js\"></script>",
+                    "    <!--@@ Python:end @@-->",
+                    "  </head>",
+                    "  <body>",
+                    "    <div id=\"briefcase-splash\"></div>",
+                    "",
+                    "    <!--@@ body-end:start @@-->",
+                    "    <!--@@ body-end:end @@-->",
+                    "  </body>",
+                    "</html>",
+                ]
+            )
+            + "\n"
+        )
+
+
     # briefcase.css has been appended
     with (bundle_path / "www/static/css/briefcase.css").open(encoding="utf-8") as f:
         assert (

From c9cfe8c4d7bf23b5319fa79a651eb4050831f37c Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 12:11:41 +0800
Subject: [PATCH 054/105] Add test_build_app_no_config

"""An app with no config.toml supplied by a wheel gets a basic config."""
---
 tests/platforms/web/static/test_build.py | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 1f9a5e56e..0f2676494 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -224,6 +224,60 @@ def mock_run(*args, **kwargs):
         )
 
 
+def test_build_app_no_config(build_command, first_app_generated, tmp_path):
+    """An app with no config.toml supplied by a wheel gets a basic config."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a config.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    build_command.build_app(first_app_generated)
+
+    # Pyscript.toml has been written with only the packages content
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
+
+
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""
     bundle_path = tmp_path / "base_path/build/first-app/web/static"

From 4bfea454d3dd9d99b17c8b2f3349c684166ad954 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 12:23:53 +0800
Subject: [PATCH 055/105] test_build_app_multiple_config

"""An app with multiple config.toml supplied by wheels fails to build."""
---
 tests/platforms/web/static/test_build.py | 64 ++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 0f2676494..865b1e4c1 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -277,6 +277,70 @@ def mock_run(*args, **kwargs):
             ],
         }
 
+def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):
+    """An app with multiple config.toml supplied by wheels fails to build."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a config.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+"""
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.10.1"
+"""
+                    ),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"Only 1 backend configuration file can be supplied.",
+    ):
+        build_command.build_app(first_app_generated)
 
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""

From 550e45fdcc5e0716a47ef9f98598c47ba172d417 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 14:51:23 +0800
Subject: [PATCH 056/105] test_build_app_config_no_backend

"""An app cannot be built with a config.toml containing no "backend" value."""
---
 tests/platforms/web/static/test_build.py | 51 ++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 865b1e4c1..17214e941 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -277,6 +277,7 @@ def mock_run(*args, **kwargs):
             ],
         }
 
+
 def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):
     """An app with multiple config.toml supplied by wheels fails to build."""
 
@@ -342,6 +343,56 @@ def mock_run(*args, **kwargs):
     ):
         build_command.build_app(first_app_generated)
 
+
+def test_build_app_config_no_backend(build_command, first_app_generated, tmp_path):
+    """An app cannot be built with a config.toml containing no "backend" value."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a config.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    ("dependency/deploy/config.toml", ""),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"No backend was provided in config.toml file.",
+    ):
+        build_command.build_app(first_app_generated)
+
+
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""
     bundle_path = tmp_path / "base_path/build/first-app/web/static"

From e57819dc402ec6125cbf0801ce6225f88afe6385 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 15:10:41 +0800
Subject: [PATCH 057/105] no pyscript.toml supplies basic config and
 test_build_app_no_wheel_pyscript_toml

"""An app with no pyscript.toml supplied by a wheel gets a basic config."""
matches original template logic
---
 src/briefcase/platforms/web/static.py    |  6 ++-
 tests/platforms/web/static/test_build.py | 65 +++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 786b7dfe8..b045fdf17 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -432,9 +432,11 @@ def extract_backend_config(self, wheels):
                         with wheel.open(pyscript_path) as pyscript_file:
                             pyscript_config = tomllib.load(pyscript_file)
                     except KeyError:
-                        raise BriefcaseConfigError(
-                            f"Pyscript configuration file not found in package: {config_package_list[0]}"
+                        self.console.info(
+                            f"Pyscript configuration file not found in package: {config_package_list[0]}\n"
+                            "Using default configuration."
                         )
+                        pyscript_config = {}
 
         return pyscript_config, pyscript_version
 
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 17214e941..dc04d9b11 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -349,7 +349,7 @@ def test_build_app_config_no_backend(build_command, first_app_generated, tmp_pat
 
     bundle_path = tmp_path / "base_path/build/first-app/web/static"
 
-    # Mock some wheels without a config.toml
+    # Mock some wheels with a single config.toml containing no backend value.
     def mock_run(*args, **kwargs):
         if args[0][5] == "wheel":
             create_wheel(
@@ -393,6 +393,69 @@ def mock_run(*args, **kwargs):
         build_command.build_app(first_app_generated)
 
 
+def test_build_app_no_wheel_pyscript_toml(build_command, first_app_generated, tmp_path):
+    """An app with no pyscript.toml supplied by a wheel gets a basic config."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a pyscript.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+"""
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    build_command.build_app(first_app_generated)
+
+    # Pyscript.toml has been written with only the packages content
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
+
+
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""
     bundle_path = tmp_path / "base_path/build/first-app/web/static"

From f5703759e0033a40f953f3889a9ec3bdf78be567 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 15:25:23 +0800
Subject: [PATCH 058/105] Invalid pyscript.toml check and
 test_build_app_invalid_wheel_pyscript_toml

"""An app with an invalid pyscript.toml raises an error."""
---
 src/briefcase/platforms/web/static.py    |  4 ++
 tests/platforms/web/static/test_build.py | 65 ++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index b045fdf17..274d6f82c 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -431,6 +431,10 @@ def extract_backend_config(self, wheels):
                     try:
                         with wheel.open(pyscript_path) as pyscript_file:
                             pyscript_config = tomllib.load(pyscript_file)
+                    except tomllib.TOMLDecodeError as e:
+                        raise BriefcaseConfigError(
+                            f"pyscript.toml content isn't valid TOML: {e}"
+                        ) from e
                     except KeyError:
                         self.console.info(
                             f"Pyscript configuration file not found in package: {config_package_list[0]}\n"
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index dc04d9b11..5755dc8fb 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -456,6 +456,71 @@ def mock_run(*args, **kwargs):
         }
 
 
+def test_build_app_invalid_wheel_pyscript_toml(
+    build_command, first_app_generated, tmp_path
+):
+    """An app with an invalid pyscript.toml raises an error."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Invoking build will create wheels as a side effect.
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+"""
+                    ),
+                    (
+                        "dependency/deploy/pyscript.toml",
+                        """
+This is not valid toml.
+"""
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Building the web app raises an error
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
+    ):
+        build_command.build_app(first_app_generated)
+
+
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""
     bundle_path = tmp_path / "base_path/build/first-app/web/static"

From 032b18cb661abaeb98767bdb77f7bcb517bfe292 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Mon, 29 Sep 2025 15:58:46 +0800
Subject: [PATCH 059/105] Remove pyscript.toml checks in test_app_package_fail
 and test_dependency_fail

---
 tests/platforms/web/static/test_build.py | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 5755dc8fb..f5654dbe6 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -814,13 +814,6 @@ def test_app_package_fail(build_command, first_app_generated, tmp_path):
     # Wheels folder still exists
     assert (bundle_path / "www/static/wheels").is_dir()
 
-    # Pyscript.toml content has not changed
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "existing-key-1": "value-1",
-            "existing-key-2": 2,
-        }
-
 
 def test_dependency_fail(build_command, first_app_generated, tmp_path):
     """If dependencies can't be downloaded, an error is raised."""
@@ -890,9 +883,3 @@ def test_dependency_fail(build_command, first_app_generated, tmp_path):
     # Wheels folder still exists
     assert (bundle_path / "www/static/wheels").is_dir()
 
-    # Pyscript.toml content has not changed
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "existing-key-1": "value-1",
-            "existing-key-2": 2,
-        }

From e2a9a385136f17903612d0520d6e5348cd1bb477 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 13:37:01 +0800
Subject: [PATCH 060/105] Update test_build__process_wheel.py

Updat test_process_wheel and test_process_wheel_no_content to match the new functionality
---
 .../web/static/test_build__process_wheel.py   | 68 +++++++------------
 1 file changed, 23 insertions(+), 45 deletions(-)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 10f344073..cdc0eb65c 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -1,5 +1,3 @@
-from io import StringIO
-
 import pytest
 
 from briefcase.console import Console
@@ -39,44 +37,26 @@ def test_process_wheel(build_command, tmp_path):
         ],
     )
 
-    # Create a dummy css file
-    css_file = StringIO()
-
-    build_command._process_wheel(wheel_filename, css_file=css_file)
-
-    assert (
-        css_file.getvalue()
-        == "\n".join(
-            [
-                "",
-                "/*******************************************************",
-                " * dummy 1.2.3::first.css",
-                " *******************************************************/",
-                "",
-                "span {",
-                "  font-color: red;",
-                "  font-size: larger",
-                "}",
-                "",
-                "/*******************************************************",
-                " * dummy 1.2.3::second.css",
-                " *******************************************************/",
-                "",
-                "div {",
-                "  padding: 10px",
-                "}",
-                "",
-                "/*******************************************************",
-                " * dummy 1.2.3::deep/third.css",
-                " *******************************************************/",
-                "",
-                "p {",
-                "  color: red",
-                "}",
-            ]
-        )
-        + "\n"
-    )
+    # Collect into inserts dict
+    inserts = {}
+    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
+
+    # Legacy CSS should be collected into the briefcase.css "CSS" insert slot
+    assert inserts == {
+        "static/css/briefcase.css": {
+            "CSS": {
+                "dummy 1.2.3 (legacy static CSS: first.css)": (
+                    "span {\n  font-color: red;\n  font-size: larger\n}\n"
+                ),
+                "dummy 1.2.3 (legacy static CSS: second.css)": (
+                    "div {\n  padding: 10px\n}\n"
+                ),
+                "dummy 1.2.3 (legacy static CSS: deep/third.css)": (
+                    "p {\n  color: red\n}\n"
+                ),
+            }
+        }
+    }
 
 
 def test_process_wheel_no_content(build_command, tmp_path):
@@ -94,9 +74,7 @@ def test_process_wheel_no_content(build_command, tmp_path):
         ],
     )
 
-    # Create a dummy css file
-    css_file = StringIO()
-
-    build_command._process_wheel(wheel_filename, css_file=css_file)
+    inserts = {}
+    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
 
-    assert css_file.getvalue() == ""
+    assert inserts == {}

From eb71d789eb404cb3f922e2fdaecb26e28b2b5b69 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 14:20:50 +0800
Subject: [PATCH 061/105] Expand _process_wheel test coverage

Collect deploy inserts, skip invalid insert names, warn for legacy /static CSS
---
 .../web/static/test_build__process_wheel.py   | 77 +++++++++++++++++++
 1 file changed, 77 insertions(+)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index cdc0eb65c..2f9f85cb0 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -78,3 +78,80 @@ def test_process_wheel_no_content(build_command, tmp_path):
     build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
 
     assert inserts == {}
+
+
+def test_process_wheel_deploy_inserts(build_command, tmp_path):
+    """Deploy inserts are collected into the correct insert slot."""
+    wheel_filename = create_wheel(
+        tmp_path,
+        extra_content=[
+            ("dummy/deploy/inserts/index.html~header", "<script>alert('hi')</script>"),
+            (
+                "dummy/deploy/inserts/static/css/briefcase.css~CSS",
+                "body { margin: 0; }",
+            ),
+        ],
+    )
+
+    inserts = {}
+    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
+
+    # The index.html header insert exists
+    assert "index.html" in inserts
+    assert "header" in inserts["index.html"]
+    contribs = inserts["index.html"]["header"]
+    assert any("<script>" in v for v in contribs.values())
+
+    # The CSS insert exists
+    assert "static/css/briefcase.css" in inserts
+    assert "CSS" in inserts["static/css/briefcase.css"]
+    css_contribs = inserts["static/css/briefcase.css"]["CSS"]
+    assert any("body { margin: 0; }" in v for v in css_contribs.values())
+
+
+def test_process_wheel_invalid_insert_skipped(build_command, tmp_path, monkeypatch):
+    """Files without '~' in their name under deploy/inserts are skipped."""
+    wheel_filename = create_wheel(
+        tmp_path,
+        extra_content=[
+            ("dummy/deploy/inserts/index.html", "<div>oops</div>"),
+        ],
+    )
+
+    # Check on console.debug to confirm a skip message was emitted
+    seen = {"debugs": []}
+    monkeypatch.setattr(
+        build_command.console, "debug", lambda msg: seen["debugs"].append(msg)
+    )
+
+    inserts = {}
+    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
+
+    assert inserts == {}
+    assert any(
+        "skipping" in msg and "must match '<target>~<insert>'" in msg
+        for msg in seen["debugs"]
+    )
+
+
+def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypatch):
+    """Legacy CSS files trigger a single deprecation warning."""
+    wheel_filename = create_wheel(
+        tmp_path,
+        extra_content=[
+            ("dummy/static/one.css", "h1 { color: blue; }"),
+            ("dummy/static/two.css", "h2 { color: green; }"),
+        ],
+    )
+
+    # Check on console.warning to count legacy warnings
+    warnings = []
+    monkeypatch.setattr(
+        build_command.console, "warning", lambda msg: warnings.append(msg)
+    )
+
+    inserts = {}
+    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
+
+    legacy_msgs = [m for m in warnings if "legacy '/static' CSS detected" in m]
+    assert len(legacy_msgs) == 1

From 0e4f0fb06716a4923844c9cf2e8a0df73cb5bc2d Mon Sep 17 00:00:00 2001
From: Caydn Lee <104604345+caydnn@users.noreply.github.com>
Date: Wed, 1 Oct 2025 14:27:08 +0800
Subject: [PATCH 062/105] Update src/briefcase/platforms/web/static.py

Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 274d6f82c..1512d7f63 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -395,7 +395,7 @@ def extract_backend_config(self, wheels):
         # Raise an error if more than one configuration file is supplied.
         elif len(config_package_list) > 1:
             raise BriefcaseConfigError(
-                f"""Only 1 backend configuration file can be supplied.
+                f"""Only one backend configuration file can be supplied.
                 Initial config.toml found in package: {config_package}
                 Duplicate config.toml found in package: {wheel.filename}"""
             )

From e68469359c1aa0f85f912373f1dacbe570b0622d Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 1 Oct 2025 15:33:16 +0800
Subject: [PATCH 063/105] change _write_pyscript_insert to
 _append_pyscript_insert

---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 1512d7f63..9da718b64 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -213,7 +213,7 @@ def write_inserts(
         # Save modified content
         target_path.write_text(file_text, encoding="utf-8")
 
-    def _write_pyscript_insert(
+    def _append_pyscript_insert(
         self,
         filename: Path,
         pyscript_version: str,

From 422b0af9565ab966d6a32f4313ab20c73e050b17 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 1 Oct 2025 15:36:48 +0800
Subject: [PATCH 064/105] changing insert tags to lower case

---
 src/briefcase/platforms/web/static.py  | 2 +-
 tests/platforms/web/static/conftest.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 9da718b64..39d80e059 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -229,7 +229,7 @@ def _append_pyscript_insert(
         """
         package_key = "briefcase"
         target = filename
-        insert = "Python"
+        insert = "python"
 
         # PyScript definitions for insertion:
         content = dedent(f"""\
diff --git a/tests/platforms/web/static/conftest.py b/tests/platforms/web/static/conftest.py
index 43eb5c914..2126b9dc4 100644
--- a/tests/platforms/web/static/conftest.py
+++ b/tests/platforms/web/static/conftest.py
@@ -24,8 +24,8 @@ def first_app_generated(first_app_config, tmp_path):
   <head>
     <!--@@ head:start @@-->
     <!--@@ head:end @@-->
-    <!--@@ Python:start @@-->
-    <!--@@ Python:end @@-->
+    <!--@@ python:start @@-->
+    <!--@@ python:end @@-->
   </head>
   <body>
     <div id="briefcase-splash"></div>
@@ -46,8 +46,8 @@ def first_app_generated(first_app_config, tmp_path):
 }
 /*******************************************************************
 ******************** Wheel contributed styles ********************/
-/*@@ CSS:start @@*/
-/*@@ CSS:end @@*/
+/*@@ css:start @@*/
+/*@@ css:end @@*/
 
 """,
     )

From 8f48e874f0e6c0f0636737ac874c37ef1408b973 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 1 Oct 2025 15:39:16 +0800
Subject: [PATCH 065/105] change CSS tag in legacy handling to lower case

---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 39d80e059..e35c24d57 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -309,7 +309,7 @@ def _process_wheel(
 
                     # Add CSS content to briefcase.css insert slot
                     target = "static/css/briefcase.css"
-                    insert = "CSS"
+                    insert = "css"
                     pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
                     if contrib_key in pkg_map and pkg_map[contrib_key]:
                         pkg_map[contrib_key] += "\n" + css_text

From faed78622cb4a70b2b8165764619239dddb2ae95 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 15:34:48 +0800
Subject: [PATCH 066/105] Expand _process_wheel test coverage

Add tests asserting BriefcaseCommandError for non-UTF8 deploy inserts and legacy CSS
---
 .../web/static/test_build__process_wheel.py   | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 2f9f85cb0..693974808 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -1,6 +1,10 @@
+import zipfile
+from pathlib import Path
+
 import pytest
 
 from briefcase.console import Console
+from briefcase.exceptions import BriefcaseCommandError
 from briefcase.platforms.web.static import StaticWebBuildCommand
 
 from ....utils import create_wheel
@@ -155,3 +159,29 @@ def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypa
 
     legacy_msgs = [m for m in warnings if "legacy '/static' CSS detected" in m]
     assert len(legacy_msgs) == 1
+
+
+def test_process_wheel_non_utf8_insert(build_command, tmp_path):
+    """Non-UTF8 deploy insert raises a BriefcaseCommandError."""
+    bad = b"\xff\xfe\xfa"
+    wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/deploy/inserts/index.html~header", bad)
+
+    inserts = {}
+    with pytest.raises(BriefcaseCommandError, match="insert must be UTF-8 encoded"):
+        build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
+
+
+def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
+    """Non-UTF8 legacy CSS raises a BriefcaseCommandError."""
+    bad = b"\xff\xfe\xfa"
+    wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/static/bad.css", bad)
+
+    inserts = {}
+    with pytest.raises(
+        BriefcaseCommandError, match="CSS content must be UTF-8 encoded"
+    ):
+        build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)

From 930bf4f98dab41b2beaa1e382d35c411826c6fbd Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 17:16:41 +0800
Subject: [PATCH 067/105] Address review comments

Simplify insert parsing and drop redundant UTF-8 try/except
---
 src/briefcase/platforms/web/static.py | 70 ++++++++++-----------------
 1 file changed, 26 insertions(+), 44 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 10a5e0d6f..58202dda5 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -297,12 +297,7 @@ def _process_wheel(
                         )
                         legacy_css_warning = True
 
-                    try:
-                        css_text = wheel.read(filename).decode("utf-8")
-                    except UnicodeDecodeError as e:
-                        raise BriefcaseCommandError(
-                            f"{filename}: CSS content must be UTF-8 encoded"
-                        ) from e
+                    css_text = wheel.read(filename).decode("utf-8")
 
                     rel_inside = "/".join(path.parts[2:])
                     contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
@@ -321,47 +316,34 @@ def _process_wheel(
                     self.console.info(f"    Found {filename}")
                     rel_inside = "/".join(parts[3:])
 
-                    if not rel_inside or rel_inside.endswith("/"):
-                        self.console.debug(
-                            f"    {filename}: skipping, not a valid insert file."
+                if not rel_inside or rel_inside.endswith("/"):
+                    self.console.debug(
+                        f"    {filename}: skipping, not a valid insert file."
+                    )
+                else:
+                    if "~" in rel_inside:
+                        # Preserve any '~' that might exist in the target path by splitting from the right
+                        target, insert = rel_inside.rsplit("~", 1)
+                        self.console.info(
+                            f"    {filename}: Adding {insert} insert for {target}"
                         )
-                    else:
-                        if "~" not in rel_inside:
-                            self.console.debug(
-                                f"    {filename}: skipping, filename must match '<target>~<insert>'."
-                            )
+
+                        text = wheel.read(filename).decode("utf-8")
+
+                        contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
+
+                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+                        if package_key in pkg_map and pkg_map[package_key]:
+                            pkg_map[package_key] += "\n" + text
                         else:
-                            try:
-                                target, insert = rel_inside.split("~")
-                            except ValueError:
-                                self.console.debug(
-                                    f"    {filename}: skipping, filename must match '<target>~<insert>'."
-                                )
-                            else:
-                                self.console.info(
-                                    f"    {filename}: Adding {insert} insert for {target}"
-                                )
-                                try:
-                                    text = wheel.read(filename).decode("utf-8")
-                                except UnicodeDecodeError as e:
-                                    raise BriefcaseCommandError(
-                                        f"{filename}: insert must be UTF-8 encoded"
-                                    ) from e
-
-                                contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
-
-                                pkg_map = inserts.setdefault(target, {}).setdefault(
-                                    insert, {}
-                                )
-                                if package_key in pkg_map and pkg_map[package_key]:
-                                    pkg_map[package_key] += "\n" + text
-                                else:
-                                    pkg_map[package_key] = text
+                            pkg_map[package_key] = text
+                    else:
+                        self.console.debug(
+                            f"    {filename}: skipping, filename must match '<target>~<insert>'."
+                        )
 
-                else:
-                    self.console.debug(
-                        f"    {filename}: skipping, not a supported insert."
-                    )
+            else:
+                self.console.debug(f"    {filename}: skipping, not a supported insert.")
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From e71d94682962d8eb4217fa2fa35a8f0bfd47ba2d Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 18:26:25 +0800
Subject: [PATCH 068/105] Address review comments

Extract legacy CSS handling into _handle_legacy_css() and deploy insert handling into _handle_insert(). Flattens _process_wheel(), reduces deep nesting
---
 src/briefcase/platforms/web/static.py | 162 ++++++++++++++++----------
 1 file changed, 99 insertions(+), 63 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 58202dda5..a14ab046a 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -35,7 +35,7 @@
 )
 from briefcase.config import AppConfig
 
-# Module level banner templates (Constants used in write_inserts)
+# Banner templates (Constants used in write_inserts)
 HTML_BANNER = (
     "<!--------------------------------------------------\n"
     " * {package}\n"
@@ -248,23 +248,104 @@ def _append_pyscript_insert(
         pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
         pkg_map[package_key] = content
 
+    def _handle_legacy_css(
+        self,
+        wheel: ZipFile,
+        path: Path,
+        filename: str,
+        package_key: str,
+        inserts: dict[str, dict[str, dict[str, str]]],
+        legacy_css_warning: bool,
+    ) -> bool:
+        """Handle legacy CSS under /static/*.css and add to briefcase.css.
+
+        :param wheel: Open wheel ZipFile being processed.
+        :param path: Path object of the file inside the wheel.
+        :param filename: Filename string inside the wheel.
+        :param package_key: Provenance label (e.g. "name version").
+        :param inserts: Nested dict of inserts keyed by target - insert - package.
+        :param legacy_css_warning: Whether the warning has already been shown.
+        :return: Updated legacy_css_warning flag.
+        """
+        self.console.info(f"    Found {filename}")
+
+        # Show deprecation warning once per wheel
+        if not legacy_css_warning:
+            self.console.warning(
+                f"    {Path(wheel.filename).name}: legacy '/static' CSS detected, "
+                "treating as insert into briefcase.css, this legacy handling will be removed in the future."
+            )
+            legacy_css_warning = True
+
+        css_text = wheel.read(filename).decode("utf-8")
+
+        rel_inside = "/".join(path.parts[2:])
+        contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
+
+        # Add CSS content to briefcase.css insert slot
+        target = "static/css/briefcase.css"
+        insert = "css"
+        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+        if contrib_key in pkg_map and pkg_map[contrib_key]:
+            pkg_map[contrib_key] += "\n" + css_text
+        else:
+            pkg_map[contrib_key] = css_text
+
+        return legacy_css_warning
+
+    def _handle_insert(
+        self,
+        wheel: ZipFile,
+        parts: tuple[str, ...],
+        filename: str,
+        package_key: str,
+        inserts: dict[str, dict[str, dict[str, str]]],
+    ) -> None:
+        """Handle deploy/inserts/<target>~<insert> files and register inserts.
+
+        :param wheel: Open wheel ZipFile being processed.
+        :param parts: Path parts of the filename inside the wheel.
+        :param filename: Filename string inside the wheel.
+        :param package_key: Provenance label (e.g. "name version").
+        :param inserts: Nested dict of inserts keyed by target - insert - package.
+        """
+        self.console.info(f"    Found {filename}")
+
+        rel_inside = "/".join(parts[3:])
+
+        if not rel_inside or rel_inside.endswith("/"):
+            self.console.debug(f"    {filename}: skipping, not a valid insert file.")
+            return
+
+        if "~" not in rel_inside:
+            self.console.debug(
+                f"    {filename}: skipping, filename must match '<target>~<insert>'."
+            )
+            return
+
+        # Preserve any '~' that might exist in the target path by splitting from the right
+        target, insert = rel_inside.rsplit("~", 1)
+        self.console.info(f"    {filename}: Adding {insert} insert for {target}")
+
+        text = wheel.read(filename).decode("utf-8")
+
+        contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
+        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
+        if contrib_key in pkg_map and pkg_map[contrib_key]:
+            pkg_map[contrib_key] += "\n" + text
+        else:
+            pkg_map[contrib_key] = text
+
     def _process_wheel(
         self,
         wheelfile,
         inserts: dict[str, dict[str, dict[str, str]]],
-    ):
-        """Process a wheel to collect insert and style content for the final project.
+    ) -> None:
+        """Process a wheel to collect insert and style content.
 
         Scans the wheel for:
-        * Legacy CSS – .css files under `static/ are appended to the
-        `briefcase.css insert slot with a deprecation warning.
-        * Deploy inserts – Any files under `deploy/inserts/<target>~<insert>
-        (HTML, CSS, JS, etc.) are added to the corresponding insert slot for
-        the target file.
-
-        Insert content is grouped by ``<package_name> <version>`` (with an
-        extra suffix for legacy CSS) to preserve ordering and provenance.
-        All content must be UTF-8 encoded, non-UTF-8 files raise an error.
+        * Legacy CSS - .css files under /static/ added to briefcase.css.
+        * Deploy inserts - files under /deploy/inserts/<target>~<insert>.
 
         :param wheelfile: Path to the wheel file.
         :param inserts: Nested dict of inserts keyed by target - insert - package.
@@ -287,63 +368,18 @@ def _process_wheel(
                     and parts[1] == "static"
                     and path.suffix.lower() == ".css"
                 ):
-                    self.console.info(f"    Found {filename}")
-
-                    # Show deprecation warning once per wheel
-                    if not legacy_css_warning:
-                        self.console.warning(
-                            f"    {wheelfile.name}: legacy '/static' CSS detected; "
-                            "treating as insert into briefcase.css; this legacy handling will be removed in the future."
-                        )
-                        legacy_css_warning = True
-
-                    css_text = wheel.read(filename).decode("utf-8")
-
-                    rel_inside = "/".join(path.parts[2:])
-                    contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
-
-                    # Add CSS content to briefcase.css insert slot
-                    target = "static/css/briefcase.css"
-                    insert = "css"
-                    pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                    if contrib_key in pkg_map and pkg_map[contrib_key]:
-                        pkg_map[contrib_key] += "\n" + css_text
-                    else:
-                        pkg_map[contrib_key] = css_text
+                    legacy_css_warning = self._handle_legacy_css(
+                        wheel, path, filename, package_key, inserts, legacy_css_warning
+                    )
 
                 # New deploy/inserts handling
                 elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
-                    self.console.info(f"    Found {filename}")
-                    rel_inside = "/".join(parts[3:])
+                    self._handle_insert(wheel, parts, filename, package_key, inserts)
 
-                if not rel_inside or rel_inside.endswith("/"):
+                else:
                     self.console.debug(
-                        f"    {filename}: skipping, not a valid insert file."
+                        f"    {filename}: skipping, not a supported insert."
                     )
-                else:
-                    if "~" in rel_inside:
-                        # Preserve any '~' that might exist in the target path by splitting from the right
-                        target, insert = rel_inside.rsplit("~", 1)
-                        self.console.info(
-                            f"    {filename}: Adding {insert} insert for {target}"
-                        )
-
-                        text = wheel.read(filename).decode("utf-8")
-
-                        contrib_key = f"{package_key} (deploy insert: {rel_inside} from {filename})"
-
-                        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-                        if package_key in pkg_map and pkg_map[package_key]:
-                            pkg_map[package_key] += "\n" + text
-                        else:
-                            pkg_map[package_key] = text
-                    else:
-                        self.console.debug(
-                            f"    {filename}: skipping, filename must match '<target>~<insert>'."
-                        )
-
-            else:
-                self.console.debug(f"    {filename}: skipping, not a supported insert.")
 
     def extract_backend_config(self, wheels):
         """Processes multiple wheels to gather a config.toml and a base pyscript.toml

From 46d4436aee824ff9ef781d8862eb12a8b8a1e04b Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 18:38:34 +0800
Subject: [PATCH 069/105] Minor fix in build_app()

---
 src/briefcase/platforms/web/static.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index a14ab046a..f43ee5873 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -571,8 +571,8 @@ def build_app(self, app: AppConfig, **kwargs):
                     inserts=inserts,
                 )
 
-            # Add pyscript insertion to inserts.
-            self._write_pyscript_insert("index.html", pyscript_version, inserts)
+            # Add pyscript insertion to inserts
+            self._append_pyscript_insert("index.html", pyscript_version, inserts)
 
             # Write inserts per target
             for target, target_inserts in sorted(inserts.items()):

From b3b9c33530639cde05563751a6e10df6585660f0 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 1 Oct 2025 18:45:05 +0800
Subject: [PATCH 070/105] Create test_build_write_inserts.py

Create a new test file that houses test cases for the write_inserts() method
---
 .../web/static/test_build_write_inserts.py    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 tests/platforms/web/static/test_build_write_inserts.py

diff --git a/tests/platforms/web/static/test_build_write_inserts.py b/tests/platforms/web/static/test_build_write_inserts.py
new file mode 100644
index 000000000..502c99f09
--- /dev/null
+++ b/tests/platforms/web/static/test_build_write_inserts.py
@@ -0,0 +1,27 @@
+import pytest
+from briefcase.platforms.web.static.build import StaticWebBuildCommand
+
+from briefcase.console import Console
+
+
+@pytest.fixture
+def build_command(tmp_path):
+    return StaticWebBuildCommand(
+        console=Console(),
+        base_path=tmp_path / "base_path",
+        data_path=tmp_path / "briefcase",
+    )
+
+
+@pytest.fixture
+def app_config(first_app_config, tmp_path):
+    first_app_config._path = tmp_path / "base_path/build/first-app/web/static"
+    (first_app_config._path / "www").mkdir(parents=True)
+    return first_app_config
+
+
+def write_target_file(base_path, rel_filename, content):
+    target = base_path / "www" / rel_filename
+    target.parent.mkdir(parents=True, exist_ok=True)
+    target.write_text(content, encoding="utf-8")
+    return target

From 344d8437a4c8b671007aeb941f4ef960c26006d8 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Fri, 3 Oct 2025 00:41:32 +0800
Subject: [PATCH 071/105] Update _process_wheel test coverage

Expand test cases for _process_wheel() to align with refactored structure. Add coverage for _handle_legacy_css() and _handle_insert() paths.
---
 .../web/static/test_build__process_wheel.py   | 225 +++++++++++++++---
 1 file changed, 192 insertions(+), 33 deletions(-)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 54b44c452..b3adf3bff 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -3,7 +3,6 @@
 
 import pytest
 
-from briefcase.console import Console
 from briefcase.exceptions import BriefcaseCommandError
 from briefcase.platforms.web.static import StaticWebBuildCommand
 
@@ -22,20 +21,26 @@ def build_command(dummy_console, tmp_path):
 def test_process_wheel(build_command, tmp_path):
     """A wheel can be processed to have CSS content extracted."""
 
-    # Create a wheel with some content.
+    # Create a wheel with some content
     wheel_filename = create_wheel(
         tmp_path,
         extra_content=[
-            # Two CSS files
+            # Three CSS files
             (
                 "dummy/static/first.css",
                 "span {\n  font-color: red;\n  font-size: larger\n}\n",
             ),
-            ("dummy/static/second.css", "div {\n  padding: 10px\n}\n"),
-            ("dummy/static/deep/third.css", "p {\n  color: red\n}\n"),
+            (
+                "dummy/static/second.css",
+                "div {\n  padding: 10px\n}\n",
+            ),
+            (
+                "dummy/static/deep/third.css",
+                "p {\n  color: red\n}\n",
+            ),
             # Content in the static file that isn't CSS
             ("dummy/static/explosions.js", "alert('boom!');"),
-            # CSS in a location that isn't the static folder.
+            # CSS in a location that isn't the static folder
             ("dummy/other.css", "div.other {\n  margin: 10px\n}\n"),
             ("lost.css", "div.lost {\n  margin: 10px\n}\n"),
         ],
@@ -45,10 +50,10 @@ def test_process_wheel(build_command, tmp_path):
     inserts = {}
     build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
 
-    # Legacy CSS should be collected into the briefcase.css "CSS" insert slot
+    # Legacy CSS should be collected into the briefcase.css "css" insert slot
     assert inserts == {
         "static/css/briefcase.css": {
-            "CSS": {
+            "css": {
                 "dummy 1.2.3 (legacy static CSS: first.css)": (
                     "span {\n  font-color: red;\n  font-size: larger\n}\n"
                 ),
@@ -113,31 +118,6 @@ def test_process_wheel_deploy_inserts(build_command, tmp_path):
     assert any("body { margin: 0; }" in v for v in css_contribs.values())
 
 
-def test_process_wheel_invalid_insert_skipped(build_command, tmp_path, monkeypatch):
-    """Files without '~' in their name under deploy/inserts are skipped."""
-    wheel_filename = create_wheel(
-        tmp_path,
-        extra_content=[
-            ("dummy/deploy/inserts/index.html", "<div>oops</div>"),
-        ],
-    )
-
-    # Check on console.debug to confirm a skip message was emitted
-    seen = {"debugs": []}
-    monkeypatch.setattr(
-        build_command.console, "debug", lambda msg: seen["debugs"].append(msg)
-    )
-
-    inserts = {}
-    build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
-
-    assert inserts == {}
-    assert any(
-        "skipping" in msg and "must match '<target>~<insert>'" in msg
-        for msg in seen["debugs"]
-    )
-
-
 def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypatch):
     """Legacy CSS files trigger a single deprecation warning."""
     wheel_filename = create_wheel(
@@ -185,3 +165,182 @@ def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
         BriefcaseCommandError, match="CSS content must be UTF-8 encoded"
     ):
         build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
+
+
+def test_handle_legacy_css_warning_once_and_append(
+    build_command, tmp_path, monkeypatch
+):
+    """Legacy CSS warns once and appends to existing contrib key."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/static/one.css", "h1 { x:1; }")
+
+    # Count warnings
+    warnings = []
+    monkeypatch.setattr(build_command.console, "warning", warnings.append)
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        # First call - warn
+        warned = build_command._handle_legacy_css(
+            wheel=zf,
+            path=Path("dummy/static/one.css"),
+            filename="dummy/static/one.css",
+            package_key="pkg 1.0",
+            inserts=inserts,
+            legacy_css_warning=False,
+        )
+        # Pre-seed same contrib key to force append on second call
+        target_map = inserts.setdefault("static/css/briefcase.css", {}).setdefault(
+            "css", {}
+        )
+        key = "pkg 1.0 (legacy static CSS: one.css)"
+        target_map[key] = target_map[key] + "\n/*extra*/"
+        # Second call - no additional warning, content appended
+        warned = build_command._handle_legacy_css(
+            wheel=zf,
+            path=Path("dummy/static/one.css"),
+            filename="dummy/static/one.css",
+            package_key="pkg 1.0",
+            inserts=inserts,
+            legacy_css_warning=warned,
+        )
+
+    # One warning only
+    legacy_msgs = [m for m in warnings if "legacy '/static' CSS detected" in m]
+    assert len(legacy_msgs) == 1
+
+    # Content appended
+    out = inserts["static/css/briefcase.css"]["css"][key]
+    assert "h1 { x:1; }" in out and "/*extra*/" in out
+
+
+def test_handle_insert_register_valid_file(build_command, tmp_path):
+    """Valid insert is registered under target/slot."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/deploy/inserts/index.html~header", "<s>ok</s>")
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path("dummy/deploy/inserts/index.html~header").parts,
+            filename="dummy/deploy/inserts/index.html~header",
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    assert "index.html" in inserts and "header" in inserts["index.html"]
+    assert any("<s>ok</s>" in v for v in inserts["index.html"]["header"].values())
+
+
+@pytest.mark.parametrize(
+    "entry",
+    [
+        "dummy/deploy/inserts/",  # Top-level directory entry
+        "dummy/deploy/inserts/assets/",  # Nested directory entry
+    ],
+)
+def test_handle_insert_skip_dir_entries(build_command, tmp_path, monkeypatch, entry):
+    """Deploy/inserts directory entries are skipped with a debug log.
+
+    Parametrized: runs once for top-level dir and once for nested dir.
+    """
+    # Create a dummy wheel containing the "directory" entry
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(entry, "")
+
+    # Capture debug messages
+    debugs = []
+    monkeypatch.setattr(build_command.console, "debug", debugs.append)
+
+    # Run the handler against this entry
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(entry).parts,
+            filename=entry,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    # Directory entries should be ignored completely
+    assert inserts == {}
+    # And a debug message explaining the skip should be logged
+    assert any("skipping, not a valid insert file" in m for m in debugs)
+
+
+@pytest.mark.parametrize("mode", ["integration", "unit"])
+def missing_tilde_under_deploy_inserts_skipped(
+    build_command, tmp_path, monkeypatch, mode
+):
+    """Files under deploy/inserts without '~' are skipped with a debug log.
+
+    Parametrized: tests both integration path (_process_wheel) and direct unit call.
+    """
+    # Create a dummy wheel containing an invalid insert file (no "~" in name)
+    wheel_filename = Path(tmp_path) / "dummy-1.2.3.whl"
+    missing_tilde = "dummy/deploy/inserts/index.html"
+    with zipfile.ZipFile(wheel_filename, "w") as zf:
+        zf.writestr(missing_tilde, "<div>oops</div>")
+
+    # Capture debug messages
+    debugs = []
+    monkeypatch.setattr(build_command.console, "debug", debugs.append)
+
+    inserts = {}
+    if mode == "integration":
+        # Run via full wheel scan, which will delegate to _handle_insert
+        build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
+    else:
+        # Run handler directly on the invalid file
+        with zipfile.ZipFile(wheel_filename) as zf:
+            build_command._handle_insert(
+                wheel=zf,
+                parts=Path(missing_tilde).parts,
+                filename=missing_tilde,
+                package_key="pkg 1.0",
+                inserts=inserts,
+            )
+
+    # File should be ignored completely
+    assert inserts == {}
+    # And a debug message should clearly say why (missing "~")
+    assert any("must match '<target>~<insert>'" in m for m in debugs)
+
+
+def test_handle_insert_append_existing_contrib(build_command, tmp_path):
+    """Second insert with same contrib key appends with newline."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    filename = "dummy/deploy/inserts/index.html~header"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(filename, "<first/>")
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        # First registration creates contrib entry
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+        # Second registration appends to same key
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    contribs = inserts["index.html"]["header"]
+    contrib_key = next(iter(contribs.keys()))
+    value = contribs[contrib_key]
+
+    assert value.count("<first/>") == 2
+    assert "\n" in value

From 78acd8c275374335d207edac087ef9a0ec8c3a4d Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Fri, 3 Oct 2025 00:50:31 +0800
Subject: [PATCH 072/105] Update non UTF8 wheel tests to expect
 UnicodeDecodeError

---
 .../platforms/web/static/test_build__process_wheel.py | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index b3adf3bff..a8e630b53 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -3,7 +3,6 @@
 
 import pytest
 
-from briefcase.exceptions import BriefcaseCommandError
 from briefcase.platforms.web.static import StaticWebBuildCommand
 
 from ....utils import create_wheel
@@ -142,28 +141,26 @@ def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypa
 
 
 def test_process_wheel_non_utf8_insert(build_command, tmp_path):
-    """Non-UTF8 deploy insert raises a BriefcaseCommandError."""
+    """Non-UTF8 deploy insert now raises an UnicodeDecodeError."""
     bad = b"\xff\xfe\xfa"
     wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:
         zf.writestr("dummy/deploy/inserts/index.html~header", bad)
 
     inserts = {}
-    with pytest.raises(BriefcaseCommandError, match="insert must be UTF-8 encoded"):
+    with pytest.raises(UnicodeDecodeError):
         build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
 
 
 def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
-    """Non-UTF8 legacy CSS raises a BriefcaseCommandError."""
+    """Non-UTF8 legacy CSS now raises an UnicodeDecodeError."""
     bad = b"\xff\xfe\xfa"
     wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:
         zf.writestr("dummy/static/bad.css", bad)
 
     inserts = {}
-    with pytest.raises(
-        BriefcaseCommandError, match="CSS content must be UTF-8 encoded"
-    ):
+    with pytest.raises(UnicodeDecodeError):
         build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
 
 

From 973b426e8ff23b125ef24bb6a32c93462b1f7351 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Fri, 3 Oct 2025 00:52:42 +0800
Subject: [PATCH 073/105] Minor comment tweak

---
 tests/platforms/web/static/test_build__process_wheel.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index a8e630b53..16443cdde 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -141,7 +141,7 @@ def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypa
 
 
 def test_process_wheel_non_utf8_insert(build_command, tmp_path):
-    """Non-UTF8 deploy insert now raises an UnicodeDecodeError."""
+    """Non-UTF8 deploy insert raises an UnicodeDecodeError."""
     bad = b"\xff\xfe\xfa"
     wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:
@@ -153,7 +153,7 @@ def test_process_wheel_non_utf8_insert(build_command, tmp_path):
 
 
 def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
-    """Non-UTF8 legacy CSS now raises an UnicodeDecodeError."""
+    """Non-UTF8 legacy CSS raises an UnicodeDecodeError."""
     bad = b"\xff\xfe\xfa"
     wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:

From 5563047c7180b1fc802d4f4beef87b09e3fec571 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Fri, 3 Oct 2025 01:35:04 +0800
Subject: [PATCH 074/105] Expand write_inserts() test coverage

---
 .../web/static/test_build_write_inserts.py    | 68 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/tests/platforms/web/static/test_build_write_inserts.py b/tests/platforms/web/static/test_build_write_inserts.py
index 502c99f09..6352f65bc 100644
--- a/tests/platforms/web/static/test_build_write_inserts.py
+++ b/tests/platforms/web/static/test_build_write_inserts.py
@@ -1,7 +1,10 @@
+from pathlib import Path
+from textwrap import dedent
+
 import pytest
-from briefcase.platforms.web.static.build import StaticWebBuildCommand
 
 from briefcase.console import Console
+from briefcase.platforms.web.static import StaticWebBuildCommand
 
 
 @pytest.fixture
@@ -25,3 +28,66 @@ def write_target_file(base_path, rel_filename, content):
     target.parent.mkdir(parents=True, exist_ok=True)
     target.write_text(content, encoding="utf-8")
     return target
+
+
+def test_write_insert_warn_if_slot_missing(build_command, app_config, monkeypatch):
+    """Warn if insert slot markers are missing from the file."""
+
+    # File without insert markers
+    file_text = "<html>No markers here</html>"
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Capture warnings
+    warnings = []
+    monkeypatch.setattr(build_command.console, "warning", warnings.append)
+
+    # Attempt to insert into missing slot
+    inserts = {"header": {"pkg": "<div/>"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+
+    # Ensure warning was raised and file is unchanged
+    assert any("markers not found" in w for w in warnings)
+    assert target.read_text() == file_text
+
+
+def test_write_insert_warn_if_file_missing(build_command, app_config, monkeypatch):
+    """Warn if the target file does not exist."""
+
+    # Capture warnings
+    warnings = []
+    monkeypatch.setattr(build_command.console, "warning", warnings.append)
+
+    # Attempt to insert into a file that doesn’t exist
+    inserts = {"header": {"pkg": "<div/>"}}
+    build_command.write_inserts(app_config, Path("notexist.html"), inserts)
+
+    # Ensure warning was raised
+    assert any("Target notexist.html not found" in w for w in warnings)
+
+
+def test_write_insert_is_idempotent(build_command, app_config):
+    """Inserts should be idempotent when run multiple times."""
+
+    # File with placeholder slot
+    file_text = dedent(
+        """\
+        <html>
+        <!--@@ header:start @@-->
+        PLACEHOLDER
+        <!--@@ header:end @@-->
+        </html>
+        """
+    )
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Apply insert once
+    inserts = {"header": {"pkg": "<p>Hello</p>"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+    once = target.read_text()
+
+    # Apply insert again
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+    twice = target.read_text()
+
+    # Ensure result did not change
+    assert once == twice

From 4a2180251f8272841ece8f7124415fb92fa5f468 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Fri, 3 Oct 2025 01:55:33 +0800
Subject: [PATCH 075/105] Expand write_inserts() test coverage

---
 .../web/static/test_build_write_inserts.py    | 133 +++++++++++++++++-
 1 file changed, 132 insertions(+), 1 deletion(-)

diff --git a/tests/platforms/web/static/test_build_write_inserts.py b/tests/platforms/web/static/test_build_write_inserts.py
index 6352f65bc..ee8910ffa 100644
--- a/tests/platforms/web/static/test_build_write_inserts.py
+++ b/tests/platforms/web/static/test_build_write_inserts.py
@@ -4,7 +4,7 @@
 import pytest
 
 from briefcase.console import Console
-from briefcase.platforms.web.static import StaticWebBuildCommand
+from briefcase.platforms.web.static import CSS_BANNER, StaticWebBuildCommand
 
 
 @pytest.fixture
@@ -91,3 +91,134 @@ def test_write_insert_is_idempotent(build_command, app_config):
 
     # Ensure result did not change
     assert once == twice
+
+
+def test_write_insert_slot_name_regex_escaped(build_command, app_config):
+    """Slots containing regex chars should be escaped and matched literally."""
+
+    # File with marker containing regex chars
+    file_text = dedent(
+        """\
+        <html>
+        <!--@@ head[er]:start @@-->
+        PLACEHOLDER
+        <!--@@ head[er]:end @@-->
+        </html>
+        """
+    )
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Insert into regex-like slot name
+    inserts = {"head[er]": {"pkg": "<p>works</p>"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+
+    # Ensure content was inserted correctly
+    out = target.read_text()
+    assert "works" in out
+
+
+def test_write_insert_css_packages_sorted(build_command, app_config):
+    """Multiple CSS contributions should be inserted in sorted order."""
+
+    # File with CSS marker slot
+    file_text = "/*@@ css:start @@*/\nold\n/*@@ css:end @@*/\n"
+    target = write_target_file(app_config._path, "static/css/briefcase.css", file_text)
+
+    # Insert two contributions out of order
+    inserts = {"css": {"b": "b{}", "a": "a{}"}}
+    build_command.write_inserts(app_config, Path("static/css/briefcase.css"), inserts)
+
+    out = target.read_text()
+    a_block = CSS_BANNER.format(package="a", content="a{}")
+    b_block = CSS_BANNER.format(package="b", content="b{}")
+
+    # Ensure alphabetical order and removal of old content
+    assert out.index(a_block) < out.index(b_block)
+    assert "old" not in out
+
+
+def test_write_insert_replaces_all_matches(build_command, app_config):
+    """All matching slots should be replaced, not just the first occurrence."""
+
+    # File with two identical slots
+    file_text = (
+        "<!--@@ h:start @@-->X<!--@@ h:end @@-->\n"
+        "<!--@@ h:start @@-->Y<!--@@ h:end @@-->\n"
+    )
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Insert replacement content
+    inserts = {"h": {"pkg": "Z"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+
+    out = target.read_text()
+
+    # Both occurrences replaced
+    assert "X" not in out and "Y" not in out
+    assert out.count("Z") == 2
+
+
+def test_write_insert_handles_html_and_css_markers(build_command, app_config):
+    """HTML and CSS marker styles should both be processed in one file."""
+
+    # File containing both HTML and CSS markers
+    file_text = dedent("""\
+        <html>
+          <!--@@ assets:start @@-->
+          OLD_HTML
+          <!--@@ assets:end @@-->
+          <style>
+          /*@@ assets:start @@*/
+          OLD_CSS
+          /*@@ assets:end @@*/
+          </style>
+        </html>
+    """)
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Insert HTML and CSS contributions
+    inserts = {"assets": {"pkgA": "<link/>", "pkgB": "h1{}"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+
+    out = target.read_text()
+
+    # Ensure both banners appear, new content is inserted, and old content removed
+    assert "<!--------------------------------------------------" in out
+    assert "<link/>" in out
+    assert "/**************************************************" in out
+    assert "h1{}" in out
+    assert "OLD_HTML" not in out and "OLD_CSS" not in out
+
+
+def test_write_insert_preserves_multiline_indent(build_command, app_config):
+    """Inserted multiline content should preserve indentation of markers."""
+
+    # File with indented marker slot
+    file_text = "    <!--@@ header:start @@-->\n    X\n    <!--@@ header:end @@-->\n"
+    target = write_target_file(app_config._path, "index.html", file_text)
+
+    # Insert multiline content
+    inserts = {"header": {"pkg": "L1\nL2"}}
+    build_command.write_inserts(app_config, Path("index.html"), inserts)
+
+    out = target.read_text()
+
+    # Ensure inserted lines are indented properly
+    assert "\n    L1\n    L2\n" in out
+
+
+def test_write_insert_ignores_empty_contributions(build_command, app_config):
+    """Empty insert contributions should be ignored (no banner written)."""
+
+    # File with CSS marker slot
+    file_text = "/*@@ css:start @@*/\nX\n/*@@ css:end @@*/\n"
+    target = write_target_file(app_config._path, "static/css/briefcase.css", file_text)
+
+    # Provide empty contribution
+    inserts = {"css": {"pkg": ""}}
+    build_command.write_inserts(app_config, Path("static/css/briefcase.css"), inserts)
+
+    out = target.read_text()
+
+    # Ensure no banner for empty contribution
+    assert " * pkg" not in out

From 477ea2e205fc3c79ba52667a3da48b0a87637fa0 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 10:42:24 +0800
Subject: [PATCH 076/105] fixes to css checks in test_build.py

---
 tests/platforms/web/static/test_build.py | 72 ++++++++++++------------
 1 file changed, 35 insertions(+), 37 deletions(-)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 9a2e8c8f9..102f07fe4 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -15,7 +15,7 @@
 from briefcase.integrations.subprocess import Subprocess
 from briefcase.platforms.web.static import StaticWebBuildCommand
 
-from ....utils import create_file, create_wheel
+from ....utils import create_wheel
 
 
 @pytest.fixture
@@ -54,14 +54,14 @@ def mock_run(*args, **kwargs):
 
 [pyscript]
 version = "2024.11.1"
-"""
+""",
                     ),
                     (
                         "dependency/deploy/pyscript.toml",
                         """
 existing-key-1 = "value-1"
 existing-key-2 = 2
-"""
+""",
                     ),
                 ],
             )
@@ -159,24 +159,24 @@ def mock_run(*args, **kwargs):
                     "  <head>",
                     "    <!--@@ head:start @@-->",
                     "    <!--@@ head:end @@-->",
-                    "    <!--@@ Python:start @@-->",
+                    "    <!--@@ python:start @@-->",
                     "    <!--------------------------------------------------",
                     "     * briefcase",
                     "     -------------------------------------------------->",
-                    "    <script type=\"module\">",
+                    '    <script type="module">',
                     "        // Hide the splash screen when the page is ready.",
-                    "        import { hooks } from \"https://pyscript.net/releases/2024.11.1/core.js\";",
+                    '        import { hooks } from "https://pyscript.net/releases/2024.11.1/core.js";',
                     "        hooks.main.onReady.add(() => {",
-                    "            document.getElementById(\"briefcase-splash\").classList.add(\"hidden\");",
+                    '            document.getElementById("briefcase-splash").classList.add("hidden");',
                     "        });",
                     "    </script>",
                     "",
-                    "    <link rel=\"stylesheet\" href=\"https://pyscript.net/releases/2024.11.1/core.css\">",
-                    "    <script type=\"module\" src=\"https://pyscript.net/releases/2024.11.1/core.js\"></script>",
-                    "    <!--@@ Python:end @@-->",
+                    '    <link rel="stylesheet" href="https://pyscript.net/releases/2024.11.1/core.css">',
+                    '    <script type="module" src="https://pyscript.net/releases/2024.11.1/core.js"></script>',
+                    "    <!--@@ python:end @@-->",
                     "  </head>",
                     "  <body>",
-                    "    <div id=\"briefcase-splash\"></div>",
+                    '    <div id="briefcase-splash"></div>',
                     "",
                     "    <!--@@ body-end:start @@-->",
                     "    <!--@@ body-end:end @@-->",
@@ -187,7 +187,6 @@ def mock_run(*args, **kwargs):
             + "\n"
         )
 
-
     # briefcase.css has been appended
     with (bundle_path / "www/static/css/briefcase.css").open(encoding="utf-8") as f:
         assert (
@@ -199,25 +198,25 @@ def mock_run(*args, **kwargs):
                     "  display: None;",
                     "}",
                     "/*******************************************************************",
-                    " ******************** Wheel contributed styles ********************/",
-                    "",
-                    "/*******************************************************",
-                    " * dependency 1.2.3::style.css",
-                    " *******************************************************/",
+                    "******************** Wheel contributed styles ********************/",
+                    "/*@@ css:start @@*/",
+                    "/**************************************************",
+                    " * dependency 1.2.3 (legacy static CSS: style.css)",
+                    " *************************************************/",
                     "",
                     "div { margin: 10px; }",
                     "",
-                    "/*******************************************************",
+                    "/**************************************************",
                     " * first_app 1.2.3::style.css",
-                    " *******************************************************/",
+                    " *************************************************/",
                     "",
                     "span { margin: 10px; }",
                     "",
-                    "/*******************************************************",
-                    " * other 1.2.3::style.css",
-                    " *******************************************************/",
-                    "",
+                    "/**************************************************",
+                    " * other 1.2.3 (legacy static CSS: style.css)",
+                    " *************************************************/",
                     "div { padding: 10px; }",
+                    "/*@@ css:end @@*/"
                 ]
             )
             + "\n"
@@ -298,7 +297,7 @@ def mock_run(*args, **kwargs):
 
 [pyscript]
 version = "2024.11.1"
-"""
+""",
                     ),
                 ],
             )
@@ -315,7 +314,7 @@ def mock_run(*args, **kwargs):
 
 [pyscript]
 version = "2024.10.1"
-"""
+""",
                     ),
                 ],
             )
@@ -413,7 +412,7 @@ def mock_run(*args, **kwargs):
 
 [pyscript]
 version = "2024.11.1"
-"""
+""",
                     ),
                 ],
             )
@@ -478,13 +477,13 @@ def mock_run(*args, **kwargs):
 
 [pyscript]
 version = "2024.11.1"
-"""
+""",
                     ),
                     (
                         "dependency/deploy/pyscript.toml",
                         """
 This is not valid toml.
-"""
+""",
                     ),
                 ],
             )
@@ -551,7 +550,7 @@ def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_
     # Mock extracting pyscript.toml from a wheel.
     build_command.extract_backend_config = lambda _: (
         {"existing-key-1": "value-1", "existing-key-2": 2},
-        "2024.11.1"
+        "2024.11.1",
     )
 
     # Build the web app.
@@ -682,7 +681,7 @@ def mock_run(*args, **kwargs):
     # Mock extracting pyscript.toml from a wheel.
     build_command.extract_backend_config = lambda _: (
         {"existing-key-1": "value-1", "existing-key-2": 2},
-        "2024.11.1"
+        "2024.11.1",
     )
 
     # Build the web app.
@@ -751,13 +750,13 @@ def mock_run(*args, **kwargs):
                     "  display: None;",
                     "}",
                     "/*******************************************************************",
-                    " ******************** Wheel contributed styles ********************/",
-                    "",
-                    "/*******************************************************",
-                    " * first_app 1.2.3::style.css",
-                    " *******************************************************/",
-                    "",
+                    "******************** Wheel contributed styles ********************/",
+                    "/*@@ css:start @@*/",
+                    "/**************************************************",
+                    " * first_app 1.2.3 (legacy static CSS: style.css)",
+                    " *************************************************/",
                     "span { margin: 10px; }",
+                    "/*@@ css:end @@*/",
                 ]
             )
             + "\n"
@@ -882,4 +881,3 @@ def test_dependency_fail(build_command, first_app_generated, tmp_path):
 
     # Wheels folder still exists
     assert (bundle_path / "www/static/wheels").is_dir()
-

From 5c698cb531d6db89493db1d1d7b82778ac3c8c99 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 12:18:57 +0800
Subject: [PATCH 077/105] test_build_app_config_backend_warning

"""Briefcase raises a warning if "backend" value is not pyscript."""
---
 src/briefcase/platforms/web/static.py    |  2 +-
 tests/platforms/web/static/test_build.py | 73 ++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 6 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f43ee5873..f45e36caf 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -435,7 +435,7 @@ def extract_backend_config(self, wheels):
                     # Currently, only pyscript is supported. Warn if another backend is found.
                     elif backend != "pyscript":
                         self.console.warning(
-                            "Only 'pyscript' backend is currently supported for web static builds."
+                            "Only 'pyscript' backend is currently supported for web static builds. "
                             "This project may not work correctly."
                         )
 
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 102f07fe4..ab8bfdecf 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -203,20 +203,19 @@ def mock_run(*args, **kwargs):
                     "/**************************************************",
                     " * dependency 1.2.3 (legacy static CSS: style.css)",
                     " *************************************************/",
-                    "",
                     "div { margin: 10px; }",
                     "",
                     "/**************************************************",
-                    " * first_app 1.2.3::style.css",
+                    " * first_app 1.2.3 (legacy static CSS: style.css)",
                     " *************************************************/",
-                    "",
                     "span { margin: 10px; }",
                     "",
                     "/**************************************************",
                     " * other 1.2.3 (legacy static CSS: style.css)",
                     " *************************************************/",
                     "div { padding: 10px; }",
-                    "/*@@ css:end @@*/"
+                    "/*@@ css:end @@*/",
+                    ""
                 ]
             )
             + "\n"
@@ -338,7 +337,7 @@ def mock_run(*args, **kwargs):
     # Build the web app.
     with pytest.raises(
         BriefcaseConfigError,
-        match=r"Only 1 backend configuration file can be supplied.",
+        match=r"Only one backend configuration file can be supplied.",
     ):
         build_command.build_app(first_app_generated)
 
@@ -391,6 +390,69 @@ def mock_run(*args, **kwargs):
     ):
         build_command.build_app(first_app_generated)
 
+def test_build_app_config_backend_warning(build_command, first_app_generated, tmp_path, capsys):
+    """Briefcase raises a warning if "backend" value is not pyscript."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels with a single config.toml containing no backend value.
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "something-else"
+""",
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    build_command.build_app(first_app_generated)
+
+    # Capture output and assert warning present.
+    captured = capsys.readouterr()
+    assert (
+        "Only 'pyscript' backend is currently supported for web static builds." in captured.out
+    )
+
+    # Check pyscript.toml was created and has correct packages.
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
 
 def test_build_app_no_wheel_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with no pyscript.toml supplied by a wheel gets a basic config."""
@@ -757,6 +819,7 @@ def mock_run(*args, **kwargs):
                     " *************************************************/",
                     "span { margin: 10px; }",
                     "/*@@ css:end @@*/",
+                    ""
                 ]
             )
             + "\n"

From 79239a2647a47bd315222a44a0a818e65d969050 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 13:13:06 +0800
Subject: [PATCH 078/105] add enconding to readtext calls

---
 .../web/static/test_build_write_inserts.py     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/platforms/web/static/test_build_write_inserts.py b/tests/platforms/web/static/test_build_write_inserts.py
index ee8910ffa..e8a7eb452 100644
--- a/tests/platforms/web/static/test_build_write_inserts.py
+++ b/tests/platforms/web/static/test_build_write_inserts.py
@@ -47,7 +47,7 @@ def test_write_insert_warn_if_slot_missing(build_command, app_config, monkeypatc
 
     # Ensure warning was raised and file is unchanged
     assert any("markers not found" in w for w in warnings)
-    assert target.read_text() == file_text
+    assert target.read_text(encoding="utf-8") == file_text
 
 
 def test_write_insert_warn_if_file_missing(build_command, app_config, monkeypatch):
@@ -83,11 +83,11 @@ def test_write_insert_is_idempotent(build_command, app_config):
     # Apply insert once
     inserts = {"header": {"pkg": "<p>Hello</p>"}}
     build_command.write_inserts(app_config, Path("index.html"), inserts)
-    once = target.read_text()
+    once = target.read_text(encoding="utf-8")
 
     # Apply insert again
     build_command.write_inserts(app_config, Path("index.html"), inserts)
-    twice = target.read_text()
+    twice = target.read_text(encoding="utf-8")
 
     # Ensure result did not change
     assert once == twice
@@ -113,7 +113,7 @@ def test_write_insert_slot_name_regex_escaped(build_command, app_config):
     build_command.write_inserts(app_config, Path("index.html"), inserts)
 
     # Ensure content was inserted correctly
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
     assert "works" in out
 
 
@@ -128,7 +128,7 @@ def test_write_insert_css_packages_sorted(build_command, app_config):
     inserts = {"css": {"b": "b{}", "a": "a{}"}}
     build_command.write_inserts(app_config, Path("static/css/briefcase.css"), inserts)
 
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
     a_block = CSS_BANNER.format(package="a", content="a{}")
     b_block = CSS_BANNER.format(package="b", content="b{}")
 
@@ -151,7 +151,7 @@ def test_write_insert_replaces_all_matches(build_command, app_config):
     inserts = {"h": {"pkg": "Z"}}
     build_command.write_inserts(app_config, Path("index.html"), inserts)
 
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
 
     # Both occurrences replaced
     assert "X" not in out and "Y" not in out
@@ -180,7 +180,7 @@ def test_write_insert_handles_html_and_css_markers(build_command, app_config):
     inserts = {"assets": {"pkgA": "<link/>", "pkgB": "h1{}"}}
     build_command.write_inserts(app_config, Path("index.html"), inserts)
 
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
 
     # Ensure both banners appear, new content is inserted, and old content removed
     assert "<!--------------------------------------------------" in out
@@ -201,7 +201,7 @@ def test_write_insert_preserves_multiline_indent(build_command, app_config):
     inserts = {"header": {"pkg": "L1\nL2"}}
     build_command.write_inserts(app_config, Path("index.html"), inserts)
 
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
 
     # Ensure inserted lines are indented properly
     assert "\n    L1\n    L2\n" in out
@@ -218,7 +218,7 @@ def test_write_insert_ignores_empty_contributions(build_command, app_config):
     inserts = {"css": {"pkg": ""}}
     build_command.write_inserts(app_config, Path("static/css/briefcase.css"), inserts)
 
-    out = target.read_text()
+    out = target.read_text(encoding="utf-8")
 
     # Ensure no banner for empty contribution
     assert " * pkg" not in out

From 9170b476f7e2a046ce9c8f2c8db4dcaf1c124cc6 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 15:15:27 +0800
Subject: [PATCH 079/105] remove pyscript.toml from test_package_app

first_app_built will not no longer contain it
---
 tests/platforms/web/static/test_package.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/platforms/web/static/test_package.py b/tests/platforms/web/static/test_package.py
index bfe2af07b..66aab995e 100644
--- a/tests/platforms/web/static/test_package.py
+++ b/tests/platforms/web/static/test_package.py
@@ -36,7 +36,6 @@ def test_package_app(package_command, first_app_built, tmp_path):
     with ZipFile(archive_file) as archive:
         assert sorted(archive.namelist()) == [
             "index.html",
-            "pyscript.toml",
             "static/",
             "static/css/",
             "static/css/briefcase.css",

From c20e55bc8eb3c84bff1de613d6073d041996a7ff Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 15:29:53 +0800
Subject: [PATCH 080/105] move extract_backend_config test to own file

---
 tests/platforms/web/static/test_build.py      | 360 ----------------
 .../test_build_extract_backend_config.py      | 394 ++++++++++++++++++
 2 files changed, 394 insertions(+), 360 deletions(-)
 create mode 100644 tests/platforms/web/static/test_build_extract_backend_config.py

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index ab8bfdecf..44b0b6fd5 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -222,366 +222,6 @@ def mock_run(*args, **kwargs):
         )
 
 
-def test_build_app_no_config(build_command, first_app_generated, tmp_path):
-    """An app with no config.toml supplied by a wheel gets a basic config."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels without a config.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
-    build_command.build_app(first_app_generated)
-
-    # Pyscript.toml has been written with only the packages content
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
-
-
-def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):
-    """An app with multiple config.toml supplied by wheels fails to build."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels without a config.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
-backend = "pyscript"
-
-[pyscript]
-version = "2024.11.1"
-""",
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
-backend = "pyscript"
-
-[pyscript]
-version = "2024.10.1"
-""",
-                    ),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
-    with pytest.raises(
-        BriefcaseConfigError,
-        match=r"Only one backend configuration file can be supplied.",
-    ):
-        build_command.build_app(first_app_generated)
-
-
-def test_build_app_config_no_backend(build_command, first_app_generated, tmp_path):
-    """An app cannot be built with a config.toml containing no "backend" value."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels with a single config.toml containing no backend value.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    ("dependency/deploy/config.toml", ""),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
-    with pytest.raises(
-        BriefcaseConfigError,
-        match=r"No backend was provided in config.toml file.",
-    ):
-        build_command.build_app(first_app_generated)
-
-def test_build_app_config_backend_warning(build_command, first_app_generated, tmp_path, capsys):
-    """Briefcase raises a warning if "backend" value is not pyscript."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels with a single config.toml containing no backend value.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
-backend = "something-else"
-""",
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    build_command.build_app(first_app_generated)
-
-    # Capture output and assert warning present.
-    captured = capsys.readouterr()
-    assert (
-        "Only 'pyscript' backend is currently supported for web static builds." in captured.out
-    )
-
-    # Check pyscript.toml was created and has correct packages.
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
-
-def test_build_app_no_wheel_pyscript_toml(build_command, first_app_generated, tmp_path):
-    """An app with no pyscript.toml supplied by a wheel gets a basic config."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels without a pyscript.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
-backend = "pyscript"
-
-[pyscript]
-version = "2024.11.1"
-""",
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
-    build_command.build_app(first_app_generated)
-
-    # Pyscript.toml has been written with only the packages content
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
-
-
-def test_build_app_invalid_wheel_pyscript_toml(
-    build_command, first_app_generated, tmp_path
-):
-    """An app with an invalid pyscript.toml raises an error."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Invoking build will create wheels as a side effect.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
-backend = "pyscript"
-
-[pyscript]
-version = "2024.11.1"
-""",
-                    ),
-                    (
-                        "dependency/deploy/pyscript.toml",
-                        """
-This is not valid toml.
-""",
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Building the web app raises an error
-    with pytest.raises(
-        BriefcaseConfigError,
-        match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
-    ):
-        build_command.build_app(first_app_generated)
-
-
 def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_path):
     """An app with extra pyscript.toml content can be written."""
     bundle_path = tmp_path / "base_path/build/first-app/web/static"
diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
new file mode 100644
index 000000000..d88362e3d
--- /dev/null
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -0,0 +1,394 @@
+import shutil
+import subprocess
+import sys
+from unittest import mock
+
+if sys.version_info >= (3, 11):  # pragma: no-cover-if-lt-py311
+    import tomllib
+else:  # pragma: no-cover-if-gte-py311
+    import tomli as tomllib
+
+import pytest
+
+from briefcase.console import LogLevel
+from briefcase.exceptions import BriefcaseCommandError, BriefcaseConfigError
+from briefcase.integrations.subprocess import Subprocess
+from briefcase.platforms.web.static import StaticWebBuildCommand
+
+from ....utils import create_wheel
+
+
+@pytest.fixture
+def build_command(dummy_console, tmp_path):
+    command = StaticWebBuildCommand(
+        console=dummy_console,
+        base_path=tmp_path / "base_path",
+        data_path=tmp_path / "briefcase",
+    )
+    command.tools.subprocess = mock.MagicMock(spec_set=Subprocess)
+    command.tools.shutil = mock.MagicMock(spec_set=shutil)
+
+    return command
+
+
+def test_build_app_no_config(build_command, first_app_generated, tmp_path):
+    """An app with no config.toml supplied by a wheel gets a basic config."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a config.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    build_command.build_app(first_app_generated)
+
+    # Pyscript.toml has been written with only the packages content
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
+
+
+def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):
+    """An app with multiple config.toml supplied by wheels fails to build."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a config.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+""",
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.10.1"
+""",
+                    ),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"Only one backend configuration file can be supplied.",
+    ):
+        build_command.build_app(first_app_generated)
+
+
+def test_build_app_config_no_backend(build_command, first_app_generated, tmp_path):
+    """An app cannot be built with a config.toml containing no "backend" value."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels with a single config.toml containing no backend value.
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    ("dependency/deploy/config.toml", ""),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"No backend was provided in config.toml file.",
+    ):
+        build_command.build_app(first_app_generated)
+
+
+def test_build_app_config_backend_warning(build_command, first_app_generated, tmp_path, capsys):
+    """Briefcase raises a warning if "backend" value is not pyscript."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels with a single config.toml containing no backend value.
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "something-else"
+""",
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    build_command.build_app(first_app_generated)
+
+    # Capture output and assert warning present.
+    captured = capsys.readouterr()
+    assert (
+        "Only 'pyscript' backend is currently supported for web static builds." in captured.out
+    )
+
+    # Check pyscript.toml was created and has correct packages.
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
+
+
+def test_build_app_no_wheel_pyscript_toml(build_command, first_app_generated, tmp_path):
+    """An app with no pyscript.toml supplied by a wheel gets a basic config."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Mock some wheels without a pyscript.toml
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+""",
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Build the web app.
+    build_command.build_app(first_app_generated)
+
+    # Pyscript.toml has been written with only the packages content
+    with (bundle_path / "www/pyscript.toml").open("rb") as f:
+        assert tomllib.load(f) == {
+            "packages": [
+                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
+                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
+                "/static/wheels/other-1.2.3-py3-none-any.whl",
+            ],
+        }
+
+
+def test_build_app_invalid_wheel_pyscript_toml(
+    build_command, first_app_generated, tmp_path
+):
+    """An app with an invalid pyscript.toml raises an error."""
+
+    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+
+    # Invoking build will create wheels as a side effect.
+    def mock_run(*args, **kwargs):
+        if args[0][5] == "wheel":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "first_app",
+                extra_content=[
+                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
+                    (
+                        "dependency/deploy/config.toml",
+                        """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.11.1"
+""",
+                    ),
+                    (
+                        "dependency/deploy/pyscript.toml",
+                        """
+This is not valid toml.
+""",
+                    ),
+                ],
+            )
+        elif args[0][5] == "pip":
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "dependency",
+                extra_content=[
+                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
+                ],
+            )
+            create_wheel(
+                bundle_path / "www/static/wheels",
+                "other",
+                extra_content=[
+                    ("other/static/style.css", "div { padding: 10px; }\n"),
+                ],
+            )
+        else:
+            raise ValueError("Unknown command")
+
+    build_command.tools.subprocess.run.side_effect = mock_run
+
+    # Mock the side effect of invoking shutil
+    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
+        bundle_path / "www/static/wheels"
+    )
+
+    # Building the web app raises an error
+    with pytest.raises(
+        BriefcaseConfigError,
+        match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
+    ):
+        build_command.build_app(first_app_generated)
+

From e6ad0ccfd134c3a1dcfbd736e825d9d5e92eadd7 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 15:57:35 +0800
Subject: [PATCH 081/105] Update to pyscript version collection and added
 test_extract_backend_config

---
 src/briefcase/platforms/web/static.py         |  2 +-
 .../test_build_extract_backend_config.py      | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f45e36caf..df87f8e36 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -440,7 +440,7 @@ def extract_backend_config(self, wheels):
                         )
 
                     # Get pyscript version from config.toml. Use default if not present.
-                    pyscript_version = config_data.get("version", pyscript_version)
+                    pyscript_version = config_data.get("pyscript", {}).get("version", pyscript_version)
 
                     # Extract pyscript.toml
                     pyscript_path = config_filename.replace(
diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index d88362e3d..141dca9f6 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -9,6 +9,9 @@
     import tomli as tomllib
 
 import pytest
+from zipfile import ZipFile
+import tomllib
+import io
 
 from briefcase.console import LogLevel
 from briefcase.exceptions import BriefcaseCommandError, BriefcaseConfigError
@@ -30,6 +33,38 @@ def build_command(dummy_console, tmp_path):
 
     return command
 
+def _mock_wheel(tmp_path, wheel_name, files):
+    """Function to mock wheel files in tests."""
+    wheel_path = tmp_path / wheel_name
+    with ZipFile(wheel_path, "w") as wheel:
+        for filename, content in files.items():
+            wheel.writestr(filename, content)
+    return wheel_path
+
+def test_extract_backend_config(build_command, tmp_path):
+    """Test function works correctly with both config.toml and pyscript.toml."""
+    files = {
+        "dependancy/deploy/config.toml": """
+backend = "pyscript"
+
+[pyscript]
+version = "2024.10.1"
+""",
+        "dependancy/deploy/pyscript.toml": """
+existing-key-1 = "value-1"
+existing-key-2 = 2
+""",
+    }
+
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+
+    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
+
+    assert pyscript_config == {
+        "existing-key-1": "value-1",
+        "existing-key-2": 2,
+    }
+    assert pyscript_version == "2024.10.1"
 
 def test_build_app_no_config(build_command, first_app_generated, tmp_path):
     """An app with no config.toml supplied by a wheel gets a basic config."""

From 7d5949ec13cfd5f9c54cf3182e34da561c8ba900 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 16:05:29 +0800
Subject: [PATCH 082/105] update test_extract_backend_config_no_config

---
 .../test_build_extract_backend_config.py      | 64 +++++--------------
 1 file changed, 15 insertions(+), 49 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index 141dca9f6..eff676ece 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -43,6 +43,7 @@ def _mock_wheel(tmp_path, wheel_name, files):
 
 def test_extract_backend_config(build_command, tmp_path):
     """Test function works correctly with both config.toml and pyscript.toml."""
+    # Mock a wheel with files
     files = {
         "dependancy/deploy/config.toml": """
 backend = "pyscript"
@@ -58,66 +59,31 @@ def test_extract_backend_config(build_command, tmp_path):
 
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
+    # Run the function.
     pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
 
+    # Check returns are correct and files were found.
     assert pyscript_config == {
         "existing-key-1": "value-1",
         "existing-key-2": 2,
     }
     assert pyscript_version == "2024.10.1"
 
-def test_build_app_no_config(build_command, first_app_generated, tmp_path):
-    """An app with no config.toml supplied by a wheel gets a basic config."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels without a config.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
+def test_extract_backend_config_no_config(build_command, tmp_path):
+    """If no config.toml supplied by wheels, functions returns a basic config."""
+    # Mock a wheel without the needed files
+    files = {
+        "dependancy/deploy/not-the-files-you-are-looking-for.toml": ""
+    }
 
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
-    # Build the web app.
-    build_command.build_app(first_app_generated)
+    # Run the function.
+    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
 
-    # Pyscript.toml has been written with only the packages content
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
+    # Check pyscript_config is empty and pyscript_version is the default.
+    assert pyscript_config == {}
+    assert pyscript_version == "2024.11.1"
 
 
 def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):

From 8883494b4fda24972b4dacc7e2fc634513fefaaa Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 16:14:48 +0800
Subject: [PATCH 083/105] update test_extract_backend_config_multiple_config

---
 .../test_build_extract_backend_config.py      | 65 +++++--------------
 1 file changed, 17 insertions(+), 48 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index eff676ece..a02b4fe22 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -41,6 +41,7 @@ def _mock_wheel(tmp_path, wheel_name, files):
             wheel.writestr(filename, content)
     return wheel_path
 
+
 def test_extract_backend_config(build_command, tmp_path):
     """Test function works correctly with both config.toml and pyscript.toml."""
     # Mock a wheel with files
@@ -69,6 +70,7 @@ def test_extract_backend_config(build_command, tmp_path):
     }
     assert pyscript_version == "2024.10.1"
 
+
 def test_extract_backend_config_no_config(build_command, tmp_path):
     """If no config.toml supplied by wheels, functions returns a basic config."""
     # Mock a wheel without the needed files
@@ -86,70 +88,37 @@ def test_extract_backend_config_no_config(build_command, tmp_path):
     assert pyscript_version == "2024.11.1"
 
 
-def test_build_app_multiple_config(build_command, first_app_generated, tmp_path):
-    """An app with multiple config.toml supplied by wheels fails to build."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+def test_extract_backend_config_multiple_config(build_command, first_app_generated, tmp_path):
+    """Multiple config.toml supplied by wheels fails."""
 
-    # Mock some wheels without a config.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
+    # Mock wheels that both contain config.toml
+    file_set_1 = {
+        "dependancy/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
-version = "2024.11.1"
+version = "2024.10.1"
 """,
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
+    }
+
+    file_set_2 = {
+        "dependancy/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
 """,
-                    ),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
+    }
 
-    build_command.tools.subprocess.run.side_effect = mock_run
+    wheel_path_1 = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=file_set_1)
+    wheel_path_2 = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=file_set_2)
 
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
-
-    # Build the web app.
+    # Run the function.
     with pytest.raises(
         BriefcaseConfigError,
         match=r"Only one backend configuration file can be supplied.",
     ):
-        build_command.build_app(first_app_generated)
+        build_command.extract_backend_config([wheel_path_1, wheel_path_2])
 
 
 def test_build_app_config_no_backend(build_command, first_app_generated, tmp_path):

From a924361766c6acda976dc6d892c7401063e4e981 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Fri, 3 Oct 2025 16:19:43 +0800
Subject: [PATCH 084/105] update test_extract_backend_config_no_backend

---
 .../test_build_extract_backend_config.py      | 47 ++++---------------
 1 file changed, 8 insertions(+), 39 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index a02b4fe22..a64d790c0 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -88,7 +88,7 @@ def test_extract_backend_config_no_config(build_command, tmp_path):
     assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_multiple_config(build_command, first_app_generated, tmp_path):
+def test_extract_backend_config_multiple_config(build_command, tmp_path):
     """Multiple config.toml supplied by wheels fails."""
 
     # Mock wheels that both contain config.toml
@@ -121,53 +121,22 @@ def test_extract_backend_config_multiple_config(build_command, first_app_generat
         build_command.extract_backend_config([wheel_path_1, wheel_path_2])
 
 
-def test_build_app_config_no_backend(build_command, first_app_generated, tmp_path):
+def test_extract_backend_config_no_backend(build_command, tmp_path):
     """An app cannot be built with a config.toml containing no "backend" value."""
 
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels with a single config.toml containing no backend value.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    ("dependency/deploy/config.toml", ""),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
+    # Mock a wheel with the needed files
+    files = {
+        "dependancy/deploy/config.toml": ""
+    }
 
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
     # Build the web app.
     with pytest.raises(
         BriefcaseConfigError,
         match=r"No backend was provided in config.toml file.",
     ):
-        build_command.build_app(first_app_generated)
+        build_command.extract_backend_config([wheel_path])
 
 
 def test_build_app_config_backend_warning(build_command, first_app_generated, tmp_path, capsys):

From 699b463d09eff289ab99f41af808e8006f5aa839 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 10:18:59 +0800
Subject: [PATCH 085/105] test_extract_backend_config_no_pyscript_toml and 
 test_extract_backend_config_backend_warning

---
 .../test_build_extract_backend_config.py      | 125 +++---------------
 1 file changed, 20 insertions(+), 105 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index a64d790c0..cf188ba95 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -139,53 +139,18 @@ def test_extract_backend_config_no_backend(build_command, tmp_path):
         build_command.extract_backend_config([wheel_path])
 
 
-def test_build_app_config_backend_warning(build_command, first_app_generated, tmp_path, capsys):
+def test_extract_backend_config_backend_warning(build_command, tmp_path, capsys):
     """Briefcase raises a warning if "backend" value is not pyscript."""
 
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Mock some wheels with a single config.toml containing no backend value.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
+    files = {
+        "dependancy/deploy/config.toml": """
 backend = "something-else"
 """,
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
+}
 
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
-    build_command.build_app(first_app_generated)
+    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
 
     # Capture output and assert warning present.
     captured = capsys.readouterr()
@@ -193,78 +158,28 @@ def mock_run(*args, **kwargs):
         "Only 'pyscript' backend is currently supported for web static builds." in captured.out
     )
 
-    # Check pyscript.toml was created and has correct packages.
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
-
+    # Check pyscript_config is empty and pyscript_version is the default.
+    assert pyscript_config == {}
+    assert pyscript_version == "2024.11.1"
 
-def test_build_app_no_wheel_pyscript_toml(build_command, first_app_generated, tmp_path):
-    """An app with no pyscript.toml supplied by a wheel gets a basic config."""
 
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
+def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path):
+    """If no pyscript.toml is supplied by a wheel, function returns a basic config."""
 
-    # Mock some wheels without a pyscript.toml
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
+    # Create wheel with no pyscript.toml
+    files = {
+        "dependancy/deploy/config.toml": """
 backend = "pyscript"
-
-[pyscript]
-version = "2024.11.1"
 """,
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
+}
 
-    build_command.tools.subprocess.run.side_effect = mock_run
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
+    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
 
-    # Build the web app.
-    build_command.build_app(first_app_generated)
-
-    # Pyscript.toml has been written with only the packages content
-    with (bundle_path / "www/pyscript.toml").open("rb") as f:
-        assert tomllib.load(f) == {
-            "packages": [
-                "/static/wheels/dependency-1.2.3-py3-none-any.whl",
-                "/static/wheels/first_app-1.2.3-py3-none-any.whl",
-                "/static/wheels/other-1.2.3-py3-none-any.whl",
-            ],
-        }
+    # Check pyscript_config is empty and pyscript_version is the default.
+    assert pyscript_config == {}
+    assert pyscript_version == "2024.11.1"
 
 
 def test_build_app_invalid_wheel_pyscript_toml(

From e74ba4ab5b0df542e0b9c9f4a5c28b02342c4a79 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 10:23:13 +0800
Subject: [PATCH 086/105] 
 test_extract_backend_config_invalid_wheel_pyscript_toml

---
 .../test_build_extract_backend_config.py      | 63 ++++---------------
 1 file changed, 12 insertions(+), 51 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index cf188ba95..9747b11f6 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -182,67 +182,28 @@ def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path):
     assert pyscript_version == "2024.11.1"
 
 
-def test_build_app_invalid_wheel_pyscript_toml(
-    build_command, first_app_generated, tmp_path
-):
-    """An app with an invalid pyscript.toml raises an error."""
-
-    bundle_path = tmp_path / "base_path/build/first-app/web/static"
-
-    # Invoking build will create wheels as a side effect.
-    def mock_run(*args, **kwargs):
-        if args[0][5] == "wheel":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "first_app",
-                extra_content=[
-                    ("dependency/static/style.css", "span { margin: 10px; }\n"),
-                    (
-                        "dependency/deploy/config.toml",
-                        """
+def test_extract_backend_config_invalid_wheel_pyscript_toml(build_command, tmp_path):
+    """A wheel with an invalid pyscript.toml raises an error."""
+
+    # Mock a wheel with files
+    files = {
+        "dependancy/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
-version = "2024.11.1"
+version = "2024.10.1"
 """,
-                    ),
-                    (
-                        "dependency/deploy/pyscript.toml",
-                        """
+        "dependancy/deploy/pyscript.toml": """
 This is not valid toml.
 """,
-                    ),
-                ],
-            )
-        elif args[0][5] == "pip":
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "dependency",
-                extra_content=[
-                    ("dependency/static/style.css", "div { margin: 10px; }\n"),
-                ],
-            )
-            create_wheel(
-                bundle_path / "www/static/wheels",
-                "other",
-                extra_content=[
-                    ("other/static/style.css", "div { padding: 10px; }\n"),
-                ],
-            )
-        else:
-            raise ValueError("Unknown command")
-
-    build_command.tools.subprocess.run.side_effect = mock_run
-
-    # Mock the side effect of invoking shutil
-    build_command.tools.shutil.rmtree.side_effect = lambda *args: shutil.rmtree(
-        bundle_path / "www/static/wheels"
-    )
+    }
+
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
 
     # Building the web app raises an error
     with pytest.raises(
         BriefcaseConfigError,
         match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
     ):
-        build_command.build_app(first_app_generated)
+        build_command.extract_backend_config([wheel_path])
 

From 6b864a7e086d37a7121d6dbdf1f77085ecb59a16 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 10:30:14 +0800
Subject: [PATCH 087/105] Add change rst

---
 changes/2442.feature.rst | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changes/2442.feature.rst

diff --git a/changes/2442.feature.rst b/changes/2442.feature.rst
new file mode 100644
index 000000000..6123e9251
--- /dev/null
+++ b/changes/2442.feature.rst
@@ -0,0 +1 @@
+Update Briefcase’s build system to support GUI toolkit-owned pyscript/backend configuration and insertion content.
\ No newline at end of file

From c361363894e05336194bc3640c65e8e994c697aa Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 10:51:05 +0800
Subject: [PATCH 088/105] fix to preserving indentation

---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index df87f8e36..62f411de0 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -193,7 +193,7 @@ def write_inserts(
                 if pattern_found:
                     # Indent content to align with markers.
                     indented_content = indent(
-                        body_map.get(kind, ""), pattern_found.group(1)
+                        body_map.get(kind, "").strip("\n") + "\n", pattern_found.group(1)
                     )
                     file_text = pattern.sub(
                         repl_tmpl.format(

From 2cea15d40da9ee2561abe78748ab6d85c27af928 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 16:40:05 +0800
Subject: [PATCH 089/105] add boolean to parameters for
 test_handle_insert_skip_dir_entries(

---
 .../web/static/test_build__process_wheel.py         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 16443cdde..31be56161 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -233,13 +233,13 @@ def test_handle_insert_register_valid_file(build_command, tmp_path):
 
 
 @pytest.mark.parametrize(
-    "entry",
+    "entry, expected_skip",
     [
-        "dummy/deploy/inserts/",  # Top-level directory entry
-        "dummy/deploy/inserts/assets/",  # Nested directory entry
+        ("dummy/deploy/inserts/", True),          # Top-level directory entry
+        ("dummy/deploy/inserts/assets/", False),  # Nested directory entry
     ],
 )
-def test_handle_insert_skip_dir_entries(build_command, tmp_path, monkeypatch, entry):
+def test_handle_insert_skip_dir_entries(build_command, tmp_path, monkeypatch, entry, expected_skip):
     """Deploy/inserts directory entries are skipped with a debug log.
 
     Parametrized: runs once for top-level dir and once for nested dir.
@@ -267,7 +267,10 @@ def test_handle_insert_skip_dir_entries(build_command, tmp_path, monkeypatch, en
     # Directory entries should be ignored completely
     assert inserts == {}
     # And a debug message explaining the skip should be logged
-    assert any("skipping, not a valid insert file" in m for m in debugs)
+    if expected_skip:
+        assert any("skipping, not a valid insert file" in m for m in debugs)
+    else:
+        assert all("skipping, not a valid insert file" not in m for m in debugs)
 
 
 @pytest.mark.parametrize("mode", ["integration", "unit"])

From c8bc01910600b9ab040bb46598c2431b30740775 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 16:53:28 +0800
Subject: [PATCH 090/105] missing pre-commits

---
 changes/2442.feature.rst                      |  2 +-
 src/briefcase/platforms/web/static.py         |  7 +-
 tests/platforms/web/static/test_build.py      |  4 +-
 .../web/static/test_build__process_wheel.py   |  6 +-
 .../test_build_extract_backend_config.py      | 84 ++++++++++---------
 5 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/changes/2442.feature.rst b/changes/2442.feature.rst
index 6123e9251..36974d860 100644
--- a/changes/2442.feature.rst
+++ b/changes/2442.feature.rst
@@ -1 +1 @@
-Update Briefcase’s build system to support GUI toolkit-owned pyscript/backend configuration and insertion content.
\ No newline at end of file
+Update Briefcase’s build system to support GUI toolkit-owned pyscript/backend configuration and insertion content.
diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 62f411de0..9fb85f8b4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -193,7 +193,8 @@ def write_inserts(
                 if pattern_found:
                     # Indent content to align with markers.
                     indented_content = indent(
-                        body_map.get(kind, "").strip("\n") + "\n", pattern_found.group(1)
+                        body_map.get(kind, "").strip("\n") + "\n",
+                        pattern_found.group(1),
                     )
                     file_text = pattern.sub(
                         repl_tmpl.format(
@@ -440,7 +441,9 @@ def extract_backend_config(self, wheels):
                         )
 
                     # Get pyscript version from config.toml. Use default if not present.
-                    pyscript_version = config_data.get("pyscript", {}).get("version", pyscript_version)
+                    pyscript_version = config_data.get("pyscript", {}).get(
+                        "version", pyscript_version
+                    )
 
                     # Extract pyscript.toml
                     pyscript_path = config_filename.replace(
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 44b0b6fd5..dd6f342ab 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -215,7 +215,7 @@ def mock_run(*args, **kwargs):
                     " *************************************************/",
                     "div { padding: 10px; }",
                     "/*@@ css:end @@*/",
-                    ""
+                    "",
                 ]
             )
             + "\n"
@@ -459,7 +459,7 @@ def mock_run(*args, **kwargs):
                     " *************************************************/",
                     "span { margin: 10px; }",
                     "/*@@ css:end @@*/",
-                    ""
+                    "",
                 ]
             )
             + "\n"
diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 31be56161..d0cd126d7 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -235,11 +235,13 @@ def test_handle_insert_register_valid_file(build_command, tmp_path):
 @pytest.mark.parametrize(
     "entry, expected_skip",
     [
-        ("dummy/deploy/inserts/", True),          # Top-level directory entry
+        ("dummy/deploy/inserts/", True),  # Top-level directory entry
         ("dummy/deploy/inserts/assets/", False),  # Nested directory entry
     ],
 )
-def test_handle_insert_skip_dir_entries(build_command, tmp_path, monkeypatch, entry, expected_skip):
+def test_handle_insert_skip_dir_entries(
+    build_command, tmp_path, monkeypatch, entry, expected_skip
+):
     """Deploy/inserts directory entries are skipped with a debug log.
 
     Parametrized: runs once for top-level dir and once for nested dir.
diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index 9747b11f6..e26341bd4 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -1,25 +1,20 @@
 import shutil
-import subprocess
 import sys
 from unittest import mock
 
 if sys.version_info >= (3, 11):  # pragma: no-cover-if-lt-py311
-    import tomllib
+    pass
 else:  # pragma: no-cover-if-gte-py311
-    import tomli as tomllib
+    pass
 
-import pytest
 from zipfile import ZipFile
-import tomllib
-import io
 
-from briefcase.console import LogLevel
-from briefcase.exceptions import BriefcaseCommandError, BriefcaseConfigError
+import pytest
+
+from briefcase.exceptions import BriefcaseConfigError
 from briefcase.integrations.subprocess import Subprocess
 from briefcase.platforms.web.static import StaticWebBuildCommand
 
-from ....utils import create_wheel
-
 
 @pytest.fixture
 def build_command(dummy_console, tmp_path):
@@ -33,6 +28,7 @@ def build_command(dummy_console, tmp_path):
 
     return command
 
+
 def _mock_wheel(tmp_path, wheel_name, files):
     """Function to mock wheel files in tests."""
     wheel_path = tmp_path / wheel_name
@@ -46,22 +42,24 @@ def test_extract_backend_config(build_command, tmp_path):
     """Test function works correctly with both config.toml and pyscript.toml."""
     # Mock a wheel with files
     files = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
 """,
-        "dependancy/deploy/pyscript.toml": """
+        "dependency/deploy/pyscript.toml": """
 existing-key-1 = "value-1"
 existing-key-2 = 2
 """,
     }
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Run the function.
-    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
+    pyscript_config, pyscript_version = build_command.extract_backend_config(
+        [wheel_path]
+    )
 
     # Check returns are correct and files were found.
     assert pyscript_config == {
@@ -74,14 +72,14 @@ def test_extract_backend_config(build_command, tmp_path):
 def test_extract_backend_config_no_config(build_command, tmp_path):
     """If no config.toml supplied by wheels, functions returns a basic config."""
     # Mock a wheel without the needed files
-    files = {
-        "dependancy/deploy/not-the-files-you-are-looking-for.toml": ""
-    }
+    files = {"dependency/deploy/not-the-files-you-are-looking-for.toml": ""}
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Run the function.
-    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
+    pyscript_config, pyscript_version = build_command.extract_backend_config(
+        [wheel_path]
+    )
 
     # Check pyscript_config is empty and pyscript_version is the default.
     assert pyscript_config == {}
@@ -93,7 +91,7 @@ def test_extract_backend_config_multiple_config(build_command, tmp_path):
 
     # Mock wheels that both contain config.toml
     file_set_1 = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
@@ -102,7 +100,7 @@ def test_extract_backend_config_multiple_config(build_command, tmp_path):
     }
 
     file_set_2 = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
@@ -110,8 +108,12 @@ def test_extract_backend_config_multiple_config(build_command, tmp_path):
 """,
     }
 
-    wheel_path_1 = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=file_set_1)
-    wheel_path_2 = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=file_set_2)
+    wheel_path_1 = _mock_wheel(
+        tmp_path=tmp_path, wheel_name="dependency", files=file_set_1
+    )
+    wheel_path_2 = _mock_wheel(
+        tmp_path=tmp_path, wheel_name="dependency", files=file_set_2
+    )
 
     # Run the function.
     with pytest.raises(
@@ -125,11 +127,9 @@ def test_extract_backend_config_no_backend(build_command, tmp_path):
     """An app cannot be built with a config.toml containing no "backend" value."""
 
     # Mock a wheel with the needed files
-    files = {
-        "dependancy/deploy/config.toml": ""
-    }
+    files = {"dependency/deploy/config.toml": ""}
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Build the web app.
     with pytest.raises(
@@ -143,19 +143,22 @@ def test_extract_backend_config_backend_warning(build_command, tmp_path, capsys)
     """Briefcase raises a warning if "backend" value is not pyscript."""
 
     files = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "something-else"
 """,
-}
+    }
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
-    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
+    pyscript_config, pyscript_version = build_command.extract_backend_config(
+        [wheel_path]
+    )
 
     # Capture output and assert warning present.
     captured = capsys.readouterr()
     assert (
-        "Only 'pyscript' backend is currently supported for web static builds." in captured.out
+        "Only 'pyscript' backend is currently supported for web static builds."
+        in captured.out
     )
 
     # Check pyscript_config is empty and pyscript_version is the default.
@@ -168,14 +171,16 @@ def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path):
 
     # Create wheel with no pyscript.toml
     files = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "pyscript"
 """,
-}
+    }
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
-    pyscript_config, pyscript_version = build_command.extract_backend_config([wheel_path])
+    pyscript_config, pyscript_version = build_command.extract_backend_config(
+        [wheel_path]
+    )
 
     # Check pyscript_config is empty and pyscript_version is the default.
     assert pyscript_config == {}
@@ -187,18 +192,18 @@ def test_extract_backend_config_invalid_wheel_pyscript_toml(build_command, tmp_p
 
     # Mock a wheel with files
     files = {
-        "dependancy/deploy/config.toml": """
+        "dependency/deploy/config.toml": """
 backend = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
 """,
-        "dependancy/deploy/pyscript.toml": """
+        "dependency/deploy/pyscript.toml": """
 This is not valid toml.
 """,
     }
 
-    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependancy", files=files)
+    wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Building the web app raises an error
     with pytest.raises(
@@ -206,4 +211,3 @@ def test_extract_backend_config_invalid_wheel_pyscript_toml(build_command, tmp_p
         match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
     ):
         build_command.extract_backend_config([wheel_path])
-

From 25b887cbffdf7ccfee4914138db8998092956309 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 17:08:01 +0800
Subject: [PATCH 091/105] update exception for 3.14 compatibility in
 extract_backend_config

---
 src/briefcase/platforms/web/static.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 9fb85f8b4..5c5bb2a85 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -456,7 +456,7 @@ def extract_backend_config(self, wheels):
                         raise BriefcaseConfigError(
                             f"pyscript.toml content isn't valid TOML: {e}"
                         ) from e
-                    except KeyError:
+                    except (KeyError, FileNotFoundError):
                         self.console.info(
                             f"Pyscript configuration file not found in package: {config_package_list[0]}\n"
                             "Using default configuration."

From 06a4df748dc6c33a8e7fd5ff12953fd7a8354a46 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 17:32:48 +0800
Subject: [PATCH 092/105] Add output assertion to
 test_extract_backend_config_no_pyscript_toml

---
 .../web/static/test_build_extract_backend_config.py        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index e26341bd4..a15baeebe 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -166,7 +166,7 @@ def test_extract_backend_config_backend_warning(build_command, tmp_path, capsys)
     assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path):
+def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path, capsys):
     """If no pyscript.toml is supplied by a wheel, function returns a basic config."""
 
     # Create wheel with no pyscript.toml
@@ -181,6 +181,11 @@ def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path):
     pyscript_config, pyscript_version = build_command.extract_backend_config(
         [wheel_path]
     )
+    # Capture output and assert console info is present.
+    captured = capsys.readouterr()
+    assert (
+         "Pyscript configuration file not found in package:" in captured.out
+    )
 
     # Check pyscript_config is empty and pyscript_version is the default.
     assert pyscript_config == {}

From ce49a346a6b60d15294da9936b6dee8d47af69f0 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 4 Oct 2025 17:37:31 +0800
Subject: [PATCH 093/105] missing pre-commits

---
 .../platforms/web/static/test_build_extract_backend_config.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_backend_config.py
index a15baeebe..5906c2fc6 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_backend_config.py
@@ -183,9 +183,7 @@ def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path, capsys
     )
     # Capture output and assert console info is present.
     captured = capsys.readouterr()
-    assert (
-         "Pyscript configuration file not found in package:" in captured.out
-    )
+    assert "Pyscript configuration file not found in package:" in captured.out
 
     # Check pyscript_config is empty and pyscript_version is the default.
     assert pyscript_config == {}

From 39a9ad3394042c97bd30828eb4a96bad05a5cd43 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 8 Oct 2025 16:15:18 +0800
Subject: [PATCH 094/105] Minor cleanups and fixes.

---
 src/briefcase/platforms/web/static.py         | 167 +++++++-----------
 tests/platforms/web/static/test_build.py      |   6 +-
 .../web/static/test_build__process_wheel.py   |  55 +++---
 .../web/static/test_build__trim_file.py       | 118 -------------
 ... => test_build_extract_pyscript_config.py} |  69 ++++----
 5 files changed, 130 insertions(+), 285 deletions(-)
 delete mode 100644 tests/platforms/web/static/test_build__trim_file.py
 rename tests/platforms/web/static/{test_build_extract_backend_config.py => test_build_extract_pyscript_config.py} (69%)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 5c5bb2a85..f5a75ecc4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -93,29 +93,6 @@ class StaticWebOpenCommand(StaticWebMixin, OpenCommand):
 class StaticWebBuildCommand(StaticWebMixin, BuildCommand):
     description = "Build a static web project."
 
-    def _trim_file(self, path, sentinel):
-        """Re-write a file to strip any content after a sentinel line.
-
-        The file is stored in-memory, so it shouldn't be used on files with a *lot* of
-        content before the sentinel.
-
-        :param path: The path to the file to be trimmed
-        :param sentinel: The content of the sentinel line. This will become the last
-            line in the trimmed file.
-        """
-        content = []
-        with path.open("r", encoding="utf-8") as f:
-            for line in f:
-                if line.rstrip("\n") == sentinel:
-                    content.append(line)
-                    break
-                else:
-                    content.append(line)
-
-        with path.open("w", encoding="utf-8") as f:
-            for line in content:
-                f.write(line)
-
     def write_inserts(
         self,
         app: AppConfig,
@@ -132,7 +109,8 @@ def write_inserts(
         * HTML: `<!--@@ insert:start @@--> and <!--@@ insert:end @@-->`
         * CSS/JS: `/*@@ insert:start @@*/ and /*@@ insert:end @@*/`
 
-        Inserts and package contributions are processed in sorted order to ensure deterministic builds.
+        Inserts and package contributions are processed in sorted order to ensure
+        deterministic builds.
 
         :param app: The application whose `pyscript.toml` is being written.
         :param filename: The file whose insert is to be written.
@@ -233,7 +211,8 @@ def _append_pyscript_insert(
         insert = "python"
 
         # PyScript definitions for insertion:
-        content = dedent(f"""\
+        content = dedent(
+            f"""\
             <script type="module">
                 // Hide the splash screen when the page is ready.
                 import {{ hooks }} from "https://pyscript.net/releases/{pyscript_version}/core.js";
@@ -244,7 +223,8 @@ def _append_pyscript_insert(
 
             <link rel="stylesheet" href="https://pyscript.net/releases/{pyscript_version}/core.css">
             <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
-            """)
+            """
+        )
 
         pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
         pkg_map[package_key] = content
@@ -253,32 +233,24 @@ def _handle_legacy_css(
         self,
         wheel: ZipFile,
         path: Path,
-        filename: str,
         package_key: str,
         inserts: dict[str, dict[str, dict[str, str]]],
-        legacy_css_warning: bool,
-    ) -> bool:
+    ) -> None:
         """Handle legacy CSS under /static/*.css and add to briefcase.css.
 
         :param wheel: Open wheel ZipFile being processed.
         :param path: Path object of the file inside the wheel.
-        :param filename: Filename string inside the wheel.
         :param package_key: Provenance label (e.g. "name version").
         :param inserts: Nested dict of inserts keyed by target - insert - package.
-        :param legacy_css_warning: Whether the warning has already been shown.
-        :return: Updated legacy_css_warning flag.
         """
-        self.console.info(f"    Found {filename}")
-
         # Show deprecation warning once per wheel
-        if not legacy_css_warning:
-            self.console.warning(
-                f"    {Path(wheel.filename).name}: legacy '/static' CSS detected, "
-                "treating as insert into briefcase.css, this legacy handling will be removed in the future."
-            )
-            legacy_css_warning = True
+        self.console.warning(
+            f"    {Path(wheel.filename).name}: legacy '/static' CSS file {path} detected.\n"
+            "     Static file handling has been deprecated; this file should be "
+            "converted into an insert."
+        )
 
-        css_text = wheel.read(filename).decode("utf-8")
+        css_text = wheel.read(str(path)).decode("utf-8")
 
         rel_inside = "/".join(path.parts[2:])
         contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
@@ -292,8 +264,6 @@ def _handle_legacy_css(
         else:
             pkg_map[contrib_key] = css_text
 
-        return legacy_css_warning
-
     def _handle_insert(
         self,
         wheel: ZipFile,
@@ -354,9 +324,6 @@ def _process_wheel(
         name_parts = wheelfile.name.split("-")
         package_key = f"{name_parts[0]} {name_parts[1]}"
 
-        # Warning flag for legacy CSS
-        legacy_css_warning = False
-
         with ZipFile(wheelfile) as wheel:
             for filename in sorted(wheel.namelist()):
                 # Skip directories and shallow paths
@@ -369,21 +336,14 @@ def _process_wheel(
                     and parts[1] == "static"
                     and path.suffix.lower() == ".css"
                 ):
-                    legacy_css_warning = self._handle_legacy_css(
-                        wheel, path, filename, package_key, inserts, legacy_css_warning
-                    )
+                    self._handle_legacy_css(wheel, path, package_key, inserts)
 
                 # New deploy/inserts handling
                 elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
                     self._handle_insert(wheel, parts, filename, package_key, inserts)
 
-                else:
-                    self.console.debug(
-                        f"    {filename}: skipping, not a supported insert."
-                    )
-
-    def extract_backend_config(self, wheels):
-        """Processes multiple wheels to gather a config.toml and a base pyscript.toml
+    def extract_pyscript_config(self, wheels):
+        """Process multiple wheels to gather a config.toml and a base pyscript.toml
         file.
 
         :param wheels: A list of wheel files to be scanned.
@@ -414,54 +374,54 @@ def extract_backend_config(self, wheels):
         # Raise an error if more than one configuration file is supplied.
         elif len(config_package_list) > 1:
             raise BriefcaseConfigError(
-                f"""Only one backend configuration file can be supplied.
-                Initial config.toml found in package: {config_package}
-                Duplicate config.toml found in package: {wheel.filename}"""
+                "Only one deployment configuration file can be supplied. "
+                f"Initial config.toml found in package: {config_package}; "
+                f"Duplicate config.toml found in package: {wheel.filename}"
             )
-        # Gather a backend configuration file from the package.
-        # For now, this is a pyscript.toml as no other backend is currently supported.
+        # Gather a deployment configuration file from the package. For now, this is a
+        # pyscript.toml as no other backend is currently supported.
         else:
-            with ZipFile(config_package_list[0]) as wheel:
-                with wheel.open(config_filename) as config_file:
-                    config_data = tomllib.load(config_file)
-
-                    # Gather backend type from config.toml
-                    backend = config_data.get("backend", None)
-
-                    # Fail if no backend is present in config.toml
-                    if backend is None:
-                        raise BriefcaseConfigError(
-                            "No backend was provided in config.toml file."
-                        )
-                    # Currently, only pyscript is supported. Warn if another backend is found.
-                    elif backend != "pyscript":
-                        self.console.warning(
-                            "Only 'pyscript' backend is currently supported for web static builds. "
-                            "This project may not work correctly."
-                        )
-
-                    # Get pyscript version from config.toml. Use default if not present.
-                    pyscript_version = config_data.get("pyscript", {}).get(
-                        "version", pyscript_version
+            with (
+                ZipFile(config_package_list[0]) as wheel,
+                wheel.open(config_filename) as config_file,
+            ):
+                config_data = tomllib.load(config_file)
+
+                # Gather implementation from config.toml
+                implementation = config_data.get("implementation", None)
+
+                # Currently, only pyscript is supported. Warn if another implementation is found,
+                # but fail safe to using pyscript with a warning.
+                if implementation is None:
+                    self.console.warning(
+                        "No web implementation specified. Defaulting to 'pyscript'."
                     )
+                elif implementation != "pyscript":
+                    self.console.warning(
+                        "At present, 'pyscript' is the only supported web implementation. "
+                        "This project may not work correctly."
+                    )
+
+                # Get pyscript version from config.toml. Use default if not present.
+                pyscript_version = config_data.get("pyscript", {}).get(
+                    "version", pyscript_version
+                )
 
-                    # Extract pyscript.toml
-                    pyscript_path = config_filename.replace(
-                        "config.toml", "pyscript.toml"
+                # Extract pyscript.toml
+                pyscript_path = config_filename.replace("config.toml", "pyscript.toml")
+                try:
+                    with wheel.open(pyscript_path) as pyscript_file:
+                        pyscript_config = tomllib.load(pyscript_file)
+                except tomllib.TOMLDecodeError as e:
+                    raise BriefcaseConfigError(
+                        f"pyscript.toml content isn't valid TOML: {e}"
+                    ) from e
+                except (KeyError, FileNotFoundError):
+                    self.console.info(
+                        f"Pyscript configuration file not found in {config_package_list[0]}. "
+                        "Using default configuration."
                     )
-                    try:
-                        with wheel.open(pyscript_path) as pyscript_file:
-                            pyscript_config = tomllib.load(pyscript_file)
-                    except tomllib.TOMLDecodeError as e:
-                        raise BriefcaseConfigError(
-                            f"pyscript.toml content isn't valid TOML: {e}"
-                        ) from e
-                    except (KeyError, FileNotFoundError):
-                        self.console.info(
-                            f"Pyscript configuration file not found in package: {config_package_list[0]}\n"
-                            "Using default configuration."
-                        )
-                        pyscript_config = {}
+                    pyscript_config = {}
 
         return pyscript_config, pyscript_version
 
@@ -529,7 +489,7 @@ def build_app(self, app: AppConfig, **kwargs):
         with self.console.wait_bar("Writing Pyscript configuration file..."):
             # Load any pre-existing pyscript.toml provided by a GUI Toolkit. If the file
             # doesn't exist, assume an empty pyscript.toml as a starting point.
-            config, pyscript_version = self.extract_backend_config(
+            config, pyscript_version = self.extract_pyscript_config(
                 self.wheel_path(app).glob("*.whl")
             )
 
@@ -558,13 +518,6 @@ def build_app(self, app: AppConfig, **kwargs):
                 tomli_w.dump(config, f)
 
         with self.console.wait_bar("Compiling static web content from wheels..."):
-            # Trim previously compiled content out of briefcase.css
-            briefcase_css_path = self.project_path(app) / "static/css/briefcase.css"
-            self._trim_file(
-                briefcase_css_path,
-                sentinel=" ******************* Wheel contributed styles **********************/",
-            )
-
             inserts: dict[str, dict[str, dict[str, str]]] = {}
 
             for wheelfile in sorted(self.wheel_path(app).glob("*.whl")):
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index dd6f342ab..07dc9789c 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -50,7 +50,7 @@ def mock_run(*args, **kwargs):
                     (
                         "dependency/deploy/config.toml",
                         """
-backend = "pyscript"
+implementation = "pyscript"
 
 [pyscript]
 version = "2024.11.1"
@@ -250,7 +250,7 @@ def test_build_app_custom_pyscript_toml(build_command, first_app_generated, tmp_
     )
 
     # Mock extracting pyscript.toml from a wheel.
-    build_command.extract_backend_config = lambda _: (
+    build_command.extract_pyscript_config = lambda _: (
         {"existing-key-1": "value-1", "existing-key-2": 2},
         "2024.11.1",
     )
@@ -381,7 +381,7 @@ def mock_run(*args, **kwargs):
     )
 
     # Mock extracting pyscript.toml from a wheel.
-    build_command.extract_backend_config = lambda _: (
+    build_command.extract_pyscript_config = lambda _: (
         {"existing-key-1": "value-1", "existing-key-2": 2},
         "2024.11.1",
     )
diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index d0cd126d7..29007ad23 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -117,7 +117,7 @@ def test_process_wheel_deploy_inserts(build_command, tmp_path):
     assert any("body { margin: 0; }" in v for v in css_contribs.values())
 
 
-def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypatch):
+def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, capsys):
     """Legacy CSS files trigger a single deprecation warning."""
     wheel_filename = create_wheel(
         tmp_path,
@@ -127,17 +127,18 @@ def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, monkeypa
         ],
     )
 
-    # Check on console.warning to count legacy warnings
-    warnings = []
-    monkeypatch.setattr(
-        build_command.console, "warning", lambda msg: warnings.append(msg)
-    )
-
     inserts = {}
     build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
 
-    legacy_msgs = [m for m in warnings if "legacy '/static' CSS detected" in m]
-    assert len(legacy_msgs) == 1
+    output = capsys.readouterr().out
+    assert (
+        "dummy-1.2.3-py3-none-any.whl: legacy '/static' CSS file dummy/static/one.css detected."
+        in output
+    )
+    assert (
+        "dummy-1.2.3-py3-none-any.whl: legacy '/static' CSS file dummy/static/two.css detected."
+        in output
+    )
 
 
 def test_process_wheel_non_utf8_insert(build_command, tmp_path):
@@ -164,28 +165,20 @@ def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
         build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
 
 
-def test_handle_legacy_css_warning_once_and_append(
-    build_command, tmp_path, monkeypatch
-):
+def test_handle_legacy_css_warning_once_and_append(build_command, tmp_path, capsys):
     """Legacy CSS warns once and appends to existing contrib key."""
     wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:
         zf.writestr("dummy/static/one.css", "h1 { x:1; }")
 
-    # Count warnings
-    warnings = []
-    monkeypatch.setattr(build_command.console, "warning", warnings.append)
-
     inserts = {}
     with zipfile.ZipFile(wheel_path) as zf:
         # First call - warn
-        warned = build_command._handle_legacy_css(
+        build_command._handle_legacy_css(
             wheel=zf,
             path=Path("dummy/static/one.css"),
-            filename="dummy/static/one.css",
             package_key="pkg 1.0",
             inserts=inserts,
-            legacy_css_warning=False,
         )
         # Pre-seed same contrib key to force append on second call
         target_map = inserts.setdefault("static/css/briefcase.css", {}).setdefault(
@@ -194,18 +187,19 @@ def test_handle_legacy_css_warning_once_and_append(
         key = "pkg 1.0 (legacy static CSS: one.css)"
         target_map[key] = target_map[key] + "\n/*extra*/"
         # Second call - no additional warning, content appended
-        warned = build_command._handle_legacy_css(
+        build_command._handle_legacy_css(
             wheel=zf,
             path=Path("dummy/static/one.css"),
-            filename="dummy/static/one.css",
             package_key="pkg 1.0",
             inserts=inserts,
-            legacy_css_warning=warned,
         )
 
-    # One warning only
-    legacy_msgs = [m for m in warnings if "legacy '/static' CSS detected" in m]
-    assert len(legacy_msgs) == 1
+    # One warning for each file
+    output = capsys.readouterr().out
+    assert (
+        "dummy-1.2.3.whl: legacy '/static' CSS file dummy/static/one.css detected."
+        in output
+    )
 
     # Content appended
     out = inserts["static/css/briefcase.css"]["css"][key]
@@ -240,7 +234,11 @@ def test_handle_insert_register_valid_file(build_command, tmp_path):
     ],
 )
 def test_handle_insert_skip_dir_entries(
-    build_command, tmp_path, monkeypatch, entry, expected_skip
+    build_command,
+    tmp_path,
+    monkeypatch,
+    entry,
+    expected_skip,
 ):
     """Deploy/inserts directory entries are skipped with a debug log.
 
@@ -277,7 +275,10 @@ def test_handle_insert_skip_dir_entries(
 
 @pytest.mark.parametrize("mode", ["integration", "unit"])
 def missing_tilde_under_deploy_inserts_skipped(
-    build_command, tmp_path, monkeypatch, mode
+    build_command,
+    tmp_path,
+    monkeypatch,
+    mode,
 ):
     """Files under deploy/inserts without '~' are skipped with a debug log.
 
diff --git a/tests/platforms/web/static/test_build__trim_file.py b/tests/platforms/web/static/test_build__trim_file.py
deleted file mode 100644
index fbb92b382..000000000
--- a/tests/platforms/web/static/test_build__trim_file.py
+++ /dev/null
@@ -1,118 +0,0 @@
-import pytest
-
-from briefcase.platforms.web.static import StaticWebBuildCommand
-
-from ....utils import create_file
-
-
-@pytest.fixture
-def build_command(dummy_console, tmp_path):
-    return StaticWebBuildCommand(
-        console=dummy_console,
-        base_path=tmp_path / "base_path",
-        data_path=tmp_path / "briefcase",
-    )
-
-
-def test_trim_file(build_command, tmp_path):
-    """A file can be trimmed at a sentinel."""
-    filename = tmp_path / "dummy.txt"
-    content = [
-        "This is before the sentinel.",
-        "This is also before the sentinel.",
-        " ** This is the sentinel ** ",
-        "This is after the sentinel.",
-        "This is also after the sentinel.",
-    ]
-
-    create_file(filename, "\n".join(content))
-
-    # Trim the file at the sentinel
-    build_command._trim_file(filename, sentinel=" ** This is the sentinel ** ")
-
-    # The file contains everything up to and including the sentinel.
-    with filename.open(encoding="utf-8") as f:
-        assert f.read() == "\n".join(content[:3]) + "\n"
-
-
-def test_trim_no_sentinel(build_command, tmp_path):
-    """A file that doesn't contain the sentinel is returned as-is."""
-    filename = tmp_path / "dummy.txt"
-    content = [
-        "This is before the sentinel.",
-        "This is also before the sentinel.",
-        "NO SENTINEL HERE",
-        "This is after the sentinel.",
-        "This is also after the sentinel.",
-    ]
-
-    create_file(filename, "\n".join(content))
-
-    # Trim the file at a sentinel
-    build_command._trim_file(filename, sentinel=" ** This is the sentinel ** ")
-
-    # The file is unmodified.
-    with filename.open(encoding="utf-8") as f:
-        assert f.read() == "\n".join(content)
-
-
-def test_trim_file_multiple_sentinels(build_command, tmp_path):
-    """A file with multiple sentinels is trimmed at the first one."""
-    filename = tmp_path / "dummy.txt"
-    content = [
-        "This is before the sentinel.",
-        "This is also before the sentinel.",
-        " ** This is the sentinel ** ",
-        "This is after the first sentinel.",
-        "This is also after the first sentinel.",
-        " ** This is the sentinel ** ",
-        "This is after the second sentinel.",
-        "This is also after the second sentinel.",
-    ]
-
-    create_file(filename, "\n".join(content))
-
-    # Trim the file at the sentinel
-    build_command._trim_file(filename, sentinel=" ** This is the sentinel ** ")
-
-    # The file contains everything up to and including the sentinel.
-    with filename.open(encoding="utf-8") as f:
-        assert f.read() == "\n".join(content[:3]) + "\n"
-
-
-def test_trim_sentinel_last_line(build_command, tmp_path):
-    """A file with the sentinel as the last full line isn't a problem."""
-    filename = tmp_path / "dummy.txt"
-    content = [
-        "This is before the sentinel.",
-        "This is also before the sentinel.",
-        " ** This is the sentinel ** ",
-    ]
-
-    create_file(filename, "\n".join(content) + "\n")
-
-    # Trim the file at a sentinel
-    build_command._trim_file(filename, sentinel=" ** This is the sentinel ** ")
-
-    # The file is unmodified.
-    with filename.open(encoding="utf-8") as f:
-        assert f.read() == "\n".join(content) + "\n"
-
-
-def test_trim_sentinel_EOF(build_command, tmp_path):
-    """A file with the sentinel at EOF isn't a problem."""
-    filename = tmp_path / "dummy.txt"
-    content = [
-        "This is before the sentinel.",
-        "This is also before the sentinel.",
-        " ** This is the sentinel ** ",
-    ]
-
-    create_file(filename, "\n".join(content))
-
-    # Trim the file at a sentinel
-    build_command._trim_file(filename, sentinel=" ** This is the sentinel ** ")
-
-    # The file is unmodified.
-    with filename.open(encoding="utf-8") as f:
-        assert f.read() == "\n".join(content)
diff --git a/tests/platforms/web/static/test_build_extract_backend_config.py b/tests/platforms/web/static/test_build_extract_pyscript_config.py
similarity index 69%
rename from tests/platforms/web/static/test_build_extract_backend_config.py
rename to tests/platforms/web/static/test_build_extract_pyscript_config.py
index 5906c2fc6..8eb51a2d3 100644
--- a/tests/platforms/web/static/test_build_extract_backend_config.py
+++ b/tests/platforms/web/static/test_build_extract_pyscript_config.py
@@ -38,12 +38,12 @@ def _mock_wheel(tmp_path, wheel_name, files):
     return wheel_path
 
 
-def test_extract_backend_config(build_command, tmp_path):
+def test_extract_pyscript_config(build_command, tmp_path):
     """Test function works correctly with both config.toml and pyscript.toml."""
     # Mock a wheel with files
     files = {
         "dependency/deploy/config.toml": """
-backend = "pyscript"
+implementation = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
@@ -57,7 +57,7 @@ def test_extract_backend_config(build_command, tmp_path):
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Run the function.
-    pyscript_config, pyscript_version = build_command.extract_backend_config(
+    pyscript_config, pyscript_version = build_command.extract_pyscript_config(
         [wheel_path]
     )
 
@@ -69,7 +69,7 @@ def test_extract_backend_config(build_command, tmp_path):
     assert pyscript_version == "2024.10.1"
 
 
-def test_extract_backend_config_no_config(build_command, tmp_path):
+def test_extract_pyscript_config_no_config(build_command, tmp_path):
     """If no config.toml supplied by wheels, functions returns a basic config."""
     # Mock a wheel without the needed files
     files = {"dependency/deploy/not-the-files-you-are-looking-for.toml": ""}
@@ -77,7 +77,7 @@ def test_extract_backend_config_no_config(build_command, tmp_path):
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
     # Run the function.
-    pyscript_config, pyscript_version = build_command.extract_backend_config(
+    pyscript_config, pyscript_version = build_command.extract_pyscript_config(
         [wheel_path]
     )
 
@@ -86,13 +86,13 @@ def test_extract_backend_config_no_config(build_command, tmp_path):
     assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_multiple_config(build_command, tmp_path):
+def test_extract_pyscript_config_multiple_config(build_command, tmp_path):
     """Multiple config.toml supplied by wheels fails."""
 
     # Mock wheels that both contain config.toml
     file_set_1 = {
         "dependency/deploy/config.toml": """
-backend = "pyscript"
+implementation = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
@@ -101,7 +101,7 @@ def test_extract_backend_config_multiple_config(build_command, tmp_path):
 
     file_set_2 = {
         "dependency/deploy/config.toml": """
-backend = "pyscript"
+implementation = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
@@ -118,46 +118,55 @@ def test_extract_backend_config_multiple_config(build_command, tmp_path):
     # Run the function.
     with pytest.raises(
         BriefcaseConfigError,
-        match=r"Only one backend configuration file can be supplied.",
+        match=r"Only one deployment configuration file can be supplied.",
     ):
-        build_command.extract_backend_config([wheel_path_1, wheel_path_2])
+        build_command.extract_pyscript_config([wheel_path_1, wheel_path_2])
 
 
-def test_extract_backend_config_no_backend(build_command, tmp_path):
-    """An app cannot be built with a config.toml containing no "backend" value."""
+def test_extract_pyscript_config_no_implementation(build_command, tmp_path, capsys):
+    """An app with no "implementation" value defaults to pyscript with a warning."""
 
     # Mock a wheel with the needed files
     files = {"dependency/deploy/config.toml": ""}
 
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
-    # Build the web app.
-    with pytest.raises(
-        BriefcaseConfigError,
-        match=r"No backend was provided in config.toml file.",
-    ):
-        build_command.extract_backend_config([wheel_path])
+    pyscript_config, pyscript_version = build_command.extract_pyscript_config(
+        [wheel_path]
+    )
+
+    # Capture output and assert warning present.
+    captured = capsys.readouterr()
+    assert "No web implementation specified. Defaulting to 'pyscript'." in captured.out
+
+    # Check pyscript_config is empty and pyscript_version is the default.
+    assert pyscript_config == {}
+    assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_backend_warning(build_command, tmp_path, capsys):
-    """Briefcase raises a warning if "backend" value is not pyscript."""
+def test_extract_pyscript_config_implementation_warning(
+    build_command,
+    tmp_path,
+    capsys,
+):
+    """Briefcase raises a warning if "implementation" value is not pyscript."""
 
     files = {
         "dependency/deploy/config.toml": """
-backend = "something-else"
+implementation = "something-else"
 """,
     }
 
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
-    pyscript_config, pyscript_version = build_command.extract_backend_config(
+    pyscript_config, pyscript_version = build_command.extract_pyscript_config(
         [wheel_path]
     )
 
     # Capture output and assert warning present.
     captured = capsys.readouterr()
     assert (
-        "Only 'pyscript' backend is currently supported for web static builds."
+        "At present, 'pyscript' is the only supported web implementation."
         in captured.out
     )
 
@@ -166,37 +175,37 @@ def test_extract_backend_config_backend_warning(build_command, tmp_path, capsys)
     assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_no_pyscript_toml(build_command, tmp_path, capsys):
+def test_extract_pyscript_config_no_pyscript_toml(build_command, tmp_path, capsys):
     """If no pyscript.toml is supplied by a wheel, function returns a basic config."""
 
     # Create wheel with no pyscript.toml
     files = {
         "dependency/deploy/config.toml": """
-backend = "pyscript"
+implementation = "pyscript"
 """,
     }
 
     wheel_path = _mock_wheel(tmp_path=tmp_path, wheel_name="dependency", files=files)
 
-    pyscript_config, pyscript_version = build_command.extract_backend_config(
+    pyscript_config, pyscript_version = build_command.extract_pyscript_config(
         [wheel_path]
     )
     # Capture output and assert console info is present.
     captured = capsys.readouterr()
-    assert "Pyscript configuration file not found in package:" in captured.out
+    assert "Pyscript configuration file not found in" in captured.out
 
     # Check pyscript_config is empty and pyscript_version is the default.
     assert pyscript_config == {}
     assert pyscript_version == "2024.11.1"
 
 
-def test_extract_backend_config_invalid_wheel_pyscript_toml(build_command, tmp_path):
+def test_extract_pyscript_config_invalid_wheel_pyscript_toml(build_command, tmp_path):
     """A wheel with an invalid pyscript.toml raises an error."""
 
     # Mock a wheel with files
     files = {
         "dependency/deploy/config.toml": """
-backend = "pyscript"
+implementation = "pyscript"
 
 [pyscript]
 version = "2024.10.1"
@@ -213,4 +222,4 @@ def test_extract_backend_config_invalid_wheel_pyscript_toml(build_command, tmp_p
         BriefcaseConfigError,
         match=r"Briefcase configuration error: pyscript.toml content isn't valid TOML: Expected",
     ):
-        build_command.extract_backend_config([wheel_path])
+        build_command.extract_pyscript_config([wheel_path])

From b487898644589af066ef9f0e3d81a794b6411b34 Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 8 Oct 2025 17:15:00 +0800
Subject: [PATCH 095/105] add body-python content to _append_pyscript_insert

---
 src/briefcase/platforms/web/static.py    | 25 ++++++++++++++++++++----
 tests/platforms/web/static/conftest.py   | 10 ++++++++--
 tests/platforms/web/static/test_build.py | 16 +++++++++++++--
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index f5a75ecc4..52c4b3f5f 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -194,6 +194,7 @@ def write_inserts(
 
     def _append_pyscript_insert(
         self,
+        app,
         filename: Path,
         pyscript_version: str,
         inserts: dict[str, dict[str, dict[str, str]]],
@@ -202,16 +203,18 @@ def _append_pyscript_insert(
 
         This function creates an insert for PyScript.
 
+        :param app: The application whose html file is being written.
         :param filename: The html file whose pyscript version is to be written.
         :param pyscript_version: The pyscript version number to be inserted.
         :param inserts: Nested dict of inserts keyed by target - insert - package.
         """
         package_key = "briefcase"
         target = filename
-        insert = "python"
+        head_insert = "head-python"
+        body_insert = "body-python"
 
         # PyScript definitions for insertion:
-        content = dedent(
+        head_content = dedent(
             f"""\
             <script type="module">
                 // Hide the splash screen when the page is ready.
@@ -225,9 +228,23 @@ def _append_pyscript_insert(
             <script type="module" src="https://pyscript.net/releases/{pyscript_version}/core.js"></script>
             """
         )
+        body_content = dedent(
+            f"""\
+            <script type="py" async="false" config="pyscript.toml">
+                import runpy
+                result = runpy.run_module(
+                    "{app.app_name}", run_name="__main__", alter_sys=True
+                )
+            </script>
+            """
+        )
+
+        pkg_map_head = inserts.setdefault(target, {}).setdefault(head_insert, {})
+        pkg_map_head[package_key] = head_content
+
+        pkg_map_body = inserts.setdefault(target, {}).setdefault(body_insert, {})
+        pkg_map_body[package_key] = body_content
 
-        pkg_map = inserts.setdefault(target, {}).setdefault(insert, {})
-        pkg_map[package_key] = content
 
     def _handle_legacy_css(
         self,
diff --git a/tests/platforms/web/static/conftest.py b/tests/platforms/web/static/conftest.py
index 2126b9dc4..fa2d14153 100644
--- a/tests/platforms/web/static/conftest.py
+++ b/tests/platforms/web/static/conftest.py
@@ -24,12 +24,18 @@ def first_app_generated(first_app_config, tmp_path):
   <head>
     <!--@@ head:start @@-->
     <!--@@ head:end @@-->
-    <!--@@ python:start @@-->
-    <!--@@ python:end @@-->
+    <!--@@ head-python:start @@-->
+    <!--@@ head-python:end @@-->
   </head>
   <body>
     <div id="briefcase-splash"></div>
 
+    <!--@@ body-start:start @@-->
+    <!--@@ body-start:end @@-->
+
+    <!--@@ body-python:start @@-->
+    <!--@@ body-python:end @@-->
+
     <!--@@ body-end:start @@-->
     <!--@@ body-end:end @@-->
   </body>
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 07dc9789c..c67c2a42f 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -159,7 +159,7 @@ def mock_run(*args, **kwargs):
                     "  <head>",
                     "    <!--@@ head:start @@-->",
                     "    <!--@@ head:end @@-->",
-                    "    <!--@@ python:start @@-->",
+                    "    <!--@@ head-python:start @@-->",
                     "    <!--------------------------------------------------",
                     "     * briefcase",
                     "     -------------------------------------------------->",
@@ -173,11 +173,23 @@ def mock_run(*args, **kwargs):
                     "",
                     '    <link rel="stylesheet" href="https://pyscript.net/releases/2024.11.1/core.css">',
                     '    <script type="module" src="https://pyscript.net/releases/2024.11.1/core.js"></script>',
-                    "    <!--@@ python:end @@-->",
+                    "    <!--@@ head-python:end @@-->",
                     "  </head>",
                     "  <body>",
                     '    <div id="briefcase-splash"></div>',
                     "",
+                    "    <!--@@ body-start:start @@-->",
+                    "    <!--@@ body-start:end @@-->",
+                    "",
+                    "    <!--@@ body-python:start @@-->",
+                    '    <script type="py" async="false" config="pyscript.toml">',
+                    "       import runpy",
+                    "       result = runpy.run_module(",
+                    '           first_app, run_name="__main__", alter_sys=True',
+                    "       )",
+                    "    </script>",
+                    "    <!--@@ body-python:end @@-->",
+                    "",
                     "    <!--@@ body-end:start @@-->",
                     "    <!--@@ body-end:end @@-->",
                     "  </body>",

From b8b0ccb014f069f0e02c2d5654604550e659694b Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Wed, 8 Oct 2025 17:17:00 +0800
Subject: [PATCH 096/105] minor fix to test_build.py

---
 tests/platforms/web/static/test_build.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index c67c2a42f..af2f8c420 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -182,6 +182,9 @@ def mock_run(*args, **kwargs):
                     "    <!--@@ body-start:end @@-->",
                     "",
                     "    <!--@@ body-python:start @@-->",
+                    "    <!--------------------------------------------------",
+                    "     * briefcase",
+                    "     -------------------------------------------------->",
                     '    <script type="py" async="false" config="pyscript.toml">',
                     "       import runpy",
                     "       result = runpy.run_module(",

From 604b7636621de926efffa03552d907afe1344b0a Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Thu, 9 Oct 2025 13:18:35 +0800
Subject: [PATCH 097/105] Minor comment update

Minor comment update warn on each legacy /static/*.css, not once per wheel
---
 src/briefcase/platforms/web/static.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 52c4b3f5f..bc1df8d41 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -245,7 +245,6 @@ def _append_pyscript_insert(
         pkg_map_body = inserts.setdefault(target, {}).setdefault(body_insert, {})
         pkg_map_body[package_key] = body_content
 
-
     def _handle_legacy_css(
         self,
         wheel: ZipFile,
@@ -255,12 +254,14 @@ def _handle_legacy_css(
     ) -> None:
         """Handle legacy CSS under /static/*.css and add to briefcase.css.
 
+        Emits a deprecation warning for every legacy CSS file discovered.
+
         :param wheel: Open wheel ZipFile being processed.
         :param path: Path object of the file inside the wheel.
         :param package_key: Provenance label (e.g. "name version").
         :param inserts: Nested dict of inserts keyed by target - insert - package.
         """
-        # Show deprecation warning once per wheel
+        # Warn on every legacy usage
         self.console.warning(
             f"    {Path(wheel.filename).name}: legacy '/static' CSS file {path} detected.\n"
             "     Static file handling has been deprecated; this file should be "

From 042b0e3dbfc0e8c581efe8e57c12be99af91561c Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Thu, 9 Oct 2025 13:54:05 +0800
Subject: [PATCH 098/105] Create test_build__handle_legacy_css.py

Create and update test_build__handle_legacy_css.py that houses the test cases for _handle_legacy_css method
---
 .../static/test_build__handle_legacy_css.py   | 77 +++++++++++++++++++
 .../web/static/test_build__process_wheel.py   | 53 -------------
 2 files changed, 77 insertions(+), 53 deletions(-)
 create mode 100644 tests/platforms/web/static/test_build__handle_legacy_css.py

diff --git a/tests/platforms/web/static/test_build__handle_legacy_css.py b/tests/platforms/web/static/test_build__handle_legacy_css.py
new file mode 100644
index 000000000..6666506c1
--- /dev/null
+++ b/tests/platforms/web/static/test_build__handle_legacy_css.py
@@ -0,0 +1,77 @@
+import zipfile
+from pathlib import Path
+
+import pytest
+
+from briefcase.platforms.web.static import StaticWebBuildCommand
+
+
+@pytest.fixture
+def build_command(dummy_console, tmp_path):
+    return StaticWebBuildCommand(
+        console=dummy_console,
+        base_path=tmp_path / "base_path",
+        data_path=tmp_path / "briefcase",
+    )
+
+
+def test_handle_legacy_css_warn_and_append(
+    build_command,
+    tmp_path,
+    capsys,
+):
+    """Legacy CSS warns and appends to existing contrib key."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/static/one.css", "h1 { x:1; }")
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        # First call - warn
+        build_command._handle_legacy_css(
+            wheel=zf,
+            path=Path("dummy/static/one.css"),
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+        # Pre-seed same contrib key to force append on second call
+        target_map = inserts.setdefault("static/css/briefcase.css", {}).setdefault(
+            "css", {}
+        )
+        key = "pkg 1.0 (legacy static CSS: one.css)"
+        target_map[key] = target_map[key] + "\n/*extra*/"
+        # Second call - no additional warning, content appended
+        build_command._handle_legacy_css(
+            wheel=zf,
+            path=Path("dummy/static/one.css"),
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    # One warning for each file
+    output = capsys.readouterr().out
+    assert (
+        "dummy-1.2.3.whl: legacy '/static' CSS file dummy/static/one.css detected."
+        in output
+    )
+
+    # Content appended
+    out = inserts["static/css/briefcase.css"]["css"][key]
+    assert "h1 { x:1; }" in out and "/*extra*/" in out
+
+
+def test_handle_legacy_css_non_utf8_raise(build_command, tmp_path):
+    """Non-UTF8 legacy CSS raises an UnicodeDecodeError."""
+    bad = b"\xff\xfe\xfa"
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr("dummy/static/bad.css", bad)
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf, pytest.raises(UnicodeDecodeError):
+        build_command._handle_legacy_css(
+            wheel=zf,
+            path=Path("dummy/static/bad.css"),
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index 29007ad23..f8b6f52fc 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -153,59 +153,6 @@ def test_process_wheel_non_utf8_insert(build_command, tmp_path):
         build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
 
 
-def test_process_wheel_non_utf8_legacy_css(build_command, tmp_path):
-    """Non-UTF8 legacy CSS raises an UnicodeDecodeError."""
-    bad = b"\xff\xfe\xfa"
-    wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr("dummy/static/bad.css", bad)
-
-    inserts = {}
-    with pytest.raises(UnicodeDecodeError):
-        build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
-
-
-def test_handle_legacy_css_warning_once_and_append(build_command, tmp_path, capsys):
-    """Legacy CSS warns once and appends to existing contrib key."""
-    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr("dummy/static/one.css", "h1 { x:1; }")
-
-    inserts = {}
-    with zipfile.ZipFile(wheel_path) as zf:
-        # First call - warn
-        build_command._handle_legacy_css(
-            wheel=zf,
-            path=Path("dummy/static/one.css"),
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-        # Pre-seed same contrib key to force append on second call
-        target_map = inserts.setdefault("static/css/briefcase.css", {}).setdefault(
-            "css", {}
-        )
-        key = "pkg 1.0 (legacy static CSS: one.css)"
-        target_map[key] = target_map[key] + "\n/*extra*/"
-        # Second call - no additional warning, content appended
-        build_command._handle_legacy_css(
-            wheel=zf,
-            path=Path("dummy/static/one.css"),
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-
-    # One warning for each file
-    output = capsys.readouterr().out
-    assert (
-        "dummy-1.2.3.whl: legacy '/static' CSS file dummy/static/one.css detected."
-        in output
-    )
-
-    # Content appended
-    out = inserts["static/css/briefcase.css"]["css"][key]
-    assert "h1 { x:1; }" in out and "/*extra*/" in out
-
-
 def test_handle_insert_register_valid_file(build_command, tmp_path):
     """Valid insert is registered under target/slot."""
     wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"

From bbf4afdc23b9d7fd6897c2100312513511b02caa Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Thu, 9 Oct 2025 14:25:44 +0800
Subject: [PATCH 099/105] Create test_build__handle_insert.py

Create and update test_build__handle_insert.py that houses the test cases for _handle_insert method
---
 .../web/static/test_build__handle_insert.py   | 172 ++++++++++++++++++
 .../web/static/test_build__process_wheel.py   | 160 +---------------
 2 files changed, 173 insertions(+), 159 deletions(-)
 create mode 100644 tests/platforms/web/static/test_build__handle_insert.py

diff --git a/tests/platforms/web/static/test_build__handle_insert.py b/tests/platforms/web/static/test_build__handle_insert.py
new file mode 100644
index 000000000..99000a865
--- /dev/null
+++ b/tests/platforms/web/static/test_build__handle_insert.py
@@ -0,0 +1,172 @@
+import zipfile
+from pathlib import Path
+
+import pytest
+
+from briefcase.platforms.web.static import StaticWebBuildCommand
+
+
+@pytest.fixture
+def build_command(dummy_console, tmp_path):
+    return StaticWebBuildCommand(
+        console=dummy_console,
+        base_path=tmp_path / "base_path",
+        data_path=tmp_path / "briefcase",
+    )
+
+
+def test_handle_insert_register_valid_file(build_command, tmp_path):
+    """Valid insert is registered under target/slot."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    filename = "dummy/deploy/inserts/index.html~header"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(filename, "<s>ok</s>")
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    assert "index.html" in inserts and "header" in inserts["index.html"]
+    assert any("<s>ok</s>" in v for v in inserts["index.html"]["header"].values())
+
+
+@pytest.mark.parametrize(
+    "entry, expected_skip",
+    [
+        ("dummy/deploy/inserts/", True),  # Top-level directory entry
+        ("dummy/deploy/inserts/assets/", False),  # Nested directory entry
+    ],
+)
+def test_handle_insert_skip_dir_entries(
+    build_command,
+    tmp_path,
+    monkeypatch,
+    entry,
+    expected_skip,
+):
+    """Deploy/inserts directory entries are skipped with a debug log.
+
+    Parametrised: runs once for top-level dir and once for nested dir.
+    """
+    # Create a dummy wheel containing the "directory" entry
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(entry, "")
+
+    # Capture debug messages
+    debugs = []
+    monkeypatch.setattr(build_command.console, "debug", debugs.append)
+
+    # Run the handler against this entry
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(entry).parts,
+            filename=entry,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    # Directory entries should be ignored completely
+    assert inserts == {}
+    # And a debug message explaining the skip should be logged
+    if expected_skip:
+        assert any("skipping, not a valid insert file" in m for m in debugs)
+    else:
+        assert all("skipping, not a valid insert file" not in m for m in debugs)
+
+
+def test_handle_insert_missing_tilde_skipped(
+    build_command,
+    tmp_path,
+    monkeypatch,
+):
+    """Files under deploy/inserts without '~' are skipped with a debug log."""
+    # Create a dummy wheel containing an invalid insert file (no "~" in name)
+    wheel_filename = Path(tmp_path) / "dummy-1.2.3.whl"
+    missing_tilde = "dummy/deploy/inserts/index.html"
+    with zipfile.ZipFile(wheel_filename, "w") as zf:
+        zf.writestr(missing_tilde, "<div>oops</div>")
+
+    # Capture debug messages
+    debugs = []
+    monkeypatch.setattr(build_command.console, "debug", debugs.append)
+
+    inserts = {}
+    # Run handler directly on the invalid file
+    with zipfile.ZipFile(wheel_filename) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(missing_tilde).parts,
+            filename=missing_tilde,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    # File should be ignored completely
+    assert inserts == {}
+    # And a debug message should clearly say why (missing "~")
+    assert any("must match '<target>~<insert>'" in m for m in debugs)
+
+
+def test_handle_insert_append_existing_contrib(build_command, tmp_path):
+    """Second insert with same contrib key appends with newline."""
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    filename = "dummy/deploy/inserts/index.html~header"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(filename, "<first/>")
+
+    inserts = {}
+    # First registration creates contrib entry
+    with zipfile.ZipFile(wheel_path) as zf:
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+        # Second registration appends to same key
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
+
+    contribs = inserts["index.html"]["header"]
+    contrib_key = next(iter(contribs.keys()))
+    value = contribs[contrib_key]
+
+    assert value.count("<first/>") == 2
+    assert "\n" in value
+
+
+def test_handle_insert_non_utf8_raises(
+    build_command,
+    tmp_path,
+):
+    """Non-UTF8 insert content raises UnicodeDecodeError."""
+    bad = b"\xff\xfe\xfa"
+    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
+    filename = "dummy/deploy/inserts/index.html~header"
+    with zipfile.ZipFile(wheel_path, "w") as zf:
+        zf.writestr(filename, bad)
+
+    inserts = {}
+    with zipfile.ZipFile(wheel_path) as zf, pytest.raises(UnicodeDecodeError):
+        build_command._handle_insert(
+            wheel=zf,
+            parts=Path(filename).parts,
+            filename=filename,
+            package_key="pkg 1.0",
+            inserts=inserts,
+        )
diff --git a/tests/platforms/web/static/test_build__process_wheel.py b/tests/platforms/web/static/test_build__process_wheel.py
index f8b6f52fc..af135e1f1 100644
--- a/tests/platforms/web/static/test_build__process_wheel.py
+++ b/tests/platforms/web/static/test_build__process_wheel.py
@@ -1,6 +1,3 @@
-import zipfile
-from pathlib import Path
-
 import pytest
 
 from briefcase.platforms.web.static import StaticWebBuildCommand
@@ -117,7 +114,7 @@ def test_process_wheel_deploy_inserts(build_command, tmp_path):
     assert any("body { margin: 0; }" in v for v in css_contribs.values())
 
 
-def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, capsys):
+def test_process_wheel_legacy_css_warn_once(build_command, tmp_path, capsys):
     """Legacy CSS files trigger a single deprecation warning."""
     wheel_filename = create_wheel(
         tmp_path,
@@ -139,158 +136,3 @@ def test_process_wheel_legacy_css_warning_once(build_command, tmp_path, capsys):
         "dummy-1.2.3-py3-none-any.whl: legacy '/static' CSS file dummy/static/two.css detected."
         in output
     )
-
-
-def test_process_wheel_non_utf8_insert(build_command, tmp_path):
-    """Non-UTF8 deploy insert raises an UnicodeDecodeError."""
-    bad = b"\xff\xfe\xfa"
-    wheel_path = Path(tmp_path) / "dummy-1.2.3-py3-none-any.whl"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr("dummy/deploy/inserts/index.html~header", bad)
-
-    inserts = {}
-    with pytest.raises(UnicodeDecodeError):
-        build_command._process_wheel(wheelfile=wheel_path, inserts=inserts)
-
-
-def test_handle_insert_register_valid_file(build_command, tmp_path):
-    """Valid insert is registered under target/slot."""
-    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr("dummy/deploy/inserts/index.html~header", "<s>ok</s>")
-
-    inserts = {}
-    with zipfile.ZipFile(wheel_path) as zf:
-        build_command._handle_insert(
-            wheel=zf,
-            parts=Path("dummy/deploy/inserts/index.html~header").parts,
-            filename="dummy/deploy/inserts/index.html~header",
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-
-    assert "index.html" in inserts and "header" in inserts["index.html"]
-    assert any("<s>ok</s>" in v for v in inserts["index.html"]["header"].values())
-
-
-@pytest.mark.parametrize(
-    "entry, expected_skip",
-    [
-        ("dummy/deploy/inserts/", True),  # Top-level directory entry
-        ("dummy/deploy/inserts/assets/", False),  # Nested directory entry
-    ],
-)
-def test_handle_insert_skip_dir_entries(
-    build_command,
-    tmp_path,
-    monkeypatch,
-    entry,
-    expected_skip,
-):
-    """Deploy/inserts directory entries are skipped with a debug log.
-
-    Parametrized: runs once for top-level dir and once for nested dir.
-    """
-    # Create a dummy wheel containing the "directory" entry
-    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr(entry, "")
-
-    # Capture debug messages
-    debugs = []
-    monkeypatch.setattr(build_command.console, "debug", debugs.append)
-
-    # Run the handler against this entry
-    inserts = {}
-    with zipfile.ZipFile(wheel_path) as zf:
-        build_command._handle_insert(
-            wheel=zf,
-            parts=Path(entry).parts,
-            filename=entry,
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-
-    # Directory entries should be ignored completely
-    assert inserts == {}
-    # And a debug message explaining the skip should be logged
-    if expected_skip:
-        assert any("skipping, not a valid insert file" in m for m in debugs)
-    else:
-        assert all("skipping, not a valid insert file" not in m for m in debugs)
-
-
-@pytest.mark.parametrize("mode", ["integration", "unit"])
-def missing_tilde_under_deploy_inserts_skipped(
-    build_command,
-    tmp_path,
-    monkeypatch,
-    mode,
-):
-    """Files under deploy/inserts without '~' are skipped with a debug log.
-
-    Parametrized: tests both integration path (_process_wheel) and direct unit call.
-    """
-    # Create a dummy wheel containing an invalid insert file (no "~" in name)
-    wheel_filename = Path(tmp_path) / "dummy-1.2.3.whl"
-    missing_tilde = "dummy/deploy/inserts/index.html"
-    with zipfile.ZipFile(wheel_filename, "w") as zf:
-        zf.writestr(missing_tilde, "<div>oops</div>")
-
-    # Capture debug messages
-    debugs = []
-    monkeypatch.setattr(build_command.console, "debug", debugs.append)
-
-    inserts = {}
-    if mode == "integration":
-        # Run via full wheel scan, which will delegate to _handle_insert
-        build_command._process_wheel(wheelfile=wheel_filename, inserts=inserts)
-    else:
-        # Run handler directly on the invalid file
-        with zipfile.ZipFile(wheel_filename) as zf:
-            build_command._handle_insert(
-                wheel=zf,
-                parts=Path(missing_tilde).parts,
-                filename=missing_tilde,
-                package_key="pkg 1.0",
-                inserts=inserts,
-            )
-
-    # File should be ignored completely
-    assert inserts == {}
-    # And a debug message should clearly say why (missing "~")
-    assert any("must match '<target>~<insert>'" in m for m in debugs)
-
-
-def test_handle_insert_append_existing_contrib(build_command, tmp_path):
-    """Second insert with same contrib key appends with newline."""
-    wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
-    filename = "dummy/deploy/inserts/index.html~header"
-    with zipfile.ZipFile(wheel_path, "w") as zf:
-        zf.writestr(filename, "<first/>")
-
-    inserts = {}
-    with zipfile.ZipFile(wheel_path) as zf:
-        # First registration creates contrib entry
-        build_command._handle_insert(
-            wheel=zf,
-            parts=Path(filename).parts,
-            filename=filename,
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-        # Second registration appends to same key
-        build_command._handle_insert(
-            wheel=zf,
-            parts=Path(filename).parts,
-            filename=filename,
-            package_key="pkg 1.0",
-            inserts=inserts,
-        )
-
-    contribs = inserts["index.html"]["header"]
-    contrib_key = next(iter(contribs.keys()))
-    value = contribs[contrib_key]
-
-    assert value.count("<first/>") == 2
-    assert "\n" in value

From bac1000c7490b0bca59ce5f5c82e7e6c00786cad Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Thu, 9 Oct 2025 14:44:13 +0800
Subject: [PATCH 100/105] Address review comments

Log invalid insert files as warnings instead of debug in _handle_insert()
---
 src/briefcase/platforms/web/static.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index bc1df8d41..158ee24b7 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -303,12 +303,14 @@ def _handle_insert(
         rel_inside = "/".join(parts[3:])
 
         if not rel_inside or rel_inside.endswith("/"):
-            self.console.debug(f"    {filename}: skipping, not a valid insert file.")
+            self.console.warning(
+                f"    {filename}: skipping; not a valid insert file (empty path or directory)."
+            )
             return
 
         if "~" not in rel_inside:
-            self.console.debug(
-                f"    {filename}: skipping, filename must match '<target>~<insert>'."
+            self.console.warning(
+                f"    {filename}: skipping; filename must match '<target>~<insert>'."
             )
             return
 

From 7bf50d0ffbc548904a8ba4ed365e2ba1f9c34805 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Sat, 11 Oct 2025 16:03:54 +0800
Subject: [PATCH 101/105] fixes to tests and _handle_legacy)css

---
 src/briefcase/platforms/web/static.py    | 12 +++++++-----
 tests/platforms/web/static/test_build.py |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 158ee24b7..e5f6073f0 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -194,7 +194,7 @@ def write_inserts(
 
     def _append_pyscript_insert(
         self,
-        app,
+        app: AppConfig,
         filename: Path,
         pyscript_version: str,
         inserts: dict[str, dict[str, dict[str, str]]],
@@ -233,7 +233,7 @@ def _append_pyscript_insert(
             <script type="py" async="false" config="pyscript.toml">
                 import runpy
                 result = runpy.run_module(
-                    "{app.app_name}", run_name="__main__", alter_sys=True
+                    {app.app_name}, run_name="__main__", alter_sys=True
                 )
             </script>
             """
@@ -249,6 +249,7 @@ def _handle_legacy_css(
         self,
         wheel: ZipFile,
         path: Path,
+        filename: str,
         package_key: str,
         inserts: dict[str, dict[str, dict[str, str]]],
     ) -> None:
@@ -258,6 +259,7 @@ def _handle_legacy_css(
 
         :param wheel: Open wheel ZipFile being processed.
         :param path: Path object of the file inside the wheel.
+        :param filename: Filename string inside the wheel.
         :param package_key: Provenance label (e.g. "name version").
         :param inserts: Nested dict of inserts keyed by target - insert - package.
         """
@@ -268,7 +270,7 @@ def _handle_legacy_css(
             "converted into an insert."
         )
 
-        css_text = wheel.read(str(path)).decode("utf-8")
+        css_text = wheel.read(filename).decode("utf-8")
 
         rel_inside = "/".join(path.parts[2:])
         contrib_key = f"{package_key} (legacy static CSS: {rel_inside})"
@@ -356,7 +358,7 @@ def _process_wheel(
                     and parts[1] == "static"
                     and path.suffix.lower() == ".css"
                 ):
-                    self._handle_legacy_css(wheel, path, package_key, inserts)
+                    self._handle_legacy_css(wheel, path, filename, package_key, inserts)
 
                 # New deploy/inserts handling
                 elif len(parts) >= 3 and parts[1] == "deploy" and parts[2] == "inserts":
@@ -548,7 +550,7 @@ def build_app(self, app: AppConfig, **kwargs):
                 )
 
             # Add pyscript insertion to inserts
-            self._append_pyscript_insert("index.html", pyscript_version, inserts)
+            self._append_pyscript_insert(app, "index.html", pyscript_version, inserts)
 
             # Write inserts per target
             for target, target_inserts in sorted(inserts.items()):
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index af2f8c420..1240bc51e 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -186,10 +186,10 @@ def mock_run(*args, **kwargs):
                     "     * briefcase",
                     "     -------------------------------------------------->",
                     '    <script type="py" async="false" config="pyscript.toml">',
-                    "       import runpy",
-                    "       result = runpy.run_module(",
-                    '           first_app, run_name="__main__", alter_sys=True',
-                    "       )",
+                    "        import runpy",
+                    "        result = runpy.run_module(",
+                    '            first-app, run_name="__main__", alter_sys=True',
+                    "        )",
                     "    </script>",
                     "    <!--@@ body-python:end @@-->",
                     "",

From 48fad39da4f48ec1fe422cd63b4c83254b149052 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Sat, 11 Oct 2025 16:35:14 +0800
Subject: [PATCH 102/105] fixes for test_build__handle_legacy_css.py

---
 src/briefcase/platforms/web/static.py                       | 2 +-
 tests/platforms/web/static/test_build__handle_legacy_css.py | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index e5f6073f0..7f394dea9 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -265,7 +265,7 @@ def _handle_legacy_css(
         """
         # Warn on every legacy usage
         self.console.warning(
-            f"    {Path(wheel.filename).name}: legacy '/static' CSS file {path} detected.\n"
+            f"    {Path(wheel.filename).name}: legacy '/static' CSS file {filename} detected.\n"
             "     Static file handling has been deprecated; this file should be "
             "converted into an insert."
         )
diff --git a/tests/platforms/web/static/test_build__handle_legacy_css.py b/tests/platforms/web/static/test_build__handle_legacy_css.py
index 6666506c1..d90b3e107 100644
--- a/tests/platforms/web/static/test_build__handle_legacy_css.py
+++ b/tests/platforms/web/static/test_build__handle_legacy_css.py
@@ -20,7 +20,7 @@ def test_handle_legacy_css_warn_and_append(
     tmp_path,
     capsys,
 ):
-    """Legacy CSS warns and appends to existing contrib key."""
+    """Legacy CSS warns and appends to new contrib key."""
     wheel_path = Path(tmp_path) / "dummy-1.2.3.whl"
     with zipfile.ZipFile(wheel_path, "w") as zf:
         zf.writestr("dummy/static/one.css", "h1 { x:1; }")
@@ -31,6 +31,7 @@ def test_handle_legacy_css_warn_and_append(
         build_command._handle_legacy_css(
             wheel=zf,
             path=Path("dummy/static/one.css"),
+            filename="dummy/static/one.css",
             package_key="pkg 1.0",
             inserts=inserts,
         )
@@ -44,6 +45,7 @@ def test_handle_legacy_css_warn_and_append(
         build_command._handle_legacy_css(
             wheel=zf,
             path=Path("dummy/static/one.css"),
+            filename="dummy/static/one.css",
             package_key="pkg 1.0",
             inserts=inserts,
         )
@@ -72,6 +74,7 @@ def test_handle_legacy_css_non_utf8_raise(build_command, tmp_path):
         build_command._handle_legacy_css(
             wheel=zf,
             path=Path("dummy/static/bad.css"),
+            filename="dummy/static/bad.css",
             package_key="pkg 1.0",
             inserts=inserts,
         )

From 89b7aec3ad7305a9d693f182caea2d456c1e7972 Mon Sep 17 00:00:00 2001
From: caydnn <caydnlee1@gmail.com>
Date: Sat, 11 Oct 2025 16:48:24 +0800
Subject: [PATCH 103/105] remove monkeypatch from test_build__handle_insert.py

debugs have been changed to warning, monkey patch no longer necessary
---
 .../web/static/test_build__handle_insert.py   | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/tests/platforms/web/static/test_build__handle_insert.py b/tests/platforms/web/static/test_build__handle_insert.py
index 99000a865..aaf6c4bd0 100644
--- a/tests/platforms/web/static/test_build__handle_insert.py
+++ b/tests/platforms/web/static/test_build__handle_insert.py
@@ -46,7 +46,7 @@ def test_handle_insert_register_valid_file(build_command, tmp_path):
 def test_handle_insert_skip_dir_entries(
     build_command,
     tmp_path,
-    monkeypatch,
+    capsys,
     entry,
     expected_skip,
 ):
@@ -59,10 +59,6 @@ def test_handle_insert_skip_dir_entries(
     with zipfile.ZipFile(wheel_path, "w") as zf:
         zf.writestr(entry, "")
 
-    # Capture debug messages
-    debugs = []
-    monkeypatch.setattr(build_command.console, "debug", debugs.append)
-
     # Run the handler against this entry
     inserts = {}
     with zipfile.ZipFile(wheel_path) as zf:
@@ -74,19 +70,21 @@ def test_handle_insert_skip_dir_entries(
             inserts=inserts,
         )
 
+    output = capsys.readouterr().out
+
     # Directory entries should be ignored completely
     assert inserts == {}
     # And a debug message explaining the skip should be logged
     if expected_skip:
-        assert any("skipping, not a valid insert file" in m for m in debugs)
+        assert "skipping; not a valid insert file" in output
     else:
-        assert all("skipping, not a valid insert file" not in m for m in debugs)
+        assert "skipping; not a valid insert file" not in output
 
 
 def test_handle_insert_missing_tilde_skipped(
     build_command,
     tmp_path,
-    monkeypatch,
+    capsys,
 ):
     """Files under deploy/inserts without '~' are skipped with a debug log."""
     # Create a dummy wheel containing an invalid insert file (no "~" in name)
@@ -95,10 +93,6 @@ def test_handle_insert_missing_tilde_skipped(
     with zipfile.ZipFile(wheel_filename, "w") as zf:
         zf.writestr(missing_tilde, "<div>oops</div>")
 
-    # Capture debug messages
-    debugs = []
-    monkeypatch.setattr(build_command.console, "debug", debugs.append)
-
     inserts = {}
     # Run handler directly on the invalid file
     with zipfile.ZipFile(wheel_filename) as zf:
@@ -110,10 +104,12 @@ def test_handle_insert_missing_tilde_skipped(
             inserts=inserts,
         )
 
+    output = capsys.readouterr().out
+
     # File should be ignored completely
     assert inserts == {}
     # And a debug message should clearly say why (missing "~")
-    assert any("must match '<target>~<insert>'" in m for m in debugs)
+    assert "must match '<target>~<insert>'" in output
 
 
 def test_handle_insert_append_existing_contrib(build_command, tmp_path):

From cab03a9e40ee1eb99209ce08ba966f3dcd6106fb Mon Sep 17 00:00:00 2001
From: 19766375 <19766375@student.curtin.edu.au>
Date: Sat, 11 Oct 2025 19:32:04 +0800
Subject: [PATCH 104/105] add quotes to pyscript body script

---
 src/briefcase/platforms/web/static.py    | 2 +-
 tests/platforms/web/static/test_build.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/briefcase/platforms/web/static.py b/src/briefcase/platforms/web/static.py
index 7f394dea9..a7ee828a4 100644
--- a/src/briefcase/platforms/web/static.py
+++ b/src/briefcase/platforms/web/static.py
@@ -233,7 +233,7 @@ def _append_pyscript_insert(
             <script type="py" async="false" config="pyscript.toml">
                 import runpy
                 result = runpy.run_module(
-                    {app.app_name}, run_name="__main__", alter_sys=True
+                    "{app.app_name}", run_name="__main__", alter_sys=True
                 )
             </script>
             """
diff --git a/tests/platforms/web/static/test_build.py b/tests/platforms/web/static/test_build.py
index 1240bc51e..f34b0a696 100644
--- a/tests/platforms/web/static/test_build.py
+++ b/tests/platforms/web/static/test_build.py
@@ -188,7 +188,7 @@ def mock_run(*args, **kwargs):
                     '    <script type="py" async="false" config="pyscript.toml">',
                     "        import runpy",
                     "        result = runpy.run_module(",
-                    '            first-app, run_name="__main__", alter_sys=True',
+                    '            "first-app", run_name="__main__", alter_sys=True',
                     "        )",
                     "    </script>",
                     "    <!--@@ body-python:end @@-->",

From ea9c0da2fc9fb9c10426ffe3428e7d04c3da7639 Mon Sep 17 00:00:00 2001
From: kavi2du <kavidu.ab@gmail.com>
Date: Wed, 15 Oct 2025 11:28:27 +0800
Subject: [PATCH 105/105] Update static.rst documentation

Update static.rst to reflect the new web platform insert system and deployment config
---
 docs/reference/platforms/web/static.rst | 42 +++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/docs/reference/platforms/web/static.rst b/docs/reference/platforms/web/static.rst
index 7bc9cdc7e..df81cd2cf 100644
--- a/docs/reference/platforms/web/static.rst
+++ b/docs/reference/platforms/web/static.rst
@@ -97,3 +97,45 @@ and change the default PyScript app name, you could use::
     [[runtimes]]
     src = "https://example.com/custom/pyodide.js"
     """
+
+Deployment Configuration
+========================
+
+Web packages can include deployment configuration to control how Briefcase builds
+and deploys web applications.  The deployment process relies on a ``config.toml``
+file and associated deployment files included in Python packages.
+
+config.toml
+-----------
+
+A package can specify deployment settings through a ``config.toml`` file located
+at ``<package>/deploy/config.toml``. The deployment configuration file accepts the
+following information:
+
+* ``implementation``: The web implementation to use (currently only ``"pyscript"``
+  is supported). If not specified, defaults to ``"pyscript"``.
+* ``pyscript.version``: The PyScript version to use (e.g., ``"2024.11.1"``). If not
+  specified, Briefcase will use its default PyScript version.
+
+Example ``config.toml``::
+
+    implementation = "pyscript"
+
+    [pyscript]
+    version = "2024.11.1"
+
+pyscript.toml
+-------------
+
+A package can include a base ``pyscript.toml`` file located at
+``<package>/deploy/pyscript.toml``. The base configuration in this file serves as
+the foundation for Briefcase to generate the final ``pyscript.toml`` file.
+Briefcase performs the following operations when processing this file:
+
+1. The system reads the base ``pyscript.toml`` file from the package directory.
+2. The system adds the ``packages`` list which contains all wheel files to the configuration.
+3. Merge in any :attr:`extra_pyscript_toml_content` from ``pyproject.toml``
+
+A Briefcase project must have only one package that defines deployment configuration
+through a ``config.toml`` file. The system will produce an error when multiple packages
+in the dependencies attempt to define deployment settings.