shipit-cli 0.17.13__tar.gz → 0.18.0__tar.gz

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.17.13
+Version: 0.18.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.17.13 → shipit_cli-0.18.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.17.13"
+version = "0.18.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.17.13 → shipit_cli-0.18.0}/src/shipit/assets/wordpress/wp-config.php

@@ -213,7 +213,3 @@ wpdefine_load_env_defines();
 
 /** Sets up WordPress vars and included files. */
 require_once ABSPATH . 'wp-settings.php';
-
-if ( PHP_SAPI === 'phpix' ) {
-    add_filter( 'got_rewrite', '__return_true' );
-}

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/generator.py

@@ -109,7 +109,7 @@ def generate_shipit(path: Path, provider: Provider) -> str:
 
     # Collect parts
     plan = ProviderPlan(
-        serve_name=provider.serve_name() or default_serve_name,
+        serve_name=default_serve_name,
         provider=provider.name(),
         mounts=provider.mounts(),
         volumes=provider.volumes(),

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/base.py

@@ -67,7 +67,6 @@ class Provider(Protocol):
         cls, path: Path, config: Config
     ) -> Optional[DetectResult]: ...
     # Structured plan steps (no path args; use self.path)
-    def serve_name(self) -> Optional[str]: ...
     def dependencies(self) -> list["DependencySpec"]: ...
     def declarations(self) -> Optional[str]: ...
     def build_steps(self) -> list[str]: ...

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/go.py

