Refactor

Author: MRFD

README.md

@@ -11,7 +11,7 @@ This plugin is free but if you use it in a commercial project please consider to
 
 ## Requirements
 
-- PHP 7.3+
+- PHP 8.0+
 - Kirby 3
 
 ## Installation
@@ -74,7 +74,7 @@ mix
 | --------------------- | ------------------- | --------------------------------------------------- |
 | `mrfd.mix.enable`     | `true`              | Activated or deactivated the Kirby Mix plugin.      |
 | `mrfd.mix.manifest`   | `mix-manifest.json` | File name including extension of the manifest file. |
-| `mrfd.mix.publicpath` | `assets`            | The public path to the assets folder.               |
+| `mrfd.mix.publicPath` | `assets`            | The public path to the assets folder.               |
 
 ## Disclaimer
 

composer.json

@@ -2,7 +2,7 @@
   "name": "mrfd/kirby-mix",
   "description": "Laravel Mix integration for Kirby 3, which hooks into the existing helper functions.",
   "type": "kirby-plugin",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "support": {
     "issues": "https://github.com/mrfd/kirby-mix/issues",
     "source": "https://github.com/mrfd/kirby-mix",

index.php

@@ -1,55 +1,66 @@
 <?php
 
 use Kirby\Cms\Url;
+use Kirby\Data\Json;
+use Kirby\Toolkit\A;
+use Kirby\Toolkit\Str;
+use Kirby\Filesystem\F;
+use Kirby\Cms\App as Kirby;
 
 function mixManifest(Kirby $kirby): array
 {
-    $manifestFile = $kirby->root('index') . DS . option('mrfd.mix.publicpath') . DS . option('mrfd.mix.manifest');
+    $manifestFile = $kirby->root('index') . '/' . option('mrfd.mix.publicPath') . '/' . option('mrfd.mix.manifest');
     $manifest = [];
 
-    if (file_exists($manifestFile)) {
-        $manifest = json_decode(file_get_contents($manifestFile, true), true);
+    if ($file = F::read($manifestFile)) {
+        $manifest = Json::decode($file);
     }
 
     return $manifest;
 }
 
 function getFromManifest(Kirby $kirby, string $url): string
 {
-    $publicPath = option('mrfd.mix.publicpath');
-    $url = str_replace($publicPath, '', Url::path($url, false));
+    $publicPath = option('mrfd.mix.publicPath');
     $manifest = mixManifest($kirby);
 
-    return DS . $publicPath . ($manifest[$url] ?? $url);
+    $file = Str::replace(Url::path($url, false), $publicPath, '');
+    $fileVersion = A::get($manifest, $file, false);
+
+    if ($fileVersion === false) {
+        return $url;
+    }
+
+    return '/' . $publicPath . $fileVersion;
 }
 
 function isInternalUrl(Kirby $kirby, string $url): bool
 {
     $url = Url::to($url);
 
-    return strpos($url, $kirby->site()->url()) !== false || strpos($url, "/") === '0';
+    return \strpos($url, $kirby->site()->url()) !== false || \strpos($url, "/") === '0';
 }
 
 
 Kirby::plugin('mrfd/mix', [
     'components' => [
         'css' => function (Kirby $kirby, string $url, $options = null): string {
-            if (!option('mrfd.mix.enable')) {
+            if (option('mrfd.mix.enable') === false) {
                 return $url;
             }
 
-            if (!isInternalUrl($kirby, $url)) {
+            if (isInternalUrl($kirby, $url) === false) {
                 return $url;
             }
 
             return getFromManifest($kirby, $url);
         },
         'js' => function (Kirby $kirby, string $url, $options = null): string {
-            if (!option('mrfd.mix.enable')) {
+            if (option('mrfd.mix.enable') === false) {
                 return $url;
             }
 
-            if (!isInternalUrl($kirby, $url)) {
+            if (isInternalUrl($kirby, $url) === false) {
                 return $url;
             }
 
@@ -59,6 +70,6 @@ function isInternalUrl(Kirby $kirby, string $url): bool
     'options' => [
         'enable' => true,
         'manifest' => 'mix-manifest.json',
-        'publicpath' => 'assets'
+        'publicPath' => 'assets'
     ]
 ]);