framework/sage
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce src/ and dist/ folders

Browse Source 
Separate minifying/renaming of files to prod-only tasks

Add tasks for copying jQuery and fonts

Ref #1138, #1070, #1155
This commit is contained in:
Ben Word
2014-10-27 10:01:17 -05:00
parent e3266279e6
commit 5b22f0bd9d
24 changed files with 164 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/scripts.php
View File

@@ -3,12 +3,12 @@
* Scripts and stylesheets
*
* Enqueue stylesheets in the following order:
* 1. /theme/assets/css/main.css
* 1. /theme/assets/dist/css/main.css
*
* Enqueue scripts in the following order:
* 1. jquery-1.11.1.min.js via Google CDN
* 2. /theme/assets/js/vendor/modernizr.min.js
* 3. /theme/assets/js/scripts.js
* 2. /theme/assets/dist/js/modernizr.min.js
* 3. /theme/assets/dist/js/scripts.js
*
* Google Analytics is loaded after enqueued scripts if:
* - An ID has been defined in config.php
@@ -21,18 +21,18 @@ function roots_scripts() {
*/
if (WP_ENV === 'development') {
$assets = array(
'css' => '/assets/css/main.css',
'js' => '/assets/js/scripts.js',
'modernizr' => '/assets/vendor/modernizr/modernizr.js',
'css' => '/assets/dist/css/main.css',
'js' => '/assets/dist/js/scripts.js',
'modernizr' => '/assets/dist/js/modernizr.min.js',
'jquery' => '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.js'
);
} else {
$get_assets = file_get_contents(get_template_directory() . '/assets/rev-manifest.json');
$assets = json_decode($get_assets, true);
$assets = array(
'css' => '/assets/' . $assets[get_template_directory() . '/assets/css/main.min.css'],
'js' => '/assets/' . $assets[get_template_directory() . '/assets/js/scripts.min.js'],
'modernizr' => '/assets/js/vendor/modernizr.min.js',
'css' => '/assets/' . $assets[get_template_directory() . '/assets/dist/css/main.min.css'],
'js' => '/assets/' . $assets[get_template_directory() . '/assets/dist/js/scripts.min.js'],
'modernizr' => '/assets/dist/js/modernizr.min.js',
'jquery' => '//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js'
);
}
@@ -65,7 +65,7 @@ function roots_jquery_local_fallback($src, $handle = null) {
static $add_jquery_fallback = false;
if ($add_jquery_fallback) {
echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/vendor/jquery/dist/jquery.min.js?1.11.1"><\/script>\')</script>' . "\n";
echo '<script>window.jQuery || document.write(\'<script src="' . get_template_directory_uri() . '/assets/dist/js/jquery-1.11.1.min.js"><\/script>\')</script>' . "\n";
$add_jquery_fallback = false;
}