From 0fab46fe14490323c8cc1e783ca7c2e881ce52c1 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 24 Mar 2017 18:34:01 -0600
Subject: [PATCH 01/23] Rename base.blade.php to app.blade.php

---
 CHANGELOG.md                                        | 1 +
 templates/404.blade.php                             | 2 +-
 templates/index.blade.php                           | 2 +-
 templates/layouts/{base.blade.php => app.blade.php} | 0
 templates/page.blade.php                            | 2 +-
 templates/search.blade.php                          | 2 +-
 templates/single.blade.php                          | 3 +--
 templates/template-custom.blade.php                 | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename templates/layouts/{base.blade.php => app.blade.php} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e67af4..07cf1b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
 
diff --git a/templates/404.blade.php b/templates/404.blade.php
index 384c394..16fb8d5 100644
--- a/templates/404.blade.php
+++ b/templates/404.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/index.blade.php b/templates/index.blade.php
index bb3ef90..f91575c 100644
--- a/templates/index.blade.php
+++ b/templates/index.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/layouts/base.blade.php b/templates/layouts/app.blade.php
similarity index 100%
rename from templates/layouts/base.blade.php
rename to templates/layouts/app.blade.php
diff --git a/templates/page.blade.php b/templates/page.blade.php
index d18f59b..edae985 100644
--- a/templates/page.blade.php
+++ b/templates/page.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())
diff --git a/templates/search.blade.php b/templates/search.blade.php
index e5897c5..f0a021e 100644
--- a/templates/search.blade.php
+++ b/templates/search.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @include('partials.page-header')
diff --git a/templates/single.blade.php b/templates/single.blade.php
index 62e9c85..b94c206 100644
--- a/templates/single.blade.php
+++ b/templates/single.blade.php
@@ -1,8 +1,7 @@
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())
     @include('partials/content-single-'.get_post_type())
   @endwhile
 @endsection
-
diff --git a/templates/template-custom.blade.php b/templates/template-custom.blade.php
index 460854d..762a54a 100644
--- a/templates/template-custom.blade.php
+++ b/templates/template-custom.blade.php
@@ -2,7 +2,7 @@
   Template Name: Custom Template
 --}}
 
-@extends('layouts.base')
+@extends('layouts.app')
 
 @section('content')
   @while(have_posts()) @php(the_post())

From 700a556c02eb6e76ed207115a00baa2e35b53e5e Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 18:26:26 -0600
Subject: [PATCH 02/23] templates/ -> resources/views/

---
 .editorconfig                                 |  2 +-
 CHANGELOG.md                                  |  2 +-
 README.md                                     | 21 ++++++-------
 functions.php                                 | 12 ++++----
 phpcs.xml                                     | 30 +++++++++----------
 {templates => resources/views}/404.blade.php  |  0
 .../views}/index.blade.php                    |  0
 .../views}/layouts/app.blade.php              |  0
 {templates => resources/views}/page.blade.php |  0
 .../views}/partials/comments.blade.php        |  0
 .../views}/partials/content-page.blade.php    |  0
 .../views}/partials/content-search.blade.php  |  0
 .../views}/partials/content-single.blade.php  |  2 +-
 .../views}/partials/content.blade.php         |  0
 .../views}/partials/entry-meta.blade.php      |  0
 .../views}/partials/footer.blade.php          |  0
 .../views}/partials/head.blade.php            |  0
 .../views}/partials/header.blade.php          |  0
 .../views}/partials/page-header.blade.php     |  0
 .../views}/partials/sidebar.blade.php         |  0
 .../views}/search.blade.php                   |  0
 .../views}/single.blade.php                   |  0
 .../views}/template-custom.blade.php          |  0
 src/filters.php                               |  4 +--
 src/setup.php                                 |  6 ++--
 25 files changed, 41 insertions(+), 38 deletions(-)
 rename {templates => resources/views}/404.blade.php (100%)
 rename {templates => resources/views}/index.blade.php (100%)
 rename {templates => resources/views}/layouts/app.blade.php (100%)
 rename {templates => resources/views}/page.blade.php (100%)
 rename {templates => resources/views}/partials/comments.blade.php (100%)
 rename {templates => resources/views}/partials/content-page.blade.php (100%)
 rename {templates => resources/views}/partials/content-search.blade.php (100%)
 rename {templates => resources/views}/partials/content-single.blade.php (83%)
 rename {templates => resources/views}/partials/content.blade.php (100%)
 rename {templates => resources/views}/partials/entry-meta.blade.php (100%)
 rename {templates => resources/views}/partials/footer.blade.php (100%)
 rename {templates => resources/views}/partials/head.blade.php (100%)
 rename {templates => resources/views}/partials/header.blade.php (100%)
 rename {templates => resources/views}/partials/page-header.blade.php (100%)
 rename {templates => resources/views}/partials/sidebar.blade.php (100%)
 rename {templates => resources/views}/search.blade.php (100%)
 rename {templates => resources/views}/single.blade.php (100%)
 rename {templates => resources/views}/template-custom.blade.php (100%)

diff --git a/.editorconfig b/.editorconfig
index 8fcbf50..e5c8d6c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -13,5 +13,5 @@ insert_final_newline = true
 [*.php]
 indent_size = 4
 
