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

Author: flurinduerst

CHANGELOG.md

@@ -1,8 +1,13 @@
 # CHANGELOG
 
-## HEAD | 1.1.4 | 02.02.2018
+## HEAD | 1.1.5 | 06.02.2018
+* 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
 * fix minor bugs and cleanup code
-* remove bower, use npm for frontend-modules/vendors
 * 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.4** (02.02.2018)
+**Version 1.1.5** (02.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.

assets/scripts/essentials.js

@@ -1,8 +1,8 @@
-/**
+/*!
  * Essential javascript functions/variables
  *
  * @author      Flurin Dürst
- * @version     1.0
+ * @version     1.0.1
  * @since       WPSeed 0.11.0
  *
  */

assets/scripts/main.js assets/scripts/functions.jsassets/scripts/main.js renamed to assets/scripts/functions.js

@@ -1,9 +1,10 @@
-/**
- * All sorts javascript/jQuery functions go here
+/*!
+ * All sorts javascript/jQuery functions
  *
  * @author      Flurin Dürst
- * @version     3.3.0
+ * @version     3.4.0
  * @since       WPSeed 0.12
+ * was main.js until 3.4.0
  *
  */
 

assets/styles/bundle.scss

@@ -0,0 +1,24 @@
+/*!
+ * Main CSS File
+ * Merges all .scss files (in the desired order) before they're processed by gulp
+ *
+ * @author      Flurin Dürst
+ * @version     1.6.0
+ * @since       WPSeed 0.1
+ * was main.scss until 1.6.0
+ *
+ */
+
+
+@charset 'UTF-8';
+
+/* VARS/FUNCTIONS
+/===================================================== */
+@import 'vars';
+@import 'essentials';
+
+/* SITE STYLES
+/===================================================== */
+@import 'general';
+@import 'content';
+@import 'nav';

assets/styles/main.scss

@@ -4,7 +4,7 @@
  * menus, theme-support settings, general settings and a wp_head cleaner
  *
  * @author      Flurin Dürst
- * @version     1.7.1
+ * @version     1.8.0
  * @since       WPSeed 0.1.6
  *
  */
@@ -18,18 +18,14 @@
   // enqueue sctipts
   // » https://developer.wordpress.org/reference/functions/wp_enqueue_script/
   function wpseed_enqueue_scripts_and_styles() {
-    # jquery.js (from wp core)
+    # jQuery (from wp core)
     wp_deregister_script( 'jquery' );
-    // wp_register_script( 'jquery', includes_url( '/js/jquery/jquery.js' ), false, NULL, true );
     wp_register_script('jquery', 'https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', false, '2.1.4');
     wp_enqueue_script( 'jquery' );
-    # main.js
+    # scripts
     wp_register_script('wpseed/scripts', get_template_directory_uri() . '/dist/script.min.js', false, array( 'jquery' ), true);
     wp_enqueue_script('wpseed/scripts');
-    # wow.js
-    wp_register_script('wowjs', get_template_directory_uri() . '/node_modules/wowjs/dist/wow.min.js', false, array( 'wowjs' ), true);
-    wp_enqueue_script('wowjs');
-    # main.css
+    # styles
     wp_enqueue_style('wpseed/styles', get_template_directory_uri() . '/dist/style.min.css', false, null);
     # fonts
     wp_enqueue_style('google/fonts', 'https://fonts.googleapis.com/css?family=Ubuntu:400,500,700', false, null);

functions/functions-wpsetup.php

@@ -1,19 +1,21 @@
 /*
  * GULP CONFIG
  *
- * Desciption:  Clean gulpfile for web development workflow with browsersync, compiling/optimization of sass, javascript and images from assets to dist
- * Usage:       gulp (to run the whole process), gulp watch (to watch for changes and compile if anything was modified)
+ * Desciption:  Clean gulpfile for web development workflow using
+ *              - browsersync
+ *              - compiling/optimization of sass, javascript and images from assets to dist and vendors (usally from npm_modules to dist)
+ * Usage:       gulp (to run the whole process), gulp watch (to watch for changes and compile if anything is being modified)
  *
  * Author:      Flurin Dürst (https://flurinduerst.ch)
  *
- * Version:     1.3.1
+ * Version:     1.4.0
  *
 */
 
 
 /* SETTINGS
 /===================================================== */
-var browsersync_proxy = "wpseed.dev";
+var browsersync_proxy = "wpseed.vm";
 
 
 /* DEPENDENCIES
@@ -60,12 +62,19 @@ gulp.task('browsersync', function() {
 
 /* CSS
 /------------------------*/
-// from:    assets/styles/main.css
+// from:    assets/styles/main.css (+ optional vendors)
 // actions: compile, minify, prefix, rename
 // to:      dist/style.min.css
 gulp.task('css', function() {
-  gulp.src('assets/styles/main.scss')
+  gulp.src([
+    //main
+    'assets/styles/bundle.scss',
+    // vendors
+    'node_modules/hamburgers/dist/hamburgers.min.css', // https://jonsuh.com/hamburgers/
+    'node_modules/animate.css/animate.min.css' // https://daneden.github.io/animate.css/
+  ])
   .pipe(plumber({errorHandler: notify.onError("<%= error.message %>")}))
+  .pipe(concat('style.min.css'))
   .pipe(sass())
   .pipe(autoprefixer('last 2 version', { cascade: false }))
   .pipe(cleanCSS())
@@ -76,11 +85,16 @@ gulp.task('css', function() {
 
 /* JAVASCRIPT
 /------------------------*/
-// from:    assets/scripts/
+// from:    assets/scripts/ (+ optional vendors)
 // actions: concatinate, minify, rename
-// to:      dist/script.min.js
+// to:      dist/script.min.css
 gulp.task('javascript', function() {
-  gulp.src('assets/scripts/*.js')
+  gulp.src([
+    // main
+    'assets/scripts/*.js',
+    // vendors
+    'node_modules/wowjs/dist/wow.min.js' // https://github.com/matthieua/WOW
+  ])
   .pipe(plumber({errorHandler: notify.onError("<%= error.message %>")}))
   .pipe(concat('script.min.js'))
   .pipe(uglify())

gulpfile.js

@@ -2,7 +2,7 @@
 Theme Name:     WPSeed
 Author:         Flurin Dürst
 Description:    WordPress Starter Theme
-Version:        1.1.4
+Version:        1.1.5
 License:        MIT Public License
 License URI:    https://github.com/flurinduerst/WPSeed/blob/master/LICENSE
 Tags:           This theme is licensed under the MIT Public License.