feat: added second argument support on @bagistoVite directive also

devansh-webkul · Sep 6, 2023 · 08e1a58 · 08e1a58
1 parent 56211c8
commit 08e1a58
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 44 deletions.
diff --git a/.env.example b/.env.example
@@ -8,12 +8,8 @@ APP_TIMEZONE=Asia/Kolkata
 APP_LOCALE=en
 APP_CURRENCY=USD
 
-VITE_SHOP_HOST=
-VITE_SHOP_PORT=
-VITE_ADMIN_HOST=
-VITE_ADMIN_PORT=
-
-ASSET_URL=http://localhost
+VITE_HOST=
+VITE_PORT=
 
 LOG_CHANNEL=stack
 

diff --git a/composer.json b/composer.json
@@ -78,6 +78,7 @@
             "Webkul\\Sales\\": "packages/Webkul/Sales/src",
             "Webkul\\Shipping\\": "packages/Webkul/Shipping/src",
             "Webkul\\Shop\\": "packages/Webkul/Shop/src",
+            "Webkul\\ShopModule\\": "packages/Webkul/ShopModule/src",
             "Webkul\\Sitemap\\": "packages/Webkul/Sitemap/src",
             "Webkul\\SocialLogin\\": "packages/Webkul/SocialLogin/src",
             "Webkul\\SocialShare\\": "packages/Webkul/SocialShare/src",

diff --git a/packages/Webkul/Admin/vite.config.js b/packages/Webkul/Admin/vite.config.js
@@ -16,8 +16,8 @@ export default defineConfig(({ mode }) => {
         envDir,
 
         server: {
-            host: process.env.VITE_ADMIN_HOST || "localhost",
-            port: process.env.VITE_ADMIN_PORT || 5173,
+            host: process.env.VITE_HOST || "localhost",
+            port: process.env.VITE_PORT || 5173,
         },
 
         plugins: [

diff --git a/packages/Webkul/Shop/vite.config.js b/packages/Webkul/Shop/vite.config.js
@@ -15,8 +15,8 @@ export default defineConfig(({ mode }) => {
         envDir,
 
         server: {
-            host: process.env.VITE_SHOP_HOST || "localhost",
-            port: process.env.VITE_SHOP_PORT || 5173,
+            host: process.env.VITE_HOST || "localhost",
+            port: process.env.VITE_PORT || 5173,
         },
 
         plugins: [

diff --git a/packages/Webkul/Theme/src/Theme.php b/packages/Webkul/Theme/src/Theme.php
@@ -3,7 +3,6 @@
 namespace Webkul\Theme;
 
 use Illuminate\Support\Facades\Vite;
-use Webkul\Theme\Exceptions\ViterNotFound;
 
 class Theme
 {
@@ -87,46 +86,21 @@ public function getViewPaths()
      *
      * @return string
      */
-    public function url(string $url, ?string $namespace)
+    public function url(string $url)
     {
-        $url = trim($url, '/');
+        $viteUrl = trim($this->vite['package_assets_directory'], '/') . '/' . $url;
 
-        /**
-         * If the namespace is null, it means the theming system is activated. We use the request URI to
-         * detect the theme and provide Vite assets based on the current theme.
-         */
-        if (empty($namespace)) {
-            $viteUrl = trim($this->vite['package_assets_directory'], '/') . '/' . $url;
-
-            return Vite::useHotFile($this->vite['hot_file'])
-                ->useBuildDirectory($this->vite['build_directory'])
-                ->asset($viteUrl);
-        }
-
-        /**
-         * If a namespace is provided, it means the developer knows what they are doing and must create the
-         * registry in the provided configuration. We will analyze based on that.
-         */
-        $viters = config('bagisto-vite.viters');
-
-        if (empty($viters[$namespace])) {
-            throw new ViterNotFound($namespace);
-        }
-
-        $viteUrl = trim($viters[$namespace]['package_assets_directory'], '/') . '/' . $url;
-
-        return Vite::useHotFile($viters[$namespace]['hot_file'])
-            ->useBuildDirectory($viters[$namespace]['build_directory'])
+        return Vite::useHotFile($this->vite['hot_file'])
+            ->useBuildDirectory($this->vite['build_directory'])
             ->asset($viteUrl);
     }
 
     /**
      * Set bagisto vite.
      *
-     * @param  array  $entryPoints
      * @return \Illuminate\Foundation\Vite
      */
-    public function setBagistoVite($entryPoints)
+    public function setBagistoVite(array $entryPoints)
     {
         return Vite::useHotFile($this->vite['hot_file'])
             ->useBuildDirectory($this->vite['build_directory'])

diff --git a/packages/Webkul/Theme/src/Themes.php b/packages/Webkul/Theme/src/Themes.php
@@ -3,7 +3,9 @@
 namespace Webkul\Theme;
 
 use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Vite;
 use Illuminate\Support\Str;
+use Webkul\Theme\Exceptions\ViterNotFound;
 
 class Themes
 {
@@ -237,7 +239,31 @@ public function getLaravelViewPaths()
      */
     public function url(string $filename, ?string $namespace)
     {
-        return $this->current()->url($filename, $namespace);
+        $url = trim($filename, '/');
+
+        /**
+         * If the namespace is null, it means the theming system is activated. We use the request URI to
+         * detect the theme and provide Vite assets based on the current theme.
+         */
+        if (empty($namespace)) {
+            return $this->current()->url($url);
+        }
+
+        /**
+         * If a namespace is provided, it means the developer knows what they are doing and must create the
+         * registry in the provided configuration. We will analyze based on that.
+         */
+        $viters = config('bagisto-vite.viters');
+
+        if (empty($viters[$namespace])) {
+            throw new ViterNotFound($namespace);
+        }
+
+        $viteUrl = trim($viters[$namespace]['package_assets_directory'], '/') . '/' . $url;
+
+        return Vite::useHotFile($viters[$namespace]['hot_file'])
+            ->useBuildDirectory($viters[$namespace]['build_directory'])
+            ->asset($viteUrl);
     }
 
     /**
@@ -246,8 +272,28 @@ public function url(string $filename, ?string $namespace)
      * @param  mixed  $entryPoints
      * @return mixed
      */
-    public function setBagistoVite($entryPoints)
+    public function setBagistoVite($entryPoints, ?string $namespace = null)
     {
-        return $this->current()->setBagistoVite($entryPoints);
+        /**
+         * If the namespace is null, it means the theming system is activated. We use the request URI to
+         * detect the theme and provide Vite assets based on the current theme.
+         */
+        if (empty($namespace)) {
+            return $this->current()->setBagistoVite($entryPoints);
+        }
+
+        /**
+         * If a namespace is provided, it means the developer knows what they are doing and must create the
+         * registry in the provided configuration. We will analyze based on that.
+         */
+        $viters = config('bagisto-vite.viters');
+
+        if (empty($viters[$namespace])) {
+            throw new ViterNotFound($namespace);
+        }
+
+        return Vite::useHotFile($viters[$namespace]['hot_file'])
+            ->useBuildDirectory($viters[$namespace]['build_directory'])
+            ->withEntryPoints($entryPoints);
     }
 }