-[templates/**.php]
+[resources/views/**.php]
 indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07cf1b5..03d4857 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ### HEAD
-* Rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
+* Move `templates/` to `resources/views/`, rename `base.blade.php` to `app.blade.php`,  ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
 
diff --git a/README.md b/README.md
index e3e3c96..b6f8a1b 100644
--- a/README.md
+++ b/README.md
@@ -53,13 +53,6 @@ During theme installation you will have the options to:
 
 ```shell
 themes/your-theme-name/   # → Root of your Sage based theme
-├── assets                # → Front-end assets
-│   ├── config.json       # → Settings for compiled assets
-│   ├── build/            # → Webpack and ESLint config
-│   ├── fonts/            # → Theme fonts
-│   ├── images/           # → Theme images
-│   ├── scripts/          # → Theme JS
-│   └── styles/           # → Theme stylesheets
 ├── composer.json         # → Autoloading for `src/` files
 ├── composer.lock         # → Composer lock file (never edit)
 ├── dist/                 # → Built theme assets (never edit)
@@ -75,9 +68,17 @@ themes/your-theme-name/   # → Root of your Sage based theme
 │   ├── helpers.php       # → Helper functions
 │   └── setup.php         # → Theme setup
 ├── style.css             # → Theme meta information
-├── templates/            # → Theme templates
-│   ├── layouts/          # → Base templates
-│   └── partials/         # → Partial templates
+├── resources/            # → Theme assets and templates
+├── ├── assets/           # → Front-end assets
+│   │   ├── config.json   # → Settings for compiled assets
+│   │   ├── build/        # → Webpack and ESLint config
+│   │   ├── fonts/        # → Theme fonts
+│   │   ├── images/       # → Theme images
+│   │   ├── scripts/      # → Theme JS
+│   │   └── styles/       # → Theme stylesheets
+│   └── views/            # → Theme templates
+│       ├── layouts/      # → Base templates
+│       └── partials/     # → Partial templates
 └── vendor/               # → Composer packages (never edit)
 ```
 
diff --git a/functions.php b/functions.php
index 87ac658..07e0b40 100644
--- a/functions.php
+++ b/functions.php
@@ -60,10 +60,10 @@ array_map(function ($file) use ($sage_error) {
 /**
  * Here's what's happening with these hooks:
  * 1. WordPress initially detects theme in themes/sage
- * 2. Upon activation, we tell WordPress that the theme is actually in themes/sage/templates
+ * 2. Upon activation, we tell WordPress that the theme is actually in themes/sage/resources/views
  * 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage
  *
- * We do this so that the Template Hierarchy will look in themes/sage/templates for core WordPress themes
+ * We do this so that the Template Hierarchy will look in themes/sage/resources/views for core WordPress themes
  * But functions.php, style.css, and index.php are all still located in themes/sage
  *
  * This is not compatible with the WordPress Customizer theme preview prior to theme activation
@@ -72,16 +72,16 @@ array_map(function ($file) use ($sage_error) {
  * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
  * locate_template()
  * ├── STYLESHEETPATH         -> /srv/www/example.com/current/web/app/themes/sage
- * └── TEMPLATEPATH           -> /srv/www/example.com/current/web/app/themes/sage/templates
+ * └── TEMPLATEPATH           -> /srv/www/example.com/current/web/app/themes/sage/resources/views
  */
 if (is_customize_preview() && isset($_GET['theme'])) {
     $sage_error(__('Theme must be activated prior to using the customizer.', 'sage'));
 }
 add_filter('template', function ($stylesheet) {
-    return dirname($stylesheet);
+    return dirname(dirname($stylesheet));
 });
-if (basename($stylesheet = get_option('template')) !== 'templates') {
-    update_option('template', "{$stylesheet}/templates");
+if (basename($stylesheet = get_option('template')) !== 'resources/views') {
+    update_option('template', "{$stylesheet}/resources/views");
     wp_redirect($_SERVER['REQUEST_URI']);
     exit();
 }
diff --git a/phpcs.xml b/phpcs.xml
index 4b4b390..df22395 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,7 @@
   <file>functions.php</file>
   <file>index.php</file>
   <file>src</file>
-  <file>templates</file>
+  <file>resources/views</file>
 
   <!-- Show colors in console -->
   <arg value="-colors"/>
@@ -17,55 +17,55 @@
   <!-- Use PSR-2 as a base -->
   <rule ref="PSR2"/>
 
-  <!-- Exclusions below are for templates/ folder -->
-  
+  <!-- Exclusions below are for resources/views/ folder -->
+
   <!-- Allow php files without any PHP in them -->
   <rule ref="Internal.NoCodeFound">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Allow braces on same line for named functions -->
   <rule ref="Squiz.Functions.MultiLineFunctionDeclaration.BraceOnSameLine">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Allow closing braces to be on the same line -->
   <rule ref="Squiz.WhiteSpace.ScopeClosingBrace">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Disable newline after opening brace -->
   <rule ref="Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Allow multiple PHP statements in the same line -->
   <rule ref="Generic.Formatting.DisallowMultipleStatements.SameLine">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Disable PSR-2 indentation rules that are buggy with 2 spaces -->
   <rule ref="PSR2.ControlStructures.SwitchDeclaration.BreakIndent">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Don't require a blank line after the last `use` -->
   <rule ref="PSR2.Namespaces.UseDeclaration.SpaceAfterLastUse">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
-  
+
   <!-- Allow long lines -->
   <rule ref="Generic.Files.LineLength.TooLong">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 
   <!-- Ignore indentation rules -->
   <rule ref="Generic.WhiteSpace.ScopeIndent">
-    <exclude-pattern>templates</exclude-pattern>
-  </rule>  
+    <exclude-pattern>resources/views</exclude-pattern>
+  </rule>
 
   <!-- Allow PHP closing tags -->
   <rule ref="PSR2.Files.ClosingTag.NotAllowed">
-    <exclude-pattern>templates</exclude-pattern>
+    <exclude-pattern>resources/views</exclude-pattern>
   </rule>
 </ruleset>
diff --git a/templates/404.blade.php b/resources/views/404.blade.php
similarity index 100%
rename from templates/404.blade.php
rename to resources/views/404.blade.php
diff --git a/templates/index.blade.php b/resources/views/index.blade.php
similarity index 100%
rename from templates/index.blade.php
rename to resources/views/index.blade.php
diff --git a/templates/layouts/app.blade.php b/resources/views/layouts/app.blade.php
similarity index 100%
rename from templates/layouts/app.blade.php
rename to resources/views/layouts/app.blade.php
diff --git a/templates/page.blade.php b/resources/views/page.blade.php
similarity index 100%
rename from templates/page.blade.php
rename to resources/views/page.blade.php
diff --git a/templates/partials/comments.blade.php b/resources/views/partials/comments.blade.php
similarity index 100%
rename from templates/partials/comments.blade.php
rename to resources/views/partials/comments.blade.php
diff --git a/templates/partials/content-page.blade.php b/resources/views/partials/content-page.blade.php
similarity index 100%
rename from templates/partials/content-page.blade.php
rename to resources/views/partials/content-page.blade.php
diff --git a/templates/partials/content-search.blade.php b/resources/views/partials/content-search.blade.php
similarity index 100%
rename from templates/partials/content-search.blade.php
rename to resources/views/partials/content-search.blade.php
diff --git a/templates/partials/content-single.blade.php b/resources/views/partials/content-single.blade.php
similarity index 83%
rename from templates/partials/content-single.blade.php
rename to resources/views/partials/content-single.blade.php
index 30a2f9c..653804b 100644
--- a/templates/partials/content-single.blade.php
+++ b/resources/views/partials/content-single.blade.php
@@ -9,5 +9,5 @@
   <footer>
     {!! wp_link_pages(['echo' => 0, 'before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}
   </footer>
-  @php(comments_template('/templates/partials/comments.blade.php'))
+  @php(comments_template('/resources/views/partials/comments.blade.php'))
 </article>
diff --git a/templates/partials/content.blade.php b/resources/views/partials/content.blade.php
similarity index 100%
rename from templates/partials/content.blade.php
rename to resources/views/partials/content.blade.php
diff --git a/templates/partials/entry-meta.blade.php b/resources/views/partials/entry-meta.blade.php
similarity index 100%
rename from templates/partials/entry-meta.blade.php
rename to resources/views/partials/entry-meta.blade.php
diff --git a/templates/partials/footer.blade.php b/resources/views/partials/footer.blade.php
similarity index 100%
rename from templates/partials/footer.blade.php
rename to resources/views/partials/footer.blade.php
diff --git a/templates/partials/head.blade.php b/resources/views/partials/head.blade.php
similarity index 100%
rename from templates/partials/head.blade.php
rename to resources/views/partials/head.blade.php
diff --git a/templates/partials/header.blade.php b/resources/views/partials/header.blade.php
similarity index 100%
rename from templates/partials/header.blade.php
rename to resources/views/partials/header.blade.php
diff --git a/templates/partials/page-header.blade.php b/resources/views/partials/page-header.blade.php
similarity index 100%
rename from templates/partials/page-header.blade.php
rename to resources/views/partials/page-header.blade.php
diff --git a/templates/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php
similarity index 100%
rename from templates/partials/sidebar.blade.php
rename to resources/views/partials/sidebar.blade.php
diff --git a/templates/search.blade.php b/resources/views/search.blade.php
similarity index 100%
rename from templates/search.blade.php
rename to resources/views/search.blade.php
diff --git a/templates/single.blade.php b/resources/views/single.blade.php
similarity index 100%
rename from templates/single.blade.php
rename to resources/views/single.blade.php
diff --git a/templates/template-custom.blade.php b/resources/views/template-custom.blade.php
similarity index 100%
rename from templates/template-custom.blade.php
rename to resources/views/template-custom.blade.php
diff --git a/src/filters.php b/src/filters.php
index da4bbe8..3dfc20a 100644
--- a/src/filters.php
+++ b/src/filters.php
@@ -35,7 +35,7 @@ array_map(function ($type) {
     add_filter("{$type}_template_hierarchy", function ($templates) {
         return call_user_func_array('array_merge', array_map(function ($template) {
             $transforms = [
-                '%^/?(templates)?/?%' => config('sage.disable_option_hack') ? 'templates/' : '',
+                '%^/?(resources/views)?/?%' => config('sage.disable_option_hack') ? 'resources/views/' : '',
                 '%(\.blade)?(\.php)?$%' => ''
             ];
             $normalizedTemplate = preg_replace(array_keys($transforms), array_values($transforms), $template);
@@ -44,7 +44,7 @@ array_map(function ($type) {
     });
 }, [
     'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
-    'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
+    'front_page', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
 ]);
 
 /**
diff --git a/src/setup.php b/src/setup.php
index 27a071c..2a93df2 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -111,10 +111,12 @@ add_action('after_setup_theme', function () {
         'uri.stylesheet' => get_stylesheet_directory_uri(),
         'uri.template'   => get_template_directory_uri(),
     ];
-    $viewPaths = collect(preg_replace('%[\/]?(templates)?[\/.]*?$%', '', [STYLESHEETPATH, TEMPLATEPATH]))
+    $viewPaths = collect(preg_replace('%[\/]?(resources/views)?[\/.]*?$%', '', [STYLESHEETPATH, TEMPLATEPATH]))
         ->flatMap(function ($path) {
-            return ["{$path}/templates", $path];
+            return ["{$path}/resources/views", $path];
         })->unique()->toArray();
+
+        // die(var_dump($viewPaths));
     config([
         'assets.manifest' => "{$paths['dir.stylesheet']}/dist/assets.json",
         'assets.uri'      => "{$paths['uri.stylesheet']}/dist",

From c3e6f1324e3964f875b1fd9a424baa868cb32341 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 18:33:06 -0600
Subject: [PATCH 03/23] assets/ -> resources/assets/

---
 CHANGELOG.md                                  |  2 +-
 package.json                                  | 10 ++++----
 {assets => resources/assets}/build/.eslintrc  |  0
 {assets => resources/assets}/build/config.js  |  2 +-
 .../assets}/build/public-path.js              |  0
 .../assets}/build/util/addHotMiddleware.js    |  0
 .../build/util/assetManifestsFormatter.js     |  0
 .../assets}/build/webpack.config.js           |  0
 .../assets}/build/webpack.config.optimize.js  |  0
 .../assets}/build/webpack.config.watch.js     |  0
 {assets => resources/assets}/config.json      |  2 +-
 {assets => resources/assets}/fonts/.gitkeep   |  0
 {assets => resources/assets}/images/.gitkeep  |  0
 .../assets}/scripts/customizer.js             |  0
 {assets => resources/assets}/scripts/main.js  |  0
 .../assets}/scripts/routes/about.js           |  0
 .../assets}/scripts/routes/common.js          |  0
 .../assets}/scripts/routes/home.js            |  0
 .../assets}/scripts/util/Router.js            |  0
 .../assets}/scripts/util/camelCase.js         |  0
 .../assets}/styles/common/_global.scss        |  0
 .../assets}/styles/common/_variables.scss     |  0
 .../assets}/styles/components/_buttons.scss   |  0
 .../assets}/styles/components/_comments.scss  |  0
 .../assets}/styles/components/_forms.scss     |  0
 .../styles/components/_wp-classes.scss        |  0
 .../assets}/styles/layouts/_footer.scss       |  0
 .../assets}/styles/layouts/_header.scss       |  0
 .../assets}/styles/layouts/_pages.scss        |  0
 .../assets}/styles/layouts/_posts.scss        |  0
 .../assets}/styles/layouts/_sidebar.scss      |  0
 .../assets}/styles/layouts/_tinymce.scss      |  0
 {assets => resources/assets}/styles/main.scss |  0
 src/lib/Sage/PostCreateProject.php            | 24 +++++++++----------
 src/setup.php                                 |  2 +-
 35 files changed, 21 insertions(+), 21 deletions(-)
 rename {assets => resources/assets}/build/.eslintrc (100%)
 rename {assets => resources/assets}/build/config.js (96%)
 rename {assets => resources/assets}/build/public-path.js (100%)
 rename {assets => resources/assets}/build/util/addHotMiddleware.js (100%)
 rename {assets => resources/assets}/build/util/assetManifestsFormatter.js (100%)
 rename {assets => resources/assets}/build/webpack.config.js (100%)
 rename {assets => resources/assets}/build/webpack.config.optimize.js (100%)
 rename {assets => resources/assets}/build/webpack.config.watch.js (100%)
 rename {assets => resources/assets}/config.json (91%)
 rename {assets => resources/assets}/fonts/.gitkeep (100%)
 rename {assets => resources/assets}/images/.gitkeep (100%)
 rename {assets => resources/assets}/scripts/customizer.js (100%)
 rename {assets => resources/assets}/scripts/main.js (100%)
 rename {assets => resources/assets}/scripts/routes/about.js (100%)
 rename {assets => resources/assets}/scripts/routes/common.js (100%)
 rename {assets => resources/assets}/scripts/routes/home.js (100%)
 rename {assets => resources/assets}/scripts/util/Router.js (100%)
 rename {assets => resources/assets}/scripts/util/camelCase.js (100%)
 rename {assets => resources/assets}/styles/common/_global.scss (100%)
 rename {assets => resources/assets}/styles/common/_variables.scss (100%)
 rename {assets => resources/assets}/styles/components/_buttons.scss (100%)
 rename {assets => resources/assets}/styles/components/_comments.scss (100%)
 rename {assets => resources/assets}/styles/components/_forms.scss (100%)
 rename {assets => resources/assets}/styles/components/_wp-classes.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_footer.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_header.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_pages.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_posts.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_sidebar.scss (100%)
 rename {assets => resources/assets}/styles/layouts/_tinymce.scss (100%)
 rename {assets => resources/assets}/styles/main.scss (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 03d4857..3fe7eb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ### HEAD
-* Move `templates/` to `resources/views/`, rename `base.blade.php` to `app.blade.php`,  ([#1864](https://github.com/roots/sage/pull/1864))
+* Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
 
diff --git a/package.json b/package.json
index f49f25f..647a3b6 100644
--- a/package.json
+++ b/package.json
@@ -18,12 +18,12 @@
     }
   ],
   "scripts": {
-    "build": "webpack --progress --config assets/build/webpack.config.js",
-    "build:production": "webpack --progress -p --config assets/build/webpack.config.js",
-    "build:profile": "webpack --progress --profile --json --config assets/build/webpack.config.js",
-    "start": "webpack --hide-modules --watch --config assets/build/webpack.config.js",
+    "build": "webpack --progress --config resources/assets/build/webpack.config.js",
+    "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js",
+    "build:profile": "webpack --progress --profile --json --config resources/assets/build/webpack.config.js",
+    "start": "webpack --hide-modules --watch --config resources/assets/build/webpack.config.js",
     "rmdist": "rimraf dist",
-    "lint": "eslint assets/scripts assets/build",
+    "lint": "eslint resources/assets/scripts resources/assets/build",
     "test": "yarn run lint"
   },
   "engines": {
diff --git a/assets/build/.eslintrc b/resources/assets/build/.eslintrc
similarity index 100%
rename from assets/build/.eslintrc
rename to resources/assets/build/.eslintrc
diff --git a/assets/build/config.js b/resources/assets/build/config.js
similarity index 96%
rename from assets/build/config.js
rename to resources/assets/build/config.js
index fcb021b..9ef5827 100644
--- a/assets/build/config.js
+++ b/resources/assets/build/config.js
@@ -15,7 +15,7 @@ const config = merge({
   cacheBusting: '[name]_[hash]',
   paths: {
     root: rootPath,
-    assets: path.join(rootPath, 'assets'),
+    assets: path.join(rootPath, 'resources/assets'),
     dist: path.join(rootPath, 'dist'),
   },
   enabled: {
diff --git a/assets/build/public-path.js b/resources/assets/build/public-path.js
similarity index 100%
rename from assets/build/public-path.js
rename to resources/assets/build/public-path.js
diff --git a/assets/build/util/addHotMiddleware.js b/resources/assets/build/util/addHotMiddleware.js
similarity index 100%
rename from assets/build/util/addHotMiddleware.js
rename to resources/assets/build/util/addHotMiddleware.js
diff --git a/assets/build/util/assetManifestsFormatter.js b/resources/assets/build/util/assetManifestsFormatter.js
similarity index 100%
rename from assets/build/util/assetManifestsFormatter.js
rename to resources/assets/build/util/assetManifestsFormatter.js
diff --git a/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js
similarity index 100%
rename from assets/build/webpack.config.js
rename to resources/assets/build/webpack.config.js
diff --git a/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js
similarity index 100%
rename from assets/build/webpack.config.optimize.js
rename to resources/assets/build/webpack.config.optimize.js
diff --git a/assets/build/webpack.config.watch.js b/resources/assets/build/webpack.config.watch.js
similarity index 100%
rename from assets/build/webpack.config.watch.js
rename to resources/assets/build/webpack.config.watch.js
diff --git a/assets/config.json b/resources/assets/config.json
similarity index 91%
rename from assets/config.json
rename to resources/assets/config.json
index 0b0bdd8..cce31fa 100644
--- a/assets/config.json
+++ b/resources/assets/config.json
@@ -13,7 +13,7 @@
   "proxyUrl": "http://localhost:3000",
   "cacheBusting": "[name]_[hash:8]",
   "watch": [
-    "{src,templates}/**/*.php"
+    "{src,resources/views}/**/*.php"
   ],
   "browsers": [
     "last 2 versions",
diff --git a/assets/fonts/.gitkeep b/resources/assets/fonts/.gitkeep
similarity index 100%
rename from assets/fonts/.gitkeep
rename to resources/assets/fonts/.gitkeep
diff --git a/assets/images/.gitkeep b/resources/assets/images/.gitkeep
similarity index 100%
rename from assets/images/.gitkeep
rename to resources/assets/images/.gitkeep
diff --git a/assets/scripts/customizer.js b/resources/assets/scripts/customizer.js
similarity index 100%
rename from assets/scripts/customizer.js
rename to resources/assets/scripts/customizer.js
diff --git a/assets/scripts/main.js b/resources/assets/scripts/main.js
similarity index 100%
rename from assets/scripts/main.js
rename to resources/assets/scripts/main.js
diff --git a/assets/scripts/routes/about.js b/resources/assets/scripts/routes/about.js
similarity index 100%
rename from assets/scripts/routes/about.js
rename to resources/assets/scripts/routes/about.js
diff --git a/assets/scripts/routes/common.js b/resources/assets/scripts/routes/common.js
similarity index 100%
rename from assets/scripts/routes/common.js
rename to resources/assets/scripts/routes/common.js
diff --git a/assets/scripts/routes/home.js b/resources/assets/scripts/routes/home.js
similarity index 100%
rename from assets/scripts/routes/home.js
rename to resources/assets/scripts/routes/home.js
diff --git a/assets/scripts/util/Router.js b/resources/assets/scripts/util/Router.js
similarity index 100%
rename from assets/scripts/util/Router.js
rename to resources/assets/scripts/util/Router.js
diff --git a/assets/scripts/util/camelCase.js b/resources/assets/scripts/util/camelCase.js
similarity index 100%
rename from assets/scripts/util/camelCase.js
rename to resources/assets/scripts/util/camelCase.js
diff --git a/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss
similarity index 100%
rename from assets/styles/common/_global.scss
rename to resources/assets/styles/common/_global.scss
diff --git a/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss
similarity index 100%
rename from assets/styles/common/_variables.scss
rename to resources/assets/styles/common/_variables.scss
diff --git a/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss
similarity index 100%
rename from assets/styles/components/_buttons.scss
rename to resources/assets/styles/components/_buttons.scss
diff --git a/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss
similarity index 100%
rename from assets/styles/components/_comments.scss
rename to resources/assets/styles/components/_comments.scss
diff --git a/assets/styles/components/_forms.scss b/resources/assets/styles/components/_forms.scss
similarity index 100%
rename from assets/styles/components/_forms.scss
rename to resources/assets/styles/components/_forms.scss
diff --git a/assets/styles/components/_wp-classes.scss b/resources/assets/styles/components/_wp-classes.scss
similarity index 100%
rename from assets/styles/components/_wp-classes.scss
rename to resources/assets/styles/components/_wp-classes.scss
diff --git a/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss
similarity index 100%
rename from assets/styles/layouts/_footer.scss
rename to resources/assets/styles/layouts/_footer.scss
diff --git a/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss
similarity index 100%
rename from assets/styles/layouts/_header.scss
rename to resources/assets/styles/layouts/_header.scss
diff --git a/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss
similarity index 100%
rename from assets/styles/layouts/_pages.scss
rename to resources/assets/styles/layouts/_pages.scss
diff --git a/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss
similarity index 100%
rename from assets/styles/layouts/_posts.scss
rename to resources/assets/styles/layouts/_posts.scss
diff --git a/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss
similarity index 100%
rename from assets/styles/layouts/_sidebar.scss
rename to resources/assets/styles/layouts/_sidebar.scss
diff --git a/assets/styles/layouts/_tinymce.scss b/resources/assets/styles/layouts/_tinymce.scss
similarity index 100%
rename from assets/styles/layouts/_tinymce.scss
rename to resources/assets/styles/layouts/_tinymce.scss
diff --git a/assets/styles/main.scss b/resources/assets/styles/main.scss
similarity index 100%
rename from assets/styles/main.scss
rename to resources/assets/styles/main.scss
diff --git a/src/lib/Sage/PostCreateProject.php b/src/lib/Sage/PostCreateProject.php
index d7583cb..0dac4fc 100755
--- a/src/lib/Sage/PostCreateProject.php
+++ b/src/lib/Sage/PostCreateProject.php
@@ -41,10 +41,10 @@ class PostCreateProject
         $default_framework_pattern = '"bootstrap": ".*"';
 
         $files_to_clear = [
-          'assets/styles/components/_comments.scss',
-          'assets/styles/components/_forms.scss',
-          'assets/styles/components/_wp-classes.scss',
-          'assets/styles/layouts/_header.scss',
+          'resources/assets/styles/components/_comments.scss',
+          'resources/assets/styles/components/_forms.scss',
+          'resources/assets/styles/components/_wp-classes.scss',
+          'resources/assets/styles/layouts/_header.scss',
         ];
 
 
@@ -61,16 +61,16 @@ class PostCreateProject
                     break;
                 case 1:
                     file_put_contents('package.json', preg_replace("/{$default_framework_pattern}/", '"foundation-sites": "6.3.0"', file_get_contents('package.json')));
-                    file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~foundation-sites/scss/foundation";' . "\n" . '@include foundation-everything;' . "\n", file_get_contents('assets/styles/main.scss')));
-                    file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", "import 'foundation-sites/dist/js/foundation';\n", file_get_contents('assets/scripts/main.js')));
+                    file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '@import "~foundation-sites/scss/foundation";' . "\n" . '@include foundation-everything;' . "\n", file_get_contents('resources/assets/styles/main.scss')));
+                    file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", "import 'foundation-sites/dist/js/foundation';\n", file_get_contents('resources/assets/scripts/main.js')));
                     foreach($files_to_clear as $file) {
                         file_put_contents($file, '');
                     }
                     break;
                 case 2:
                     file_put_contents('package.json', preg_replace("/\s+{$default_framework_pattern},/", '', file_get_contents('package.json')));
-                    file_put_contents('assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('assets/styles/main.scss')));
-                    file_put_contents('assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('assets/scripts/main.js')));
+                    file_put_contents('resources/assets/styles/main.scss', str_replace('@import "~bootstrap/scss/bootstrap";' . "\n", '', file_get_contents('resources/assets/styles/main.scss')));
+                    file_put_contents('resources/assets/scripts/main.js', str_replace("import 'bootstrap';\n", '', file_get_contents('resources/assets/scripts/main.js')));
                     foreach($files_to_clear as $file) {
                         file_put_contents($file, '');
                     }
@@ -93,8 +93,8 @@ class PostCreateProject
                 file_put_contents('package.json', $package);
 
                 $import_dep_str = '// Import npm dependencies' . "\n";
-                file_put_contents('assets/styles/main.scss', str_replace($import_dep_str, $import_dep_str . '@import "~font-awesome/scss/font-awesome";' . "\n", file_get_contents('assets/styles/main.scss')));
-                file_put_contents('assets/styles/common/_variables.scss', "\n" . '$fa-font-path:          \'~font-awesome/fonts\';' . "\n", FILE_APPEND);
+                file_put_contents('resources/assets/styles/main.scss', str_replace($import_dep_str, $import_dep_str . '@import "~font-awesome/scss/font-awesome";' . "\n", file_get_contents('resources/assets/styles/main.scss')));
+                file_put_contents('resources/assets/styles/common/_variables.scss', "\n" . '$fa-font-path:          \'~font-awesome/fonts\';' . "\n", FILE_APPEND);
             }
         }
     }
@@ -116,8 +116,8 @@ class PostCreateProject
                 'devUrl'      => $io->ask('<info>Local development URL of WP site [<comment>'.$browsersync_settings_default['devUrl'].'</comment>]:</info> ', $browsersync_settings_default['devUrl'])
             ];
 
-            file_put_contents('assets/config.json', str_replace('/app/themes/sage', $browsersync_settings['publicPath'], file_get_contents('assets/config.json')));
-            file_put_contents('assets/config.json', str_replace($browsersync_settings_default['devUrl'], $browsersync_settings['devUrl'], file_get_contents('assets/config.json')));
+            file_put_contents('resources/assets/config.json', str_replace('/app/themes/sage', $browsersync_settings['publicPath'], file_get_contents('resources/assets/config.json')));
+            file_put_contents('resources/assets/config.json', str_replace($browsersync_settings_default['devUrl'], $browsersync_settings['devUrl'], file_get_contents('resources/assets/config.json')));
         }
     }
     // @codingStandardsIgnoreEnd
diff --git a/src/setup.php b/src/setup.php
index 2a93df2..549f44f 100644
--- a/src/setup.php
+++ b/src/setup.php
@@ -64,7 +64,7 @@ add_action('after_setup_theme', function () {
 
     /**
      * Use main stylesheet for visual editor
-     * @see assets/styles/layouts/_tinymce.scss
+     * @see resources/assets/styles/layouts/_tinymce.scss
      */
     add_editor_style(asset_path('styles/main.css'));
 }, 20);

From 5ac56aadf2f00f8ba30ade31f0c4bdf9bc69d878 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 18:49:09 -0600
Subject: [PATCH 04/23] Fix redirect loop

---
 functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.php b/functions.php
index 07e0b40..3329747 100644
--- a/functions.php
+++ b/functions.php
@@ -80,8 +80,8 @@ if (is_customize_preview() && isset($_GET['theme'])) {
 add_filter('template', function ($stylesheet) {
     return dirname(dirname($stylesheet));
 });
-if (basename($stylesheet = get_option('template')) !== 'resources/views') {
-    update_option('template', "{$stylesheet}/resources/views");
+if (($sage_views = basename(__DIR__).'/resources/views') !== get_option('template')) {
+    update_option('template', $sage_views);
     wp_redirect($_SERVER['REQUEST_URI']);
     exit();
 }

From 80728a1b94d2356b080ccfc283bf9f407df5760f Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 19:39:58 -0600
Subject: [PATCH 05/23] Move src/ to app/

---
 CHANGELOG.md                                  |  1 +
 README.md                                     | 24 +++++++++----------
 {src => app}/admin.php                        |  0
 {src => app}/filters.php                      |  0
 {src => app}/helpers.php                      |  0
 {src => app}/lib/Sage/Assets/JsonManifest.php |  0
 .../lib/Sage/Assets/ManifestInterface.php     |  0
 {src => app}/lib/Sage/Config.php              |  0
 {src => app}/lib/Sage/Container.php           |  0
 {src => app}/lib/Sage/PostCreateProject.php   |  0
 {src => app}/lib/Sage/Template/Blade.php      |  0
 .../lib/Sage/Template/BladeProvider.php       |  0
 .../lib/Sage/Template/FileViewFinder.php      |  0
 {src => app}/setup.php                        |  0
 composer.json                                 |  2 +-
 functions.php                                 |  2 +-
 resources/assets/config.json                  |  2 +-
 17 files changed, 16 insertions(+), 15 deletions(-)
 rename {src => app}/admin.php (100%)
 rename {src => app}/filters.php (100%)
 rename {src => app}/helpers.php (100%)
 rename {src => app}/lib/Sage/Assets/JsonManifest.php (100%)
 rename {src => app}/lib/Sage/Assets/ManifestInterface.php (100%)
 rename {src => app}/lib/Sage/Config.php (100%)
 rename {src => app}/lib/Sage/Container.php (100%)
 rename {src => app}/lib/Sage/PostCreateProject.php (100%)
 rename {src => app}/lib/Sage/Template/Blade.php (100%)
 rename {src => app}/lib/Sage/Template/BladeProvider.php (100%)
 rename {src => app}/lib/Sage/Template/FileViewFinder.php (100%)
 rename {src => app}/setup.php (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fe7eb2..45c5396 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Move `src/` to `app/` ([#1868](https://github.com/roots/sage/pull/1868))
 * Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
diff --git a/README.md b/README.md
index b6f8a1b..f77cfa2 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,13 @@ During theme installation you will have the options to:
 
 ```shell
 themes/your-theme-name/   # → Root of your Sage based theme
-├── composer.json         # → Autoloading for `src/` files
+├── app/                  # → Theme PHP
+│   ├── lib/Sage/         # → Blade implementation, asset manifest
+│   ├── admin.php         # → Theme customizer setup
+│   ├── filters.php       # → Theme filters
+│   ├── helpers.php       # → Helper functions
+│   └── setup.php         # → Theme setup
+├── composer.json         # → Autoloading for `app/` files
 ├── composer.lock         # → Composer lock file (never edit)
 ├── dist/                 # → Built theme assets (never edit)
 ├── functions.php         # → Composer autoloader, theme includes
@@ -61,12 +67,6 @@ themes/your-theme-name/   # → Root of your Sage based theme
 ├── node_modules/         # → Node.js packages (never edit)
 ├── package.json          # → Node.js dependencies and scripts
 ├── screenshot.png        # → Theme screenshot for WP admin
-├── src/                  # → Theme PHP
-│   ├── lib/Sage/         # → Blade implementation, asset manifest
-│   ├── admin.php         # → Theme customizer setup
-│   ├── filters.php       # → Theme filters
-│   ├── helpers.php       # → Helper functions
-│   └── setup.php         # → Theme setup
 ├── style.css             # → Theme meta information
 ├── resources/            # → Theme assets and templates
 ├── ├── assets/           # → Front-end assets
@@ -84,7 +84,7 @@ themes/your-theme-name/   # → Root of your Sage based theme
 
 ## Theme setup
 
-Edit `src/setup.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, and sidebars.
+Edit `app/setup.php` to enable or disable theme features, setup navigation menus, post thumbnail sizes, and sidebars.
 
 ## Theme development
 
@@ -134,14 +134,14 @@ If you are not using [Bedrock](https://roots.io/bedrock/), update `publicPath` t
 
 By default, Browsersync will use webpack's [HMR](https://webpack.github.io/docs/hot-module-replacement.html), which won't trigger a page reload in your browser.
 
-If you would like to force Browsersync to reload the page whenever certain file types are edited, then add them to `watch` in `assets/config.json`.
+If you would like to force Browsersync to reload the page whenever certain file types are edited, then add them to `watch` in `resources/assets/config.json`.
 
 ```json
 ...
   "watch": [
-    "assets/scripts/**/*.js",
-    "templates/**/*.php",
-    "src/**/*.php"
+    "resources/assets/scripts/**/*.js",
+    "resources/views/**/*.php",
+    "app/**/*.php"
   ],
 ...
 ```
diff --git a/src/admin.php b/app/admin.php
similarity index 100%
rename from src/admin.php
rename to app/admin.php
diff --git a/src/filters.php b/app/filters.php
similarity index 100%
rename from src/filters.php
rename to app/filters.php
diff --git a/src/helpers.php b/app/helpers.php
similarity index 100%
rename from src/helpers.php
rename to app/helpers.php
diff --git a/src/lib/Sage/Assets/JsonManifest.php b/app/lib/Sage/Assets/JsonManifest.php
similarity index 100%
rename from src/lib/Sage/Assets/JsonManifest.php
rename to app/lib/Sage/Assets/JsonManifest.php
diff --git a/src/lib/Sage/Assets/ManifestInterface.php b/app/lib/Sage/Assets/ManifestInterface.php
similarity index 100%
rename from src/lib/Sage/Assets/ManifestInterface.php
rename to app/lib/Sage/Assets/ManifestInterface.php
diff --git a/src/lib/Sage/Config.php b/app/lib/Sage/Config.php
similarity index 100%
rename from src/lib/Sage/Config.php
rename to app/lib/Sage/Config.php
diff --git a/src/lib/Sage/Container.php b/app/lib/Sage/Container.php
similarity index 100%
rename from src/lib/Sage/Container.php
rename to app/lib/Sage/Container.php
diff --git a/src/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php
similarity index 100%
rename from src/lib/Sage/PostCreateProject.php
rename to app/lib/Sage/PostCreateProject.php
diff --git a/src/lib/Sage/Template/Blade.php b/app/lib/Sage/Template/Blade.php
similarity index 100%
rename from src/lib/Sage/Template/Blade.php
rename to app/lib/Sage/Template/Blade.php
diff --git a/src/lib/Sage/Template/BladeProvider.php b/app/lib/Sage/Template/BladeProvider.php
similarity index 100%
rename from src/lib/Sage/Template/BladeProvider.php
rename to app/lib/Sage/Template/BladeProvider.php
diff --git a/src/lib/Sage/Template/FileViewFinder.php b/app/lib/Sage/Template/FileViewFinder.php
similarity index 100%
rename from src/lib/Sage/Template/FileViewFinder.php
rename to app/lib/Sage/Template/FileViewFinder.php
diff --git a/src/setup.php b/app/setup.php
similarity index 100%
rename from src/setup.php
rename to app/setup.php
diff --git a/composer.json b/composer.json
index 47b53e0..a57ec66 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
   },
   "autoload": {
     "psr-4": {
-      "Roots\\Sage\\": "src/lib/Sage/"
+      "Roots\\Sage\\": "app/lib/Sage/"
     }
   },
   "require": {
diff --git a/functions.php b/functions.php
index 3329747..b2ee7c2 100644
--- a/functions.php
+++ b/functions.php
@@ -51,7 +51,7 @@ if (!class_exists('Roots\\Sage\\Container')) {
  * Add or remove files to the array as needed. Supports child theme overrides.
  */
 array_map(function ($file) use ($sage_error) {
-    $file = "src/{$file}.php";
+    $file = "app/{$file}.php";
     if (!locate_template($file, true, true)) {
         $sage_error(sprintf(__('Error locating <code>%s</code> for inclusion.', 'sage'), $file), 'File not found');
     }
diff --git a/resources/assets/config.json b/resources/assets/config.json
index cce31fa..6beda62 100644
--- a/resources/assets/config.json
+++ b/resources/assets/config.json
@@ -13,7 +13,7 @@
   "proxyUrl": "http://localhost:3000",
   "cacheBusting": "[name]_[hash:8]",
   "watch": [
-    "{src,resources/views}/**/*.php"
+    "{app,resources/views}/**/*.php"
   ],
   "browsers": [
     "last 2 versions",

From 3540e3831f628f1f41d476a8b3fb6fedb86e6fc8 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 19:58:10 -0600
Subject: [PATCH 06/23] Missed a path

---
 phpcs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpcs.xml b/phpcs.xml
index df22395..e3a334d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -5,7 +5,7 @@
   <!-- Scan these files -->
   <file>functions.php</file>
   <file>index.php</file>
-  <file>src</file>
+  <file>app</file>
   <file>resources/views</file>
 
   <!-- Show colors in console -->

From 146258899e12aaae998549ce31b0e4f9c7ed482f Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Mon, 3 Apr 2017 22:37:51 -0600
Subject: [PATCH 07/23] Update README [ci skip]

---
 README.md | 58 +++++--------------------------------------------------
 1 file changed, 5 insertions(+), 53 deletions(-)

diff --git a/README.md b/README.md
index f77cfa2..9cce3f2 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,6 @@
 [![Packagist](https://img.shields.io/packagist/vpre/roots/sage.svg?style=flat-square)](https://packagist.org/packages/roots/sage)
 [![devDependency Status](https://img.shields.io/david/dev/roots/sage.svg?style=flat-square)](https://david-dm.org/roots/sage#info=devDependencies)
 [![Build Status](https://img.shields.io/travis/roots/sage.svg?style=flat-square)](https://travis-ci.org/roots/sage)
-[![Sponsored by ES6.io](https://img.shields.io/badge/%F0%9F%92%9A_Sponsored_by-ES6.io%20Tutorials-brightgreen.svg?style=flat-square)](https://roots.io/r/es6)
 
 Sage is a WordPress starter theme with a modern development workflow.
 
@@ -69,7 +68,7 @@ themes/your-theme-name/   # → Root of your Sage based theme
 ├── screenshot.png        # → Theme screenshot for WP admin
 ├── style.css             # → Theme meta information
 ├── resources/            # → Theme assets and templates
-├── ├── assets/           # → Front-end assets
+│   ├── assets/           # → Front-end assets
 │   │   ├── config.json   # → Settings for compiled assets
 │   │   ├── build/        # → Webpack and ESLint config
 │   │   ├── fonts/        # → Theme fonts
@@ -88,18 +87,10 @@ Edit `app/setup.php` to enable or disable theme features, setup navigation menus
 
 ## Theme development
 
-Sage uses [Webpack](https://webpack.github.io/) as a build tool and [npm](https://www.npmjs.com/) to manage front-end packages.
-
-### Install dependencies
-
-From the command line on your host machine (not on your Vagrant development box), navigate to the theme directory then run `yarn`:
-
-```shell
-# @ themes/your-theme-name/
-$ yarn
-```
-
-You now have all the necessary dependencies to run the build process.
+* Run `yarn` from the theme directory to install dependencies
+* Update `resources/assets/config.json` settings:
+  * `devUrl` should reflect your local development hostname
+  * `publicPath` should reflect your WordPress folder structure (`/wp-content/themes/sage` for non-[Bedrock](https://roots.io/bedrock/) installs)
 
 ### Build commands
 
@@ -107,45 +98,6 @@ You now have all the necessary dependencies to run the build process.
 * `yarn run build` — Compile and optimize the files in your assets directory
 * `yarn run build:production` — Compile assets for production
 
-#### Additional commands
-
-* `yarn run rmdist` — Remove your `dist/` folder
-* `yarn run lint` — Run ESLint against your assets and build scripts
-* `composer test` — Check your PHP for PSR-2 compliance with `phpcs`
-
-### Using Browsersync
-
-To use Browsersync you need to update `devUrl` at the bottom of `assets/config.json` to reflect your local development hostname.
-
-If your local development URL is `https://project-name.dev`, update the file to read:
-```json
-...
-  "devUrl": "https://project-name.dev",
-...
-```
-
-If you are not using [Bedrock](https://roots.io/bedrock/), update `publicPath` to reflect your folder structure:
-
-```json
-...
-  "publicPath": "/wp-content/themes/sage"
-...
-```
-
-By default, Browsersync will use webpack's [HMR](https://webpack.github.io/docs/hot-module-replacement.html), which won't trigger a page reload in your browser.
-
-If you would like to force Browsersync to reload the page whenever certain file types are edited, then add them to `watch` in `resources/assets/config.json`.
-
-```json
-...
-  "watch": [
-    "resources/assets/scripts/**/*.js",
-    "resources/views/**/*.php",
-    "app/**/*.php"
-  ],
-...
-```
-
 ## Documentation
 
 Sage 8 documentation is available at [https://roots.io/sage/docs/](https://roots.io/sage/docs/).

From 3852cf8f4ba21df6216395753315472191e71bfb Mon Sep 17 00:00:00 2001
From: Ciro Mattia Gonano <ciromattia@gmail.com>
Date: Wed, 5 Apr 2017 11:13:07 +0200
Subject: [PATCH 08/23] front_page -> frontpage

Fix regression, see https://github.com/roots/sage/commit/6ca3b3faa7e3ec29d01016fdc7bd656ff0e8a64e
---
 app/filters.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/filters.php b/app/filters.php
index 3dfc20a..270b531 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -44,7 +44,7 @@ array_map(function ($type) {
     });
 }, [
     'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
-    'front_page', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
+    'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
 ]);
 
 /**

From 99160be992458667c8dbf7db4901b47f56faa4bf Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Fri, 14 Apr 2017 01:23:42 -0700
Subject: [PATCH 09/23] Move required theme files to sage/resources

* Resolves issue with WP only looking one-level deep for templates #1870
* get_template_dir() and related functions now point to sage/resources
* Use collect() when assembling views paths
* Update tree in README
---
 CHANGELOG.md                                  |   1 +
 README.md                                     |  36 +++++++++---------
 app/filters.php                               |  30 ++++++++-------
 app/lib/Sage/PostCreateProject.php            |   2 +-
 phpcs.xml                                     |   4 +-
 functions.php => resources/functions.php      |  24 +++++++-----
 index.php => resources/index.php              |   0
 screenshot.png => resources/screenshot.png    | Bin
 style.css => resources/style.css              |   0
 .../views/partials/content-single.blade.php   |   2 +-
 10 files changed, 54 insertions(+), 45 deletions(-)
 rename functions.php => resources/functions.php (84%)
 rename index.php => resources/index.php (100%)
 rename screenshot.png => resources/screenshot.png (100%)
 rename style.css => resources/style.css (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45c5396..c410099 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Move required theme files to `sage/resources` ([#1877](https://github.com/roots/sage/pull/1877))
 * Move `src/` to `app/` ([#1868](https://github.com/roots/sage/pull/1868))
 * Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
diff --git a/README.md b/README.md
index 9cce3f2..5260fb9 100644
--- a/README.md
+++ b/README.md
@@ -53,31 +53,31 @@ During theme installation you will have the options to:
 ```shell
 themes/your-theme-name/   # → Root of your Sage based theme
 ├── app/                  # → Theme PHP
-│   ├── lib/Sage/         # → Blade implementation, asset manifest
-│   ├── admin.php         # → Theme customizer setup
-│   ├── filters.php       # → Theme filters
-│   ├── helpers.php       # → Helper functions
-│   └── setup.php         # → Theme setup
+│   ├── lib/Sage/         # → Blade implementation, asset manifest
+│   ├── admin.php         # → Theme customizer setup
+│   ├── filters.php       # → Theme filters
+│   ├── helpers.php       # → Helper functions
+│   └── setup.php         # → Theme setup
 ├── composer.json         # → Autoloading for `app/` files
 ├── composer.lock         # → Composer lock file (never edit)
 ├── dist/                 # → Built theme assets (never edit)
-├── functions.php         # → Composer autoloader, theme includes
-├── index.php             # → Never manually edit
 ├── node_modules/         # → Node.js packages (never edit)
 ├── package.json          # → Node.js dependencies and scripts
-├── screenshot.png        # → Theme screenshot for WP admin
-├── style.css             # → Theme meta information
 ├── resources/            # → Theme assets and templates
 │   ├── assets/           # → Front-end assets
-│   │   ├── config.json   # → Settings for compiled assets
-│   │   ├── build/        # → Webpack and ESLint config
-│   │   ├── fonts/        # → Theme fonts
-│   │   ├── images/       # → Theme images
-│   │   ├── scripts/      # → Theme JS
-│   │   └── styles/       # → Theme stylesheets
-│   └── views/            # → Theme templates
-│       ├── layouts/      # → Base templates
-│       └── partials/     # → Partial templates
+│   │   ├── config.json   # → Settings for compiled assets
+│   │   ├── build/        # → Webpack and ESLint config
+│   │   ├── fonts/        # → Theme fonts
+│   │   ├── images/       # → Theme images
+│   │   ├── scripts/      # → Theme JS
+│   │   └── styles/       # → Theme stylesheets
+│   ├── functions.php     # → Composer autoloader, theme includes
+│   ├── index.php         # → Never manually edit
+│   ├── screenshot.png    # → Theme screenshot for WP admin
+│   ├── style.css         # → Theme meta information
+│   └── views/            # → Theme templates
+│       ├── layouts/      # → Base templates
+│       └── partials/     # → Partial templates
 └── vendor/               # → Composer packages (never edit)
 ```
 
diff --git a/app/filters.php b/app/filters.php
index 270b531..050bf8f 100644
--- a/app/filters.php
+++ b/app/filters.php
@@ -6,19 +6,24 @@ namespace App;
  * Add <body> classes
  */
 add_filter('body_class', function (array $classes) {
-    // Add page slug if it doesn't exist
+    /** Add page slug if it doesn't exist */
     if (is_single() || is_page() && !is_front_page()) {
         if (!in_array(basename(get_permalink()), $classes)) {
             $classes[] = basename(get_permalink());
         }
     }
 
-    // Add class if sidebar is active
+    /** Add class if sidebar is active */
     if (display_sidebar()) {
         $classes[] = 'sidebar-primary';
     }
 
-    return $classes;
+    /** Clean up class names for custom templates */
+    $classes = array_map(function ($class) {
+        return preg_replace(['/-blade(-php)?$/', '/^page-template-views/'], '', $class);
+    }, $classes);
+
+    return array_filter($classes);
 });
 
 /**
@@ -31,31 +36,30 @@ add_filter('excerpt_more', function () {
 /**
  * Template Hierarchy should search for .blade.php files
  */
-array_map(function ($type) {
+collect([
+    'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
+    'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
+])->map(function ($type) {
     add_filter("{$type}_template_hierarchy", function ($templates) {
-        return call_user_func_array('array_merge', array_map(function ($template) {
+        return collect($templates)->flatMap(function ($template) {
             $transforms = [
-                '%^/?(resources/views)?/?%' => config('sage.disable_option_hack') ? 'resources/views/' : '',
+                '%^/?(resources[\\/]views)?[\\/]?%' => '',
                 '%(\.blade)?(\.php)?$%' => ''
             ];
             $normalizedTemplate = preg_replace(array_keys($transforms), array_values($transforms), $template);
             return ["{$normalizedTemplate}.blade.php", "{$normalizedTemplate}.php"];
-        }, $templates));
+        })->toArray();
     });
-}, [
-    'index', '404', 'archive', 'author', 'category', 'tag', 'taxonomy', 'date', 'home',
-    'frontpage', 'page', 'paged', 'search', 'single', 'singular', 'attachment'
-]);
+});
 
 /**
  * Render page using Blade
  */
 add_filter('template_include', function ($template) {
-    $data = array_reduce(get_body_class(), function ($data, $class) use ($template) {
+    $data = collect(get_body_class())->reduce(function ($data, $class) use ($template) {
         return apply_filters("sage/template/{$class}/data", $data, $template);
     }, []);
     echo template($template, $data);
-
     // Return a blank file to make WordPress happy
     return get_theme_file_path('index.php');
 }, PHP_INT_MAX);
diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php
index 0dac4fc..4499598 100755
--- a/app/lib/Sage/PostCreateProject.php
+++ b/app/lib/Sage/PostCreateProject.php
@@ -31,7 +31,7 @@ class PostCreateProject
               'author_uri'  => $io->ask('<info>Theme Author URI [<comment>'.$theme_headers_default['author_uri'].'</comment>]:</info> ', $theme_headers_default['author_uri'])
             ];
 
-            file_put_contents('style.css', str_replace($theme_headers_default, $theme_headers, file_get_contents('style.css')));
+            file_put_contents('resources/style.css', str_replace($theme_headers_default, $theme_headers, file_get_contents('resources/style.css')));
         }
     }
 
diff --git a/phpcs.xml b/phpcs.xml
index e3a334d..8e52177 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -3,8 +3,8 @@
   <description>Roots Coding Standards</description>
 
   <!-- Scan these files -->
-  <file>functions.php</file>
-  <file>index.php</file>
+  <file>resources/functions.php</file>
+  <file>resources/index.php</file>
   <file>app</file>
   <file>resources/views</file>
 
diff --git a/functions.php b/resources/functions.php
similarity index 84%
rename from functions.php
rename to resources/functions.php
index b2ee7c2..a92aa27 100644
--- a/functions.php
+++ b/resources/functions.php
@@ -35,7 +35,7 @@ if (version_compare('4.7.0', get_bloginfo('version'), '>=')) {
  * Ensure dependencies are loaded
  */
 if (!class_exists('Roots\\Sage\\Container')) {
-    if (!file_exists($composer = __DIR__.'/vendor/autoload.php')) {
+    if (!file_exists($composer = __DIR__.'/../vendor/autoload.php')) {
         $sage_error(
             __('You must run <code>composer install</code> from the Sage directory.', 'sage'),
             __('Autoloader not found.', 'sage')
@@ -51,7 +51,7 @@ if (!class_exists('Roots\\Sage\\Container')) {
  * Add or remove files to the array as needed. Supports child theme overrides.
  */
 array_map(function ($file) use ($sage_error) {
-    $file = "app/{$file}.php";
+    $file = "../app/{$file}.php";
     if (!locate_template($file, true, true)) {
         $sage_error(sprintf(__('Error locating <code>%s</code> for inclusion.', 'sage'), $file), 'File not found');
     }
@@ -68,20 +68,24 @@ array_map(function ($file) use ($sage_error) {
  *
  * This is not compatible with the WordPress Customizer theme preview prior to theme activation
  *
- * get_template_directory()   -> /srv/www/example.com/current/web/app/themes/sage
- * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage
+ * get_template_directory()   -> /srv/www/example.com/current/web/app/themes/sage/resources
+ * get_stylesheet_directory() -> /srv/www/example.com/current/web/app/themes/sage/resources
  * locate_template()
- * ├── STYLESHEETPATH         -> /srv/www/example.com/current/web/app/themes/sage
- * └── TEMPLATEPATH           -> /srv/www/example.com/current/web/app/themes/sage/resources/views
+ * ├── STYLESHEETPATH         -> /srv/www/example.com/current/web/app/themes/sage/resources/views
+ * └── TEMPLATEPATH           -> /srv/www/example.com/current/web/app/themes/sage/resources
  */
 if (is_customize_preview() && isset($_GET['theme'])) {
     $sage_error(__('Theme must be activated prior to using the customizer.', 'sage'));
 }
-add_filter('template', function ($stylesheet) {
-    return dirname(dirname($stylesheet));
+$sage_views = basename(dirname(__DIR__)).'/'.basename(__DIR__).'/views';
+add_filter('stylesheet', function () use ($sage_views) {
+    return dirname($sage_views);
 });
-if (($sage_views = basename(__DIR__).'/resources/views') !== get_option('template')) {
-    update_option('template', $sage_views);
+add_filter('stylesheet_directory_uri', function ($uri) {
+    return dirname($uri);
+});
+if ($sage_views !== get_option('stylesheet')) {
+    update_option('stylesheet', $sage_views);
     wp_redirect($_SERVER['REQUEST_URI']);
     exit();
 }
diff --git a/index.php b/resources/index.php
similarity index 100%
rename from index.php
rename to resources/index.php
diff --git a/screenshot.png b/resources/screenshot.png
similarity index 100%
rename from screenshot.png
rename to resources/screenshot.png
diff --git a/style.css b/resources/style.css
similarity index 100%
rename from style.css
rename to resources/style.css
diff --git a/resources/views/partials/content-single.blade.php b/resources/views/partials/content-single.blade.php
index 653804b..ff5aea1 100644
--- a/resources/views/partials/content-single.blade.php
+++ b/resources/views/partials/content-single.blade.php
@@ -9,5 +9,5 @@
   <footer>
     {!! wp_link_pages(['echo' => 0, 'before' => '<nav class="page-nav"><p>' . __('Pages:', 'sage'), 'after' => '</p></nav>']) !!}
   </footer>
-  @php(comments_template('/resources/views/partials/comments.blade.php'))
+  @php(comments_template('/partials/comments.blade.php'))
 </article>

From 1f062301183118d19408ad1a6546c142c288e3d6 Mon Sep 17 00:00:00 2001
From: QWp6t <hi@qwp6t.me>
Date: Sat, 15 Apr 2017 16:11:34 -0700
Subject: [PATCH 10/23] Update dependencies

---
 composer.json |   2 +-
 composer.lock | 113 +++++++++++++-------------
 package.json  |  16 ++--
 yarn.lock     | 217 +++++++++++++++++++++++++++-----------------------
 4 files changed, 183 insertions(+), 165 deletions(-)

diff --git a/composer.json b/composer.json
index a57ec66..0eccc7e 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
     "illuminate/config": "~5.4.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "^2.5.1"
+    "squizlabs/php_codesniffer": "^2.8.0"
   },
   "scripts": {
     "test": [
diff --git a/composer.lock b/composer.lock
index 7fdcbc9..97a25cb 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "9fa5c6956d3ed29ca107f717891465c6",
-    "content-hash": "f00026ba7588607051943fd388bead9b",
+    "content-hash": "ea9fa1afa3655447aadf2168ebe1d9b4",
     "packages": [
         {
             "name": "composer/installers",
@@ -112,7 +111,7 @@
                 "zend",
                 "zikula"
             ],
-            "time": "2016-08-13 20:53:52"
+            "time": "2016-08-13T20:53:52+00:00"
         },
         {
             "name": "doctrine/inflector",
@@ -179,11 +178,11 @@
                 "singularize",
                 "string"
             ],
-            "time": "2015-11-06 14:35:42"
+            "time": "2015-11-06T14:35:42+00:00"
         },
         {
             "name": "illuminate/config",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/config.git",
@@ -223,20 +222,20 @@
             ],
             "description": "The Illuminate Config package.",
             "homepage": "https://laravel.com",
-            "time": "2017-02-04 20:27:32"
+            "time": "2017-02-04T20:27:32+00:00"
         },
         {
             "name": "illuminate/container",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
-                "reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052"
+                "reference": "1fc0d2451e23d2ea73c10462d74add4767e2b74c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/ccbfa2c69369a11b419d071ad11147b59eb9f052",
-                "reference": "ccbfa2c69369a11b419d071ad11147b59eb9f052",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/1fc0d2451e23d2ea73c10462d74add4767e2b74c",
+                "reference": "1fc0d2451e23d2ea73c10462d74add4767e2b74c",
                 "shasum": ""
             },
             "require": {
@@ -266,20 +265,20 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "https://laravel.com",
-            "time": "2017-01-28 17:55:54"
+            "time": "2017-03-13T14:14:19+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea"
+                "reference": "ab2825726bee46a67c8cc66789852189dbef74a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/dd256891c80fd94a58ab83d7989d6da2f50e30ea",
-                "reference": "dd256891c80fd94a58ab83d7989d6da2f50e30ea",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/ab2825726bee46a67c8cc66789852189dbef74a9",
+                "reference": "ab2825726bee46a67c8cc66789852189dbef74a9",
                 "shasum": ""
             },
             "require": {
@@ -308,20 +307,20 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "https://laravel.com",
-            "time": "2017-02-21 14:21:59"
+            "time": "2017-03-29T13:17:47+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
-                "reference": "e31e5be1d704a3a001b6cf7ebf457a208e9a8a60"
+                "reference": "e8337bde9cc65409d5fa7548ff11d360a4b4ae2b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/e31e5be1d704a3a001b6cf7ebf457a208e9a8a60",
-                "reference": "e31e5be1d704a3a001b6cf7ebf457a208e9a8a60",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/e8337bde9cc65409d5fa7548ff11d360a4b4ae2b",
+                "reference": "e8337bde9cc65409d5fa7548ff11d360a4b4ae2b",
                 "shasum": ""
             },
             "require": {
@@ -353,20 +352,20 @@
             ],
             "description": "The Illuminate Events package.",
             "homepage": "https://laravel.com",
-            "time": "2017-02-10 21:05:38"
+            "time": "2017-03-16T14:12:50+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "9e74fd5bef124640852da3ec71ec6365408de417"
+                "reference": "3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/9e74fd5bef124640852da3ec71ec6365408de417",
-                "reference": "9e74fd5bef124640852da3ec71ec6365408de417",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1",
+                "reference": "3ed8b9a35880a9619141e2965fd5cbbe2e1c0da1",
                 "shasum": ""
             },
             "require": {
@@ -403,20 +402,20 @@
             ],
             "description": "The Illuminate Filesystem package.",
             "homepage": "https://laravel.com",
-            "time": "2017-01-03 14:19:43"
+            "time": "2017-03-01T21:44:04+00:00"
         },
         {
             "name": "illuminate/support",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "904f63003fd67ede2ec3be018b322d1c29415465"
+                "reference": "c7e7c9daf5044e76b46085b8351f8235a3e979c6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/904f63003fd67ede2ec3be018b322d1c29415465",
-                "reference": "904f63003fd67ede2ec3be018b322d1c29415465",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/c7e7c9daf5044e76b46085b8351f8235a3e979c6",
+                "reference": "c7e7c9daf5044e76b46085b8351f8235a3e979c6",
                 "shasum": ""
             },
             "require": {
@@ -460,20 +459,20 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "time": "2017-02-15 19:29:24"
+            "time": "2017-03-28T12:49:45+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v5.4.13",
+            "version": "v5.4.17",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
-                "reference": "0152506ccc2815e12e2daf8a01946b627db1efe0"
+                "reference": "45932749b21aeee7a5f60601a2ceafb36d032a94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/view/zipball/0152506ccc2815e12e2daf8a01946b627db1efe0",
-                "reference": "0152506ccc2815e12e2daf8a01946b627db1efe0",
+                "url": "https://api.github.com/repos/illuminate/view/zipball/45932749b21aeee7a5f60601a2ceafb36d032a94",
+                "reference": "45932749b21aeee7a5f60601a2ceafb36d032a94",
                 "shasum": ""
             },
             "require": {
@@ -508,20 +507,20 @@
             ],
             "description": "The Illuminate View package.",
             "homepage": "https://laravel.com",
-            "time": "2017-02-22 15:30:41"
+            "time": "2017-03-30T14:26:45+00:00"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v2.0.7",
+            "version": "v2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f"
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
-                "reference": "b5ea1ef3d8ff10c307ba8c5945c2f134e503278f",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d",
+                "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d",
                 "shasum": ""
             },
             "require": {
@@ -556,7 +555,7 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2017-02-27 17:11:23"
+            "time": "2017-03-13T16:27:32+00:00"
         },
         {
             "name": "psr/log",
@@ -603,20 +602,20 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2016-10-10 12:19:37"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v3.2.4",
+            "version": "v3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
+                "reference": "56f613406446a4a0a031475cfd0a01751de22659"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
-                "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659",
+                "reference": "56f613406446a4a0a031475cfd0a01751de22659",
                 "shasum": ""
             },
             "require": {
@@ -660,20 +659,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2017-02-16 16:34:18"
+            "time": "2017-03-28T21:38:24+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v3.2.4",
+            "version": "v3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
+                "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
-                "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/b20900ce5ea164cd9314af52725b0bb5a758217a",
+                "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a",
                 "shasum": ""
             },
             "require": {
@@ -709,22 +708,22 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-02 20:32:22"
+            "time": "2017-03-20T09:32:19+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "2.8.0",
+            "version": "2.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "86dd55a522238211f9f3631e3361703578941d9a"
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/86dd55a522238211f9f3631e3361703578941d9a",
-                "reference": "86dd55a522238211f9f3631e3361703578941d9a",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
+                "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d",
                 "shasum": ""
             },
             "require": {
@@ -789,7 +788,7 @@
                 "phpcs",
                 "standards"
             ],
-            "time": "2017-02-02 03:30:00"
+            "time": "2017-03-01T22:17:45+00:00"
         }
     ],
     "aliases": [],
diff --git a/package.json b/package.json
index 647a3b6..e857796 100644
--- a/package.json
+++ b/package.json
@@ -37,29 +37,29 @@
     "buble-loader": "^0.4.1",
     "clean-webpack-plugin": "^0.1.16",
     "copy-globs-webpack-plugin": "^0.2.0",
-    "css-loader": "^0.27.3",
+    "css-loader": "^0.28.0",
     "cssnano": "^3.10.0",
-    "eslint": "^3.18.0",
-    "eslint-loader": "^1.7.0",
+    "eslint": "^3.19.0",
+    "eslint-loader": "^1.7.1",
     "eslint-plugin-import": "^2.2.0",
     "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.10.1",
+    "file-loader": "^0.11.1",
     "imagemin-mozjpeg": "^6.0.0",
     "imagemin-webpack-plugin": "^1.4.4",
     "node-sass": "^4.5.1",
-    "optimize-css-assets-webpack-plugin": "^1.3.0",
+    "optimize-css-assets-webpack-plugin": "^1.3.1",
     "postcss-loader": "^1.3.3",
     "resolve-url-loader": "^2.0.2",
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.3",
     "style-loader": "^0.16.0",
     "url-loader": "^0.5.8",
-    "webpack": "^2.3.1",
+    "webpack": "^2.4.1",
     "webpack-assets-manifest": "^0.6.2",
     "webpack-dev-middleware": "^1.10.1",
-    "webpack-hot-middleware": "^2.17.1",
+    "webpack-hot-middleware": "^2.18.0",
     "webpack-merge": "^4.1.0",
-    "yargs": "^7.0.2"
+    "yargs": "^7.1.0"
   },
   "dependencies": {
     "bootstrap": "^4.0.0-alpha.6",
diff --git a/yarn.lock b/yarn.lock
index cbf7ea3..b19051b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -37,10 +37,6 @@ acorn-object-spread@^1.0.0:
   dependencies:
     acorn "^3.1.0"
 
-acorn@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
-
 acorn@^2.1.0, acorn@^2.4.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
@@ -49,10 +45,14 @@ acorn@^3.0.4, acorn@^3.1.0, acorn@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3, acorn@^4.0.4:
+acorn@^4.0.3:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
 
+acorn@^5.0.0, acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
 adjust-sourcemap-loader@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.1.0.tgz#412d92404eb61e4113635012cba53a33d008e0e2"
@@ -74,8 +74,8 @@ ajv-keywords@^1.0.0, ajv-keywords@^1.1.1:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
 ajv@^4.11.2, ajv@^4.7.0, ajv@^4.9.1:
-  version "4.11.5"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+  version "4.11.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.6.tgz#947e93049790942b2a2d60a8289b28924d39f987"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -149,8 +149,8 @@ arr-diff@^2.0.0:
     arr-flatten "^1.0.1"
 
 arr-flatten@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.2.tgz#1ec1e63439c54f67d6f72bb4299c3d4f73b2d996"
 
 array-differ@^1.0.0:
   version "1.0.0"
@@ -233,8 +233,8 @@ async@1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.2, async@^2.1.5:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.2.0.tgz#c324eba010a237e4fbd55a12dee86367d5c0ef32"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
   dependencies:
     lodash "^4.14.0"
 
@@ -406,8 +406,8 @@ bootstrap@^4.0.0-alpha.6:
     tether "^1.4.0"
 
 brace-expansion@^1.0.0:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.7.tgz#3effc3c50e000531fb720eaff80f0ae8ef23cf59"
   dependencies:
     balanced-match "^0.4.1"
     concat-map "0.0.1"
@@ -528,7 +528,7 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.0.1, browserslist@^1.5.2, browserslist@^1.7.6:
+browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
@@ -601,7 +601,7 @@ buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
-buffer-shims@^1.0.0:
+buffer-shims@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
 
@@ -668,21 +668,21 @@ camelcase@^3.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
 
 camelcase@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.0.0.tgz#8b0f90d44be5e281b903b9887349b92595ef07f2"
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
 
 caniuse-api@^1.5.2:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.5.3.tgz#5018e674b51c393e4d50614275dc017e27c4a2a2"
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
   dependencies:
-    browserslist "^1.0.1"
-    caniuse-db "^1.0.30000346"
-    lodash.memoize "^4.1.0"
-    lodash.uniq "^4.3.0"
+    browserslist "^1.3.6"
+    caniuse-db "^1.0.30000529"
+    lodash.memoize "^4.1.2"
+    lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000646"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000646.tgz#c724b90d61df24286e015fc528d062073c00def4"
+caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+  version "1.0.30000655"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1061,9 +1061,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@^0.27.3:
-  version "0.27.3"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.27.3.tgz#69ab6f47b69bfb1b5acee61bac2aab14302ff0dc"
+css-loader@^0.28.0:
+  version "0.28.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.28.0.tgz#417cfa9789f8cde59a30ccbf3e4da7a806889bad"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1453,8 +1453,8 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
 electron-to-chromium@^1.2.7:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab"
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.3.tgz#651eb63fe89f39db70ffc8dbd5d9b66958bc6a0e"
 
 elliptic@^6.0.0:
   version "6.4.0"
@@ -1480,12 +1480,18 @@ encodeurl@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
 
-end-of-stream@1.0.0, end-of-stream@^1.0.0:
+end-of-stream@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
   dependencies:
     once "~1.3.0"
 
+end-of-stream@^1.0.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
+  dependencies:
+    once "^1.4.0"
+
 engine.io-client@1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.0.tgz#7b730e4127414087596d9be3c88d2bc5fdb6cf5c"
@@ -1638,9 +1644,9 @@ eslint-import-resolver-node@^0.2.0:
     object-assign "^4.0.1"
     resolve "^1.1.6"
 
-eslint-loader@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.7.0.tgz#9813e77046730191ab399938732dff7960c639cb"
+eslint-loader@^1.7.1:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-loader/-/eslint-loader-1.7.1.tgz#50b158dd6272dcefb97e984254837f81a5802ce0"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-fs-cache "^1.0.0"
@@ -1671,9 +1677,9 @@ eslint-plugin-import@^2.2.0:
     minimatch "^3.0.3"
     pkg-up "^1.0.0"
 
-eslint@^3.18.0:
-  version "3.18.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.18.0.tgz#647e985c4ae71502d20ac62c109f66d5104c8a4b"
+eslint@^3.19.0:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
@@ -1712,10 +1718,10 @@ eslint@^3.18.0:
     user-home "^2.0.0"
 
 espree@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
   dependencies:
-    acorn "4.0.4"
+    acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
 esprima@^2.6.0, esprima@^2.7.1:
@@ -1908,9 +1914,9 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@^0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.1.tgz#815034119891fc6441fb5a64c11bc93c22ddd842"
+file-loader@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.11.1.tgz#6b328ee1234a729e4e47d36375dd6d35c0e1db84"
   dependencies:
     loader-utils "^1.0.2"
 
@@ -2014,8 +2020,8 @@ forever-agent@~0.6.1:
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
 form-data@~2.1.1:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.5"
@@ -2374,8 +2380,8 @@ hawk@~3.1.3:
     sntp "1.x.x"
 
 hmac-drbg@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
   dependencies:
     hash.js "^1.0.3"
     minimalistic-assert "^1.0.0"
@@ -2386,8 +2392,8 @@ hoek@2.x.x:
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
 
 hosted-git-info@^2.1.4:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.2.tgz#0076b9f46a270506ddbaaea56496897460612a67"
 
 html-comment-regex@^1.1.0:
   version "1.1.1"
@@ -2444,8 +2450,8 @@ ieee754@^1.1.4:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore@^3.2.0:
-  version "3.2.6"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.7.tgz#4810ca5f1d8eca5595213a34b94f2eb4ed926bbd"
 
 imagemin-gifsicle@^5.1.0:
   version "5.1.0"
@@ -2585,8 +2591,8 @@ inquirer@^0.12.0:
     through "^2.3.6"
 
 interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
 
 invert-kv@^1.0.0:
   version "1.0.0"
@@ -2869,8 +2875,8 @@ js-tokens@^3.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
 
 js-yaml@^3.4.3, js-yaml@^3.5.1:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.2.tgz#02d3e2c0f6beab20248d412c352203827d786721"
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
@@ -2933,7 +2939,7 @@ json3@3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
-json5@^0.5.0:
+json5@^0.5.0, json5@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
 
@@ -3196,7 +3202,7 @@ lodash.map@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
 
-lodash.memoize@^4.1.0:
+lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
 
@@ -3241,7 +3247,7 @@ lodash.templatesettings@^3.0.0:
     lodash._reinterpolate "^3.0.0"
     lodash.escape "^3.0.0"
 
-lodash.uniq@^4.3.0:
+lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
@@ -3454,8 +3460,8 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
 
 nan@^2.3.0, nan@^2.3.2:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"
 
 natural-compare@^1.4.0:
   version "1.4.0"
@@ -3579,8 +3585,10 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
 
 normalize-range@^0.1.2:
   version "0.1.2"
@@ -3647,8 +3655,8 @@ object-component@0.0.3:
   resolved "https://registry.yarnpkg.com/object-component/-/object-component-0.0.3.tgz#f0c69aa50efc95b866c186f400a33769cb2f1291"
 
 object-hash@^1.1.4:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.7.tgz#a8d83fdf5d4583a4e2e7ffc18e8915e08482ef52"
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.1.8.tgz#28a659cf987d96a4dabe7860289f3b5326c4a03c"
 
 object-path@^0.9.0, object-path@^0.9.2:
   version "0.9.2"
@@ -3667,7 +3675,7 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.3.3:
+once@^1.3.0, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -3694,9 +3702,9 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-optimize-css-assets-webpack-plugin@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.0.tgz#331b3dc7ac0b2b3597f68d18fd555f5a0c81b15c"
+optimize-css-assets-webpack-plugin@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-1.3.1.tgz#e2f198cdf63fe92ac2e3e321f1ade8faf1b59179"
   dependencies:
     cssnano "^3.4.0"
     underscore "^1.8.3"
@@ -3718,8 +3726,8 @@ options@>=0.0.5:
   resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f"
 
 optipng-bin@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.2.tgz#18c5a3388ed5d6f1e6ef1998ab0a6bcc8bdd0ca0"
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.4.tgz#95d34f2c488704f6fd70606bfea0c659f1d95d84"
   dependencies:
     bin-build "^2.0.0"
     bin-wrapper "^3.0.0"
@@ -4179,8 +4187,8 @@ postcss-zindex@^2.0.1:
     uniqs "^2.0.0"
 
 postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.15, postcss@^5.2.16:
-  version "5.2.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57"
+  version "5.2.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
     chalk "^1.1.3"
     js-base64 "^2.1.9"
@@ -4292,8 +4300,8 @@ range-parser@^1.0.3, range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
 rc@^1.1.2, rc@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.7.tgz#c5ea564bb07aff9fd3a5b32e906c1d3a65940fea"
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
@@ -4331,16 +4339,16 @@ read-pkg@^1.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.0, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+  version "2.2.9"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
   dependencies:
-    buffer-shims "^1.0.0"
+    buffer-shims "~1.0.0"
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "~1.0.0"
     process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
+    string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
 readable-stream@~1.1.9:
@@ -4433,6 +4441,10 @@ regjsparser@^0.1.4:
   dependencies:
     jsesc "~0.5.0"
 
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
 repeat-element@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
@@ -4879,8 +4891,8 @@ squeak@^1.0.0:
     lpad-align "^1.0.1"
 
 sshpk@^1.7.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.0.tgz#ff2a3e4fd04497555fed97b39a0fd82fafb3a33c"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -4922,12 +4934,12 @@ stream-combiner2@^1.1.1:
     readable-stream "^2.0.2"
 
 stream-http@^2.3.1:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.1.0"
+    readable-stream "^2.2.6"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
@@ -4965,6 +4977,12 @@ string_decoder@^0.10.25, string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
+string_decoder@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.0.tgz#f06f41157b664d86069f84bdbdc9b0d8ab281667"
+  dependencies:
+    buffer-shims "~1.0.0"
+
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
@@ -5238,8 +5256,8 @@ ua-parser-js@0.7.12:
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
 uglify-js@^2.8.5:
-  version "2.8.18"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.18.tgz#925d14bae48ab62d1883b41afe6e2261662adb8e"
+  version "2.8.22"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.22.tgz#d54934778a8da14903fa29a326fb24c0ab51a1a0"
   dependencies:
     source-map "~0.5.1"
     yargs "~3.10.0"
@@ -5427,8 +5445,8 @@ vinyl@^1.0.0:
     replace-ext "0.0.1"
 
 vlq@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.1.tgz#14439d711891e682535467f8587c5630e4222a6c"
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.2.tgz#e316d5257b40b86bb43cb8d5fea5d7f54d6b0ca1"
 
 vm-browserify@0.0.4:
   version "0.0.4"
@@ -5471,9 +5489,9 @@ webpack-dev-middleware@^1.10.1:
     path-is-absolute "^1.0.0"
     range-parser "^1.0.3"
 
-webpack-hot-middleware@^2.17.1:
-  version "2.17.1"
-  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz#0c8fbf6f93ff29c095d684b07ab6d6c0f2f951d7"
+webpack-hot-middleware@^2.17.1, webpack-hot-middleware@^2.18.0:
+  version "2.18.0"
+  resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.18.0.tgz#a16bb535b83a6ac94a78ac5ebce4f3059e8274d3"
   dependencies:
     ansi-html "0.0.7"
     html-entities "^1.2.0"
@@ -5500,11 +5518,11 @@ webpack-sources@^0.2.3:
     source-list-map "^1.1.1"
     source-map "~0.5.3"
 
-webpack@*, webpack@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.2.tgz#7d521e6f0777a3a58985c69425263fdfe977b458"
+webpack@*, webpack@^2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.4.1.tgz#15a91dbe34966d8a4b99c7d656efd92a2e5a6f6a"
   dependencies:
-    acorn "^4.0.4"
+    acorn "^5.0.0"
     acorn-dynamic-import "^2.0.0"
     ajv "^4.7.0"
     ajv-keywords "^1.1.1"
@@ -5512,6 +5530,7 @@ webpack@*, webpack@^2.3.1:
     enhanced-resolve "^3.0.0"
     interpret "^1.0.0"
     json-loader "^0.5.4"
+    json5 "^0.5.1"
     loader-runner "^2.3.0"
     loader-utils "^0.2.16"
     memory-fs "~0.4.1"
@@ -5709,9 +5728,9 @@ yargs@^4.7.1:
     y18n "^3.2.1"
     yargs-parser "^2.4.1"
 
-yargs@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.0.2.tgz#115b97df1321823e8b8648e8968c782521221f67"
+yargs@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
   dependencies:
     camelcase "^3.0.0"
     cliui "^3.2.0"

From b11cb99d64987b44e9e90341dfd05a77de6b98cf Mon Sep 17 00:00:00 2001
From: Nicolo Sacchi <nicolo.sacchi@gmail.com>
Date: Tue, 18 Apr 2017 12:47:43 +1000
Subject: [PATCH 11/23] Fixed production manifest path (#1881)

---
 app/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/setup.php b/app/setup.php
index 549f44f..6daee40 100644
--- a/app/setup.php
+++ b/app/setup.php
@@ -118,7 +118,7 @@ add_action('after_setup_theme', function () {
 
         // die(var_dump($viewPaths));
     config([
-        'assets.manifest' => "{$paths['dir.stylesheet']}/dist/assets.json",
+        'assets.manifest' => "{$paths['dir.stylesheet']}/../dist/assets.json",
         'assets.uri'      => "{$paths['uri.stylesheet']}/dist",
         'view.compiled'   => "{$paths['dir.upload']}/cache/compiled",
         'view.namespaces' => ['App' => WP_CONTENT_DIR],

From 4917135ed393ee7c3960d2151d42280b73da0843 Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Fri, 21 Apr 2017 14:13:20 -0600
Subject: [PATCH 12/23] Beta 3

---
 CHANGELOG.md                       | 6 +++---
 README.md                          | 4 ++++
 app/lib/Sage/PostCreateProject.php | 2 +-
 package.json                       | 2 +-
 resources/style.css                | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c410099..3403ea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,11 @@
-### HEAD
+### 9.0.0-beta.3: April 21st, 2017
 * Move required theme files to `sage/resources` ([#1877](https://github.com/roots/sage/pull/1877))
 * Move `src/` to `app/` ([#1868](https://github.com/roots/sage/pull/1868))
 * Move `templates/` to `resources/views/`, move `assets/` to `resources/assets/`, rename `base.blade.php` to `app.blade.php` ([#1864](https://github.com/roots/sage/pull/1864))
 * Add option to configure build settings ([#1822](https://github.com/roots/sage/pull/1822))
 * Add support for HTML injection ([#1817](https://github.com/roots/sage/pull/1817))
 
-### 9.0.0-beta.2: January 19th, 2016
+### 9.0.0-beta.2: January 19th, 2017
 * Fix Browersync ([#1815](https://github.com/roots/sage/pull/1815))
 * Add option to select CSS framework, add Foundation as an option ([#1813](https://github.com/roots/sage/pull/1813))
 * Add option to add Font Awesome ([#1812](https://github.com/roots/sage/pull/1812))
@@ -18,7 +18,7 @@
 * Allow browser versions to be configured in `config.json` ([#1798](https://github.com/roots/sage/pull/1798))
 * Use stock ESLint ([#1796](https://github.com/roots/sage/pull/1796))
 
-### 9.0.0-beta.1: January 10th, 2016
+### 9.0.0-beta.1: January 10th, 2017
 * Update to Bootstrap 4 Alpha 6 ([#1792](https://github.com/roots/sage/pull/1792))
 * Add Blade ([#1765](https://github.com/roots/sage/pull/1765) and [#1777](https://github.com/roots/sage/pull/1777))
 * Remove sidebar defaults ([#1760](https://github.com/roots/sage/pull/1760))
diff --git a/README.md b/README.md
index 5260fb9..c4fbf55 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,10 @@ Sage is a WordPress starter theme with a modern development workflow.
 
 See a working example at [roots-example-project.com](https://roots-example-project.com/).
 
+### Recommended extensions
+
+* [Controller](https://github.com/soberwp/controller) — WordPress plugin to enable a basic controller when using Blade with Sage 9
+
 ## Requirements
 
 Make sure all dependencies have been installed before moving on:
diff --git a/app/lib/Sage/PostCreateProject.php b/app/lib/Sage/PostCreateProject.php
index 4499598..d153992 100755
--- a/app/lib/Sage/PostCreateProject.php
+++ b/app/lib/Sage/PostCreateProject.php
@@ -18,7 +18,7 @@ class PostCreateProject
                 'name'        => 'Sage Starter Theme',
                 'uri'         => 'https://roots.io/sage/',
                 'description' => 'Sage is a WordPress starter theme.',
-                'version'     => '9.0.0-beta.2',
+                'version'     => '9.0.0-beta.3',
                 'author'      => 'Roots',
                 'author_uri'  => 'https://roots.io/'
             ];
diff --git a/package.json b/package.json
index e857796..75c16de 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sage",
-  "version": "9.0.0-beta.2",
+  "version": "9.0.0-beta.3",
   "author": "Roots <team@roots.io>",
   "homepage": "https://roots.io/sage/",
   "private": true,
diff --git a/resources/style.css b/resources/style.css
index 23cd888..fd82508 100644
--- a/resources/style.css
+++ b/resources/style.css
@@ -2,7 +2,7 @@
 Theme Name:         Sage Starter Theme
 Theme URI:          https://roots.io/sage/
 Description:        Sage is a WordPress starter theme.
-Version:            9.0.0-beta.2
+Version:            9.0.0-beta.3
 Author:             Roots
 Author URI:         https://roots.io/
 Text Domain:        sage

From 17e7d7637704ac86697a7c13fc5eaef31e5f0a78 Mon Sep 17 00:00:00 2001
From: Sam Rapaport <sam@gigasavvy.com>
Date: Mon, 24 Apr 2017 11:38:43 -0700
Subject: [PATCH 13/23] Add Stylelint linting for scss files.

---
 .stylelintrc                             |   3 +
 package.json                             |   3 +
 resources/assets/build/webpack.config.js |   5 +
 yarn.lock                                | 405 +++++++++++++++++++++--
 4 files changed, 393 insertions(+), 23 deletions(-)
 create mode 100644 .stylelintrc

diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..40db42c
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+  "extends": "stylelint-config-standard"
+}
diff --git a/package.json b/package.json
index 75c16de..1efe4e0 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,9 @@
     "rimraf": "^2.6.1",
     "sass-loader": "^6.0.3",
     "style-loader": "^0.16.0",
+    "stylelint": "^7.10.1",
+    "stylelint-config-standard": "^16.0.0",
+    "stylelint-webpack-plugin": "^0.5.1",
     "url-loader": "^0.5.8",
     "webpack": "^2.4.1",
     "webpack-assets-manifest": "^0.6.2",
diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js
index cdd44b2..10c271e 100644
--- a/resources/assets/build/webpack.config.js
+++ b/resources/assets/build/webpack.config.js
@@ -5,6 +5,7 @@ const merge = require('webpack-merge');
 const autoprefixer = require('autoprefixer');
 const CleanPlugin = require('clean-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const StyleLintPlugin = require('stylelint-webpack-plugin');
 
 const CopyGlobsPlugin = require('copy-globs-webpack-plugin');
 const config = require('./config');
@@ -151,6 +152,10 @@ let webpackConfig = {
         eslint: { failOnWarning: false, failOnError: true },
       },
     }),
+    new StyleLintPlugin({
+      failOnError: ! config.enabled.watcher,
+      syntax: 'scss',
+    }),
   ],
 };
 
diff --git a/yarn.lock b/yarn.lock
index b19051b..d5b65c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,6 +2,13 @@
 # yarn lockfile v1
 
 
+JSONStream@^0.8.4:
+  version "0.8.4"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd"
+  dependencies:
+    jsonparse "0.0.5"
+    through ">=2.2.7 <3"
+
 abbrev@1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
@@ -178,7 +185,7 @@ arraybuffer.slice@0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz#f33b2159f0532a3f3107a272c0ccfbd1ad2979ca"
 
-arrify@^1.0.0:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
@@ -246,7 +253,7 @@ atob@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
 
-autoprefixer@^6.3.1, autoprefixer@^6.7.7:
+autoprefixer@^6.0.0, autoprefixer@^6.3.1, autoprefixer@^6.7.7:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
@@ -284,7 +291,7 @@ backo2@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
 
-balanced-match@^0.4.1, balanced-match@^0.4.2:
+balanced-match@^0.4.0, balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
 
@@ -528,7 +535,7 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
+browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
   version "1.7.7"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
   dependencies:
@@ -680,7 +687,7 @@ caniuse-api@^1.5.2:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
+caniuse-db@^1.0.30000187, caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000655"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874"
 
@@ -795,6 +802,13 @@ clone-deep@^0.2.4:
     lazy-cache "^1.0.3"
     shallow-clone "^0.1.2"
 
+clone-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-regexp/-/clone-regexp-1.0.0.tgz#eae0a2413f55c0942f818c229fefce845d7f3b1c"
+  dependencies:
+    is-regexp "^1.0.0"
+    is-supported-regexp-flag "^1.0.0"
+
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -831,6 +845,10 @@ color-convert@^1.3.0:
   dependencies:
     color-name "^1.1.1"
 
+color-diff@^0.1.3:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2"
+
 color-name@^1.0.0, color-name@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
@@ -849,6 +867,21 @@ color@^0.11.0:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+colorguard@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.0.tgz#f3facaf5caaeba4ef54653d9fb25bb73177c0d84"
+  dependencies:
+    chalk "^1.1.1"
+    color-diff "^0.1.3"
+    log-symbols "^1.0.2"
+    object-assign "^4.0.1"
+    pipetteur "^2.0.0"
+    plur "^2.0.0"
+    postcss "^5.0.4"
+    postcss-reporter "^1.2.1"
+    text-table "^0.2.0"
+    yargs "^1.2.6"
+
 colormin@^1.0.5:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
@@ -1057,6 +1090,10 @@ crypto-browserify@^3.11.0:
     public-encrypt "^4.0.0"
     randombytes "^2.0.0"
 
+css-color-names@0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6"
+
 css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
@@ -1078,6 +1115,15 @@ css-loader@^0.28.0:
     postcss-modules-values "^1.1.0"
     source-list-map "^0.1.7"
 
+css-rule-stream@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2"
+  dependencies:
+    css-tokenize "^1.0.1"
+    duplexer2 "0.0.2"
+    ldjson-stream "^1.2.1"
+    through2 "^0.6.3"
+
 css-selector-tokenizer@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.6.0.tgz#6445f582c7930d241dcc5007a43d6fcb8f073152"
@@ -1094,6 +1140,13 @@ css-selector-tokenizer@^0.7.0:
     fastparse "^1.1.1"
     regexpu-core "^1.0.0"
 
+css-tokenize@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be"
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^1.0.33"
+
 css@^2.0.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/css/-/css-2.2.1.tgz#73a4c81de85db664d4ee674f7d47085e3b2d55dc"
@@ -1199,7 +1252,7 @@ debug@2.3.3:
   dependencies:
     ms "0.7.2"
 
-debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
+debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.6.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
   dependencies:
@@ -1342,6 +1395,23 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doiuse@^2.4.1:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834"
+  dependencies:
+    browserslist "^1.1.1"
+    caniuse-db "^1.0.30000187"
+    css-rule-stream "^1.1.0"
+    duplexer2 "0.0.2"
+    jsonfilter "^1.1.2"
+    ldjson-stream "^1.2.1"
+    lodash "^4.0.0"
+    multimatch "^2.0.0"
+    postcss "^5.0.8"
+    source-map "^0.4.2"
+    through2 "^0.6.3"
+    yargs "^3.5.4"
+
 dom-compare-temp@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dom-compare-temp/-/dom-compare-temp-0.1.0.tgz#d540969876741a83a447fe7dc8b28d8a5b95339a"
@@ -1414,6 +1484,10 @@ duplexer2@^0.1.4, duplexer2@~0.1.0:
   dependencies:
     readable-stream "^2.0.2"
 
+duplexer@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 duplexify@^3.2.0:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604"
@@ -1819,6 +1893,12 @@ execa@^0.5.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
+execall@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execall/-/execall-1.0.0.tgz#73d0904e395b3cab0658b08d09ec25307f29bb73"
+  dependencies:
+    clone-regexp "^1.0.0"
+
 executable@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
@@ -2075,6 +2155,10 @@ function-bind@^1.0.2:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.0.tgz#16176714c801798e4e8f2cf7f7529467bb4a5771"
 
+gather-stream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b"
+
 gauge@~2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
@@ -2118,6 +2202,10 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
+get-stdin@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398"
+
 get-stream@^2.2.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
@@ -2208,6 +2296,20 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+globby@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
+  dependencies:
+    array-union "^1.0.1"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+globjoin@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/globjoin/-/globjoin-0.1.4.tgz#2f4494ac8919e3767c5cbb691e9f463324285d43"
+
 globule@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.1.0.tgz#c49352e4dc183d85893ee825385eb994bb6df45f"
@@ -2403,6 +2505,10 @@ html-entities@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.0.tgz#41948caf85ce82fed36e4e6a0ed371a6664379e2"
 
+html-tags@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-1.1.1.tgz#869f43859f12d9bdc3892419e494a628aa1b204e"
+
 "htmlparser2@>= 3.7.3 < 4.0.0":
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.9.2.tgz#1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"
@@ -2602,6 +2708,10 @@ ip-regex@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
 
+irregular-plurals@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.2.0.tgz#38f299834ba8c00c30be9c554e137269752ff3ac"
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -2774,6 +2884,10 @@ is-redirect@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
 
+is-regexp@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
+
 is-relative@^0.1.0:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
@@ -2792,6 +2906,10 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
 
+is-supported-regexp-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz#8b520c85fae7a253382d4b02652e045576e13bb8"
+
 is-svg@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
@@ -2949,10 +3067,23 @@ jsonfile@^2.1.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+jsonfilter@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11"
+  dependencies:
+    JSONStream "^0.8.4"
+    minimist "^1.1.0"
+    stream-combiner "^0.2.1"
+    through2 "^0.6.3"
+
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64"
+
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -2984,6 +3115,10 @@ klaw@^1.0.0:
   optionalDependencies:
     graceful-fs "^4.1.9"
 
+known-css-properties@^0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.0.7.tgz#9104343a2adfd8ef3b07bdee7a325e4d44ed9371"
+
 lazy-cache@^0.2.3:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-0.2.7.tgz#7feddf2dcb6edb77d11ef1d117ab5ffdf0ab1b65"
@@ -3008,6 +3143,13 @@ lcid@^1.0.0:
   dependencies:
     invert-kv "^1.0.0"
 
+ldjson-stream@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b"
+  dependencies:
+    split2 "^0.2.1"
+    through2 "^0.6.1"
+
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -3255,7 +3397,7 @@ lodash@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.1.0, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -3263,6 +3405,12 @@ lodash@~4.16.4:
   version "4.16.6"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.6.tgz#d22c9ac660288f3843e16ba7d2b5d06cca27d777"
 
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  dependencies:
+    chalk "^1.0.0"
+
 logalot@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/logalot/-/logalot-2.1.0.tgz#5f8e8c90d304edf12530951a5554abb8c5e3f552"
@@ -3351,7 +3499,7 @@ merge-stream@^1.0.0:
   dependencies:
     readable-stream "^2.0.1"
 
-micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.7:
+micromatch@2.3.11, micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -3449,6 +3597,15 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
+multimatch@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
+  dependencies:
+    array-differ "^1.0.0"
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    minimatch "^3.0.0"
+
 multipipe@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
@@ -3594,6 +3751,10 @@ normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
 
+normalize-selector@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
+
 normalize-url@^1.4.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
@@ -3687,6 +3848,10 @@ once@~1.3.0:
   dependencies:
     wrappy "1"
 
+onecolor@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.4.tgz#75a46f80da6c7aaa5b4daae17a47198bd9652494"
+
 onetime@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
@@ -3894,6 +4059,13 @@ pinkie@^2.0.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
+pipetteur@^2.0.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f"
+  dependencies:
+    onecolor "^3.0.4"
+    synesthesia "^1.0.1"
+
 pkg-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
@@ -3906,6 +4078,12 @@ pkg-up@^1.0.0:
   dependencies:
     find-up "^1.0.0"
 
+plur@^2.0.0, plur@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a"
+  dependencies:
+    irregular-plurals "^1.0.0"
+
 pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
@@ -3986,6 +4164,12 @@ postcss-filter-plugins@^2.0.0:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
+postcss-less@^0.14.0:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324"
+  dependencies:
+    postcss "^5.0.21"
+
 postcss-load-config@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
@@ -4018,6 +4202,10 @@ postcss-loader@^1.3.3:
     postcss "^5.2.15"
     postcss-load-config "^1.2.0"
 
+postcss-media-query-parser@^0.2.0:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244"
+
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
   resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
@@ -4149,7 +4337,35 @@ postcss-reduce-transforms@^1.0.3:
     postcss "^5.0.8"
     postcss-value-parser "^3.0.1"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
+postcss-reporter@^1.2.1, postcss-reporter@^1.3.3:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-reporter@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f"
+  dependencies:
+    chalk "^1.0.0"
+    lodash "^4.1.0"
+    log-symbols "^1.0.2"
+    postcss "^5.0.0"
+
+postcss-resolve-nested-selector@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz#29ccbc7c37dedfac304e9fff0bf1596b3f6a0e4e"
+
+postcss-scss@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c"
+  dependencies:
+    postcss "^5.2.13"
+
+postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
   dependencies:
@@ -4186,7 +4402,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.15, postcss@^5.2.16:
+postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.15, postcss@^5.2.16, postcss@^5.2.4:
   version "5.2.17"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.17.tgz#cf4f597b864d65c8a492b2eabe9d706c879c388b"
   dependencies:
@@ -4315,6 +4531,12 @@ read-all-stream@^3.0.0:
     pinkie-promise "^2.0.0"
     readable-stream "^2.0.0"
 
+read-file-stdin@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61"
+  dependencies:
+    gather-stream "^1.0.0"
+
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -4339,6 +4561,15 @@ read-pkg@^1.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
+readable-stream@^1.0.33, readable-stream@~1.1.9:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "0.0.1"
+    string_decoder "~0.10.x"
+
 readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
   version "2.2.9"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.9.tgz#cf78ec6f4a6d1eb43d26488cac97f042e74b7fc8"
@@ -4351,15 +4582,6 @@ readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.
     string_decoder "~1.0.0"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -4542,6 +4764,10 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
+resolve-from@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
+
 resolve-url-loader@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-2.0.2.tgz#c465e97ea0a4791f3961f766cea775ff2e3ceb8c"
@@ -4850,6 +5076,12 @@ source-map@^0.1.38:
   dependencies:
     amdefine ">=0.0.4"
 
+source-map@^0.4.2:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
@@ -4878,6 +5110,16 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
+specificity@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.0.tgz#332472d4e5eb5af20821171933998a6bc3b1ce6f"
+
+split2@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900"
+  dependencies:
+    through2 "~0.6.1"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -4933,6 +5175,13 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
+stream-combiner@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858"
+  dependencies:
+    duplexer "~0.1.1"
+    through "~2.3.4"
+
 stream-http@^2.3.1:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
@@ -5047,6 +5296,87 @@ style-loader@^0.16.0:
   dependencies:
     loader-utils "^1.0.2"
 
+style-search@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902"
+
+stylehacks@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b"
+  dependencies:
+    browserslist "^1.1.3"
+    chalk "^1.1.1"
+    log-symbols "^1.0.2"
+    minimist "^1.2.0"
+    plur "^2.1.2"
+    postcss "^5.0.18"
+    postcss-reporter "^1.3.3"
+    postcss-selector-parser "^2.0.0"
+    read-file-stdin "^0.2.1"
+    text-table "^0.2.0"
+    write-file-stdout "0.0.2"
+
+stylelint-config-standard@^16.0.0:
+  version "16.0.0"
+  resolved "https://registry.yarnpkg.com/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz#bb7387bff1d7dd7186a52b3ebf885b2405d691bf"
+
+stylelint-webpack-plugin@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/stylelint-webpack-plugin/-/stylelint-webpack-plugin-0.5.1.tgz#c07a92d9acbdc653a67b66aa3aa4fedde0bfcc9d"
+  dependencies:
+    arrify "^1.0.1"
+    chalk "^1.1.3"
+    object-assign "^4.1.0"
+    stylelint "^7.7.0"
+
+stylelint@^7.10.1, stylelint@^7.7.0:
+  version "7.10.1"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.10.1.tgz#209a7ce5e781fc2a62489fbb31ec0201ec675db2"
+  dependencies:
+    autoprefixer "^6.0.0"
+    balanced-match "^0.4.0"
+    chalk "^1.1.1"
+    colorguard "^1.2.0"
+    cosmiconfig "^2.1.1"
+    debug "^2.6.0"
+    doiuse "^2.4.1"
+    execall "^1.0.0"
+    file-entry-cache "^2.0.0"
+    get-stdin "^5.0.0"
+    globby "^6.0.0"
+    globjoin "^0.1.4"
+    html-tags "^1.1.1"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    known-css-properties "^0.0.7"
+    lodash "^4.17.4"
+    log-symbols "^1.0.2"
+    meow "^3.3.0"
+    micromatch "^2.3.11"
+    normalize-selector "^0.2.0"
+    postcss "^5.0.20"
+    postcss-less "^0.14.0"
+    postcss-media-query-parser "^0.2.0"
+    postcss-reporter "^3.0.0"
+    postcss-resolve-nested-selector "^0.1.1"
+    postcss-scss "^0.4.0"
+    postcss-selector-parser "^2.1.1"
+    postcss-value-parser "^3.1.1"
+    resolve-from "^2.0.0"
+    specificity "^0.3.0"
+    string-width "^2.0.0"
+    style-search "^0.1.0"
+    stylehacks "^2.3.2"
+    sugarss "^0.2.0"
+    svg-tags "^1.0.0"
+    table "^4.0.1"
+
+sugarss@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e"
+  dependencies:
+    postcss "^5.2.4"
+
 sum-up@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
@@ -5063,6 +5393,10 @@ supports-color@^3.1.0, supports-color@^3.2.3:
   dependencies:
     has-flag "^1.0.0"
 
+svg-tags@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
+
 svgo@^0.7.0:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
@@ -5079,6 +5413,12 @@ svgo@^0.7.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
+synesthesia@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777"
+  dependencies:
+    css-color-names "0.0.3"
+
 table@^3.7.8:
   version "3.8.3"
   resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
@@ -5090,6 +5430,17 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
+table@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.1.tgz#a8116c133fac2c61f4a420ab6cdf5c4d61f0e435"
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
 tapable@^0.2.5, tapable@~0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.6.tgz#206be8e188860b514425375e6f1ae89bfb01fd8d"
@@ -5135,7 +5486,7 @@ tether@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/tether/-/tether-1.4.0.tgz#0f9fa171f75bf58485d8149e94799d7ae74d1c1a"
 
-text-table@~0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -5153,7 +5504,7 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2@^0.6.0, through2@^0.6.1:
+through2@^0.6.0, through2@^0.6.1, through2@^0.6.3, through2@~0.6.1:
   version "0.6.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
   dependencies:
@@ -5167,7 +5518,7 @@ through2@^2.0.0, through2@~2.0.0:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-through@^2.3.6:
+"through@>=2.2.7 <3", through@^2.3.6, through@~2.3.4:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -5615,6 +5966,10 @@ wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
 
+write-file-stdout@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1"
+
 write@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
@@ -5679,7 +6034,7 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
-yargs@3.29.0:
+yargs@3.29.0, yargs@^3.5.4:
   version "3.29.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.29.0.tgz#1aab9660eae79d8b8f675bcaeeab6ee34c2cf69c"
   dependencies:
@@ -5709,6 +6064,10 @@ yargs@6.4.0, yargs@^6.0.0:
     y18n "^3.2.1"
     yargs-parser "^4.1.0"
 
+yargs@^1.2.6:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a"
+
 yargs@^4.7.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"

From d81b85ec48470fa14fb60c3f2e355ae9fd5e9937 Mon Sep 17 00:00:00 2001
From: Sam Rapaport <sam@gigasavvy.com>
Date: Mon, 24 Apr 2017 11:42:59 -0700
Subject: [PATCH 14/23] Fix stylelint errors.

---
 resources/assets/styles/common/_global.scss         | 3 +++
 resources/assets/styles/components/_buttons.scss    | 3 +++
 resources/assets/styles/components/_comments.scss   | 4 ++++
 resources/assets/styles/components/_forms.scss      | 6 +++++-
 resources/assets/styles/components/_wp-classes.scss | 6 ++++++
 resources/assets/styles/layouts/_footer.scss        | 3 +++
 resources/assets/styles/layouts/_header.scss        | 1 +
 resources/assets/styles/layouts/_pages.scss         | 3 +++
 resources/assets/styles/layouts/_posts.scss         | 3 +++
 resources/assets/styles/layouts/_sidebar.scss       | 3 +++
 resources/assets/styles/main.scss                   | 1 +
 11 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/resources/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss
index e69de29..657a224 100644
--- a/resources/assets/styles/common/_global.scss
+++ b/resources/assets/styles/common/_global.scss
@@ -0,0 +1,3 @@
+/*
+ | Global Theme Styles.
+ */
diff --git a/resources/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss
index e69de29..0dbb070 100644
--- a/resources/assets/styles/components/_buttons.scss
+++ b/resources/assets/styles/components/_buttons.scss
@@ -0,0 +1,3 @@
+/*
+ | Theme Button Styles.
+ */
diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss
index e007fe6..baaff86 100644
--- a/resources/assets/styles/components/_comments.scss
+++ b/resources/assets/styles/components/_comments.scss
@@ -1,18 +1,22 @@
 .comment-list {
   @extend .list-unstyled;
 }
+
 .comment-list ol {
   list-style: none;
 }
+
 .comment-form p {
   @extend .form-group;
 }
+
 .comment-form input[type="text"],
 .comment-form input[type="email"],
 .comment-form input[type="url"],
 .comment-form textarea {
   @extend .form-control;
 }
+
 .comment-form input[type="submit"] {
   @extend .btn;
   @extend .btn-secondary;
diff --git a/resources/assets/styles/components/_forms.scss b/resources/assets/styles/components/_forms.scss
index 0d619bf..b2c7c6b 100644
--- a/resources/assets/styles/components/_forms.scss
+++ b/resources/assets/styles/components/_forms.scss
@@ -2,13 +2,17 @@
 .search-form {
   @extend .form-inline;
 }
+
 .search-form label {
-  font-weight: normal;
   @extend .form-group;
+
+  font-weight: normal;
 }
+
 .search-form .search-field {
   @extend .form-control;
 }
+
 .search-form .search-submit {
   @extend .btn;
   @extend .btn-secondary;
diff --git a/resources/assets/styles/components/_wp-classes.scss b/resources/assets/styles/components/_wp-classes.scss
index 19c9434..8a250eb 100644
--- a/resources/assets/styles/components/_wp-classes.scss
+++ b/resources/assets/styles/components/_wp-classes.scss
@@ -8,22 +8,26 @@
   max-width: 100%;
   height: auto;
 }
+
 .aligncenter {
   display: block;
   margin: ($spacer / 2) auto;
   height: auto;
 }
+
 .alignleft,
 .alignright {
   margin-bottom: ($spacer / 2);
   height: auto;
 }
+
 @include media-breakpoint-up(sm) {
   // Only float if not on an extra small device
   .alignleft {
     float: left;
     margin-right: ($spacer / 2);
   }
+
   .alignright {
     float: right;
     margin-left: ($spacer / 2);
@@ -34,10 +38,12 @@
 .wp-caption {
   @extend .figure;
 }
+
 .wp-caption img {
   @extend .figure-img;
   @extend .img-fluid;
 }
+
 .wp-caption-text {
   @extend .figure-caption;
 }
diff --git a/resources/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss
index e69de29..5e1bb06 100644
--- a/resources/assets/styles/layouts/_footer.scss
+++ b/resources/assets/styles/layouts/_footer.scss
@@ -0,0 +1,3 @@
+/*
+ | Site Footer Styles.
+ */
diff --git a/resources/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss
index 2ad1956..fca4956 100644
--- a/resources/assets/styles/layouts/_header.scss
+++ b/resources/assets/styles/layouts/_header.scss
@@ -1,6 +1,7 @@
 .banner .nav li {
   @extend .nav-item;
 }
+
 .banner .nav a {
   @extend .nav-link;
 }
diff --git a/resources/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss
index e69de29..eefac62 100644
--- a/resources/assets/styles/layouts/_pages.scss
+++ b/resources/assets/styles/layouts/_pages.scss
@@ -0,0 +1,3 @@
+/*
+ | Page-specific Styles.
+ */
diff --git a/resources/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss
index e69de29..43cdebb 100644
--- a/resources/assets/styles/layouts/_posts.scss
+++ b/resources/assets/styles/layouts/_posts.scss
@@ -0,0 +1,3 @@
+/*
+ | Site Post Styles.
+ */
diff --git a/resources/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss
index e69de29..ac9f50e 100644
--- a/resources/assets/styles/layouts/_sidebar.scss
+++ b/resources/assets/styles/layouts/_sidebar.scss
@@ -0,0 +1,3 @@
+/*
+ | Site Sidebar Styles.
+ */
diff --git a/resources/assets/styles/main.scss b/resources/assets/styles/main.scss
index 171457f..9852cda 100644
--- a/resources/assets/styles/main.scss
+++ b/resources/assets/styles/main.scss
@@ -3,6 +3,7 @@
 // Import npm dependencies
 @import "~bootstrap/scss/bootstrap";
 
+// Import theme styles
 @import "common/global";
 @import "components/buttons";
 @import "components/comments";

From dfcac1e8579261e6d0428e0c137a6133aa7ce4c0 Mon Sep 17 00:00:00 2001
From: Toby Schrapel <toby@tobyschrapel.com>
Date: Tue, 25 Apr 2017 08:54:27 -0500
Subject: [PATCH 15/23] Remove die/var_dump

---
 app/setup.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/setup.php b/app/setup.php
index 6daee40..3c92a04 100644
--- a/app/setup.php
+++ b/app/setup.php
@@ -116,7 +116,6 @@ add_action('after_setup_theme', function () {
             return ["{$path}/resources/views", $path];
         })->unique()->toArray();
 
-        // die(var_dump($viewPaths));
     config([
         'assets.manifest' => "{$paths['dir.stylesheet']}/../dist/assets.json",
         'assets.uri'      => "{$paths['uri.stylesheet']}/dist",

From 62bba1bd232d8728fea72d400160965139863ed4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Colombaro?= <git@colombaro.fr>
Date: Tue, 2 May 2017 10:21:07 +0200
Subject: [PATCH 16/23] illuminate: make with parameters (#1888)

Since Illuminate 5.4, `$container->make` with `$parameters` is `$container->makeWith` : https://github.com/illuminate/container/blob/8fbb101a6081786e830cb89d1a1faa846c2c0442/Container.php#L547-L568

Related:
* https://github.com/roots/sage/commit/f242cb50e9033af815ec56c7346d7f9da4b23460
* https://github.com/illuminate/container/commit/1fc0d2451e23d2ea73c10462d74add4767e2b74c
---
 app/helpers.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 5c11fa5..b56c162 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -21,8 +21,8 @@ function sage($abstract = null, $parameters = [], ContainerContract $container =
         return $container;
     }
     return $container->bound($abstract)
-        ? $container->make($abstract, $parameters)
-        : $container->make("sage.{$abstract}", $parameters);
+        ? $container->makeWith($abstract, $parameters)
+        : $container->makeWith("sage.{$abstract}", $parameters);
 }
 
 /**

From da353de6eeb9da3b51c2be8c409a7c6be788214b Mon Sep 17 00:00:00 2001
From: Russell Fair <rfair404@gmail.com>
Date: Wed, 3 May 2017 17:26:51 +0000
Subject: [PATCH 17/23] update inline documentation to reflect correct theme
 file locations

---
 resources/functions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/functions.php b/resources/functions.php
index a92aa27..7c579f5 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -59,12 +59,12 @@ array_map(function ($file) use ($sage_error) {
 
 /**
  * Here's what's happening with these hooks:
- * 1. WordPress initially detects theme in themes/sage
+ * 1. WordPress initially detects theme in themes/sage/resources
  * 2. Upon activation, we tell WordPress that the theme is actually in themes/sage/resources/views
- * 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage
+ * 3. When we call get_template_directory() or get_template_directory_uri(), we point it back to themes/sage/resources
  *
  * We do this so that the Template Hierarchy will look in themes/sage/resources/views for core WordPress themes
- * But functions.php, style.css, and index.php are all still located in themes/sage
+ * But functions.php, style.css, and index.php are all still located in themes/sage/resources
  *
  * This is not compatible with the WordPress Customizer theme preview prior to theme activation
  *

From 74b485be95aa25a398d1d91f2f99328c422ff043 Mon Sep 17 00:00:00 2001
From: Toby Schrapel <toby@tobyschrapel.com>
Date: Fri, 19 May 2017 16:22:23 -0500
Subject: [PATCH 18/23] Do not redirect for WP-CLI (#1891)

---
 resources/functions.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/resources/functions.php b/resources/functions.php
index a92aa27..137a026 100644
--- a/resources/functions.php
+++ b/resources/functions.php
@@ -86,6 +86,9 @@ add_filter('stylesheet_directory_uri', function ($uri) {
 });
 if ($sage_views !== get_option('stylesheet')) {
     update_option('stylesheet', $sage_views);
+    if (php_sapi_name() === 'cli') {
+        return;
+    }
     wp_redirect($_SERVER['REQUEST_URI']);
     exit();
 }

From c21df9965ff8217c3b4ff90bbe6099206d7b4fbf Mon Sep 17 00:00:00 2001
From: Ben <ben@alwaysblank.org>
Date: Wed, 31 May 2017 13:09:00 -0700
Subject: [PATCH 19/23] Update Autoprefixer and standardize browserlist
 location (#1899)

This updates Autoprefixer to 7.1.1, and also moves the browser target
list to package.json, in line with the recommendation made in this
article (https://evilmartians.com/chronicles/autoprefixer-7-browserslist-2-released)
from the developers of Autoprefixer and Browserslist.
---
 package.json                                  |  7 +++-
 resources/assets/build/config.js              |  1 -
 resources/assets/build/webpack.config.js      |  2 +-
 .../assets/build/webpack.config.optimize.js   |  2 +-
 resources/assets/config.json                  |  5 ---
 yarn.lock                                     | 36 ++++++++++++++++++-
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 75c16de..8b3d461 100644
--- a/package.json
+++ b/package.json
@@ -17,6 +17,11 @@
       "url": "http://opensource.org/licenses/MIT"
     }
   ],
+  "browserslist": [
+    "last 2 versions",
+    "android 4",
+    "opera 12"
+  ],
   "scripts": {
     "build": "webpack --progress --config resources/assets/build/webpack.config.js",
     "build:production": "webpack --progress -p --config resources/assets/build/webpack.config.js",
@@ -30,7 +35,7 @@
     "node": ">= 6.9.4"
   },
   "devDependencies": {
-    "autoprefixer": "^6.7.7",
+    "autoprefixer": "^7.1.1",
     "browser-sync": "^2.18.8",
     "browsersync-webpack-plugin": "^0.5.3",
     "bs-html-injector": "^3.0.3",
diff --git a/resources/assets/build/config.js b/resources/assets/build/config.js
index 9ef5827..c9a04a1 100644
--- a/resources/assets/build/config.js
+++ b/resources/assets/build/config.js
@@ -25,7 +25,6 @@ const config = merge({
     watcher: !!argv.watch,
   },
   watch: [],
-  browsers: [],
 }, userConfig);
 
 module.exports = merge(config, {
diff --git a/resources/assets/build/webpack.config.js b/resources/assets/build/webpack.config.js
index cdd44b2..995d9f6 100644
--- a/resources/assets/build/webpack.config.js
+++ b/resources/assets/build/webpack.config.js
@@ -141,7 +141,7 @@ let webpackConfig = {
         output: { path: config.paths.dist },
         context: config.paths.assets,
         postcss: [
-          autoprefixer({ browsers: config.browsers }),
+          autoprefixer(),
         ],
       },
     }),
diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js
index 3b306ab..666c945 100644
--- a/resources/assets/build/webpack.config.optimize.js
+++ b/resources/assets/build/webpack.config.optimize.js
@@ -13,7 +13,7 @@ module.exports = {
       cssProcessor: cssnano,
       cssProcessorOptions: {
         discardComments: { removeAll: true },
-        autoprefixer: { browsers: config.browsers },
+        autoprefixer: {},
       },
       canPrint: true,
     }),
diff --git a/resources/assets/config.json b/resources/assets/config.json
index 6beda62..4dfdb17 100644
--- a/resources/assets/config.json
+++ b/resources/assets/config.json
@@ -14,10 +14,5 @@
   "cacheBusting": "[name]_[hash:8]",
   "watch": [
     "{app,resources/views}/**/*.php"
-  ],
-  "browsers": [
-    "last 2 versions",
-    "android 4",
-    "opera 12"
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index b19051b..e35627b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -246,7 +246,7 @@ atob@~1.1.0:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/atob/-/atob-1.1.3.tgz#95f13629b12c3a51a5d215abdce2aa9f32f80773"
 
-autoprefixer@^6.3.1, autoprefixer@^6.7.7:
+autoprefixer@^6.3.1:
   version "6.7.7"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
   dependencies:
@@ -257,6 +257,17 @@ autoprefixer@^6.3.1, autoprefixer@^6.7.7:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
+autoprefixer@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.1.1.tgz#97bc854c7d0b979f8d6489de547a0d17fb307f6d"
+  dependencies:
+    browserslist "^2.1.3"
+    caniuse-lite "^1.0.30000670"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^6.0.1"
+    postcss-value-parser "^3.2.3"
+
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -535,6 +546,13 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
     caniuse-db "^1.0.30000639"
     electron-to-chromium "^1.2.7"
 
+browserslist@^2.1.3:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.1.4.tgz#cc526af4a1312b7d2e05653e56d0c8ab70c0e053"
+  dependencies:
+    caniuse-lite "^1.0.30000670"
+    electron-to-chromium "^1.3.11"
+
 browsersync-webpack-plugin@^0.5.3:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/browsersync-webpack-plugin/-/browsersync-webpack-plugin-0.5.3.tgz#35bc3b1c5aba8c7d2d7b700e23d511454b8d516e"
@@ -684,6 +702,10 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
   version "1.0.30000655"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000655.tgz#e40b6287adc938848d6708ef83d65b5f54ac1874"
 
+caniuse-lite@^1.0.30000670:
+  version "1.0.30000676"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000676.tgz#1e962123f48073f0c51c4ea0651dd64d25786498"
+
 capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@@ -1456,6 +1478,10 @@ electron-to-chromium@^1.2.7:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.3.tgz#651eb63fe89f39db70ffc8dbd5d9b66958bc6a0e"
 
+electron-to-chromium@^1.3.11:
+  version "1.3.13"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.13.tgz#1b3a5eace6e087bb5e257a100b0cbfe81b2891fc"
+
 elliptic@^6.0.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
@@ -4195,6 +4221,14 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.2.3"
 
+postcss@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2"
+  dependencies:
+    chalk "^1.1.3"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"

From c304c3041dcba8ab71d4b2d3d68dc29407d9b7a7 Mon Sep 17 00:00:00 2001
From: Julien Melissas <julien.melissas@gmail.com>
Date: Tue, 6 Jun 2017 16:15:34 -0400
Subject: [PATCH 20/23] Optimize CSS Assets safe = true (#1901)

Related: https://github.com/roots/sage/pull/1610#issuecomment-182969178
oh word!
---
 resources/assets/build/webpack.config.optimize.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/assets/build/webpack.config.optimize.js b/resources/assets/build/webpack.config.optimize.js
index 666c945..9480cfc 100644
--- a/resources/assets/build/webpack.config.optimize.js
+++ b/resources/assets/build/webpack.config.optimize.js
@@ -14,6 +14,7 @@ module.exports = {
       cssProcessorOptions: {
         discardComments: { removeAll: true },
         autoprefixer: {},
+        safe: true,
       },
       canPrint: true,
     }),

From 7e02fdbb6b68d0a40ca3230eab19e04c58522cfe Mon Sep 17 00:00:00 2001
From: Ben Word <ben@benword.com>
Date: Sun, 11 Jun 2017 17:53:22 -0600
Subject: [PATCH 21/23] Update comments, add some more

---
 resources/assets/styles/common/_global.scss       | 4 +---
 resources/assets/styles/common/_variables.scss    | 2 ++
 resources/assets/styles/components/_buttons.scss  | 4 +---
 resources/assets/styles/components/_comments.scss | 1 +
 resources/assets/styles/layouts/_footer.scss      | 4 +---
 resources/assets/styles/layouts/_header.scss      | 1 +
 resources/assets/styles/layouts/_pages.scss       | 4 +---
 resources/assets/styles/layouts/_posts.scss       | 4 +---
 resources/assets/styles/layouts/_sidebar.scss     | 4 +---
 resources/assets/styles/layouts/_tinymce.scss     | 2 ++
 10 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/resources/assets/styles/common/_global.scss b/resources/assets/styles/common/_global.scss
index 657a224..25a3f0b 100644
--- a/resources/assets/styles/common/_global.scss
+++ b/resources/assets/styles/common/_global.scss
@@ -1,3 +1 @@
-/*
- | Global Theme Styles.
- */
+// Base styles
diff --git a/resources/assets/styles/common/_variables.scss b/resources/assets/styles/common/_variables.scss
index 078c5cb..8a365d9 100644
--- a/resources/assets/styles/common/_variables.scss
+++ b/resources/assets/styles/common/_variables.scss
@@ -1,2 +1,4 @@
+// Variables
+
 // Colors
 $brand-primary:         #27ae60;
diff --git a/resources/assets/styles/components/_buttons.scss b/resources/assets/styles/components/_buttons.scss
index 0dbb070..c202a63 100644
--- a/resources/assets/styles/components/_buttons.scss
+++ b/resources/assets/styles/components/_buttons.scss
@@ -1,3 +1 @@
-/*
- | Theme Button Styles.
- */
+// Buttons
diff --git a/resources/assets/styles/components/_comments.scss b/resources/assets/styles/components/_comments.scss
index baaff86..922fd0c 100644
--- a/resources/assets/styles/components/_comments.scss
+++ b/resources/assets/styles/components/_comments.scss
@@ -1,3 +1,4 @@
+// Comments
 .comment-list {
   @extend .list-unstyled;
 }
diff --git a/resources/assets/styles/layouts/_footer.scss b/resources/assets/styles/layouts/_footer.scss
index 5e1bb06..44848fd 100644
--- a/resources/assets/styles/layouts/_footer.scss
+++ b/resources/assets/styles/layouts/_footer.scss
@@ -1,3 +1 @@
-/*
- | Site Footer Styles.
- */
+// Footer
diff --git a/resources/assets/styles/layouts/_header.scss b/resources/assets/styles/layouts/_header.scss
index fca4956..8b11e1f 100644
--- a/resources/assets/styles/layouts/_header.scss
+++ b/resources/assets/styles/layouts/_header.scss
@@ -1,3 +1,4 @@
+// Header
 .banner .nav li {
   @extend .nav-item;
 }
diff --git a/resources/assets/styles/layouts/_pages.scss b/resources/assets/styles/layouts/_pages.scss
index eefac62..26ca20f 100644
--- a/resources/assets/styles/layouts/_pages.scss
+++ b/resources/assets/styles/layouts/_pages.scss
@@ -1,3 +1 @@
-/*
- | Page-specific Styles.
- */
+// Pages
diff --git a/resources/assets/styles/layouts/_posts.scss b/resources/assets/styles/layouts/_posts.scss
index 43cdebb..b18806b 100644
--- a/resources/assets/styles/layouts/_posts.scss
+++ b/resources/assets/styles/layouts/_posts.scss
@@ -1,3 +1 @@
-/*
- | Site Post Styles.
- */
+// Posts
diff --git a/resources/assets/styles/layouts/_sidebar.scss b/resources/assets/styles/layouts/_sidebar.scss
index ac9f50e..b2fa83c 100644
--- a/resources/assets/styles/layouts/_sidebar.scss
+++ b/resources/assets/styles/layouts/_sidebar.scss
@@ -1,3 +1 @@
-/*
- | Site Sidebar Styles.
- */
+// Sidebar
diff --git a/resources/assets/styles/layouts/_tinymce.scss b/resources/assets/styles/layouts/_tinymce.scss
index 7a91799..dae912d 100644
--- a/resources/assets/styles/layouts/_tinymce.scss
+++ b/resources/assets/styles/layouts/_tinymce.scss
@@ -1,3 +1,5 @@
+// TinyMCE Editor styles
+
 body#tinymce {
   margin: 12px !important;
 }

From 94b172f85c1b992f3a8eda4722f33c2e5186a5df Mon Sep 17 00:00:00 2001
From: Raquelle Fahle <raquel.fahle@gmail.com>
Date: Sun, 11 Jun 2017 19:43:20 -0500
Subject: [PATCH 22/23] Remove post format reference in template call

---
 resources/views/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index f91575c..c532f3f 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -11,7 +11,7 @@
   @endif
 
   @while (have_posts()) @php(the_post())
-    @include ('partials.content-'.(get_post_type() !== 'post' ? get_post_type() : get_post_format()))
+    @include ('partials.content-'.(get_post_type() !== 'post' ?: get_post_type()))
   @endwhile
 
   {!! get_the_posts_navigation() !!}

From 870306960724536ab9b1272e3a1369c92a37c606 Mon Sep 17 00:00:00 2001
From: Raquelle Fahle <raquel.fahle@gmail.com>
Date: Sun, 11 Jun 2017 20:59:49 -0500
Subject: [PATCH 23/23] Update operator for template call

---
 resources/views/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index c532f3f..3e0a8d2 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -11,7 +11,7 @@
   @endif
 
   @while (have_posts()) @php(the_post())
-    @include ('partials.content-'.(get_post_type() !== 'post' ?: get_post_type()))
+    @include ('partials.content-'.(get_post_type() === 'post' ?: get_post_type()))
   @endwhile
 
   {!! get_the_posts_navigation() !!}