plain 0.18.0__py3-none-any.whl → 0.19.1__py3-none-any.whl

plain/assets/views.py

@@ -28,8 +28,11 @@ class AssetView(View):
     This class could be subclassed to further tweak the responses or behavior.
     """
 
+    def get_url_path(self):
+        return self.url_kwargs["path"]
+
     def get(self):
-        url_path = self.url_kwargs["path"]
+        url_path = self.get_url_path()
 
         # Make a trailing slash work, but we don't expect it
         url_path = url_path.rstrip("/")

plain/cli/cli.py

@@ -1,9 +1,9 @@
 import importlib
-import json
 import os
 import shutil
 import subprocess
 import sys
+import tomllib
 import traceback
 from importlib.metadata import entry_points
 from importlib.util import find_spec
@@ -287,29 +287,32 @@ def compile(keep_original, fingerprint, compress):
         )
         sys.exit(1)
 
+    # Run user-defined compile commands first
+    pyproject_path = plain.runtime.APP_PATH.parent / "pyproject.toml"
+    if pyproject_path.exists():
+        with pyproject_path.open("rb") as f:
+            pyproject = tomllib.load(f)
+
+        for name, data in (
+            pyproject.get("tool", {})
+            .get("plain", {})
+            .get("compile", {})
+            .get("run", {})
+            .items()
+        ):
+            click.secho(f"Running {name} from pyproject.toml", bold=True)
+            result = subprocess.run(data["cmd"], shell=True)
+            print()
+            if result.returncode:
+                click.secho(f"Error in {name} (exit {result.returncode})", fg="red")
+                sys.exit(result.returncode)
+
+    # Then run installed package compile steps (like tailwind, typically should run last...)
     for entry_point in entry_points(group="plain.assets.compile"):
         click.secho(f"Running {entry_point.name}", bold=True)
         result = entry_point.load()()
         print()
 
-    # TODO also look in [tool.plain.compile.run]
-
-    # Run a "compile" script from package.json automatically
-    package_json = Path("package.json")
-    if package_json.exists():
-        with package_json.open() as f:
-            package = json.load(f)
-
-        if package.get("scripts", {}).get("compile"):
-            click.secho("Running `npm run compile`", bold=True)
-            result = subprocess.run(["npm", "run", "compile"])
-            print()
-            if result.returncode:
-                click.secho(
-                    f"Error in `npm run compile` (exit {result.returncode})", fg="red"
-                )
-                sys.exit(result.returncode)
-
     # Compile our assets
     target_dir = get_compiled_path()
     click.secho(f"Compiling assets to {target_dir}", bold=True)

{plain-0.18.0.dist-info → plain-0.19.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain
-Version: 0.18.0
+Version: 0.19.1
 Summary: A web framework for building products with Python.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain-0.18.0.dist-info → plain-0.19.1.dist-info}/RECORD

@@ -13,10 +13,10 @@ plain/assets/compile.py,sha256=lsnciN85YjHe6d8VIKJi1L8r7NGHNzMOe9L87wObM5I,3287
 plain/assets/finders.py,sha256=WEKAnXTmpuQ7UKLZz7vHPrKFdDOkuZSP6_JTKmIxrKg,1268
 plain/assets/fingerprints.py,sha256=1NKAnnXVlncY5iimXztr0NL3RIjBKsNlZRIe6nmItJc,931
 plain/assets/urls.py,sha256=ZTIoM1Zq35JaXZ3wFhXhfGa7VoITDNlH9i5RS0R5xow,933
-plain/assets/views.py,sha256=dhjIpMu0GDR_VGbXM90_6RnC84C2C4bFv1RxDVklGBk,9173
+plain/assets/views.py,sha256=2Y2KVJinlaMBB2ZyMAVPj_ejuMv3cCO079TN8lSsbd8,9237
 plain/cli/README.md,sha256=TvWCnNwb1rNthPzJglCRMKacN5H_RLeEjYBMe62Uz4M,2461
 plain/cli/__init__.py,sha256=9ByBOIdM8DebChjNz-RH2atdz4vWe8somlwNEsbhwh4,40
-plain/cli/cli.py,sha256=akk7koDuFXNpFPsSv4mzJNbtEuXTSXTeMFhFGUbbB9A,14426
+plain/cli/cli.py,sha256=UNWIVnx2r2qn-eZejh2F_UA9C80HDNFysDd1rAWh2K4,14593
 plain/cli/formatting.py,sha256=1hZH13y1qwHcU2K2_Na388nw9uvoeQH8LrWL-O9h8Yc,2207
 plain/cli/packages.py,sha256=FqRJaizaxpQ8lSS4nYNjqIGpYGDbeTmCXCvkGxusGOM,2160
 plain/cli/print.py,sha256=XraUYrgODOJquIiEv78wSCYGRBplHXtXSS9QtFG5hqY,217
@@ -138,8 +138,8 @@ plain/views/forms.py,sha256=RhlaUcZCkeqokY_fvv-NOS-kgZAG4XhDLOPbf9K_Zlc,2691
 plain/views/objects.py,sha256=fRfS6KNehIGqkbPw4nSafj8HStxYExHmbggolBbzcxs,7921
 plain/views/redirect.py,sha256=KLnlktzK6ZNMTlaEiZpMKQMEP5zeTgGLJ9BIkIJfwBo,1733
 plain/views/templates.py,sha256=nF9CcdhhjAyp3LB0RrSYnBaHpHzMfPSw719RCdcXk7o,2007
-plain-0.18.0.dist-info/METADATA,sha256=Qik7zQyhLtbB8QcE6qwCar14RSDbiFaalX_6-VejaBc,2518
-plain-0.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-plain-0.18.0.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
-plain-0.18.0.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
-plain-0.18.0.dist-info/RECORD,,
+plain-0.19.1.dist-info/METADATA,sha256=RlzXMJklCiL5RItFRnMBVVGWkv5DJ4mZWNWAQiTrToY,2518
+plain-0.19.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+plain-0.19.1.dist-info/entry_points.txt,sha256=DHHprvufgd7xypiBiqMANYRnpJ9xPPYhYbnPGwOkWqE,40
+plain-0.19.1.dist-info/licenses/LICENSE,sha256=m0D5O7QoH9l5Vz_rrX_9r-C8d9UNr_ciK6Qwac7o6yo,3175
+plain-0.19.1.dist-info/RECORD,,