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 5008ddf..0000000 Binary files a/assets/.DS_Store and /dev/null differ diff --git a/assets/sass/.DS_Store b/assets/sass/.DS_Store deleted file mode 100644 index fcc4cd6..0000000 Binary files a/assets/sass/.DS_Store and /dev/null differ diff --git a/assets/sass/utils/.DS_Store b/assets/sass/utils/.DS_Store deleted file mode 100644 index 5008ddf..0000000 Binary files a/assets/sass/utils/.DS_Store and /dev/null differ 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 @@ - +