From 72bf09de7099f7c9de898a68dd9c4c7bf1db9e9c Mon Sep 17 00:00:00 2001
From: Lukas Juhas <hello@lukasjuhas.com>
Date: Mon, 13 Mar 2017 12:00:06 +0000
Subject: [PATCH] Use filetime() for asset revisions

---
 CHANGELOG.md                |   3 +++
 assets/.DS_Store            | Bin 6148 -> 0 bytes
 assets/sass/.DS_Store       | Bin 6148 -> 0 bytes
 assets/sass/utils/.DS_Store | Bin 6148 -> 0 bytes
 functions.php               |  15 +--------------
 gulpfile.js                 |  20 +-------------------
 header.php                  |   2 +-
 package.json                |   3 +--
 8 files changed, 7 insertions(+), 36 deletions(-)
 delete mode 100644 assets/.DS_Store
 delete mode 100644 assets/sass/.DS_Store
 delete mode 100644 assets/sass/utils/.DS_Store

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c262899..1061df0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 # barebones changelog
+## 2.0.5
+* Use filetime() for asset revisions as it's more compatible and easier to support.
+
 ## 2.0.4
 * Better static asset revisioning using randomly generated hash when running gulp tasks.
 
diff --git a/assets/.DS_Store b/assets/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/assets/sass/.DS_Store b/assets/sass/.DS_Store
deleted file mode 100644
index fcc4cd6750a4b68b28399d2a316477ce230c1403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKOHKnZ47H&`mAdJYWv<X0glafJFMu>73KC_ypz1dFW7iY$UTlyCA~r~<AX`eF
z6WjT`(Il~m==w0MM3y2lM<FVehOoP7x^U+iQ0o|vvVGdFHvPEUHwHS#F0TDbdKu+e
z?xnr{iG4SA-Ees6MNT)z*Se)o_TgLm{^3vYbB^CE))Wi`1HnKr@G}N*XH(`2!>EIS
zU?3RyV1VaCLLp|yVpxw3R5b+v@)=zPI&%reB**Mn3}Jz&g#s;9J;hK9M}Km^>{tvf
zT-1{f^_kz37p=2n{8ZgVvtiW1Krk?6;L@5)-v77wWtvI;G$dNVKrryn7|>a_>DJhk
z->qM^$GbM6+@VnDSExXsPaXki@Ep0WMzbgC@XL<HkfX4_h6CdvPzi}D82AMS-T?42
BDIov=

diff --git a/assets/sass/utils/.DS_Store b/assets/sass/utils/.DS_Store
deleted file mode 100644
index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

diff --git a/functions.php b/functions.php
index 66972db..bfff09d 100644
--- a/functions.php
+++ b/functions.php
@@ -72,7 +72,7 @@ function barebones_scripts()
     wp_deregister_script('jquery');
     wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js', false, '1.11.3', true);
     wp_enqueue_script('jquery');
-    wp_enqueue_script('script', get_stylesheet_directory_uri() . '/js/script.min.js?' . getPackageHash(), ['jquery'], null, true);
+    wp_enqueue_script('script', get_stylesheet_directory_uri() . '/js/script.min.js?' . filemtime(get_stylesheet_directory() . '/js/script.min.js'), ['jquery'], null, true);
 }
 
 add_action('wp_enqueue_scripts', 'barebones_scripts');
@@ -173,19 +173,6 @@ function barebones_tiny_mce_before_init($settings)
 
 add_filter('tiny_mce_before_init', 'barebones_tiny_mce_before_init');
 
-/**
- * Get hash from package.json used for assets url hash
- * @return string
- */
-function getPackageHash()
-{
-  $package = file_get_contents(get_bloginfo( 'stylesheet_directory' ) . "/package.json");
-  $packageJson = json_decode($package, true);
-
-  // if there is problem, fallback to time.
-  return isset($packageJson['hash']) ? $packageJson['hash'] : time();
-}
-
 /**
  * Get post thumbnail url
  * @param   string    $size    Size of the returned image
diff --git a/gulpfile.js b/gulpfile.js
index 77073ff..b649bdf 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -21,27 +21,9 @@ elixir.extend('imagemin', function(src, dest) {
   }).watch(elixir.config.assetsPath + src);
 });
 
-// Create a Hash in package.json
-elixir.extend('hash', function() {
-  new Task('hash', function() {
-    var fs = require('fs');
-    var fileName = './package.json';
-    var file = require(fileName);
-
-    // generate a new hash
-    file.hash = ( 0 | Math.random() * 9e6 ).toString(36);
-    // save to package.json
-    fs.writeFile(fileName, JSON.stringify(file, null, 2), function (err) {
-      if (err) return console.log(err);
-      console.log('writing to ' + fileName);
-    });
-  })
-});
-
 // Run elixir tasks
 elixir(function(mix) {
     mix.sass('barebones.scss', 'style.css')
        .scripts(['script.js'], 'js/script.min.js')
-       .imagemin('/images/**/*', './img')
-       .hash();
+       .imagemin('/images/**/*', './img');
 });
diff --git a/header.php b/header.php
index 7660712..5cbcf62 100755
--- a/header.php
+++ b/header.php
@@ -7,7 +7,7 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
         <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
         <link rel="dns-prefetch" href="//google-analytics.com">
-        <link rel="stylesheet" href="<?php echo get_bloginfo('stylesheet_url') . '?' . getPackageHash(); ?>">
+        <link rel="stylesheet" href="<?php echo get_bloginfo( 'stylesheet_url' ) . '?' . filemtime(get_stylesheet_directory() . '/style.css'); ?>">
         <?php wp_head(); ?>
         <!--[if lt IE 10]>
         <script src="//cdnjs.cloudflare.com/ajax/libs/placeholders/3.0.2/placeholders.min.js"></script>
diff --git a/package.json b/package.json
index 3e9a920..5cd3513 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,6 @@
 {
   "name": "barebones",
-  "version": "2.0.4",
-  "hash": "brbns",
+  "version": "2.0.5",
   "author": "Benchmark Studios",
   "description": "A lightweight and skeletal WordPress boilerplate theme for HTML5 and beyond",
   "license": "MIT",