Skip to content

Commit 72bf09d

Browse files
committed
Use filetime() for asset revisions
1 parent a1d40bc commit 72bf09d

8 files changed

Lines changed: 7 additions & 36 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# barebones changelog
2+
## 2.0.5
3+
* Use filetime() for asset revisions as it's more compatible and easier to support.
4+
25
## 2.0.4
36
* Better static asset revisioning using randomly generated hash when running gulp tasks.
47

assets/.DS_Store

-6 KB
Binary file not shown.

assets/sass/.DS_Store

-6 KB
Binary file not shown.

assets/sass/utils/.DS_Store

-6 KB
Binary file not shown.

functions.php

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function barebones_scripts()
7272
wp_deregister_script('jquery');
7373
wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js', false, '1.11.3', true);
7474
wp_enqueue_script('jquery');
75-
wp_enqueue_script('script', get_stylesheet_directory_uri() . '/js/script.min.js?' . getPackageHash(), ['jquery'], null, true);
75+
wp_enqueue_script('script', get_stylesheet_directory_uri() . '/js/script.min.js?' . filemtime(get_stylesheet_directory() . '/js/script.min.js'), ['jquery'], null, true);
7676
}
7777

7878
add_action('wp_enqueue_scripts', 'barebones_scripts');
@@ -173,19 +173,6 @@ function barebones_tiny_mce_before_init($settings)
173173

174174
add_filter('tiny_mce_before_init', 'barebones_tiny_mce_before_init');
175175

176-
/**
177-
* Get hash from package.json used for assets url hash
178-
* @return string
179-
*/
180-
function getPackageHash()
181-
{
182-
$package = file_get_contents(get_bloginfo( 'stylesheet_directory' ) . "/package.json");
183-
$packageJson = json_decode($package, true);
184-
185-
// if there is problem, fallback to time.
186-
return isset($packageJson['hash']) ? $packageJson['hash'] : time();
187-
}
188-
189176
/**
190177
* Get post thumbnail url
191178
* @param string $size Size of the returned image

gulpfile.js

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,9 @@ elixir.extend('imagemin', function(src, dest) {
2121
}).watch(elixir.config.assetsPath + src);
2222
});
2323

24-
// Create a Hash in package.json
25-
elixir.extend('hash', function() {
26-
new Task('hash', function() {
27-
var fs = require('fs');
28-
var fileName = './package.json';
29-
var file = require(fileName);
30-
31-
// generate a new hash
32-
file.hash = ( 0 | Math.random() * 9e6 ).toString(36);
33-
// save to package.json
34-
fs.writeFile(fileName, JSON.stringify(file, null, 2), function (err) {
35-
if (err) return console.log(err);
36-
console.log('writing to ' + fileName);
37-
});
38-
})
39-
});
40-
4124
// Run elixir tasks
4225
elixir(function(mix) {
4326
mix.sass('barebones.scss', 'style.css')
4427
.scripts(['script.js'], 'js/script.min.js')
45-
.imagemin('/images/**/*', './img')
46-
.hash();
28+
.imagemin('/images/**/*', './img');
4729
});

header.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
88
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
99
<link rel="dns-prefetch" href="//google-analytics.com">
10-
<link rel="stylesheet" href="<?php echo get_bloginfo('stylesheet_url') . '?' . getPackageHash(); ?>">
10+
<link rel="stylesheet" href="<?php echo get_bloginfo( 'stylesheet_url' ) . '?' . filemtime(get_stylesheet_directory() . '/style.css'); ?>">
1111
<?php wp_head(); ?>
1212
<!--[if lt IE 10]>
1313
<script src="//cdnjs.cloudflare.com/ajax/libs/placeholders/3.0.2/placeholders.min.js"></script>

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "barebones",
3-
"version": "2.0.4",
4-
"hash": "brbns",
3+
"version": "2.0.5",
54
"author": "Benchmark Studios",
65
"description": "A lightweight and skeletal WordPress boilerplate theme for HTML5 and beyond",
76
"license": "MIT",

0 commit comments

Comments
 (0)