shipit-cli 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

shipit/providers/node_static.py

@@ -31,7 +31,7 @@ class PackageManager(Enum):
         dep_name = {
             PackageManager.NPM: "npm",
             PackageManager.PNPM: "pnpm",
-            PackageManager.YARN:  "yarn",
+            PackageManager.YARN: "yarn",
             PackageManager.BUN: "bun",
         }[self]
 
@@ -51,16 +51,18 @@ class PackageManager(Enum):
             default_version=default_version,
         )
 
-    def lockfile(self) -> (str):
+    def lockfile(self) -> str:
         return {
             PackageManager.NPM: "package-lock.json",
             PackageManager.PNPM: "pnpm-lock.yaml",
             PackageManager.YARN: "yarn.lock",
             PackageManager.BUN: "bun.lockb",
         }[self]
-    
+
     @classmethod
     def pnpm_lockfile_version(cls, lockfile: Path) -> Optional[str]:
+        if not lockfile.exists():
+            return None
         # Read line by line and return the lockfileVersion
         with open(lockfile, "r") as f:
             for line in f:
@@ -109,6 +111,8 @@ class StaticGenerator(Enum):
     REMIX = "remix"
     NUXT_OLD = "nuxt"
     NUXT_V3 = "nuxt3"
+    REMIX_OLD = "remix-old"
+    REMIX_V2 = "remix-v2"
 
 
 class NodeStaticProvider(StaticFileProvider):
@@ -139,8 +143,12 @@ class NodeStaticProvider(StaticFileProvider):
             self.static_generator = StaticGenerator.DOCUSAURUS
         elif self.has_dependency(self.package_json, "svelte"):
             self.static_generator = StaticGenerator.SVELTE
+        elif self.has_dependency(
+            self.package_json, "@remix-run/dev", "1"
+        ) or self.has_dependency(self.package_json, "@remix-run/dev", "0"):
+            self.static_generator = StaticGenerator.REMIX_OLD
         elif self.has_dependency(self.package_json, "@remix-run/dev"):
-            self.static_generator = StaticGenerator.REMIX
+            self.static_generator = StaticGenerator.REMIX_V2
         elif self.has_dependency(self.package_json, "vite"):
             self.static_generator = StaticGenerator.VITE
         elif self.has_dependency(self.package_json, "next"):
@@ -151,7 +159,7 @@ class NodeStaticProvider(StaticFileProvider):
             self.static_generator = StaticGenerator.NUXT_OLD
         elif self.has_dependency(self.package_json, "nuxt"):
             self.static_generator = StaticGenerator.NUXT_V3
-        
+
         # if self.has_dependency(self.package_json, "sharp"):
         #     self.extra_dependencies.add("libvips")
 
@@ -171,7 +179,10 @@ class NodeStaticProvider(StaticFileProvider):
 
     @classmethod
     def has_dependency(
-        cls, package_json: Optional[Dict[str, Any]], dep: str, version: Optional[str] = None
+        cls,
+        package_json: Optional[Dict[str, Any]],
+        dep: str,
+        version: Optional[str] = None,
     ) -> bool:
         if not package_json:
             return False
@@ -199,7 +210,16 @@ class NodeStaticProvider(StaticFileProvider):
         package_json = cls.parse_package_json(path)
         if not package_json:
             return None
-        static_generators = ["astro", "vite", "next", "nuxt", "gatsby", "svelte", "@docusaurus/core", "@remix-run/dev"]
+        static_generators = [
+            "astro",
+            "vite",
+            "next",
+            "nuxt",
+            "gatsby",
+            "svelte",
+            "@docusaurus/core",
+            "@remix-run/dev",
+        ]
         if any(cls.has_dependency(package_json, dep) for dep in static_generators):
             return DetectResult(cls.name(), 40)
         return None
@@ -233,11 +253,22 @@ class NodeStaticProvider(StaticFileProvider):
     def get_output_dir(self) -> str:
         if self.static_generator == StaticGenerator.NEXT:
             return "out"
-        elif self.static_generator in [StaticGenerator.ASTRO, StaticGenerator.VITE, StaticGenerator.NUXT_OLD, StaticGenerator.NUXT_V3]:
+        elif self.static_generator in [
+            StaticGenerator.ASTRO,
+            StaticGenerator.VITE,
+            StaticGenerator.NUXT_OLD,
+            StaticGenerator.NUXT_V3,
+            StaticGenerator.REMIX_V2,
+        ]:
             return "dist"
-        elif self.static_generator in [StaticGenerator.GATSBY, StaticGenerator.REMIX]:
+        elif self.static_generator == StaticGenerator.GATSBY:
             return "public"
-        elif self.static_generator in [StaticGenerator.DOCUSAURUS, StaticGenerator.SVELTE]:
+        elif self.static_generator == StaticGenerator.REMIX_OLD:
+            return "build/client"
+        elif self.static_generator in [
+            StaticGenerator.DOCUSAURUS,
+            StaticGenerator.SVELTE,
+        ]:
             return "build"
         else:
             return "dist"