@@ -70,9 +70,6 @@ class GoProvider(Provider):
             return DetectResult(cls.name(), 80)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             DependencySpec(

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/hugo.py

@@ -98,9 +98,6 @@ class HugoProvider(StaticFileProvider):
             return DetectResult(cls.name(), 80)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             DependencySpec(

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/jekyll.py

@@ -68,9 +68,6 @@ class JekyllProvider(StaticFileProvider):
             return DetectResult(cls.name(), 85)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             DependencySpec(

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/laravel.py

@@ -30,6 +30,7 @@ class LaravelProvider(PhpProvider):
     @classmethod
     def load_config(cls, path: Path, base_config: Config) -> 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
@@ -51,63 +52,45 @@ class LaravelProvider(PhpProvider):
             return DetectResult(cls.name(), 95)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
-        php_dependency = "phpix" if self.config.phpix else "php"
         return [
-            DependencySpec(
-                php_dependency,
-                var_name="config.php_version",
-                use_in_build=True,
-                use_in_serve=True,
-            ),
-            DependencySpec("composer", use_in_build=True),
-            # DependencySpec("pie", use_in_build=True),
-            *self.node_provider.dependencies(),
-            DependencySpec("bash", use_in_serve=True),
+            *super().dependencies(),
+            *self.node_provider.dependencies()
         ]
 
     def build_steps(self) -> list[str]:
-        return [
-            'env(COMPOSER_HOME="/tmp", COMPOSER_FUND="0", COMPOSER_ALLOW_SUPERUSER="1")',
-            'workdir(app.path)',
-            # "run(\"pie install php/pdo_pgsql\")",
-            'run("composer install --optimize-autoloader --no-scripts --no-interaction", inputs=["composer.json", "composer.lock", "artisan"], outputs=["."], group="install")',
-            *self.node_provider.build_steps(),
-        ]
+        node_install = list(self.node_provider.build_steps_install())
+        node_build = list(self.node_provider.build_steps_build())
+        return super().build_steps_with_options(
+            extra_ignore=["node_modules"],
+            after_install=node_install,
+            after_build=node_build
+        )
 
     def prepare_steps(self) -> Optional[list[str]]:
-        php_script = "phpix" if self.config.phpix else "php"
         return [
             'workdir(app.serve_path)',
             'run("mkdir -p storage/framework/{sessions,views,cache,testing} storage/logs bootstrap/cache")',
-            f'run("{php_script} artisan config:cache")',
-            f'run("{php_script} artisan event:cache")',
-            f'run("{php_script} artisan route:cache")',
-            f'run("{php_script} artisan view:cache")',
+            'run("php artisan config:cache")',
+            'run("php artisan event:cache")',
+            'run("php artisan route:cache")',
+            'run("php artisan view:cache")',
         ]
 
     def commands(self) -> Dict[str, str]:
-        php_script = "phpix" if self.config.phpix else "php"
         return {
-            "start": f'f"{php_script} -S localhost:{{PORT}} -t public"',
-            "after_deploy": f'"{php_script} artisan migrate"',
+            "start": 'f"php -S localhost:{PORT} -t public"',
+            "after_deploy": '"php artisan migrate"',
         }
 
     def mounts(self) -> list[MountSpec]:
-        return [MountSpec("app"), *self.node_provider.mounts()]
+        return [*super().mounts(), *self.node_provider.mounts()]
 
     def volumes(self) -> list[VolumeSpec]:
         return []
 
     def env(self) -> Optional[Dict[str, str]]:
-        if self.config.phpix and self.config.phpix_worker_threads:
-            return {
-                "PHPIX_PHP_THREADS": f'"{self.config.phpix_worker_threads}"',
-            }
-        return None
+        return super().env()
 
     def services(self) -> list[ServiceSpec]:
         return []

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/mkdocs.py

@@ -55,9 +55,6 @@ class MkdocsProvider(StaticFileProvider):
             return DetectResult(cls.name(), 85)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             *self.python_provider.dependencies(),

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/node_static.py

@@ -349,9 +349,6 @@ class NodeStaticProvider(StaticFileProvider):
             return DetectResult(cls.name(), 40)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         package_manager_dep = self.config.package_manager.as_dependency(self.path)
         package_manager_dep.use_in_build = True
@@ -362,7 +359,7 @@ class NodeStaticProvider(StaticFileProvider):
                 use_in_build=True,
             ),
             package_manager_dep,
-            *super().dependencies(),
+            *(super().dependencies() if not self.only_build else []),
         ]
 
     @classmethod
@@ -383,34 +380,55 @@ class NodeStaticProvider(StaticFileProvider):
         command = static_generator.build_command()
         return package_manager.run_execute_command(command)
 
-    def build_steps(self) -> list[str]:
+    def build_steps_install(self) -> list[str]:
         lockfile = self.config.package_manager.lockfile()
         has_lockfile = (self.path / lockfile).exists()
         install_command = self.config.package_manager.install_command(
             has_lockfile=has_lockfile
         )
-        ignored_files = ["node_modules", ".git"]
-        if has_lockfile:
-            ignored_files.append(lockfile)
-        all_ignored_files = ", ".join([f'"{file}"' for file in ignored_files])
-
         return filter(
             None,
             [
-                'workdir(temp.path)' if not self.only_build else None,
                 f'copy("{lockfile}")' if has_lockfile else None,
                 'env(CI="true", NODE_ENV="production", NPM_CONFIG_FUND="false")'
                 if self.config.package_manager == PackageManager.NPM
                 else None,
                 # 'run("npx corepack enable", inputs=["package.json"], group="install")',
                 f'run("{install_command}", inputs=["package.json"], group="install")',
-                f'copy(".", ignore=[{all_ignored_files}])',
+            ],
+        )
+    
+    def build_steps_build(self) -> list[str]:
+        return filter(
+            None,
+            [
                 f'run("{self.config.build_command}", outputs=[config.static_dir], group="build")'
                 if not self.only_build
                 else None,
                 f'run("{self.config.build_command}", group="build")'
                 if self.only_build
                 else None,
+            ]
+        )
+
+    def build_steps(self) -> list[str]:
+        lockfile = self.config.package_manager.lockfile()
+        has_lockfile = (self.path / lockfile).exists()
+        install_command = self.config.package_manager.install_command(
+            has_lockfile=has_lockfile
+        )
+        ignored_files = ["node_modules", ".git"]
+        if has_lockfile:
+            ignored_files.append(lockfile)
+        all_ignored_files = ", ".join([f'"{file}"' for file in ignored_files])
+
+        return filter(
+            None,
+            [
+                'workdir(temp.path)' if not self.only_build else None,
+                *self.build_steps_install(),
+                f'copy(".", ignore=[{all_ignored_files}])',
+                *self.build_steps_build(),
                 'run("cp -R {}/* {}/".format(config.static_dir, static_app.path))'
                 if not self.only_build
                 else None,

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/php.py

@@ -83,9 +83,6 @@ class PhpProvider:
             return DetectResult(cls.name(), 30)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         deps = [
             DependencySpec(
@@ -104,7 +101,7 @@ class PhpProvider:
     def declarations(self) -> Optional[str]:
         return None
 
-    def build_steps(self) -> list[str]:
+    def build_steps_with_options(self, extra_ignore: Optional[list[str]] = None, after_install: Optional[list[str]] = None, after_build: Optional[list] = None) -> list[str]:
         steps = [
             'workdir(app.path)',
         ]
@@ -121,20 +118,39 @@ class PhpProvider:
                 'run("composer install --optimize-autoloader --ignore-platform-reqs --no-scripts --no-interaction", inputs=["composer.json", "composer.lock"], outputs=["."], group="install")'
             )
 
-        dirs_to_ignore = [".git"]   
+        if after_install:
+            assert isinstance(after_install, list), "after_install must be a list if provided"
+            steps = steps + after_install
+
+        dirs_to_ignore = [".git"]
+        if extra_ignore:
+            assert isinstance(extra_ignore, list), "extra_ignore must be a list if provided"
+            dirs_to_ignore += extra_ignore
+
         if self.config.use_composer:
             dirs_to_ignore.append("vendor")
         if self.config.framework == PhpFramework.Symfony:
             dirs_to_ignore.append("var")
 
-        steps.append('copy(".", ".", ignore={})'.format(json.dumps(dirs_to_ignore)))
+        steps.append('copy(".", ignore={})'.format(json.dumps(dirs_to_ignore)))
 
         # Since we don't run the scripts during the install step, we need to run them after the build step
         if self.config.use_composer and self.config.composer_build_script:
             steps.append(f'run("composer run-script {self.config.composer_build_script}", outputs=["."], group="build")')
 
+        if after_build:
+            assert isinstance(after_build, list), "after_build must be a list if provided"
+            steps = steps + after_build
+
         return steps
 
+    def build_steps(self) -> list[str]:
+        return self.build_steps_with_options(
+            extra_ignore=None,
+            after_install=None,
+            after_build=None
+        )
+
     def prepare_steps(self) -> Optional[list[str]]:
         return None
 

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/python.py

@@ -315,9 +315,6 @@ class PythonProvider:
             return DetectResult(cls.name(), 10)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         deps = [
             DependencySpec(

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/staticfile.py

@@ -78,9 +78,6 @@ class StaticFileProvider:
             return DetectResult(cls.name(), 70)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             DependencySpec(

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/providers/wordpress.py

@@ -45,9 +45,6 @@ class WordPressProvider(PhpProvider):
             return DetectResult(cls.name(), 80)
         return None
 
-    def serve_name(self) -> Optional[str]:
-        return None
-
     def dependencies(self) -> list[DependencySpec]:
         return [
             *super().dependencies(),

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/src/shipit/runners/wasmer.py

@@ -134,7 +134,7 @@ class WasmerRunner:
                 },
             },
             "scripts": {"php", "phpix"},
-            "aliases": {},
+            "aliases": {"php": "phpix"},
             "env": {},
         },
         "bash": {
@@ -504,6 +504,7 @@ class WasmerRunner:
             memory["limit"] = "2Gb"
             capabilities["memory"] = memory
             yaml_config["capabilities"] = capabilities
+            yaml_config["enable_email"] = True
 
         if has_phpix and serve.env and serve.env.get("PHPIX_PHP_THREADS"):
             app_env = yaml_config.get("env", {})

shipit_cli-0.18.0/src/shipit/version.py

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

{shipit_cli-0.17.13 → shipit_cli-0.18.0}/tests/test_wordpress_phpix.py

@@ -83,4 +83,5 @@ def test_wasmer_app_yaml_sets_memory_limit_for_wordpress_phpix(
 
     assert app_yaml["capabilities"]["database"]["engine"] == "mysql"
     assert app_yaml["capabilities"]["memory"]["limit"] == "2Gb"
+    assert app_yaml["enable_email"] is True
     assert app_yaml["env"]["PHPIX_PHP_THREADS"] == "4"

shipit_cli-0.17.13/src/shipit/version.py

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