Merge pull request #1 from MattiasMediaempire/master

Support for Laravel Blade.

Author: edcs

LaravelMixModifier.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Statamic\Addons\LaravelMix;
+
+use Statamic\Extend\Modifier;
+
+class LaravelMixModifier extends Modifier
+{
+    use LaravelMixTrait;
+
+    /**
+     * Modifies the input into an asset path.
+     *
+     * @param string $value In this case either 'js' or 'css'.
+     * @return string
+     */
+    public function index($value)
+    {
+        return $this->getAssetPath($value);
+    }
+}

LaravelMixTags.php

@@ -2,18 +2,11 @@
 
 namespace Statamic\Addons\LaravelMix;
 
-use Statamic\API\Config;
-use Statamic\API\File;
-use Statamic\API\Str;
-use Statamic\API\URL;
 use Statamic\Extend\Tags;
 
 class LaravelMixTags extends Tags
 {
-    /**
-     * The name of Mix's revision manifest file.
-     */
-    const MANIFEST = 'mix-manifest.json';
+    use LaravelMixTrait;
 
     /**
      * The {{ laravel_mix }} tag - outputs the revision manifest file as JSON.
@@ -32,9 +25,7 @@ public function index()
      */
     public function css()
     {
-        $src  = $this->get('src', Config::get('theming.theme'));
-        $path = '/css/' . Str::ensureRight($src, '.css');
-        $url  = $this->themeUrl($this->getManifest()->get($path, $path));
+        $url = $this->getAssetPath('css');
 
         if ($this->getBool('tag')) {
             return '<link rel="stylesheet" href="' . $url . '" />';
@@ -50,53 +41,12 @@ public function css()
      */
     public function js()
     {
-        $src  = $this->get('src', Config::get('theming.theme'));
-        $path = '/js/' . Str::ensureRight($src, '.js');
-        $url  = $this->themeUrl($this->getManifest()->get($path, $path));
+        $url = $this->getAssetPath('js');
 
         if ($this->getBool('tag')) {
             return '<script src="' . $url . '"></script>';
         }
 
         return $url;
     }
-
-    /**
-     * Returns the revision manifest contained in a Collection.
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    private function getManifest()
-    {
-        $path = webroot_path('site/themes/' . Config::get('theming.theme') . '/' . static::MANIFEST);
-
-        return collect(json_decode(File::get($path), true));
-    }
-
-    /**
-     * Transforms the asset directory into a relative or absolute URL for use in the front-end.
-     *
-     * @param string $path
-     * @return string
-     */
-    private function themeUrl($path)
-    {
-        $url = URL::assemble(
-            Config::get('system.filesystems.themes.url'),
-            Config::get('theming.theme'),
-            $path
-        );
-
-        $url = URL::prependSiteUrl(
-            $url,
-            $this->get('locale', default_locale()),
-            false
-        );
-
-        if (!$this->getBool('absolute')) {
-            $url = URL::makeRelative($url);
-        }
-
-        return $url;
-    }
 }

LaravelMixTrait.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Statamic\Addons\LaravelMix;
+
+use Statamic\API\Config;
+use Statamic\API\File;
+use Statamic\API\Str;
+use Statamic\API\URL;
+use Statamic\Extend\HasParameters;
+
+trait LaravelMixTrait
+{
+    /**
+     * Provides access to methods for retrieving parameters
+     */
+    use HasParameters;
+
+    /**
+     * The name of Mix's revision manifest file.
+     */
+    protected $manifest = 'mix-manifest.json';
+
+    /**
+     * Returns the path of given asset type.
+
+     * @param  string $type
+     * @return string
+     */
+    public function getAssetPath($type)
+    {
+        $theme    = Config::get('theming.theme');
+        $path     = '/' . $type . '/' . Str::ensureRight($theme, '.' . $type);
+        $manifest = $this->getManifest()->get($path);
+
+        return $this->themeUrl($manifest);
+    }
+
+    /**
+     * Transforms the asset directory into a relative or absolute URL for use in the front-end.
+     *
+     * @param string $path
+     * @return string
+     */
+    private function themeUrl($path)
+    {
+        $url = URL::assemble(
+            Config::get('system.filesystems.themes.url'),
+            Config::get('theming.theme'),
+            $path
+        );
+
+        $url = URL::prependSiteUrl(
+            $url,
+            $this->get('locale', default_locale()),
+            false
+        );
+
+        if (!$this->getBool('absolute')) {
+            $url = URL::makeRelative($url);
+        }
+
+        return $url;
+    }
+
+    /**
+     * Returns the revision manifest contained in a Collection.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    private function getManifest()
+    {
+        $path = webroot_path('site/themes/' . Config::get('theming.theme') . '/' . $this->manifest);
+
+        return collect(json_decode(File::get($path), true));
+    }
+}

README.md

@@ -1,7 +1,7 @@
 # Laravel Mix for Statamic
 
-This is a Stamic add-on which allows you to build CSS and JavaScript files for your website using 
-[Laravel Mix](https://github.com/JeffreyWay/laravel-mix). Mix differs from Laravel Elixir in several ways - the one we're 
+This is a Stamic add-on which allows you to build CSS and JavaScript files for your website using
+[Laravel Mix](https://github.com/JeffreyWay/laravel-mix). Mix differs from Laravel Elixir in several ways - the one we're
 interested in here is the `mix-manifest.json` file, if you're familiar with Elixir then you'll notice the filename has changed.
 This makes it incompatible with Statamic's built in support, hence needing a separate add-on.
 
@@ -10,7 +10,7 @@ This makes it incompatible with Statamic's built in support, hence needing a sep
 The easiest way of installing this add-on is to download as a zip bundle straigt from GitHub and placing it in your
 `site/addons` directory.
 
-An alternative way, if you're a Git user, would be do add it as a Git submodule. This gives you the avantage of being able 
+An alternative way, if you're a Git user, would be do add it as a Git submodule. This gives you the avantage of being able
 to pull in any updates which may be published in the future. The following command will install this add-on as a submodule if
 run from the root of your project:
 
@@ -21,7 +21,7 @@ $ git submodule add https://github.com/edcs/laravel-mix-statamic site/addons/Lar
 ## Setting Up Mix
 
 This is an example `webpack.mix.js` file - it sets the public path where the built JavaScript and CSS should end up (I like to
-keep my Statamic application files out of my public directory), then it transpiles my JavaScript modules into a single file 
+keep my Statamic application files out of my public directory), then it transpiles my JavaScript modules into a single file
 and finally it converts my SASS into CSS:
 
 ```javascript
@@ -75,6 +75,18 @@ This add-on supports some of the parameters as the default Statamic tags, these
 |      `tag` | `boolean` false | Enable this to output the full HTML tag. |
 | `absolute` | `boolean` false | Output an absolute or relative URL.      |
 
+## Using with Laravel Blade instead of Antlers.
+
+When using Laravel Blade the add-on tags aren't available. Instead, use the modifier:
+
+```
+<!-- For CSS. -->
+<link rel="stylesheet" href="{{ modify('css')->laravelMix() }}">
+
+<!-- For JS. -->
+<script src="{{ modify('js')->laravelMix() }}"></script>
+```
+
 ## And Finally...
 
 Now you're ready to build your CSS and JavaScript assets using Laravel Mix - once complete, there should be a