@@ -252,8 +283,10 @@ class NodeStaticProvider(StaticFileProvider):
             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:
+        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:
@@ -273,7 +306,9 @@ class NodeStaticProvider(StaticFileProvider):
         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)
+        install_command = self.package_manager.install_command(
+            has_lockfile=has_lockfile
+        )
         input_files = ["package.json"]
         if has_lockfile:
             input_files.append(lockfile)

shipit/version.py

@@ -1,5 +1,5 @@
 __all__ = ["version", "version_info"]
 
 
-version = "0.9.0"
-version_info = (0, 9, 0, "final", 0)
+version = "0.9.1"
+version_info = (0, 9, 1, "final", 0)

{shipit_cli-0.9.0.dist-info → shipit_cli-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shipit-cli
-Version: 0.9.0
+Version: 0.9.1
 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.9.0.dist-info → shipit_cli-0.9.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ shipit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shipit/cli.py,sha256=NMZ6xSLq8MlV9yT3FLi9XZ5IBw2IMppoPna_vl9LK1Y,59170
 shipit/generator.py,sha256=W4MynSFwId4PRWWrF0R3NsANye_Zv8TwXCUXai94pW0,6553
 shipit/procfile.py,sha256=GlfdwzFUr0GWGKaaiXlLKNFInWaRNMy_wN14UEyU_5Q,2974
-shipit/version.py,sha256=0hkQAsOavRu0fhDHnq4yN300QZjC88Y_Nr7gIReJ_9Y,95
+shipit/version.py,sha256=lVDUJez84exvM3cupsLPLkgwODb6keB_FDCxjb0ObkA,95
 shipit/assets/php/php.ini,sha256=f4irndAjB4GuuouEImRkNV22Q-yw1KqR-43jAMDw730,2531
 shipit/assets/wordpress/install.sh,sha256=fJkVeGAw_dj-ywmQipAWRjaz57sayD6F0OFvZKMIKug,669
 shipit/assets/wordpress/wp-config.php,sha256=IdGQoeg8E89JiqwxO2i8WnGMzmhNWgRz80X6lbU5GXc,4134
@@ -11,13 +11,13 @@ shipit/providers/gatsby.py,sha256=kzfS-z040GaJ0a9u2_6S6K-ykGSX2yPG17VpjUWBOBA,23
 shipit/providers/hugo.py,sha256=l3IZ14LGYc3wQ7Uk0iQMDNN9Syd1G4HPzm0ePCGFyzE,1808
 shipit/providers/laravel.py,sha256=2rCuOi2kC5OYQfAG7C0NMhG7KEgzfudwUT_CvVFz4hM,3031
 shipit/providers/mkdocs.py,sha256=mDJpT3rzYAr5Vw-yt5fCpV0QgBZyksn9MrkPd4nzROU,2200
-shipit/providers/node_static.py,sha256=j5VKT_RblonIHTtpiUNai4e_izZUhbyLtPTsGeALpcY,11508
+shipit/providers/node_static.py,sha256=1eWjhcrKZF8DE9EwlEXwFYrbD2AkeabZjIo1_BocWJk,12335
 shipit/providers/php.py,sha256=BSOqS3UhABoe_ued8aXtyn0KdqWbOCq6VV2ehtoBlmk,3547
 shipit/providers/python.py,sha256=kQpaaQi8ajHM_SFk2xI5lRIeOc6PXSKumb-Tv_5n6m0,20954
 shipit/providers/registry.py,sha256=JCuQaYTvJcWK1nS-om9TIQgGW6pT5BuNLIRzChLLFWE,731
 shipit/providers/staticfile.py,sha256=F4thEuihDW-h5DO-lotrjSdHYWzoXofQPpsAgWonvpY,2677
 shipit/providers/wordpress.py,sha256=Wjc1fgFburewlf4hQ2ZmxTQko_SHQW-8jrDukzKx0Gs,3019
-shipit_cli-0.9.0.dist-info/METADATA,sha256=ULUMj5u3OzMZA00AoJJOxA0iAsHIw5R-d8IODyR0hJ8,615
-shipit_cli-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shipit_cli-0.9.0.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
-shipit_cli-0.9.0.dist-info/RECORD,,
+shipit_cli-0.9.1.dist-info/METADATA,sha256=i8nzdCcT8qJFNNazduiVP1afqfxv1g2rlyCpDfCTcXQ,615
+shipit_cli-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shipit_cli-0.9.1.dist-info/entry_points.txt,sha256=7AE1NjSrHaSDfbfsRRO50KKnHFTbB0Imsccd1WynzAQ,72
+shipit_cli-0.9.1.dist-info/RECORD,,