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

Merge branch 'master' into normalize-quotes

Browse Source
This commit is contained in:
Ben Word
2018-11-16 11:34:28 -07:00
committed by GitHub
parent 248c569bff 93ee95dfac
commit eee07a84f4
20 changed files with 3001 additions and 2100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintrc.js
View File

@@ -32,9 +32,8 @@ module.exports = {
], ],
}, },
'rules': { 'rules': {
'no-console': process.env.NODE_ENV === 'production' ? 2 : 0, 'no-console': 0,
'quotes': ['error', 'single'], 'quotes': ['error', 'single'],
'semi': 'error',
'comma-dangle': [ 'comma-dangle': [
'error', 'error',
{ {

26
CHANGELOG.md
View File

@@ -1,3 +1,29 @@
### 9.0.5: September 17th, 2018
* Workaround for Bootstrap incompatibility with webpack. Fixes #2017 ([e72b490](https://github.com/roots/sage/commit/e72b4906264551dc00cd0890de74ae2bce0d77c8))
### 9.0.4: September 7th, 2018
* Force `illuminate/support` to `5.6.*` ([#2112](https://github.com/roots/sage/pull/2112))
### 9.0.3: September 7th, 2018
* Revert "Add searchform partial and function to replace default WordPress functionality" ([#2110](https://github.com/roots/sage/pull/2110))
* Unescape get_language_attributes() ([#2108](https://github.com/roots/sage/pull/2108))
* Add data from controller to comments template ([#2100](https://github.com/roots/sage/pull/2100))
### 9.0.2: August 21st, 2018
* Update to Bootstrap 4.1.3 ([#2097](https://github.com/roots/sage/pull/2097))
* Comments template fix ([#2095](https://github.com/roots/sage/pull/2095))
* UglifyJs: Change the ecma option from 8 to 5 ([#2092](https://github.com/roots/sage/pull/2092))
* Add searchform partial and function to replace default WordPress functionality ([#2090](https://github.com/roots/sage/pull/2090))
* Change language_attributes() to get_language_attributes() ([#2089](https://github.com/roots/sage/pull/2089))
* Fix missing comment-reply JS ([#2085](https://github.com/roots/sage/pull/2085))
* Use better merge method for Webpack Preset config ([#2084](https://github.com/roots/sage/pull/2084))
* Add support for preset specific Webpack config ([#2083](https://github.com/roots/sage/pull/2083))
* Enable Sass comments and run prefixing before minification ([#2078](https://github.com/roots/sage/pull/2078))
* Set removeViewBox to 'false' in webpack's optimization settings ([#2075](https://github.com/roots/sage/pull/2075))
* Add uglifyjs plugin ([#2070](https://github.com/roots/sage/pull/2070))
* Make template() compatible with wp admin ([#2068](https://github.com/roots/sage/pull/2068))
* Upgrade to Controller 2.1.0 ([#2025](https://github.com/roots/sage/pull/2025))
### 9.0.1: April 30th, 2018 ### 9.0.1: April 30th, 2018
* Update to Bootstrap 4.1.1 ([#2065](https://github.com/roots/sage/pull/2065)) * Update to Bootstrap 4.1.1 ([#2065](https://github.com/roots/sage/pull/2065))
* Auto-detect `proxyUrl` scheme ([#2062](https://github.com/roots/sage/pull/2062)) * Auto-detect `proxyUrl` scheme ([#2062](https://github.com/roots/sage/pull/2062))

12
README.md
View File

@@ -11,9 +11,9 @@ Sage is a WordPress starter theme with a modern development workflow.
* Modern JavaScript * Modern JavaScript
* [Webpack](https://webpack.github.io/) for compiling assets, optimizing images, and concatenating and minifying files * [Webpack](https://webpack.github.io/) for compiling assets, optimizing images, and concatenating and minifying files
* [Browsersync](http://www.browsersync.io/) for synchronized browser testing * [Browsersync](http://www.browsersync.io/) for synchronized browser testing
* [Blade](https://laravel.com/docs/5.5/blade) as a templating engine * [Blade](https://laravel.com/docs/5.6/blade) as a templating engine
* [Controller](https://github.com/soberwp/controller) for passing data to Blade templates * [Controller](https://github.com/soberwp/controller) for passing data to Blade templates
* CSS framework (optional): [Bootstrap 4](https://getbootstrap.com/), [Bulma](https://bulma.io/), [Foundation](https://foundation.zurb.com/), [Tachyons](http://tachyons.io/) * CSS framework (optional): [Bootstrap 4](https://getbootstrap.com/), [Bulma](https://bulma.io/), [Foundation](https://foundation.zurb.com/), [Tachyons](http://tachyons.io/), [Tailwind](https://tailwindcss.com/)
See a working example at [roots-example-project.com](https://roots-example-project.com/). See a working example at [roots-example-project.com](https://roots-example-project.com/).
@@ -49,7 +49,7 @@ During theme installation you will have options to update `style.css` theme head
```shell ```shell
themes/your-theme-name/ # → Root of your Sage based theme themes/your-theme-name/ # → Root of your Sage based theme
├── app/ # → Theme PHP ├── app/ # → Theme PHP
│ ├── controllers/ # → Controller files │ ├── Controllers/ # → Controller files
│ ├── admin.php # → Theme customizer setup │ ├── admin.php # → Theme customizer setup
│ ├── filters.php # → Theme filters │ ├── filters.php # → Theme filters
│ ├── helpers.php # → Helper functions │ ├── helpers.php # → Helper functions
@@ -103,11 +103,11 @@ Edit `app/setup.php` to enable or disable theme features, setup navigation menus
Contributions are welcome from everyone. We have [contributing guidelines](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) to help you get started. Contributions are welcome from everyone. We have [contributing guidelines](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) to help you get started.
## Gold sponsors ## Sage sponsors
Help support our open-source development efforts by [contributing to Sage on OpenCollective](https://opencollective.com/sage). Help support our open-source development efforts by [becoming a patron](https://www.patreon.com/rootsdev).
<a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a> <a href="https://kinsta.com/?kaid=OFDHAJIXUDIV"><img src="https://cdn.roots.io/app/uploads/kinsta.svg" alt="Kinsta" width="200" height="150"></a> <a href="https://k-m.com/"><img src="https://cdn.roots.io/app/uploads/km-digital.svg" alt="KM Digital" width="200" height="150"></a>
## Community ## Community

2
app/controllers/app.php → app/Controllers/App.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace App; namespace App\Controllers;
use Sober\Controller\Controller; use Sober\Controller\Controller;

2
app/controllers/front-page.php → app/Controllers/FrontPage.php
View File

@@ -1,6 +1,6 @@
<?php <?php
namespace App; namespace App\Controllers;
use Sober\Controller\Controller; use Sober\Controller\Controller;

25
app/filters.php
View File

@@ -47,6 +47,15 @@ collect([
* Render page using Blade * Render page using Blade
*/ */
add_filter('template_include', function ($template) { add_filter('template_include', function ($template) {
collect(['get_header', 'wp_head'])->each(function ($tag) {
ob_start();
do_action($tag);
$output = ob_get_clean();
remove_all_actions($tag);
add_action($tag, function () use ($output) {
echo $output;
});
});
$data = collect(get_body_class())->reduce(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); return apply_filters("sage/template/{$class}/data", $data, $template);
}, []); }, []);
@@ -58,7 +67,7 @@ add_filter('template_include', function ($template) {
}, PHP_INT_MAX); }, PHP_INT_MAX);
/** /**
* Tell WordPress how to find the compiled path of comments.blade.php * Render comments.blade.php
*/ */
add_filter('comments_template', function ($comments_template) { add_filter('comments_template', function ($comments_template) {
$comments_template = str_replace( $comments_template = str_replace(
@@ -66,5 +75,17 @@ add_filter('comments_template', function ($comments_template) {
'', '',
$comments_template $comments_template
); );
return template_path(locate_template(["views/{$comments_template}", $comments_template]) ?: $comments_template);
$data = collect(get_body_class())->reduce(function ($data, $class) use ($comments_template) {
return apply_filters("sage/template/{$class}/data", $data, $comments_template);
}, []);
$theme_template = locate_template(["views/{$comments_template}", $comments_template]);
if ($theme_template) {
echo template($theme_template, $data);
return get_stylesheet_directory().'/index.php';
}
return $comments_template;
}, 100); }, 100);

4
app/helpers.php
View File

@@ -52,10 +52,6 @@ function config($key = null, $default = null)
*/ */
function template($file, $data = []) function template($file, $data = [])
{ {
if (!is_admin() && remove_action('wp_head', 'wp_enqueue_scripts', 1)) {
wp_enqueue_scripts();
}
return sage('blade')->render($file, $data); return sage('blade')->render($file, $data);
} }

4
app/setup.php
View File

@@ -13,6 +13,10 @@ use Roots\Sage\Template\BladeProvider;
add_action('wp_enqueue_scripts', function () { add_action('wp_enqueue_scripts', function () {
wp_enqueue_style('sage/main.css', asset_path('styles/main.css'), false, null); wp_enqueue_style('sage/main.css', asset_path('styles/main.css'), false, null);
wp_enqueue_script('sage/main.js', asset_path('scripts/main.js'), ['jquery'], null, true); wp_enqueue_script('sage/main.js', asset_path('scripts/main.js'), ['jquery'], null, true);
if (is_single() && comments_open() && get_option('thread_comments')) {
wp_enqueue_script('comment-reply');
}
}, 100); }, 100);
/** /**

8
composer.json
View File

@@ -34,13 +34,13 @@
"require": { "require": {
"php": ">=7.1", "php": ">=7.1",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"illuminate/support": "~5.6", "illuminate/support": "5.6.*",
"roots/sage-lib": "~9.0.1", "roots/sage-lib": "~9.0.5",
"soberwp/controller": "~9.0.0-beta.4" "soberwp/controller": "~2.1.0"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "^2.8.0", "squizlabs/php_codesniffer": "^2.8.0",
"roots/sage-installer": "~1.3" "roots/sage-installer": "~1.4"
}, },
"scripts": { "scripts": {
"test": ["phpcs"], "test": ["phpcs"],

340
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1387af18b4df853db96edd5d561c8545", "content-hash": "2535b3b47ef47a3b146a488b73081199",
"packages": [ "packages": [
{ {
"name": "brain/hierarchy", "name": "brain/hierarchy",
@@ -64,16 +64,16 @@
}, },
{ {
"name": "composer/installers", "name": "composer/installers",
"version": "v1.5.0", "version": "v1.6.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/installers.git", "url": "https://github.com/composer/installers.git",
"reference": "049797d727261bf27f2690430d935067710049c2" "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/049797d727261bf27f2690430d935067710049c2", "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b",
"reference": "049797d727261bf27f2690430d935067710049c2", "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -180,7 +180,7 @@
"zend", "zend",
"zikula" "zikula"
], ],
"time": "2017-12-29T09:13:20+00:00" "time": "2018-08-27T06:10:37+00:00"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
@@ -249,66 +249,9 @@
], ],
"time": "2018-01-09T20:05:19+00:00" "time": "2018-01-09T20:05:19+00:00"
}, },
{
"name": "hassankhan/config",
"version": "0.10.0",
"source": {
"type": "git",
"url": "https://github.com/hassankhan/config.git",
"reference": "06ac500348af033f1a2e44dc357ca86282626d4a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hassankhan/config/zipball/06ac500348af033f1a2e44dc357ca86282626d4a",
"reference": "06ac500348af033f1a2e44dc357ca86282626d4a",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"scrutinizer/ocular": "~1.1",
"squizlabs/php_codesniffer": "~2.2"
},
"suggest": {
"symfony/yaml": "~2.5"
},
"type": "library",
"autoload": {
"psr-4": {
"Noodlehaus\\": "src"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Hassan Khan",
"homepage": "http://hassankhan.me/",
"role": "Developer"
}
],
"description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
"homepage": "http://hassankhan.me/config/",
"keywords": [
"config",
"configuration",
"ini",
"json",
"microphp",
"unframework",
"xml",
"yaml",
"yml"
],
"time": "2016-02-11T16:21:17+00:00"
},
{ {
"name": "illuminate/config", "name": "illuminate/config",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/config.git", "url": "https://github.com/illuminate/config.git",
@@ -352,16 +295,16 @@
}, },
{ {
"name": "illuminate/container", "name": "illuminate/container",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/container.git", "url": "https://github.com/illuminate/container.git",
"reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a" "reference": "1f0757cae8749400aeda730f6438a081fc3c082d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/container/zipball/4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", "url": "https://api.github.com/repos/illuminate/container/zipball/1f0757cae8749400aeda730f6438a081fc3c082d",
"reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", "reference": "1f0757cae8749400aeda730f6438a081fc3c082d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -392,20 +335,20 @@
], ],
"description": "The Illuminate Container package.", "description": "The Illuminate Container package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-01-21T02:13:38+00:00" "time": "2018-05-24T13:16:56+00:00"
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/contracts.git", "url": "https://github.com/illuminate/contracts.git",
"reference": "322ec80498b3bf85bc4025d028e130a9b50242b9" "reference": "2c029101285f6066f45e3ae5910b1b5f900fdcb4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/contracts/zipball/322ec80498b3bf85bc4025d028e130a9b50242b9", "url": "https://api.github.com/repos/illuminate/contracts/zipball/2c029101285f6066f45e3ae5910b1b5f900fdcb4",
"reference": "322ec80498b3bf85bc4025d028e130a9b50242b9", "reference": "2c029101285f6066f45e3ae5910b1b5f900fdcb4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -436,20 +379,20 @@
], ],
"description": "The Illuminate Contracts package.", "description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-04-07T17:05:26+00:00" "time": "2018-07-31T12:49:53+00:00"
}, },
{ {
"name": "illuminate/events", "name": "illuminate/events",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/events.git", "url": "https://github.com/illuminate/events.git",
"reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea" "reference": "5bdd8e84c0528970961289da088306c632eca8f7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/events/zipball/b6e73ed40478cef2ef98d5ddb27f333291606cea", "url": "https://api.github.com/repos/illuminate/events/zipball/5bdd8e84c0528970961289da088306c632eca8f7",
"reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea", "reference": "5bdd8e84c0528970961289da088306c632eca8f7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -481,20 +424,20 @@
], ],
"description": "The Illuminate Events package.", "description": "The Illuminate Events package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-02-26T19:00:55+00:00" "time": "2018-07-23T01:01:28+00:00"
}, },
{ {
"name": "illuminate/filesystem", "name": "illuminate/filesystem",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/filesystem.git", "url": "https://github.com/illuminate/filesystem.git",
"reference": "c9ab9376076cedd88a374d7281d62b619634d578" "reference": "569904131813e4ac7051ae00bc1834063da562a6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/filesystem/zipball/c9ab9376076cedd88a374d7281d62b619634d578", "url": "https://api.github.com/repos/illuminate/filesystem/zipball/569904131813e4ac7051ae00bc1834063da562a6",
"reference": "c9ab9376076cedd88a374d7281d62b619634d578", "reference": "569904131813e4ac7051ae00bc1834063da562a6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -533,20 +476,20 @@
], ],
"description": "The Illuminate Filesystem package.", "description": "The Illuminate Filesystem package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-04-06T13:15:37+00:00" "time": "2018-08-13T14:51:11+00:00"
}, },
{ {
"name": "illuminate/support", "name": "illuminate/support",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/support.git", "url": "https://github.com/illuminate/support.git",
"reference": "cc8d6f5cef3a901de6bb7d1b362102a6db001085" "reference": "4eb12aa00bbf2d5e73c355ad404a9d0679879094"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/support/zipball/cc8d6f5cef3a901de6bb7d1b362102a6db001085", "url": "https://api.github.com/repos/illuminate/support/zipball/4eb12aa00bbf2d5e73c355ad404a9d0679879094",
"reference": "cc8d6f5cef3a901de6bb7d1b362102a6db001085", "reference": "4eb12aa00bbf2d5e73c355ad404a9d0679879094",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -561,6 +504,7 @@
}, },
"suggest": { "suggest": {
"illuminate/filesystem": "Required to use the composer class (5.6.*).", "illuminate/filesystem": "Required to use the composer class (5.6.*).",
"ramsey/uuid": "Required to use Str::uuid() (^3.7).",
"symfony/process": "Required to use the composer class (~4.0).", "symfony/process": "Required to use the composer class (~4.0).",
"symfony/var-dumper": "Required to use the dd function (~4.0)." "symfony/var-dumper": "Required to use the dd function (~4.0)."
}, },
@@ -590,20 +534,20 @@
], ],
"description": "The Illuminate Support package.", "description": "The Illuminate Support package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-04-17T12:26:47+00:00" "time": "2018-08-15T21:02:31+00:00"
}, },
{ {
"name": "illuminate/view", "name": "illuminate/view",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/view.git", "url": "https://github.com/illuminate/view.git",
"reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d" "reference": "87645c175810ffe2969318d004138eb786b99dd9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/view/zipball/54eaf45ee7946d8f8cde13d5e89c5ea2e997040d", "url": "https://api.github.com/repos/illuminate/view/zipball/87645c175810ffe2969318d004138eb786b99dd9",
"reference": "54eaf45ee7946d8f8cde13d5e89c5ea2e997040d", "reference": "87645c175810ffe2969318d004138eb786b99dd9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -638,20 +582,20 @@
], ],
"description": "The Illuminate View package.", "description": "The Illuminate View package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-04-03T12:56:35+00:00" "time": "2018-09-02T11:28:46+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "1.27.0", "version": "1.33.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9" "reference": "55667c1007a99e82030874b1bb14d24d07108413"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ef81c39b67200dcd7401c24363dcac05ac3a4fe9", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/55667c1007a99e82030874b1bb14d24d07108413",
"reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9", "reference": "55667c1007a99e82030874b1bb14d24d07108413",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -663,6 +607,13 @@
"phpunit/phpunit": "^4.8.35 || ^5.7" "phpunit/phpunit": "^4.8.35 || ^5.7"
}, },
"type": "library", "type": "library",
"extra": {
"laravel": {
"providers": [
"Carbon\\Laravel\\ServiceProvider"
]
}
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"": "src/" "": "src/"
@@ -686,7 +637,7 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2018-04-23T09:02:57+00:00" "time": "2018-08-07T08:39:47+00:00"
}, },
{ {
"name": "psr/container", "name": "psr/container",
@@ -834,23 +785,23 @@
}, },
{ {
"name": "roots/sage-lib", "name": "roots/sage-lib",
"version": "9.0.1", "version": "9.0.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/roots/sage-lib.git", "url": "https://github.com/roots/sage-lib.git",
"reference": "36573cd93b8109633c953e3f05b9f7d654bad885" "reference": "b85bf4e3bf4a766dbc956acb535a2ceb799f3ca4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/roots/sage-lib/zipball/36573cd93b8109633c953e3f05b9f7d654bad885", "url": "https://api.github.com/repos/roots/sage-lib/zipball/b85bf4e3bf4a766dbc956acb535a2ceb799f3ca4",
"reference": "36573cd93b8109633c953e3f05b9f7d654bad885", "reference": "b85bf4e3bf4a766dbc956acb535a2ceb799f3ca4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/installers": "~1.0", "composer/installers": "~1.0",
"illuminate/config": "~5.6", "illuminate/config": "~5.6",
"illuminate/view": "~5.6", "illuminate/view": "~5.6",
"php": ">=7" "php": ">=7.1"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "~3.0" "squizlabs/php_codesniffer": "~3.0"
@@ -882,37 +833,34 @@
"keywords": [ "keywords": [
"wordpress" "wordpress"
], ],
"time": "2018-04-25T17:24:31+00:00" "time": "2018-06-03T02:04:14+00:00"
}, },
{ {
"name": "soberwp/controller", "name": "soberwp/controller",
"version": "9.0.0-beta.4", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/soberwp/controller.git", "url": "https://github.com/soberwp/controller.git",
"reference": "2b6c8450f4a3100b16bfc482c825d89422b6adc6" "reference": "1b2a71df0eb6d82cef10ed528a3e71cab40096b5"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/soberwp/controller/zipball/2b6c8450f4a3100b16bfc482c825d89422b6adc6", "url": "https://api.github.com/repos/soberwp/controller/zipball/1b2a71df0eb6d82cef10ed528a3e71cab40096b5",
"reference": "2b6c8450f4a3100b16bfc482c825d89422b6adc6", "reference": "1b2a71df0eb6d82cef10ed528a3e71cab40096b5",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"brain/hierarchy": "^2.3", "brain/hierarchy": "^2.3",
"composer/installers": "~1.0", "composer/installers": "^1.5",
"hassankhan/config": "^0.10.0", "php": ">=5.6.0"
"php": ">=5.6.0",
"symfony/yaml": "^3.2"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "2.*" "squizlabs/php_codesniffer": "^3.2"
}, },
"type": "package", "type": "package",
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Sober\\Controller\\": "src/", "Sober\\Controller\\": "src/"
"Sober\\Controller\\Module\\": "src/Module/"
}, },
"files": [ "files": [
"controller.php" "controller.php"
@@ -934,20 +882,20 @@
"keywords": [ "keywords": [
"wordpress" "wordpress"
], ],
"time": "2017-08-22T17:35:30+00:00" "time": "2018-08-17T08:45:11+00:00"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
"version": "v4.0.8", "version": "v4.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/debug.git", "url": "https://github.com/symfony/debug.git",
"reference": "5961d02d48828671f5d8a7805e06579d692f6ede" "reference": "47ead688f1f2877f3f14219670f52e4722ee7052"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede", "url": "https://api.github.com/repos/symfony/debug/zipball/47ead688f1f2877f3f14219670f52e4722ee7052",
"reference": "5961d02d48828671f5d8a7805e06579d692f6ede", "reference": "47ead688f1f2877f3f14219670f52e4722ee7052",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -963,7 +911,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -990,20 +938,20 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-08-03T11:13:38+00:00"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
"version": "v4.0.8", "version": "v4.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/finder.git", "url": "https://github.com/symfony/finder.git",
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "url": "https://api.github.com/repos/symfony/finder/zipball/e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
"reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "reference": "e162f1df3102d0b7472805a5a9d5db9fcf0a8068",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1012,7 +960,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1039,20 +987,20 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-04T05:10:37+00:00" "time": "2018-07-26T11:24:31+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.7.0", "version": "v1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
"reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1064,7 +1012,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.7-dev" "dev-master": "1.9-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1098,20 +1046,20 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2018-01-30T19:27:44+00:00" "time": "2018-08-06T14:22:27+00:00"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
"version": "v4.0.8", "version": "v4.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/translation.git", "url": "https://github.com/symfony/translation.git",
"reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f",
"reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1126,20 +1074,21 @@
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/console": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
"symfony/finder": "~2.8|~3.0|~4.0", "symfony/finder": "~2.8|~3.0|~4.0",
"symfony/intl": "~3.4|~4.0", "symfony/intl": "~3.4|~4.0",
"symfony/yaml": "~3.4|~4.0" "symfony/yaml": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
"psr/log": "To use logging capability in translator", "psr/log-implementation": "To use logging capability in translator",
"symfony/config": "", "symfony/config": "",
"symfony/yaml": "" "symfony/yaml": ""
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1166,80 +1115,22 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-02-22T10:50:29+00:00" "time": "2018-08-07T12:45:11+00:00"
},
{
"name": "symfony/yaml",
"version": "v3.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/a42f9da85c7c38d59f5e53f076fe81a091f894d0",
"reference": "a42f9da85c7c38d59f5e53f076fe81a091f894d0",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8"
},
"conflict": {
"symfony/console": "<3.4"
},
"require-dev": {
"symfony/console": "~3.4|~4.0"
},
"suggest": {
"symfony/console": "For validating YAML files using the lint command"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.4-dev"
}
},
"autoload": {
"psr-4": {
"Symfony\\Component\\Yaml\\": ""
},
"exclude-from-classmap": [
"/Tests/"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Fabien Potencier",
"email": "fabien@symfony.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2018-04-03T05:14:20+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
{ {
"name": "illuminate/console", "name": "illuminate/console",
"version": "v5.6.17", "version": "v5.6.38",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/illuminate/console.git", "url": "https://github.com/illuminate/console.git",
"reference": "8e276273dd518d83e229488b358ddf3a0b47acff" "reference": "2f4d3640d4d72054c45bc3b2133f1f64ce6ce40e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/illuminate/console/zipball/8e276273dd518d83e229488b358ddf3a0b47acff", "url": "https://api.github.com/repos/illuminate/console/zipball/2f4d3640d4d72054c45bc3b2133f1f64ce6ce40e",
"reference": "8e276273dd518d83e229488b358ddf3a0b47acff", "reference": "2f4d3640d4d72054c45bc3b2133f1f64ce6ce40e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1276,20 +1167,20 @@
], ],
"description": "The Illuminate Console package.", "description": "The Illuminate Console package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2018-04-07T17:05:26+00:00" "time": "2018-09-03T13:49:38+00:00"
}, },
{ {
"name": "roots/sage-installer", "name": "roots/sage-installer",
"version": "1.3.6", "version": "1.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/roots/sage-installer.git", "url": "https://github.com/roots/sage-installer.git",
"reference": "e811ab937a36b321ea88ec6000ab3d5019b8f2b1" "reference": "290e17d20da6566eda339f1ee448ada4a9bc3b1d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/roots/sage-installer/zipball/e811ab937a36b321ea88ec6000ab3d5019b8f2b1", "url": "https://api.github.com/repos/roots/sage-installer/zipball/290e17d20da6566eda339f1ee448ada4a9bc3b1d",
"reference": "e811ab937a36b321ea88ec6000ab3d5019b8f2b1", "reference": "290e17d20da6566eda339f1ee448ada4a9bc3b1d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1331,10 +1222,11 @@
"foundation", "foundation",
"sage", "sage",
"tachyons", "tachyons",
"tailwindcss",
"theme", "theme",
"wordpress" "wordpress"
], ],
"time": "2018-04-25T17:45:56+00:00" "time": "2018-09-17T17:09:42+00:00"
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
@@ -1416,16 +1308,16 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.0.8", "version": "v4.1.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64" "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f",
"reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1445,7 +1337,7 @@
"symfony/process": "~3.4|~4.0" "symfony/process": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log-implementation": "For using the console logger",
"symfony/event-dispatcher": "", "symfony/event-dispatcher": "",
"symfony/lock": "", "symfony/lock": "",
"symfony/process": "" "symfony/process": ""
@@ -1453,7 +1345,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.0-dev" "dev-master": "4.1-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1480,20 +1372,20 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:24:00+00:00" "time": "2018-07-26T11:24:31+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v3.4.8", "version": "v3.4.15",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "4b7d64e852886319e93ddfdecff0d744ab87658b" "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/4b7d64e852886319e93ddfdecff0d744ab87658b", "url": "https://api.github.com/repos/symfony/process/zipball/4d6b125d5293cbceedc2aa10f2c71617e76262e7",
"reference": "4b7d64e852886319e93ddfdecff0d744ab87658b", "reference": "4d6b125d5293cbceedc2aa10f2c71617e76262e7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1529,14 +1421,12 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2018-04-03T05:22:50+00:00" "time": "2018-08-03T10:42:44+00:00"
} }
], ],
"aliases": [], "aliases": [],
"minimum-stability": "stable", "minimum-stability": "stable",
"stability-flags": { "stability-flags": [],
"soberwp/controller": 10
},
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {

2393
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

27
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "sage", "name": "sage",
"version": "9.0.1", "version": "9.0.5",
"author": "Roots <team@roots.io>", "author": "Roots <team@roots.io>",
"homepage": "https://roots.io/sage/", "homepage": "https://roots.io/sage/",
"private": true, "private": true,
@@ -24,7 +24,7 @@
], ],
"scripts": { "scripts": {
"build": "webpack --progress --config resources/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:production": "webpack --env.production --progress --config resources/assets/build/webpack.config.js",
"build:profile": "webpack --progress --profile --json --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", "start": "webpack --hide-modules --watch --config resources/assets/build/webpack.config.js",
"rmdist": "rimraf dist", "rmdist": "rimraf dist",
@@ -38,7 +38,7 @@
}, },
"devDependencies": { "devDependencies": {
"autoprefixer": "~8.2.0", "autoprefixer": "~8.2.0",
"browser-sync": "~2.23.6", "browser-sync": "~2.24.6",
"browsersync-webpack-plugin": "^0.6.0", "browsersync-webpack-plugin": "^0.6.0",
"bs-html-injector": "~3.0", "bs-html-injector": "~3.0",
"buble-loader": "^0.4.1", "buble-loader": "^0.4.1",
@@ -46,37 +46,38 @@
"clean-webpack-plugin": "^0.1.18", "clean-webpack-plugin": "^0.1.18",
"copy-globs-webpack-plugin": "^0.2.0", "copy-globs-webpack-plugin": "^0.2.0",
"css-loader": "^0.28.9", "css-loader": "^0.28.9",
"cssnano": "~v4.0.0-rc.2", "cssnano": "~4.0.5",
"eslint": "~4.19.1", "eslint": "~4.19.1",
"eslint-loader": "~1.9", "eslint-loader": "~1.9",
"eslint-plugin-import": "~2.11.0", "eslint-plugin-import": "~2.14.0",
"extract-text-webpack-plugin": "~3.0.2", "extract-text-webpack-plugin": "~3.0.2",
"file-loader": "^1.1.6", "file-loader": "^1.1.6",
"friendly-errors-webpack-plugin": "^1.6.1", "friendly-errors-webpack-plugin": "^1.6.1",
"imagemin-mozjpeg": "~7.0.0", "imagemin-mozjpeg": "~7.0.0",
"imagemin-webpack-plugin": "~2.1.1", "imagemin-webpack-plugin": "~2.2.0",
"import-glob": "~1.5", "import-glob": "~1.5",
"node-sass": "~4.8.3", "node-sass": "~4.9.3",
"postcss-loader": "~2.1.0", "postcss-loader": "~2.1.0",
"postcss-safe-parser": "~3.0", "postcss-safe-parser": "~3.0",
"resolve-url-loader": "~2.3.0", "resolve-url-loader": "~2.3.0",
"rimraf": "~2.6", "rimraf": "~2.6",
"sass-loader": "~6.0", "sass-loader": "~6.0",
"style-loader": "^0.20.1", "style-loader": "^0.22.1",
"stylelint": "^8.4.0", "stylelint": "^8.4.0",
"stylelint-config-standard": "~18.2.0", "stylelint-config-standard": "~18.2.0",
"stylelint-webpack-plugin": "^0.10.1", "stylelint-webpack-plugin": "^0.10.5",
"uglifyjs-webpack-plugin": "^1.3.0",
"url-loader": "^0.6.2", "url-loader": "^0.6.2",
"webpack": "~3.10.0", "webpack": "~3.10.0",
"webpack-assets-manifest": "^1.0.0", "webpack-assets-manifest": "^1.0.0",
"webpack-dev-middleware": "~2.0.4", "webpack-dev-middleware": "~2.0.4",
"webpack-hot-middleware": "~2.22.0", "webpack-hot-middleware": "~2.22.3",
"webpack-merge": "~4.1.1", "webpack-merge": "~4.1.4",
"yargs": "~11.0.0" "yargs": "~11.0.0"
}, },
"dependencies": { "dependencies": {
"bootstrap": "v4.1.1", "bootstrap": "v4.1.3",
"jquery": "^3.3.1", "jquery": "^3.3.1",
"popper.js": "^1.14.3" "popper.js": "^1.14.4"
} }
} }

2
resources/assets/build/config.js
View File

@@ -44,7 +44,7 @@ if (process.env.NODE_ENV === undefined) {
* If your publicPath differs between environments, but you know it at compile time, * If your publicPath differs between environments, but you know it at compile time,
* then set SAGE_DIST_PATH as an environment variable before compiling. * then set SAGE_DIST_PATH as an environment variable before compiling.
* Example: * Example:
* SAGE_DIST_PATH=/wp-content/themes/sage/dist yarn build:production * SAGE_DIST_PATH=/wp-content/themes/sage/dist/ yarn build:production
*/ */
if (process.env.SAGE_DIST_PATH) { if (process.env.SAGE_DIST_PATH) {
module.exports.publicPath = process.env.SAGE_DIST_PATH; module.exports.publicPath = process.env.SAGE_DIST_PATH;

2
resources/assets/build/postcss.config.js
View File

@@ -8,8 +8,8 @@ module.exports = ({ file, options }) => {
return { return {
parser: options.enabled.optimize ? 'postcss-safe-parser' : undefined, parser: options.enabled.optimize ? 'postcss-safe-parser' : undefined,
plugins: { plugins: {
cssnano: options.enabled.optimize ? cssnanoConfig : false,
autoprefixer: true, autoprefixer: true,
cssnano: options.enabled.optimize ? cssnanoConfig : false,
}, },
}; };
}; };

21
resources/assets/build/webpack.config.js
View File

@@ -8,6 +8,7 @@ const StyleLintPlugin = require('stylelint-webpack-plugin');
const CopyGlobsPlugin = require('copy-globs-webpack-plugin'); const CopyGlobsPlugin = require('copy-globs-webpack-plugin');
const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin'); const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin');
const desire = require('./util/desire');
const config = require('./config'); const config = require('./config');
const assetsFilenames = (config.enabled.cacheBusting) ? config.cacheBusting : '[name]'; const assetsFilenames = (config.enabled.cacheBusting) ? config.cacheBusting : '[name]';
@@ -89,7 +90,12 @@ let webpackConfig = {
}, },
}, },
{ loader: 'resolve-url', options: { sourceMap: config.enabled.sourceMaps } }, { loader: 'resolve-url', options: { sourceMap: config.enabled.sourceMaps } },
{ loader: 'sass', options: { sourceMap: config.enabled.sourceMaps } }, {
loader: 'sass', options: {
sourceMap: config.enabled.sourceMaps,
sourceComments: true,
},
},
], ],
}), }),
}, },
@@ -208,4 +214,15 @@ if (config.enabled.watcher) {
webpackConfig = merge(webpackConfig, require('./webpack.config.watch')); webpackConfig = merge(webpackConfig, require('./webpack.config.watch'));
} }
module.exports = webpackConfig; /**
* During installation via sage-installer (i.e. composer create-project) some
* presets may generate a preset specific config (webpack.config.preset.js) to
* override some of the default options set here. We use webpack-merge to merge
* them in. If you need to modify Sage's default webpack config, we recommend
* that you modify this file directly, instead of creating your own preset
* file, as there are limitations to using webpack-merge which can hinder your
* ability to change certain options.
*/
module.exports = merge.smartStrategy({
'module.loaders': 'replace',
})(webpackConfig, desire(`${__dirname}/webpack.config.preset`));

10
resources/assets/build/webpack.config.optimize.js
View File

@@ -2,6 +2,7 @@
const { default: ImageminPlugin } = require('imagemin-webpack-plugin'); const { default: ImageminPlugin } = require('imagemin-webpack-plugin');
const imageminMozjpeg = require('imagemin-mozjpeg'); const imageminMozjpeg = require('imagemin-mozjpeg');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
const config = require('./config'); const config = require('./config');
@@ -21,5 +22,14 @@ module.exports = {
plugins: [imageminMozjpeg({ quality: 75 })], plugins: [imageminMozjpeg({ quality: 75 })],
disable: (config.enabled.watcher), disable: (config.enabled.watcher),
}), }),
new UglifyJsPlugin({
uglifyOptions: {
ecma: 5,
compress: {
warnings: true,
drop_console: true,
},
},
}),
], ],
}; };

4
resources/assets/styles/common/_variables.scss
View File

@@ -4,3 +4,7 @@
$theme-colors: ( $theme-colors: (
primary: #525ddc primary: #525ddc
); );
/** Bootstrap navbar fix (https://git.io/fADqW) */
$navbar-dark-toggler-icon-bg: none;
$navbar-light-toggler-icon-bg: none;

2
resources/style.css
View File

@@ -2,7 +2,7 @@
Theme Name: Sage Starter Theme Theme Name: Sage Starter Theme
Theme URI: https://roots.io/sage/ Theme URI: https://roots.io/sage/
Description: Sage is a WordPress starter theme. Description: Sage is a WordPress starter theme.
Version: 9.0.1 Version: 9.0.5
Author: Roots Author: Roots
Author URI: https://roots.io/ Author URI: https://roots.io/
Text Domain: sage Text Domain: sage

2
resources/views/layouts/app.blade.php
View File

@@ -1,5 +1,5 @@
<!doctype html> <!doctype html>
<html @php language_attributes() @endphp> <html {!! get_language_attributes() !!}>
@include('partials.head') @include('partials.head')
<body @php body_class() @endphp> <body @php body_class() @endphp>
@php do_action('get_header') @endphp @php do_action('get_header') @endphp

2212
yarn.lock
View File

File diff suppressed because it is too large Load Diff