Merge 1.2Beta to Release Master

* add cache-busting
* update/debug gulpfile
* re-organize build-process
  * rename main.js to functions.js
  * rename main.scss to bundler.scss
  * remove vendor-dependencies from `functions-wppsetup.php` and `bundler.scss`
  * add all vendor-dependencies to the gulpfile to have them organized in one place
  * remove bower, use npm for frontend-modules/vendors
* add unification to function-names cleanup functions
* fix minor bugs and cleanup code
* rearrange defaults in vars.scss
* remove editor-hiding in elements-template (we can hide it within ACF now)

Author: flurinduerst

CHANGELOG.md

@@ -1,12 +1,15 @@
 # CHANGELOG
 
-## HEAD | 1.1.5 | 06.02.2018
+## 1.2.0 | 18.02.2018 | «Busted»
+* add cache-busting
+* update/debug gulpfile
 * re-organize build-process
   * rename main.js to functions.js
   * rename main.scss to bundler.scss
   * remove vendor-dependencies from `functions-wppsetup.php` and `bundler.scss`
   * add all vendor-dependencies to the gulpfile to have them organized in one place
   * remove bower, use npm for frontend-modules/vendors
+* add unification to function-names cleanup functions
 * fix minor bugs and cleanup code
 * rearrange defaults in vars.scss
 * remove editor-hiding in elements-template (we can hide it within ACF now)

README.md

@@ -1,6 +1,6 @@
 <img src="/assets/images/wpseed.png" width="518"/>
 
-**Version 1.1.5** (06.02.2018)
+**Version 1.2.0** (18.02.2018)
 
 ## What is WPSeed?
 WPSeed is a WordPress starter theme following the intention of being able to skip the time-consuming first steps when creating a new theme.
