Skip to content
This repository was archived by the owner on Aug 29, 2024. It is now read-only.

Commit 25c5846

Browse files
committed
Merge remote-tracking branch 'roots/master' into genero
* roots/master: (41 commits) Add uglifyjs plugin (roots#2070) Add missing trailing commas in 2f51b51 Run autoprefixer before minification Enable source comments in Sass Fix travis CI build error (missing trailing comma) Tweaked SVGO settings Make template() compatible with wp admin 9.0.1 Update to Bootstrap 4.1.1 Remove useless whitespace Auto-detect scheme Close roots#2028 - Increase priority on comments_template filter Remove Font Awesome reference [ci skip] Bump sage-lib Close roots#1962 - Bump to Laravel 5.6 Remove php blade shorthand Stable vs dev install messaging, ref roots/docs#140 [ci skip] Update some dependencies Update CHANGELOG [ci skip] Bootstrap 4.1.0 ...
2 parents 8858444 + fd2a94f commit 25c5846

14 files changed

+97
-9831
lines changed

.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module.exports = {
3333
]
3434
},
3535
"rules": {
36-
"no-console": process.env.NODE_ENV === 'production' ? 2 : 0,
36+
"no-console": 0,
3737
"comma-dangle": [
3838
"error",
3939
{

.travis.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ sudo: false
33
dist: trusty
44
php:
55
- 7.1
6-
- 7.0
76
- nightly
87

98
env:

CHANGELOG.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
1-
### HEAD
1+
### 9.0.1: April 30th, 2018
2+
* Update to Bootstrap 4.1.1 ([#2065](https://github.com/roots/sage/pull/2065))
3+
* Auto-detect `proxyUrl` scheme ([#2062](https://github.com/roots/sage/pull/2062))
4+
* Bump to Laravel 5.6 ([#2061](https://github.com/roots/sage/pull/2061))
5+
* Update to Bootstrap 4.1.0 ([#2056](https://github.com/roots/sage/pull/2056))
6+
* Change inline `@php` directive to full form ([#2042](https://github.com/roots/sage/pull/2042))
7+
* PHP 7.1.3+ is now required ([#2037](https://github.com/roots/sage/pull/2037))
8+
9+
### 9.0.0: February 7th, 2018
10+
* Update to Bootstrap 4 ([#2015](https://github.com/roots/sage/pull/2015))
11+
* Allow `no-console` development ([#2008](https://github.com/roots/sage/pull/2008))
12+
* Move variables and Bootstrap lines to autoload ([#1993](https://github.com/roots/sage/pull/1993))
13+
* Update controller examples ([#1986](https://github.com/roots/sage/pull/1986))
214
* Update to Bootstrap 4 Beta 2 ([#1981](https://github.com/roots/sage/pull/1981))
315
* Add friendly-errors-webpack-plugin ([#1961](https://github.com/roots/sage/pull/1961))
416
* Update to Controller 9.0.0-beta.4 ([#1959](https://github.com/roots/sage/pull/1959))

README.md

+22-26
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,15 @@
55

66
Sage is a WordPress starter theme with a modern development workflow.
77

8-
**Sage 9 is in active development and is currently in beta. The `master` branch tracks Sage 9 development. If you want a stable version, use the [latest Sage 8 release](https://github.com/roots/sage/releases/latest).**
9-
108
## Features
119

1210
* Sass for stylesheets
13-
* ES6 for JavaScript
11+
* Modern JavaScript
1412
* [Webpack](https://webpack.github.io/) for compiling assets, optimizing images, and concatenating and minifying files
1513
* [Browsersync](http://www.browsersync.io/) for synchronized browser testing
16-
* [Laravel Blade](https://laravel.com/docs/5.3/blade) as a templating engine
14+
* [Blade](https://laravel.com/docs/5.5/blade) as a templating engine
1715
* [Controller](https://github.com/soberwp/controller) for passing data to Blade templates
18-
* CSS framework options:
19-
* [Bootstrap 4](http://getbootstrap.com/)
20-
* [Bulma](http://bulma.io/)
21-
* [Foundation](http://foundation.zurb.com/)
22-
* [Tachyons](http://tachyons.io/)
23-
* None (blank slate)
24-
* Font Awesome (optional)
16+
* CSS framework (optional): [Bootstrap 4](https://getbootstrap.com/), [Bulma](https://bulma.io/), [Foundation](https://foundation.zurb.com/), [Tachyons](http://tachyons.io/)
2517

2618
See a working example at [roots-example-project.com](https://roots-example-project.com/).
2719

@@ -30,7 +22,7 @@ See a working example at [roots-example-project.com](https://roots-example-proje
3022
Make sure all dependencies have been installed before moving on:
3123

3224
* [WordPress](https://wordpress.org/) >= 4.7
33-
* [PHP](http://php.net/manual/en/install.php) >= 7.0
25+
* [PHP](https://secure.php.net/manual/en/install.php) >= 7.1.3 (with [`php-mbstring`](https://secure.php.net/manual/en/book.mbstring.php) enabled)
3426
* [Composer](https://getcomposer.org/download/)
3527
* [Node.js](http://nodejs.org/) >= 6.9.x
3628
* [Yarn](https://yarnpkg.com/en/docs/install)
@@ -41,15 +33,16 @@ Install Sage using Composer from your WordPress themes directory (replace `your-
4133

4234
```shell
4335
# @ app/themes/ or wp-content/themes/
44-
$ composer create-project roots/sage your-theme-name dev-master
36+
$ composer create-project roots/sage your-theme-name
4537
```
4638

47-
During theme installation you will have the options to:
39+
To install the latest development version of Sage, add `dev-master` to the end of the command:
40+
41+
```shell
42+
$ composer create-project roots/sage your-theme-name dev-master
43+
```
4844

49-
* Update theme headers (theme name, description, author, etc.)
50-
* Select a CSS framework (Bootstrap, Bulma, Foundation, Tachyons, none)
51-
* Add Font Awesome
52-
* Configure Browsersync (path to theme, local development URL)
45+
During theme installation you will have options to update `style.css` theme headers, select a CSS framework, and configure Browsersync.
5346

5447
## Theme structure
5548

@@ -97,22 +90,25 @@ Edit `app/setup.php` to enable or disable theme features, setup navigation menus
9790

9891
### Build commands
9992

100-
* `yarn run start` — Compile assets when file changes are made, start Browsersync session
101-
* `yarn run build` — Compile and optimize the files in your assets directory
102-
* `yarn run build:production` — Compile assets for production
93+
* `yarn start` — Compile assets when file changes are made, start Browsersync session
94+
* `yarn build` — Compile and optimize the files in your assets directory
95+
* `yarn build:production` — Compile assets for production
10396

10497
## Documentation
10598

106-
Sage 8 documentation is available at [https://roots.io/sage/docs/](https://roots.io/sage/docs/).
107-
108-
Sage 9 documentation is currently in progress and can be viewed at [https://github.com/roots/docs/tree/sage-9/sage](https://github.com/roots/docs/tree/sage-9/sage).
109-
110-
Controller documentation is available at [https://github.com/soberwp/controller#usage](https://github.com/soberwp/controller#usage).
99+
* [Sage documentation](https://roots.io/sage/docs/)
100+
* [Controller documentation](https://github.com/soberwp/controller#usage)
111101

112102
## Contributing
113103

114104
Contributions are welcome from everyone. We have [contributing guidelines](https://github.com/roots/guidelines/blob/master/CONTRIBUTING.md) to help you get started.
115105

106+
## Gold sponsors
107+
108+
Help support our open-source development efforts by [contributing to Sage on OpenCollective](https://opencollective.com/sage).
109+
110+
<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>
111+
116112
## Community
117113

118114
Keep track of development and community news.

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
{ "type": "composer", "url": "https://packagist.minasithil.genero.fi/" }
4343
],
4444
"require": {
45-
"php": ">=7",
45+
"php": ">=7.1",
4646
"composer/installers": "~1.0",
47-
"illuminate/support": "~5.4",
48-
"roots/sage-lib": "~9.0.0-beta.4",
47+
"illuminate/support": "~5.6",
48+
"roots/sage-lib": "~9.0.1",
4949
"generoi/sage-foundation": "~1.0",
5050
"generoi/sage-polylang": "~1.0",
5151
"generoi/acf-genero-components": "^1.0.0-alpha"

0 commit comments

Comments
 (0)