shipit-cli 0.19.9__tar.gz → 0.20.0__tar.gz

{shipit_cli-0.19.9 → shipit_cli-0.20.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.19.9
+Version: 0.20.0
 Summary: Shipit CLI is the best way to build, serve and deploy your projects anywhere.
 Project-URL: homepage, https://wasmer.io
 Project-URL: repository, https://github.com/wasmerio/shipit

{shipit_cli-0.19.9 → shipit_cli-0.20.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.19.9"
+version = "0.20.0"
 description = "Shipit CLI is the best way to build, serve and deploy your projects anywhere."
 readme = "README.md"
 requires-python = ">=3.10"

shipit_cli-0.20.0/src/shipit/assets/node/optimize-node-modules.sh

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+root="${1:-node_modules}"
+
+if [[ ! -d "$root" ]]; then
+  exit 0
+fi
+
+is_wasm() {
+  local file="$1"
+  local magic
+
+  case "$file" in
+    *.wasm | *.WASM)
+      return 0
+      ;;
+  esac
+
+  magic="$(dd if="$file" bs=4 count=1 2>/dev/null | od -An -tx1 | tr -d ' \n')"
+  [[ "$magic" == "0061736d" ]]
+}
+
+while IFS= read -r -d "" file; do
+  if is_wasm "$file"; then
+    continue
+  fi
+
+  if ! grep -Iq . "$file"; then
+    rm -f -- "$file"
+  fi
+done < <(
+  find "$root" -type f \( -perm -100 -o -perm -010 -o -perm -001 \) -print0
+)

{shipit_cli-0.19.9 → shipit_cli-0.20.0}/src/shipit/providers/hugo.py

@@ -17,20 +17,32 @@ from pydantic_settings import SettingsConfigDict
 import toml
 import json
 import yaml
-from pyripgrep import Grep
 
 
-def is_old_hugo(src_dir: Path) -> dict:
-    rg = Grep()
+def _contains_text(src_dir: Path, text: str) -> bool:
+    skipped_dirs = {".git", ".shipit", "node_modules"}
+    for path in src_dir.rglob("*"):
+        if any(part in skipped_dirs for part in path.parts):
+            continue
+        if not path.is_file():
+            continue
+        try:
+            if text in path.read_text(errors="ignore"):
+                return True
+        except OSError:
+            continue
+    return False
+
 
+def is_old_hugo(src_dir: Path) -> bool:
     # Hard-fail signal: old Hugo
-    if rg.search("resources.ToCSS", path=str(src_dir)):
+    if _contains_text(src_dir, "resources.ToCSS"):
         return True
 
     # Modern Hugo signal
-    if rg.search("css.Sass", path=str(src_dir)):
+    if _contains_text(src_dir, "css.Sass"):
         return False
-    
+
     return False
 
 

{shipit_cli-0.19.9 → shipit_cli-0.20.0}/src/shipit/providers/laravel.py

@@ -1,43 +1,52 @@
 from pathlib import Path
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
+
+from pydantic_settings import SettingsConfigDict
 
 from .base import (
+    Config,
     DetectResult,
     DependencySpec,
-    Provider,
-    _exists,
     MountSpec,
     ServiceSpec,
     VolumeSpec,
-    CustomCommands,
-    Config,
+    _exists,
 )
+from .node import NodeConfig, NodeProvider
 from .php import PhpConfig, PhpProvider
-from .node_static import NodeStaticConfig, NodeStaticProvider
-from pydantic_settings import SettingsConfigDict
 
 
-class LaravelConfig(PhpConfig, NodeStaticConfig):
+class LaravelConfig(PhpConfig, NodeConfig):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
+    framework: Optional[Any] = None
+
+
+class LaravelProvider(PhpProvider, NodeProvider):
+    config: LaravelConfig
 
-class LaravelProvider(PhpProvider):
     def __init__(self, path: Path, config: LaravelConfig):
         self.path = path
-        self.node_provider = NodeStaticProvider(path, config, only_build=True)
         self.config = config
+        self.only_build = True
 
     @classmethod
-    def load_config(cls, path: Path, base_config: Config) -> LaravelConfig:
+    def load_config(
+        cls,
+        path: Path,
+        base_config: Config,
+        infer_start: bool = False,
+    ) -> LaravelConfig:
         config = super().load_config(path, base_config)
         config.use_composer = True
-        node_config = NodeStaticProvider.load_config(path, base_config)
-        node_config.static_dir = None
-        node_config.static_generator = None
+        node_config = NodeProvider.load_config(
+            path, base_config, infer_start=False
+        )
+        node_config_data = node_config.model_dump(exclude={"framework"})
         return LaravelConfig(
             **(
                 config.model_dump()
-                | node_config.model_dump()
+                | node_config_data
                 | base_config.model_dump()
             )
         )
@@ -46,6 +55,10 @@ class LaravelProvider(PhpProvider):
     def name(cls) -> str:
         return "laravel"
 
+    @classmethod
+    def detect_framework(cls, *args: Any, **kwargs: Any) -> Any:
+        return PhpProvider.detect_framework(*args, **kwargs)
+
     @classmethod
     def detect(cls, path: Path, config: Config) -> Optional[DetectResult]:
         if _exists(path, "artisan") and _exists(path, "composer.json"):
@@ -55,12 +68,12 @@ class LaravelProvider(PhpProvider):
     def dependencies(self) -> list[DependencySpec]:
         return [
             *super().dependencies(),
-            *self.node_provider.dependencies()
+            *NodeProvider.dependencies(self),
         ]
 
     def build_steps(self) -> list[str]:
-        node_install = list(self.node_provider.build_steps_install())
-        node_build = list(self.node_provider.build_steps_build())
+        node_install = list(NodeProvider.build_steps_install(self))
+        node_build = list(NodeProvider.build_steps_build(self))
         return super().build_steps_with_options(
             extra_ignore=["node_modules"],
             after_install=node_install,
@@ -84,7 +97,7 @@ class LaravelProvider(PhpProvider):
         }
 
     def mounts(self) -> list[MountSpec]:
-        return [*super().mounts(), *self.node_provider.mounts()]
+        return [*super().mounts(), *NodeProvider.mounts(self)]
 
     def volumes(self) -> list[VolumeSpec]:
         return []