@@ -26,6 +26,7 @@ WPSeed uses npm to manage development-modules aswell as frontend-modules and [gu
   * in the theme directory run `npm install && gulp`
   * add your domain/ip to `browsersync_proxy` in `gulpfile.js`
   * you can now use gulp (run `gulp watch` in your theme directory) to compile and optimize your asset files and run browsersync
+  * you can use any TLD for local development. WPSeed assumes you're using `.vm` for "virtual machine". If you want to use a different TLD make sure to change `.vm` to your preffered TLD in `Vagrantfile`, `gulpfile.js` and `functions-wpsetup.php`.
 
 #### Deployment
 * when deploying your website using a deployment-environment like [deploybot](https://deploybot.com/) or [deployHQ](https://www.deployhq.com/) run
@@ -37,6 +38,7 @@ WPSeed uses npm to manage development-modules aswell as frontend-modules and [gu
 
 ### General
 * All important files provide a description/version at the top. Make sure to read it first.
+* Since Version 1.2.0 WPSeed creates cache-busting using [gulp-rev](https://www.npmjs.com/package/gulp-rev). If you're working locally (using the `.vm` TLD) the non-busted stylesheet (style.min.css) is enqueued, to make sure browsersync runs as expected.
 
 ### Important Files/Folders
 

assets/styles/bundle.scss

@@ -1,4 +1,4 @@
-/*!
+/*
  * Main CSS File
  * Merges all .scss files (in the desired order) before they're processed by gulp
  *

functions/functions-access.php

@@ -4,7 +4,7 @@
  *
  * @author      Flurin Dürst
  * @version     1.0
- * @since       WPSeed 0.11.3
+ * @since       WPSeed 0.11.4
  *
  */
 
@@ -30,7 +30,7 @@ function is_login_page() {
      wp_redirect('/admin'); die();
    }
 
-   /* MAINTENANCE MODE
+   /* MAINTENANCE MODE (GERMAN)
    /------------------------*/
    // show maintenance page if not my ip (is_me() and not logged in as admin)
    // remove `false && ` to activate

functions/functions-dev.php

@@ -3,7 +3,7 @@
  * Functions used for development purposes
  *
  * @author      Flurin Dürst
- * @version     1.6.0
+ * @version     1.6.1
  * @since       WPegg 0.1.0
  *
  */
@@ -39,7 +39,7 @@ function is_pjax_request() {
   /* STRING SHORTENER
   /------------------------*/
   // shorten strings and append ...
-  function wpseed_shorten($string,$length,$append="...") {
+  function shorten($string,$length,$append="...") {
     $string = trim($string);
     if(strlen($string) > $length) {
       $string  = substr($string, 0, $length);
@@ -50,7 +50,7 @@ function wpseed_shorten($string,$length,$append="...") {
 
   /* URL CHECK
   /------------------------*/
-  // searches url by string
+  // searche url by string
   // note: also consider using basename($url) or basename(dirname($url)) => http://php.net/manual/de/function.basename.php
   function urlcontains($string) {
     if (strpos('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'],$string) == true) {
@@ -60,8 +60,8 @@ function urlcontains($string) {
 
   /* SLUGIFY
   /------------------------*/
-  // creates slugs
-  // exaple: "Lorem Ipsum 25%" will be "lorem-ipsum-25"
+  // create slugs
+  // example: "Lorem Ipsum 25%" will be "lorem-ipsum-25"
   function slugify($text) {
      // replace non letter or digits by -
      $text = preg_replace('~[^\pL\d]+~u', '-', $text);
@@ -89,19 +89,12 @@ function sanitize_output($buffer) {
     return $buffer;
   }
 
-  /* THUMBNAIL URL
-  /------------------------*/
-  // output the absolute url of the featured image
-  // usage: wpseed_the_post_thumbnail_url($post->ID, 'large');
-  function wpseed_the_post_thumbnail_url($size, $postid) {
-    echo wp_get_attachment_image_src( get_post_thumbnail_id($postid), $size )['0'];
-  }
 
   /* BLOG RELATED
   /------------------------*/
 
   // Output formatted post-date in german
-  function wpseed_get_the_date_german() {
+  function get_the_date_german() {
     $months_de = ['Januar','Februar','März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'];
     return get_the_date('d.').' '.$months_de[intval(get_the_date('m'))-1].' '.get_the_date('Y');
   }

functions/functions-elements.php

@@ -4,7 +4,7 @@
  * WPSeed_Text and WPSeed_Gallery are placeholder presets.
  *
  * @author     Flurin Dürst
- * @version    1.2
+ * @version    1.2.1
  * @since      WPSeed 0.10.0
  *
  */
@@ -13,21 +13,21 @@
 /----------------------------*/
 // adds the title-sub_field to the ACF-element bar. Edit `name` at `add_filter` to match your ACF-value.
 // » https://www.advancedcustomfields.com/resources/acf-fields-flexible_content-layout_title/
-function acf_flexiblecontent_title( $title, $field, $layout, $i ) {
+function WPSeed_acf_flexiblecontent_title( $title, $field, $layout, $i ) {
   if (!empty(get_sub_field('title'))) {          // remove layout title from text
   	$title = get_sub_field('title')." ($title)";  // add new title
   }
   return $title;
 }
-add_filter('acf/fields/flexible_content/layout_title/name=element', 'acf_flexiblecontent_title', 10, 4);
+add_filter('acf/fields/flexible_content/layout_title/name=element', 'WPSeed_acf_flexiblecontent_title', 10, 4);
 
 
 /* GATHER ELEMENTS
 /--------------------------*/
-function elements() {
+function WPSeed_elements() {
   ob_start('sanitize_output');
-  if (have_rows('elements')):
-    while (have_rows('elements')): the_row();
+  if (have_rows('element_content')):
+    while (have_rows('element_content')): the_row();
       if (get_row_layout() == 'text'): WPSeed_Text(); endif;
       if (get_row_layout() == 'gallery'): WPSeed_Gallery(); endif;
       if (get_row_layout() == 'seperator'): echo '<hr>'; endif;

functions/functions-wpsetup.php

@@ -1,10 +1,10 @@
 <?php
 /**
  * WordPress Setup including
- * menus, theme-support settings, general settings and a wp_head cleaner
+ * menus, theme-support settings, cache-busting integration, a wp_head cleaner and general settings
  *
  * @author      Flurin Dürst
- * @version     1.8.0
+ * @version     1.9.0
  * @since       WPSeed 0.1.6
  *
  */
@@ -13,6 +13,22 @@
 /* THEME SETUP
 /===================================================== */
 
+  /* GET CACHE-BUSTED CSS-FILE
+  /------------------------*/
+  // get the url to the busted css-file, or the default css-file if working locally (on the TLD `.vm`)
+  // the busted css file is generated by `gulp cachebust` and is located through dist/rev-manifest.json
+  function wpseed_get_cachebusted_css() {
+    $current_tld = substr(strrchr(get_bloginfo('url'),"."),1);
+    if ($current_tld == 'vm') :
+      $css_src = '/dist/style.min.css';
+    else :
+      $css_manifest_url = get_template_directory_uri() . '/dist/rev-manifest.json';
+      $css_manifest_content = json_decode(file_get_contents($css_manifest_url), true);
+      $css_src = '/dist/'.$css_manifest_content['style.min.css'];
+    endif;
+    return $css_src;
+  }
+
   /* ENQUEUE SCRIPTS
   /------------------------*/
   // enqueue sctipts
@@ -26,7 +42,7 @@ function wpseed_enqueue_scripts_and_styles() {
     wp_register_script('wpseed/scripts', get_template_directory_uri() . '/dist/script.min.js', false, array( 'jquery' ), true);
     wp_enqueue_script('wpseed/scripts');
     # styles
-    wp_enqueue_style('wpseed/styles', get_template_directory_uri() . '/dist/style.min.css', false, null);
+    wp_enqueue_style('wpseed/styles', get_template_directory_uri() . wpseed_get_cachebusted_css(), false, null);
     # fonts
     wp_enqueue_style('google/fonts', 'https://fonts.googleapis.com/css?family=Ubuntu:400,500,700', false, null);
   }
@@ -35,13 +51,13 @@ function wpseed_enqueue_scripts_and_styles() {
   /* SETUP WP-MENUS
   /------------------------*/
   // » https://codex.wordpress.org/Function_Reference/register_nav_menus
-  function register_theme_menus() {
+  function wpseed_register_theme_menus() {
     register_nav_menus([
       'mainmenu' => __('Mainmenu'),
       'submenu' => __('Submenu')
     ]);
   }
-  add_action( 'init', 'register_theme_menus');
+  add_action( 'init', 'wpseed_register_theme_menus');
 
 
 /* THEME SUPPORT
@@ -84,10 +100,10 @@ function wpseed_theme_features()  {
 
   /* Disable Backend Theme-Editor
   /------------------------------*/
-  function remove_editor_menu() {
+  function wpseed_remove_editor_menu() {
     remove_action('admin_menu', '_add_themes_utility_last', 101);
   }
-  add_action('_admin_menu', 'remove_editor_menu', 1);
+  add_action('_admin_menu', 'wpseed_remove_editor_menu', 1);
 
   /* Disable Admin Bar
   /------------------------------*/
@@ -110,7 +126,7 @@ function remove_thumbnail_dimensions( $html, $post_id, $post_image_id ) {
 /* WPHEAD CLEANUP
 /===================================================== */
 // removes unused stuff from wp_head()
-function wphead_cleanup () {
+function wpseed_wphead_cleanup () {
   // remove the generator meta tag
   remove_action('wp_head', 'wp_generator');
   // remove wlwmanifest link
@@ -138,7 +154,7 @@ function wphead_cleanup () {
   // remove canonical links
   remove_action('wp_head', 'rel_canonical');
 }
-add_action('after_setup_theme', 'wphead_cleanup');
+add_action('after_setup_theme', 'wpseed_wphead_cleanup');
 
 
 ?>