shipit-cli 0.13.3__tar.gz → 0.14.0__tar.gz

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.13.3
+Version: 0.14.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.13.3 → shipit_cli-0.14.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.13.3"
+version = "0.14.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.13.3 → shipit_cli-0.14.0}/src/shipit/assets/wordpress/install.sh

@@ -94,7 +94,7 @@ fi
 
 if [ -n "${WP_LOCALE:-}" ]; then
   echo "Setting locale: $WP_LOCALE"
-  wp language install "$WP_LOCALE"
+  wp language core install "$WP_LOCALE"
   wp language theme install --all "$WP_LOCALE"
   wp language plugin install --all "$WP_LOCALE"
   wp site switch-language "$WP_LOCALE"

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/cli.py

@@ -387,7 +387,7 @@ RUN apt-get update \\
         dpkg-dev pkg-config re2c locate \\
         libmariadb-dev libmariadb-dev-compat libpq-dev \\
         libvips-dev default-libmysqlclient-dev libmagickwand-dev \\
-        libicu-dev libxml2-dev libxslt-dev \\
+        libicu-dev libxml2-dev libxslt-dev libyaml-dev \\
         sudo curl ca-certificates \\
     && rm -rf /var/lib/apt/lists/*
 
@@ -1337,10 +1337,12 @@ class Ctx:
     def copy(
         self,
         source: str,
-        target: str,
+        target: Optional[str] = None,
         ignore: Optional[List[str]] = None,
         base: Optional[Literal["source", "assets"]] = None,
     ) -> Optional[str]:
+        if target is None:
+            target = source
         step = CopyStep(source, target, ignore, base or "source")
         return self.add_step(step)
 

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/generator.py

@@ -92,9 +92,11 @@ def generate_shipit(path: Path, custom_commands: CustomCommands, use_provider: O
         provider_cls = detect_provider(path, custom_commands)
     provider = provider_cls(path, custom_commands)
 
+    default_serve_name = path.absolute().name
+
     # Collect parts
     plan = ProviderPlan(
-        serve_name=provider.serve_name(),
+        serve_name=provider.serve_name() or default_serve_name,
         provider=provider.name(),
         platform=provider.platform(),
         mounts=provider.mounts(),

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/base.py

@@ -27,7 +27,7 @@ class Provider(Protocol):
     def detect(cls, path: Path, custom_commands: CustomCommands) -> Optional[DetectResult]: ...
     def initialize(self) -> None: ...
     # Structured plan steps (no path args; use self.path)
-    def serve_name(self) -> str: ...
+    def serve_name(self) -> Optional[str]: ...
     def platform(self) -> Optional[str]: ...
     def dependencies(self) -> list["DependencySpec"]: ...
     def declarations(self) -> Optional[str]: ...

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/hugo.py

@@ -24,8 +24,8 @@ class HugoProvider(StaticFileProvider):
             return DetectResult(cls.name(), 40)
         return None
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return "hugo"

shipit_cli-0.14.0/src/shipit/providers/jekyll.py

@@ -0,0 +1,96 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import Dict, Optional
+
+from .base import (
+    DetectResult,
+    DependencySpec,
+    Provider,
+    _exists,
+    MountSpec,
+    ServiceSpec,
+    VolumeSpec,
+    CustomCommands,
+)
+from .staticfile import StaticFileProvider
+
+
+class JekyllProvider(StaticFileProvider):
+    def __init__(self, path: Path, custom_commands: CustomCommands):
+        self.path = path
+
+    @classmethod
+    def name(cls) -> str:
+        return "jekyll"
+
+    @classmethod
+    def detect(
+        cls, path: Path, custom_commands: CustomCommands
+    ) -> Optional[DetectResult]:
+        if _exists(path, "_config.yml", "_config.yaml"):
+            if _exists(path, "Gemfile"):
+                return DetectResult(cls.name(), 85)
+            return DetectResult(cls.name(), 40)
+        if custom_commands.build and custom_commands.build.startswith("jekyll "):
+            return DetectResult(cls.name(), 85)
+        return None
+
+    def initialize(self) -> None:
+        pass
+
+    def serve_name(self) -> Optional[str]:
+        return None
+
+    def platform(self) -> Optional[str]:
+        return None
+
+    def dependencies(self) -> list[DependencySpec]:
+        return [
+            DependencySpec(
+                "ruby",
+                env_var="SHIPIT_RUBY_VERSION",
+                use_in_build=True,
+                use_in_serve=False,
+            ),
+            *super().dependencies(),
+        ]
+
+    def declarations(self) -> Optional[str]:
+        return 'jekyll_version = getenv("SHIPIT_JEKYLL_VERSION") or "1.6.1"\n'
+
+    def build_steps(self) -> list[str]:
+        if _exists(self.path, "Gemfile"):
+            install_deps = ["Gemfile"]
+            install_deps_str = ", ".join([f'"{dep}"' for dep in install_deps])
+            install_commands = [
+                f'run("bundle install", inputs=[{install_deps_str}], group="build")'
+            ]
+            if _exists(self.path, "Gemfile.lock"):
+                install_commands = [
+                    'copy("Gemfile.lock")',
+                    *install_commands,
+                ]
+        else:
+            install_commands = ['run("gem install jekyll", group="build")']
+        return [
+            'workdir(temp["build"])',
+            'copy(".", ignore=[".git"])',
+            *install_commands,
+            'run("jekyll build --destination={}".format(app["build"]), outputs=["."], group="build")',
+        ]
+
+    def prepare_steps(self) -> Optional[list[str]]:
+        return None
+
+    def mounts(self) -> list[MountSpec]:
+        return [MountSpec("temp", attach_to_serve=False), *super().mounts()]
+
+    def volumes(self) -> list[VolumeSpec]:
+        return []
+
+    def env(self) -> Optional[Dict[str, str]]:
+        return None
+
+    def services(self) -> list[ServiceSpec]:
+        return []

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/laravel.py

@@ -33,8 +33,8 @@ class LaravelProvider:
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return "laravel"

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/mkdocs.py

@@ -37,8 +37,8 @@ class MkdocsProvider(StaticFileProvider):
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return None

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/node_static.py

@@ -78,8 +78,8 @@ class PackageManager(Enum):
     def install_command(self, has_lockfile: bool = False) -> str:
         return {
             PackageManager.NPM: f"npm {'ci' if has_lockfile else 'install'}",
-            PackageManager.PNPM: f"pnpm install{' --frozen-lockfile' if has_lockfile else ''}",
-            PackageManager.YARN: f"yarn install{' --frozen-lockfile' if has_lockfile else ''}",
+            PackageManager.PNPM: "pnpm install",
+            PackageManager.YARN: "yarn install",
             PackageManager.BUN: f"bun install{' --no-save' if has_lockfile else ''}",
         }[self]
 
@@ -105,6 +105,7 @@ class StaticGenerator(Enum):
     VITE = "vite"
     NEXT = "next"
     GATSBY = "gatsby"
+    DOCUSAURUS_OLD = "docusaurus-old"
     DOCUSAURUS = "docusaurus"
     SVELTE = "svelte"
     REMIX = "remix"
@@ -119,6 +120,7 @@ class NodeStaticProvider(StaticFileProvider):
     package_json: Optional[Dict[str, Any]]
     extra_dependencies: Set[str]
     static_generator: Optional[StaticGenerator] = None
+    build_command: Optional[str] = None
 
     def __init__(self, path: Path, custom_commands: CustomCommands):
         super().__init__(path, custom_commands)
@@ -139,6 +141,8 @@ class NodeStaticProvider(StaticFileProvider):
             self.static_generator = StaticGenerator.GATSBY
         elif self.has_dependency(self.package_json, "astro"):
             self.static_generator = StaticGenerator.ASTRO
+        elif self.has_dependency(self.package_json, "docusaurus"):
+            self.static_generator = StaticGenerator.DOCUSAURUS_OLD
         elif self.has_dependency(self.package_json, "@docusaurus/core"):
             self.static_generator = StaticGenerator.DOCUSAURUS
         elif self.has_dependency(self.package_json, "svelte"):
@@ -160,6 +164,8 @@ class NodeStaticProvider(StaticFileProvider):
         elif self.has_dependency(self.package_json, "nuxt"):
             self.static_generator = StaticGenerator.NUXT_V3
 
+        self.build_command = self.get_build_command(self.package_json, self.package_manager, self.static_generator)
+
         # if self.has_dependency(self.package_json, "sharp"):
         #     self.extra_dependencies.add("libvips")
 
@@ -217,6 +223,7 @@ class NodeStaticProvider(StaticFileProvider):
             "nuxt",
             "gatsby",
             "svelte",
+            "docusaurus",
             "@docusaurus/core",
             "@remix-run/dev",
         ]
@@ -227,8 +234,8 @@ class NodeStaticProvider(StaticFileProvider):
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return self.static_generator.value if self.static_generator else None
@@ -248,7 +255,10 @@ class NodeStaticProvider(StaticFileProvider):
         ]
 
     def declarations(self) -> Optional[str]:
-        return None
+        output_dir = self.get_output_dir()
+        return (
+            f'shipit_static_dir = getenv("SHIPIT_STATIC_DIR") or "{output_dir}"\n'
+        )
 
     def get_output_dir(self) -> str:
         if self.static_generator == StaticGenerator.NEXT:
@@ -267,60 +277,67 @@ class NodeStaticProvider(StaticFileProvider):
             return "build/client"
         elif self.static_generator in [
             StaticGenerator.DOCUSAURUS,
+            StaticGenerator.DOCUSAURUS_OLD,
             StaticGenerator.SVELTE,
         ]:
             return "build"
         else:
             return "dist"
 
-    def get_build_command(self) -> bool:
-        if not self.package_json:
-            return False
-        build_command = self.package_json.get("scripts", {}).get("build")
-        if build_command:
-            return self.package_manager.run_command("build")
-        if self.static_generator == StaticGenerator.GATSBY:
-            return self.package_manager.run_execute_command("gatsby build")
-        if self.static_generator == StaticGenerator.ASTRO:
-            return self.package_manager.run_execute_command("astro build")
-        elif self.static_generator == StaticGenerator.REMIX_OLD:
-            return self.package_manager.run_execute_command("remix-ssg build")
-        elif self.static_generator == StaticGenerator.REMIX_V2:
-            return self.package_manager.run_execute_command("vite build")
-        elif self.static_generator == StaticGenerator.DOCUSAURUS:
-            return self.package_manager.run_execute_command("docusaurus build")
-        elif self.static_generator == StaticGenerator.SVELTE:
-            return self.package_manager.run_execute_command("svelte-kit build")
-        elif self.static_generator == StaticGenerator.VITE:
-            return self.package_manager.run_execute_command("vite build")
-        elif self.static_generator == StaticGenerator.NEXT:
-            return self.package_manager.run_execute_command("next export")
-        elif self.static_generator == StaticGenerator.NUXT_V3:
-            return self.package_manager.run_execute_command("nuxi generate")
-        elif self.static_generator == StaticGenerator.NUXT_OLD:
-            return self.package_manager.run_execute_command("nuxt generate")
-        return False
+    @classmethod
+    def get_build_command(cls, package_json: Optional[Dict[str, Any]], package_manager: PackageManager, static_generator: StaticGenerator) -> Optional[str]:
+        if package_json:
+            build_command = package_json.get("scripts", {}).get("build")
+            if build_command:
+                return package_manager.run_command("build")
+        if static_generator == StaticGenerator.GATSBY:
+            return package_manager.run_execute_command("gatsby build")
+        elif static_generator == StaticGenerator.ASTRO:
+            return package_manager.run_execute_command("astro build")
+        elif static_generator == StaticGenerator.REMIX_OLD:
+            return package_manager.run_execute_command("remix-ssg build")
+        elif static_generator == StaticGenerator.REMIX_V2:
+            return package_manager.run_execute_command("vite build")
+        elif static_generator == StaticGenerator.DOCUSAURUS:
+            return package_manager.run_execute_command("docusaurus build")
+        elif static_generator == StaticGenerator.DOCUSAURUS_OLD:
+            return package_manager.run_execute_command("docusaurus build")
+        elif static_generator == StaticGenerator.SVELTE:
+            return package_manager.run_execute_command("svelte-kit build")
+        elif static_generator == StaticGenerator.VITE:
+            return package_manager.run_execute_command("vite build")
+        elif static_generator == StaticGenerator.NEXT:
+            return package_manager.run_execute_command("next export")
+        elif static_generator == StaticGenerator.NUXT_V3:
+            return package_manager.run_execute_command("nuxi generate")
+        elif static_generator == StaticGenerator.NUXT_OLD:
+            return package_manager.run_execute_command("nuxt generate")
+        return None
 
     def build_steps(self) -> list[str]:
-        output_dir = self.get_output_dir()
-        get_build_command = self.get_build_command()
         lockfile = self.package_manager.lockfile()
         has_lockfile = (self.path / lockfile).exists()
         install_command = self.package_manager.install_command(
             has_lockfile=has_lockfile
         )
         input_files = ["package.json"]
-        if has_lockfile:
-            input_files.append(lockfile)
+        # if has_lockfile:
+        #     input_files.append(lockfile)
         inputs_install_files = ", ".join([f'"{file}"' for file in input_files])
 
+        ignored_files = ["node_modules", ".git"]
+        if has_lockfile:
+            ignored_files.append(lockfile)
+        all_ignored_files = ", ".join([f'"{file}"' for file in ignored_files])
+    
         return [
             'workdir(temp["build"])',
+            f'copy("{lockfile}")' if has_lockfile else None,
             # 'run("npx corepack enable", inputs=["package.json"], group="install")',
             f'run("{install_command}", inputs=[{inputs_install_files}], group="install")',
-            'copy(".", ".", ignore=["node_modules", ".git"])',
-            f'run("{get_build_command}", outputs=["{output_dir}"], group="build")',
-            f'run("cp -R {output_dir}/* {{}}/".format(app["build"]))',
+            f'copy(".", ignore=[{all_ignored_files}])',
+            f'run("{self.build_command}", outputs=[shipit_static_dir], group="build")',
+            f'run("cp -R {{}}/* {{}}/".format(shipit_static_dir, app["build"]))',
         ]
 
     def prepare_steps(self) -> Optional[list[str]]:

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/php.py

@@ -49,8 +49,8 @@ class PhpProvider:
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return None

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/python.py

@@ -225,8 +225,8 @@ class PythonProvider:
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return self.framework.value if self.framework else None

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/registry.py

@@ -8,6 +8,7 @@ from .node_static import NodeStaticProvider
 from .wordpress import WordPressProvider
 from .php import PhpProvider
 from .python import PythonProvider
+from .jekyll import JekyllProvider
 from .staticfile import StaticFileProvider
 
 
@@ -21,5 +22,6 @@ def providers() -> list[type[Provider]]:
         WordPressProvider,
         PhpProvider,
         NodeStaticProvider,
+        JekyllProvider,
         StaticFileProvider,
     ]

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/staticfile.py

@@ -55,8 +55,8 @@ class StaticFileProvider:
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return None

{shipit_cli-0.13.3 → shipit_cli-0.14.0}/src/shipit/providers/wordpress.py

@@ -40,8 +40,8 @@ class WordPressProvider(PhpProvider):
     def initialize(self) -> None:
         pass
 
-    def serve_name(self) -> str:
-        return self.path.name
+    def serve_name(self) -> Optional[str]:
+        return None
 
     def platform(self) -> Optional[str]:
         return None

shipit_cli-0.14.0/src/shipit/version.py

@@ -0,0 +1,5 @@
+__all__ = ["version", "version_info"]
+
+
+version = "0.14.0"
+version_info = (0, 14, 0, "final", 0)

shipit_cli-0.13.3/src/shipit/version.py

@@ -1,5 +0,0 @@
-__all__ = ["version", "version_info"]
-
-
-version = "0.13.3"
-version_info = (0, 13, 3, "final", 0)