From 036818d023fe09ff78ee2f9c05c39f6cd62a9338 Mon Sep 17 00:00:00 2001
From: Adam Wathan <adam.wathan@gmail.com>
Date: Mon, 30 Oct 2017 16:05:29 -0400
Subject: [PATCH] Add versioning to CSS and JS assets

---
 docs/bootstrap.php                    | 30 ++++++++++++++++++++++++++-
 docs/mix-manifest.json                |  4 ----
 docs/source/{ => _assets}/js/nav.js   |  0
 docs/source/_layouts/master.blade.php |  6 +++---
 docs/source/mix-manifest.json         |  5 +++++
 docs/webpack.mix.js                   |  7 ++++++-
 6 files changed, 43 insertions(+), 9 deletions(-)
 delete mode 100644 docs/mix-manifest.json
 rename docs/source/{ => _assets}/js/nav.js (100%)
 create mode 100644 docs/source/mix-manifest.json

diff --git a/docs/bootstrap.php b/docs/bootstrap.php
index 7fb8d5127..f5c60d504 100644
--- a/docs/bootstrap.php
+++ b/docs/bootstrap.php
@@ -1,4 +1,32 @@
 <?php
 
+use Illuminate\Support\Str;
+use Illuminate\Support\HtmlString;
+
 /** @var $container \Illuminate\Container\Container */
-/** @var $jigsaw \TightenCo\Jigsaw\Jigsaw */
\ No newline at end of file
+/** @var $jigsaw \TightenCo\Jigsaw\Jigsaw */
+
+function mix($path, $manifestDirectory = '')
+{
+    static $manifests = [];
+    if (! Str::startsWith($path, '/')) {
+        $path = "/{$path}";
+    }
+    if ($manifestDirectory && ! Str::startsWith($manifestDirectory, '/')) {
+        $manifestDirectory = "/{$manifestDirectory}";
+    }
+
+    $manifestPath = public_path($manifestDirectory.'/mix-manifest.json');
+
+    if (! isset($manifests[$manifestPath])) {
+        if (! file_exists($manifestPath)) {
+            throw new Exception('The Mix manifest does not exist.');
+        }
+        $manifests[$manifestPath] = json_decode(file_get_contents($manifestPath), true);
+    }
+    $manifest = $manifests[$manifestPath];
+    if (! isset($manifest[$path])) {
+        throw new InvalidArgumentException("Unable to locate Mix file: {$path}.");
+    }
+    return new HtmlString($manifestDirectory.$manifest[$path]);
+}
diff --git a/docs/mix-manifest.json b/docs/mix-manifest.json
deleted file mode 100644
index 4362e9385..000000000
--- a/docs/mix-manifest.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "/source/js/app.js": "/source/js/app.js",
-    "/source/css/main.css": "/source/css/main.css"
-}
\ No newline at end of file
diff --git a/docs/source/js/nav.js b/docs/source/_assets/js/nav.js
similarity index 100%
rename from docs/source/js/nav.js
rename to docs/source/_assets/js/nav.js
diff --git a/docs/source/_layouts/master.blade.php b/docs/source/_layouts/master.blade.php
index 43ce446ec..38f062efb 100644
--- a/docs/source/_layouts/master.blade.php
+++ b/docs/source/_layouts/master.blade.php
@@ -19,9 +19,9 @@
           @import url("https://use.typekit.net/iqy1okj.css");
         </style>
         {{-- <link rel="stylesheet" href="https://use.typekit.net/iqy1okj.css"> --}}
-        <link rel="stylesheet" href="/css/main.css">
+        <link rel="stylesheet" href="{{ mix('/css/main.css') }}">
         <script src="https://code.jquery.com/jquery-3.2.1.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
-        <script src="/js/nav.js"></script>
+        <script src="{{ mix('/js/nav.js') }}"></script>
 
     </head>
     <body class="font-sans font-normal text-slate-darker leading-normal">
@@ -190,7 +190,7 @@
                     <div id="app">
                         @yield('body')
                     </div>
-                    <script src="/js/app.js"></script>
+                    <script src="{{ mix('/js/app.js') }}"></script>
                     <script src="/js/prism.js"></script>
                     <script>
                         anchors.options = { placement: 'left', class: 'text-slate-light' };
diff --git a/docs/source/mix-manifest.json b/docs/source/mix-manifest.json
new file mode 100644
index 000000000..d2e55d3a1
--- /dev/null
+++ b/docs/source/mix-manifest.json
@@ -0,0 +1,5 @@
+{
+    "/js/app.js": "/js/app.js?id=829229e23347506d9965",
+    "/js/nav.js": "/js/nav.js?id=d3b9e827e277824739e0",
+    "/css/main.css": "/css/main.css?id=4501af3f10b009fbb9a1"
+}
\ No newline at end of file
diff --git a/docs/webpack.mix.js b/docs/webpack.mix.js
index 781c598fd..6bc4ae6e3 100644
--- a/docs/webpack.mix.js
+++ b/docs/webpack.mix.js
@@ -3,12 +3,17 @@ const tailwind = require('./../lib/index.js')
 const config = require('./tailwind.js')
 const fs = require('fs')
 
+mix.setPublicPath('source/');
+
 fs.writeFileSync('./tailwind.json', JSON.stringify(config))
 
-mix.js('source/_assets/js/app.js', 'source/js')
+mix
+  .js('source/_assets/js/nav.js', 'source/js')
+  .js('source/_assets/js/app.js', 'source/js')
   .less('source/_assets/less/main.less', 'source/css')
   .options({
     postCss: [
       tailwind('tailwind.js'),
     ]
   })
+  .version()