shipit-cli 0.21.4__tar.gz → 0.21.5__tar.gz

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.21.4
+Version: 0.21.5
 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
@@ -166,7 +166,7 @@ Conventional Commits. When that PR is merged, it creates a GitHub release with
 a `vX.Y.Z` tag and dispatches the PyPI workflow for that tag with the built-in
 `GITHUB_TOKEN`. The PyPI workflow also supports manual dispatch for reruns. It:
 
-* Runs regular test and e2e workflows.
+* Runs regular tests, excluding e2e tests.
 * Validates that the tag version without the leading `v` matches:
   * `project.version` in `pyproject.toml`
   * `version` in `src/shipit/version.py`

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/README.md

@@ -143,7 +143,7 @@ Conventional Commits. When that PR is merged, it creates a GitHub release with
 a `vX.Y.Z` tag and dispatches the PyPI workflow for that tag with the built-in
 `GITHUB_TOKEN`. The PyPI workflow also supports manual dispatch for reruns. It:
 
-* Runs regular test and e2e workflows.
+* Runs regular tests, excluding e2e tests.
 * Validates that the tag version without the leading `v` matches:
   * `project.version` in `pyproject.toml`
   * `version` in `src/shipit/version.py`

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shipit-cli"
-version = "0.21.4"
+version = "0.21.5"
 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.21.4 → shipit_cli-0.21.5}/src/shipit/providers/node.py

@@ -420,6 +420,7 @@ class NodeConfig(Config):
     model_config = SettingsConfigDict(extra="ignore", env_prefix="SHIPIT_")
 
     use_edgejs: Optional[bool] = False
+    precompile_edgejs: Optional[bool] = None
     package_manager: Optional[PackageManager] = None
     framework: Optional[NodeFramework] = None
     extra_dependencies: Set[str] = Field(default_factory=set)
@@ -1234,7 +1235,11 @@ class NodeProvider:
         return None
 
     def prepare_steps(self) -> Optional[list[str]]:
-        return None
+        if not self.config.precompile_edgejs:
+            return []
+        return [
+            'run("edgejs --precompile {}".format(app.serve_path))',
+        ]
 
     def commands(self) -> Dict[str, str]:
         if not self.config.commands.start:

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/src/shipit/runners/wasmer.py

@@ -29,6 +29,7 @@ SHIPIT_CONFIG_ANNOTATION = "shipitcli.com/config"
 SHIPIT_PROVIDER_ANNOTATION = "shipitcli.com/provider"
 SHIPIT_VERSION_ANNOTATION = "shipitcli.com/version"
 WASMER_APP_KIND_ANNOTATION = "wasmer.io/app-kind"
+EDGEJS_QUICKJS_DEPENDENCY = "wasmer/edgejs-quickjs@=0.0.6"
 
 
 def serialize_provider_config(provider_config: Any) -> Dict[str, Any]:
@@ -101,9 +102,9 @@ class WasmerRunner:
     mapper: Dict[str, MapperItem] = {
         "node": {
             "dependencies": {
-                "latest": "wasmer/edgejs-quickjs@=0.0.4",
-                "24": "wasmer/edgejs-quickjs@=0.0.4",
-                "22": "wasmer/edgejs-quickjs@=0.0.4",
+                "latest": EDGEJS_QUICKJS_DEPENDENCY,
+                "24": EDGEJS_QUICKJS_DEPENDENCY,
+                "22": EDGEJS_QUICKJS_DEPENDENCY,
             },
             "scripts": {"edge"},
             "aliases": {"node": "edge"},
@@ -256,6 +257,8 @@ class WasmerRunner:
             provider_config.phpix = True
         if isinstance(provider_config, NodeConfig):
             provider_config.use_edgejs = True
+            if provider_config.precompile_edgejs is None:
+                provider_config.precompile_edgejs = True
             provider_config.remove_native_binaries = True
         self.provider_config = provider_config
         return provider_config
@@ -486,7 +489,8 @@ class WasmerRunner:
                 wasi_args = table()
                 if serve.cwd:
                     wasi_args.add("cwd", serve.cwd)
-                wasi_args.add("main-args", array(parts[1:]).multiline(True))
+                main_args = self.main_args_for_module(command_module, parts[1:])
+                wasi_args.add("main-args", array(main_args).multiline(True))
                 if serve.env:
                     command_env.update(serve.env)
                 if command_env:
@@ -701,6 +705,11 @@ class WasmerRunner:
             return "edgejs" in module or atom == "edgejs"
         return False
 
+    def main_args_for_module(self, module: str, args: List[str]) -> List[str]:
+        if "edgejs" not in module or "--bytecode-cache" in args:
+            return args
+        return ["--bytecode-cache", *args]
+
     def has_serve_command(self, command: str) -> bool:
         wasmer_toml_path = self.wasmer_dir_path / "wasmer.toml"
         if not wasmer_toml_path.exists():

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/src/shipit/version.py

@@ -1,7 +1,7 @@
 __all__ = ["version", "version_info"]
 
 
-version = "0.21.4"  # x-release-please-version
+version = "0.21.5"  # x-release-please-version
 _version_parts = version.split(".")
 version_info = (
     int(_version_parts[0]),

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/tests/test_node_provider.py

@@ -7,7 +7,12 @@ import pytest
 from shipit.generator import load_provider
 from shipit.providers.base import Config
 from shipit.providers.laravel import LaravelProvider
-from shipit.providers.node import NodeFramework, NodeProvider, PackageManager
+from shipit.providers.node import (
+    NodeConfig,
+    NodeFramework,
+    NodeProvider,
+    PackageManager,
+)
 from shipit.providers.node_static import NodeStaticProvider
 from shipit.providers.php import PhpFramework
 
@@ -420,6 +425,19 @@ def test_node_provider_skips_native_binary_optimizer_by_default(
     assert all(mount.name != "assets" for mount in provider.mounts())
 
 
+def test_node_prepare_steps_use_precompile_edgejs_flag(tmp_path: Path) -> None:
+    config = NodeConfig()
+    provider = NodeProvider(tmp_path, config)
+
+    assert config.precompile_edgejs is None
+    assert provider.prepare_steps() == []
+
+    config.precompile_edgejs = True
+    assert provider.prepare_steps() == [
+        'run("edgejs --precompile {}".format(app.serve_path))',
+    ]
+
+
 def test_node_provider_uses_build_only_assets_mount(tmp_path: Path) -> None:
     (tmp_path / "package.json").write_text("{}\n")
     provider_config = NodeProvider.load_config(tmp_path, Config())

{shipit_cli-0.21.4 → shipit_cli-0.21.5}/tests/test_wasmer_annotations.py

@@ -201,13 +201,35 @@ def test_wasmer_node_manifest_maps_to_edgejs(tmp_path: Path) -> None:
     runner.build_serve(serve)
 
     manifest = tomllib.loads((runner.wasmer_dir_path / "wasmer.toml").read_text())
-    assert manifest["dependencies"]["wasmer/edgejs-quickjs"] == "=0.0.4"
+    assert manifest["dependencies"]["wasmer/edgejs-quickjs"] == "=0.0.6"
     assert manifest["command"][0]["module"] == "wasmer/edgejs-quickjs:edge"
     wasi = manifest["command"][0]["annotations"]["wasi"]
-    assert wasi["main-args"] == ["server.js"]
+    assert wasi["main-args"] == ["--bytecode-cache", "server.js"]
     assert "env" not in wasi
 
 
+def test_wasmer_edge_manifest_does_not_duplicate_bytecode_cache(
+    tmp_path: Path,
+) -> None:
+    src_dir = tmp_path / "src"
+    src_dir.mkdir()
+    runner = WasmerRunner(DummyBuildBackend(tmp_path), src_dir)
+
+    serve = Serve(
+        name="node",
+        provider="node",
+        build=[],
+        deps=[Package("node", "22")],
+        commands={"start": "edge --bytecode-cache server.js"},
+    )
+
+    runner.build_serve(serve)
+
+    manifest = tomllib.loads((runner.wasmer_dir_path / "wasmer.toml").read_text())
+    wasi = manifest["command"][0]["annotations"]["wasi"]
+    assert wasi["main-args"] == ["--bytecode-cache", "server.js"]
+
+
 def test_wasmer_prepare_config_enables_node_edge_optimizations(
     tmp_path: Path,
 ) -> None:
@@ -218,6 +240,21 @@ def test_wasmer_prepare_config_enables_node_edge_optimizations(
     config = runner.prepare_config(NodeConfig())
 
     assert config.use_edgejs is True
+    assert config.precompile_edgejs is True
+    assert config.remove_native_binaries is True
+
+
+def test_wasmer_prepare_config_preserves_node_precompile_override(
+    tmp_path: Path,
+) -> None:
+    src_dir = tmp_path / "src"
+    src_dir.mkdir()
+    runner = WasmerRunner(DummyBuildBackend(tmp_path), src_dir)
+
+    config = runner.prepare_config(NodeConfig(precompile_edgejs=False))
+
+    assert config.use_edgejs is True
+    assert config.precompile_edgejs is False
     assert config.remove_native_binaries is True