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

Merge pull request #1943 from roots/bs4-beta

Browse Source 
Bootstrap 4 Beta, Sage 9.0.0-beta.4
This commit is contained in:
Ben Word
2017-08-11 18:18:34 -06:00
committed by GitHub
parent 0a0f1dc025 d208fa4b4e
commit 79fb1ee5de
9 changed files with 4890 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,4 +1,6 @@
### HEAD ### 9.0.0-beta.4: August 11th, 2017
* Update to Bootstrap 4.0.0-beta ([#1943](https://github.com/roots/sage/pull/1943))
* PHP 7+ is now required ([#1935](https://github.com/roots/sage/pull/1935))
* Update dependencies, support `config-local.json`, implement autoload system for styles/scripts, use `roots/sage-installer`, use `roots/sage-lib` ([#1919](https://github.com/roots/sage/pull/1919)) * Update dependencies, support `config-local.json`, implement autoload system for styles/scripts, use `roots/sage-installer`, use `roots/sage-lib` ([#1919](https://github.com/roots/sage/pull/1919))
* Add soberwp/controller ([#1903](https://github.com/roots/sage/pull/1903)) * Add soberwp/controller ([#1903](https://github.com/roots/sage/pull/1903))
* Change syntax of template call to match other files in views ([#1908](https://github.com/roots/sage/pull/1908)) * Change syntax of template call to match other files in views ([#1908](https://github.com/roots/sage/pull/1908))

9
composer.json
View File

@@ -14,6 +14,11 @@
"name": "Scott Walkinshaw", "name": "Scott Walkinshaw",
"email": "scott.walkinshaw@gmail.com", "email": "scott.walkinshaw@gmail.com",
"homepage": "https://github.com/swalkinshaw" "homepage": "https://github.com/swalkinshaw"
},
{
"name": "QWp6t",
"email": "hi@qwp6t.me",
"homepage": "https://github.com/qwp6t"
} }
], ],
"keywords": ["wordpress"], "keywords": ["wordpress"],
@@ -30,12 +35,12 @@
"php": ">=7", "php": ">=7",
"composer/installers": "~1.0", "composer/installers": "~1.0",
"illuminate/support": "~5.4", "illuminate/support": "~5.4",
"roots/sage-lib": "~9.0.0-beta.3", "roots/sage-lib": "~9.0.0-beta.4",
"soberwp/controller": "dev-master" "soberwp/controller": "dev-master"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "^2.8.0", "squizlabs/php_codesniffer": "^2.8.0",
"roots/sage-installer": "~1.2" "roots/sage-installer": "~1.3"
}, },
"scripts": { "scripts": {
"test": ["phpcs"], "test": ["phpcs"],

94
composer.lock generated
View File

@@ -4,7 +4,8 @@
"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": "1df1cc8effa8af96eaf4c2ebaea87a45", "hash": "3b5ec6db6f1d65c1102e7617961a9b6d",
"content-hash": "5baee523a1f1729eb6eb338a48a1fdf7",
"packages": [ "packages": [
{ {
"name": "brain/hierarchy", "name": "brain/hierarchy",
@@ -60,20 +61,20 @@
"keywords": [ "keywords": [
"wordpress" "wordpress"
], ],
"time": "2016-09-15T13:33:53+00:00" "time": "2016-09-15 13:33:53"
}, },
{ {
"name": "composer/installers", "name": "composer/installers",
"version": "v1.3.0", "version": "v1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/installers.git", "url": "https://github.com/composer/installers.git",
"reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045" "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/installers/zipball/79ad876c7498c0bbfe7eed065b8651c93bfd6045", "url": "https://api.github.com/repos/composer/installers/zipball/9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"reference": "79ad876c7498c0bbfe7eed065b8651c93bfd6045", "reference": "9ce17fb70e9a38dd8acff0636a29f5cf4d575c1b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -119,6 +120,7 @@
"Hurad", "Hurad",
"ImageCMS", "ImageCMS",
"Kanboard", "Kanboard",
"Lan Management System",
"MODX Evo", "MODX Evo",
"Mautic", "Mautic",
"Maya", "Maya",
@@ -142,6 +144,7 @@
"croogo", "croogo",
"dokuwiki", "dokuwiki",
"drupal", "drupal",
"eZ Platform",
"elgg", "elgg",
"expressionengine", "expressionengine",
"fuelphp", "fuelphp",
@@ -158,6 +161,7 @@
"mediawiki", "mediawiki",
"modulework", "modulework",
"moodle", "moodle",
"osclass",
"phpbb", "phpbb",
"piwik", "piwik",
"ppi", "ppi",
@@ -174,7 +178,7 @@
"zend", "zend",
"zikula" "zikula"
], ],
"time": "2017-04-24T06:37:16+00:00" "time": "2017-08-09 07:53:48"
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
@@ -241,7 +245,7 @@
"singularize", "singularize",
"string" "string"
], ],
"time": "2017-07-22T12:18:28+00:00" "time": "2017-07-22 12:18:28"
}, },
{ {
"name": "hassankhan/config", "name": "hassankhan/config",
@@ -298,7 +302,7 @@
"yaml", "yaml",
"yml" "yml"
], ],
"time": "2016-02-11T16:21:17+00:00" "time": "2016-02-11 16:21:17"
}, },
{ {
"name": "illuminate/config", "name": "illuminate/config",
@@ -342,7 +346,7 @@
], ],
"description": "The Illuminate Config package.", "description": "The Illuminate Config package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-02-04T20:27:32+00:00" "time": "2017-02-04 20:27:32"
}, },
{ {
"name": "illuminate/container", "name": "illuminate/container",
@@ -385,7 +389,7 @@
], ],
"description": "The Illuminate Container package.", "description": "The Illuminate Container package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-05-24T14:15:53+00:00" "time": "2017-05-24 14:15:53"
}, },
{ {
"name": "illuminate/contracts", "name": "illuminate/contracts",
@@ -427,7 +431,7 @@
], ],
"description": "The Illuminate Contracts package.", "description": "The Illuminate Contracts package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-04-19T20:17:43+00:00" "time": "2017-04-19 20:17:43"
}, },
{ {
"name": "illuminate/events", "name": "illuminate/events",
@@ -472,7 +476,7 @@
], ],
"description": "The Illuminate Events package.", "description": "The Illuminate Events package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-05-02T12:57:00+00:00" "time": "2017-05-02 12:57:00"
}, },
{ {
"name": "illuminate/filesystem", "name": "illuminate/filesystem",
@@ -522,7 +526,7 @@
], ],
"description": "The Illuminate Filesystem package.", "description": "The Illuminate Filesystem package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-05-18T14:37:58+00:00" "time": "2017-05-18 14:37:58"
}, },
{ {
"name": "illuminate/support", "name": "illuminate/support",
@@ -579,7 +583,7 @@
], ],
"description": "The Illuminate Support package.", "description": "The Illuminate Support package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-06-15T12:35:32+00:00" "time": "2017-06-15 12:35:32"
}, },
{ {
"name": "illuminate/view", "name": "illuminate/view",
@@ -627,7 +631,7 @@
], ],
"description": "The Illuminate View package.", "description": "The Illuminate View package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-06-07T13:32:57+00:00" "time": "2017-06-07 13:32:57"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
@@ -675,7 +679,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2017-03-13T16:27:32+00:00" "time": "2017-03-13 16:27:32"
}, },
{ {
"name": "psr/log", "name": "psr/log",
@@ -722,30 +726,30 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2016-10-10T12:19:37+00:00" "time": "2016-10-10 12:19:37"
}, },
{ {
"name": "roots/sage-lib", "name": "roots/sage-lib",
"version": "9.0.0-beta.3", "version": "9.0.0-beta.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/roots/sage-lib.git", "url": "https://github.com/roots/sage-lib.git",
"reference": "d7789609eae857e910812cf62ae55355b836ad58" "reference": "71ed6e54e831fd1ced5bae028f0515d277e8c1c1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/roots/sage-lib/zipball/d7789609eae857e910812cf62ae55355b836ad58", "url": "https://api.github.com/repos/roots/sage-lib/zipball/71ed6e54e831fd1ced5bae028f0515d277e8c1c1",
"reference": "d7789609eae857e910812cf62ae55355b836ad58", "reference": "71ed6e54e831fd1ced5bae028f0515d277e8c1c1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/installers": "~1.0", "composer/installers": "~1.0",
"illuminate/config": "~5.4", "illuminate/config": "~5.4",
"illuminate/view": "~5.4", "illuminate/view": "~5.4",
"php": ">=5.6.4" "php": ">=7"
}, },
"require-dev": { "require-dev": {
"squizlabs/php_codesniffer": "^2.8.0" "squizlabs/php_codesniffer": "~3.0"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@@ -774,7 +778,7 @@
"keywords": [ "keywords": [
"wordpress" "wordpress"
], ],
"time": "2017-07-09T11:48:17+00:00" "time": "2017-08-11 23:38:23"
}, },
{ {
"name": "soberwp/controller", "name": "soberwp/controller",
@@ -782,12 +786,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/soberwp/controller.git", "url": "https://github.com/soberwp/controller.git",
"reference": "f45eddf3427b5a4d9e487d1f3e2e4e3785531d14" "reference": "220d88a8e2e4ca8dc97364f913defac4d8e82c1d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/soberwp/controller/zipball/f45eddf3427b5a4d9e487d1f3e2e4e3785531d14", "url": "https://api.github.com/repos/soberwp/controller/zipball/220d88a8e2e4ca8dc97364f913defac4d8e82c1d",
"reference": "f45eddf3427b5a4d9e487d1f3e2e4e3785531d14", "reference": "220d88a8e2e4ca8dc97364f913defac4d8e82c1d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -826,7 +830,7 @@
"keywords": [ "keywords": [
"wordpress" "wordpress"
], ],
"time": "2017-08-02T10:59:14+00:00" "time": "2017-08-04 18:38:48"
}, },
{ {
"name": "symfony/debug", "name": "symfony/debug",
@@ -882,7 +886,7 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-28T15:27:31+00:00" "time": "2017-07-28 15:27:31"
}, },
{ {
"name": "symfony/finder", "name": "symfony/finder",
@@ -931,7 +935,7 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-06-01T21:01:25+00:00" "time": "2017-06-01 21:01:25"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@@ -986,7 +990,7 @@
], ],
"description": "Symfony Yaml Component", "description": "Symfony Yaml Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-23T12:43:26+00:00" "time": "2017-07-23 12:43:26"
} }
], ],
"packages-dev": [ "packages-dev": [
@@ -1039,7 +1043,7 @@
], ],
"description": "The Illuminate Console package.", "description": "The Illuminate Console package.",
"homepage": "https://laravel.com", "homepage": "https://laravel.com",
"time": "2017-06-10T13:11:18+00:00" "time": "2017-06-10 13:11:18"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
@@ -1092,20 +1096,20 @@
"datetime", "datetime",
"time" "time"
], ],
"time": "2017-01-16T07:55:07+00:00" "time": "2017-01-16 07:55:07"
}, },
{ {
"name": "roots/sage-installer", "name": "roots/sage-installer",
"version": "1.2.0", "version": "1.3.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/roots/sage-installer.git", "url": "https://github.com/roots/sage-installer.git",
"reference": "2407e3c24c1050c1769c18f2d45d561fa2c67f90" "reference": "250c74a935f9aba19f90d45d92884b7b56bc989c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/roots/sage-installer/zipball/2407e3c24c1050c1769c18f2d45d561fa2c67f90", "url": "https://api.github.com/repos/roots/sage-installer/zipball/250c74a935f9aba19f90d45d92884b7b56bc989c",
"reference": "2407e3c24c1050c1769c18f2d45d561fa2c67f90", "reference": "250c74a935f9aba19f90d45d92884b7b56bc989c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1151,7 +1155,7 @@
"theme", "theme",
"wordpress" "wordpress"
], ],
"time": "2017-08-03T22:59:11+00:00" "time": "2017-08-12 00:03:02"
}, },
{ {
"name": "squizlabs/php_codesniffer", "name": "squizlabs/php_codesniffer",
@@ -1229,7 +1233,7 @@
"phpcs", "phpcs",
"standards" "standards"
], ],
"time": "2017-05-22T02:43:20+00:00" "time": "2017-05-22 02:43:20"
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
@@ -1298,7 +1302,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-29T21:27:59+00:00" "time": "2017-07-29 21:27:59"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
@@ -1357,7 +1361,7 @@
"portable", "portable",
"shim" "shim"
], ],
"time": "2017-06-09T14:24:12+00:00" "time": "2017-06-09 14:24:12"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
@@ -1406,7 +1410,7 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-07-13T13:05:09+00:00" "time": "2017-07-13 13:05:09"
}, },
{ {
"name": "symfony/translation", "name": "symfony/translation",
@@ -1471,7 +1475,7 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2017-06-24T16:45:30+00:00" "time": "2017-06-24 16:45:30"
} }
], ],
"aliases": [], "aliases": [],
@@ -1483,7 +1487,7 @@
"prefer-stable": false, "prefer-stable": false,
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=5.6.4" "php": ">=7"
}, },
"platform-dev": [] "platform-dev": []
} }

5433
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

5
package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "sage", "name": "sage",
"version": "9.0.0-beta.3", "version": "9.0.0-beta.4",
"author": "Roots <team@roots.io>", "author": "Roots <team@roots.io>",
"homepage": "https://roots.io/sage/", "homepage": "https://roots.io/sage/",
"private": true, "private": true,
@@ -126,7 +126,8 @@
"yargs": "~8.0" "yargs": "~8.0"
}, },
"dependencies": { "dependencies": {
"bootstrap": "^4.0.0-alpha.6", "bootstrap": "^4.0.0-beta",
"popper.js": "^1.11.0",
"jquery": "1.12.4 - 3" "jquery": "1.12.4 - 3"
} }
} }

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

@@ -151,8 +151,7 @@ let webpackConfig = {
$: 'jquery', $: 'jquery',
jQuery: 'jquery', jQuery: 'jquery',
'window.jQuery': 'jquery', 'window.jQuery': 'jquery',
Tether: 'tether', Popper: 'popper.js',
'window.Tether': 'tether',
}), }),
new webpack.LoaderOptionsPlugin({ new webpack.LoaderOptionsPlugin({
minimize: config.enabled.optimize, minimize: config.enabled.optimize,

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

@@ -1,2 +0,0 @@
/** Colors */
$brand-primary: #27ae60;

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.0-beta.3 Version: 9.0.0-beta.4
Author: Roots Author: Roots
Author URI: https://roots.io/ Author URI: https://roots.io/
Text Domain: sage Text Domain: sage

19
yarn.lock
View File

@@ -443,12 +443,9 @@ boom@2.x.x:
dependencies: dependencies:
hoek "2.x.x" hoek "2.x.x"
bootstrap@^4.0.0-alpha.6: bootstrap@^4.0.0-beta:
version "4.0.0-alpha.6" version "4.0.0-beta"
resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz#4f54dd33ac0deac3b28407bc2df7ec608869c9c8" resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.0.0-beta.tgz#dc5928175d2e71310bc668cf9e05a907211b72a6"
dependencies:
jquery ">=1.9.1"
tether "^1.4.0"
brace-expansion@^1.1.7: brace-expansion@^1.1.7:
version "1.1.8" version "1.1.8"
@@ -3214,7 +3211,7 @@ jpegtran-bin@^3.0.0:
bin-wrapper "^3.0.0" bin-wrapper "^3.0.0"
logalot "^2.0.0" logalot "^2.0.0"
"jquery@1.12.4 - 3", jquery@>=1.9.1: "jquery@1.12.4 - 3":
version "3.2.1" version "3.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
@@ -4418,6 +4415,10 @@ pngquant-bin@^3.0.0:
bin-wrapper "^3.0.0" bin-wrapper "^3.0.0"
logalot "^2.0.0" logalot "^2.0.0"
popper.js@^1.11.0:
version "1.11.1"
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.11.1.tgz#f5aca9a73bca1ce1fdbd9be8b1ba68677cbdd8e0"
portscanner@2.1.1: portscanner@2.1.1:
version "2.1.1" version "2.1.1"
resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96" resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
@@ -6155,10 +6156,6 @@ tempfile@^2.0.0:
temp-dir "^1.0.0" temp-dir "^1.0.0"
uuid "^3.0.1" uuid "^3.0.1"
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, text-table@~0.2.0:
version "0.2.0" version "0.2.0"
resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"