Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sage 10 #2138

Merged
merged 145 commits into from
May 10, 2020
Merged

Sage 10 #2138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
2467d95
Sage 10 (#2122)
QWp6t Dec 28, 2018
603bfdd
Merge branch 'master' into 10.0.0-dev
QWp6t Dec 29, 2018
27167b6
Add wp_body_open hook (WP 5.2+)
retlehs Apr 18, 2019
da723af
Add missing search blade
Log1x May 1, 2019
5c72cc9
Add WP Blade Check
Log1x May 1, 2019
e5505a4
Remove redundant ARIA roles
Log1x May 1, 2019
e3888bb
Revert language_attributes() to get_language_attributes()
Log1x May 1, 2019
0e4df1e
Make searchform translations match WordPress core
Log1x May 1, 2019
a3fa3e0
Merge pull request #2171 from Log1x/10.0.0-dev
retlehs May 1, 2019
2893958
️Merge branch 'master' into 10.0.0-dev
retlehs May 1, 2019
b083b89
Update Travis conf
retlehs May 1, 2019
eb34767
rmdist is gone in Sage 10
retlehs May 1, 2019
4f9222b
Change to Laravel Mix
Log1x May 1, 2019
e1c943d
Fix merge conflicts
Log1x May 1, 2019
59289e7
Simplify Blade cache removal
Log1x May 1, 2019
2e082bf
Use ->uri() on asset for sanity purposes
Log1x May 1, 2019
9117058
Fix app.js typo
Log1x May 1, 2019
33566ab
Merge pull request #2172 from Log1x/10.0.0-dev
retlehs May 1, 2019
ffa1fd7
Add npm-run-all
knowler May 2, 2019
51b7d5d
Add -c (continue on error) flag to lint command
knowler May 2, 2019
f5c5d28
run-s all the things
knowler May 2, 2019
1c418b4
Refactor build commands
knowler May 2, 2019
c46ef7b
Fix start command
knowler May 2, 2019
dd151a0
Fix hot command
knowler May 2, 2019
b2511c2
Merge pull request #2173 from roots/sage-10-add-npm-run-all
retlehs May 2, 2019
aad9f79
Move cache location to `storage/`
Log1x May 3, 2019
f3edfe7
Remove redundent $asset in setup.php
Log1x May 3, 2019
29e6dd2
Merge pull request #2174 from Log1x/10.0.0-dev
retlehs May 3, 2019
7033c34
Add clean:views npm script (#2176)
knowler May 4, 2019
1cf759e
[Sage 10] Add src and public mix path helpers (#2177)
knowler May 4, 2019
71af56c
Typo [ci skip]
retlehs May 4, 2019
6db4199
Syntax optimizations
knowler May 5, 2019
1a86124
Use out instead of public for publicPath helper
knowler May 5, 2019
e8167f5
Use publicPath instead of out
knowler May 5, 2019
dba5cbf
Use Roots\Acorn\ServiceProvider (#2180)
knowler May 6, 2019
0c65766
Merge pull request #2179 from knowler/10-mix-golf
retlehs May 7, 2019
e1a7965
Make editorconfig account for Blade's outside of resources/views
Log1x May 9, 2019
04102fa
Merge pull request #2183 from Log1x/patch-1
retlehs May 9, 2019
108aafe
non-Blade files located in resources/views should also be indent_size…
Log1x May 9, 2019
0f5cf8a
[Sage 10] Replace jQuery’s .ready() (#2182)
knowler May 9, 2019
a43790c
Merge pull request #2184 from Log1x/patch-2
retlehs May 10, 2019
9c6a51c
Merge branch '10.0.0-dev' into wp_body_open-hook
retlehs May 10, 2019
892ae84
Merge pull request #2167 from roots/wp_body_open-hook
retlehs May 10, 2019
cd05a13
Replace Travis CI with CircleCI (#2185)
retlehs May 14, 2019
e907401
Replace badge [ci skip]
retlehs May 14, 2019
8c1ed95
Optimize CircleCI (#2186)
Log1x May 14, 2019
a367176
Update .gitattributes
retlehs May 14, 2019
f4b1ca6
Update .gitattributes
retlehs May 14, 2019
9979ef1
Optimize CircleCI config (#2188)
tangrufus May 16, 2019
cc8898f
Update composer dependencies
QWp6t May 21, 2019
ea60923
Bump required WordPress version (#2193)
Log1x May 22, 2019
cf15e45
Restructure (#2200)
QWp6t Jun 12, 2019
260925d
Fix version_compare() operators (#2195)
Log1x Jun 12, 2019
c3ae1fb
Simplify Mix Browsersync API (#2198)
knowler Jun 12, 2019
07275ac
New DOM router + dynamic imports (#2190)
QWp6t Jun 13, 2019
3b8faa1
Update dependencies
QWp6t Jun 13, 2019
2e14a43
Add post-autoload-dump script for package discovery (#2201)
Log1x Jun 13, 2019
808addd
CircleCI: `yarn install` with `--frozen-lockfile` (#2203)
tangrufus Jun 18, 2019
83afc41
Bump babel-eslint from 10.0.1 to 10.0.2 (#2209)
dependabot-preview[bot] Jun 20, 2019
4e95f03
Bump sass from 1.21.0 to 1.22.0 (#2211)
dependabot-preview[bot] Jun 25, 2019
57499b2
Bump eslint-plugin-import from 2.17.3 to 2.18.0 (#2210)
dependabot-preview[bot] Jun 25, 2019
6961eba
Bump eslint from 5.16.0 to 6.0.1 (#2212)
dependabot-preview[bot] Jun 26, 2019
e507645
Fix npm run start script options not forwarded with npm (#2205)
oxyc Jun 26, 2019
98efe4c
Use WordPress’ Browserslist config (#2214)
knowler Jun 26, 2019
3f173b4
Bump sass from 1.22.0 to 1.22.1 (#2216)
dependabot-preview[bot] Jun 27, 2019
de1249c
Bump sass from 1.22.1 to 1.22.3 (#2218)
dependabot-preview[bot] Jul 6, 2019
e7f86c6
Bump laravel-mix from 4.0.16 to 4.1.2 (#2219)
dependabot-preview[bot] Jul 13, 2019
8f12829
Update README [ci skip]
retlehs Jul 13, 2019
a714074
[Security] Bump lodash from 4.17.11 to 4.17.14 (#2259)
dependabot-preview[bot] Jul 13, 2019
ea303be
Bump sass from 1.22.3 to 1.22.4 (#2260)
dependabot-preview[bot] Jul 13, 2019
6bd5d65
chore(readme): Use brand color for Twitter follow badge
QWp6t Jul 15, 2019
676ca39
Acorn asset manager config (#2220)
QWp6t Jul 16, 2019
b23186e
Add logs directory
Log1x Jul 16, 2019
6d3ea05
Merge pull request #2264 from roots/log1x/add-log-dir
Log1x Jul 16, 2019
a6c0beb
Bump sass from 1.22.4 to 1.22.5 (#2263)
dependabot-preview[bot] Jul 16, 2019
b9b743d
Add alert component with view composer (#2267)
knowler Jul 16, 2019
399ab45
Fix broken source maps + remove unnecessary conditionals (#2268)
knowler Jul 16, 2019
a71e76d
chore(config): add alert component alias to view config (#2272)
knowler Jul 18, 2019
d462e41
Bump sass from 1.22.5 to 1.22.7 (#2273)
dependabot-preview[bot] Jul 20, 2019
055e9fe
Bump eslint-plugin-import from 2.18.0 to 2.18.2 (#2275)
dependabot-preview[bot] Jul 20, 2019
e4573b3
No scripts/suggests during `composer install` on CircleCI [ci skip]
Log1x Jul 22, 2019
3c5e0e6
Add timezone, globals, and locale app config [ci skip]
Log1x Jul 22, 2019
3f6db1a
Add logging config
Log1x Jul 22, 2019
5551ec4
Update theme structure in README [ci skip]
Log1x Jul 23, 2019
4edc43b
Move get_search_form and body_class to Acorn
Log1x Jul 29, 2019
9ab51f1
Bump sass from 1.22.7 to 1.22.9 (#2281)
dependabot-preview[bot] Jul 31, 2019
ec2791d
Bump eslint from 6.0.1 to 6.1.0 (#2276)
dependabot-preview[bot] Jul 31, 2019
9bfdb73
Update sponsors [ci skip]
retlehs Aug 1, 2019
80f7a13
Keep a commented out example of calling a Composer class
Log1x Aug 3, 2019
4c335f5
Merge pull request #2280 from roots/log1x/acorn-update
Log1x Aug 3, 2019
a99a8f7
Bump dependencies
Log1x Aug 3, 2019
45f4884
Set `wp_nav_menu` echo to `false` (#2278)
Log1x Aug 3, 2019
ef14ed9
Bump @wordpress/browserslist-config from 2.5.0 to 2.6.0 (#2282)
dependabot-preview[bot] Aug 5, 2019
cefbd04
chore(deps): log1x/sage-directives from 1.0.9 to 1.1.2 (#2286)
dependabot-preview[bot] Aug 8, 2019
0232d87
Bump sass-loader from 7.1.0 to 7.2.0 (#2287)
dependabot-preview[bot] Aug 9, 2019
c90c502
Remove unnecessary linebreak [ci skip]
Log1x Aug 10, 2019
6207152
docs(changelog): Use lowercase for "webpack"
knowler Aug 15, 2019
01f6b3c
Bump rimraf from 2.6.3 to 3.0.0 (#2289)
dependabot-preview[bot] Aug 25, 2019
f1d09ee
Bump sass from 1.22.9 to 1.22.10 (#2292)
dependabot-preview[bot] Aug 25, 2019
85d9444
Bump sass-loader from 7.2.0 to 7.3.1 (#2293)
dependabot-preview[bot] Aug 25, 2019
058a45e
Bump eslint from 6.1.0 to 6.2.1 (#2294)
dependabot-preview[bot] Aug 25, 2019
b1d164f
Bump babel-eslint from 10.0.2 to 10.0.3 (#2295)
dependabot-preview[bot] Aug 31, 2019
2dad674
Bump eslint from 6.2.1 to 6.2.2 (#2296)
dependabot-preview[bot] Aug 31, 2019
f0f7a39
Bump log1x/sage-directives from 1.1.2 to 1.1.3 (#2297)
dependabot-preview[bot] Aug 31, 2019
98d45e7
Adds i18n support (#2290)
kellymears Aug 31, 2019
c5b86db
Update Composers to work with the latest Acorn
Log1x Sep 1, 2019
1005f6f
Use $this->data in the Alert Composer (#2300)
Log1x Sep 1, 2019
1561b1b
Update sponsors [ci skip]
retlehs Sep 30, 2019
9d9ab09
Update sponsors [ci skip]
retlehs Oct 1, 2019
8dd2658
Update sponsors [ci skip]
retlehs Oct 2, 2019
3e8c421
Call ->render() on view instead of relying on toString (#2330)
Log1x Oct 26, 2019
920744c
Bump for Acorn (#2337)
Log1x Nov 7, 2019
41e4f6d
Use mix-manifest.json (Fixes #2329)
Log1x Nov 8, 2019
13dbdbd
Pre-Sage 10 Alpha (#2338)
Log1x Nov 16, 2019
1790fbf
Inline manifest.js when enqueueing editor.js (#2344)
Log1x Nov 19, 2019
b2df923
Add theme color palette support (#2352)
kellymears Dec 3, 2019
61d3550
Bump bootstrap from 4.3.1 to 4.4.1 (#2350)
dependabot-preview[bot] Dec 3, 2019
15a1a01
Bump eslint from 6.6.0 to 6.7.2 (#2354)
dependabot-preview[bot] Dec 3, 2019
36b2c28
Bump sass from 1.23.3 to 1.23.7 (#2345)
dependabot-preview[bot] Dec 3, 2019
fdbe712
Sage 10 editor scripts & styles (#2351)
kellymears Dec 7, 2019
cef9185
Bump stylelint from 11.1.1 to 12.0.0 (#2342)
dependabot-preview[bot] Dec 7, 2019
09e9db9
Bump squizlabs/php_codesniffer from 3.5.2 to 3.5.3 (#2356)
dependabot-preview[bot] Dec 7, 2019
7dc3bad
README updates for 10.0.0-alpha.1 (#2271)
knowler Dec 7, 2019
9ced9e8
Update setup.php
retlehs Dec 7, 2019
a43e6fc
Keep hierarchical assets directory structure (#2372)
oxyc Dec 30, 2019
31ce2b1
fix(stylelint): Fix broken tests (#2375)
Log1x Dec 31, 2019
98397f4
chore(deps): Bump dependencies (#2376)
Log1x Dec 31, 2019
1671198
update laravel-mix-wp-blocks (#2381)
kellymears Jan 8, 2020
7a343ad
Update sponsors [ci skip]
retlehs Feb 11, 2020
4a7ff33
Sage 10 fixes/cleanup (#2413)
Log1x Mar 10, 2020
879119e
Laravel 7.x (#2429)
Log1x Mar 25, 2020
f876376
enhance(deps): Add `Requires PHP` and `Requires at least` to theme st…
tangrufus Apr 1, 2020
7f8e828
Sage 10 Chores (#2431)
Log1x Apr 2, 2020
31559f0
Bump roots/acorn from 1.0.2 to 1.0.3 (#2433)
dependabot-preview[bot] Apr 3, 2020
1b6be64
Bump roots/acorn from 1.0.3 to 1.0.4 (#2440)
dependabot-preview[bot] Apr 8, 2020
61e22dd
Bump stylelint from 13.2.1 to 13.3.0 (#2439)
dependabot-preview[bot] Apr 8, 2020
3c64c3a
Update sponsors [ci skip]
retlehs Apr 12, 2020
71c621e
Bump roots/acorn from 1.0.4 to 1.0.6 (#2444)
dependabot-preview[bot] Apr 21, 2020
2886c41
Bump @wordpress/dependency-extraction-webpack-plugin from 2.4.0 to 2.…
dependabot-preview[bot] Apr 21, 2020
0ba13c0
Bump @wordpress/babel-preset-default from 4.11.0 to 4.12.1 (#2450)
dependabot-preview[bot] Apr 21, 2020
4ccca3b
Bump squizlabs/php_codesniffer from 3.5.4 to 3.5.5 (#2451)
dependabot-preview[bot] Apr 21, 2020
d56dcef
Bump laravel-mix-copy-watched from 2.2.3 to 2.2.4 (#2452)
dependabot-preview[bot] Apr 21, 2020
60298d8
Bump jquery from 3.4.1 to 3.5.0 (#2445)
dependabot-preview[bot] Apr 21, 2020
9395d9d
Bump stylelint from 13.3.0 to 13.3.3 (#2453)
dependabot-preview[bot] Apr 21, 2020
b36d07c
Update README.md
retlehs May 9, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
version: 2.1

orbs:
sage:
executors:
node-10:
docker:
- image: 'circleci/node:10-stretch'
php-73:
docker:
- image: 'circleci/php:7.3-stretch'
php-72:
docker:
- image: 'circleci/php:7.2-stretch'
jobs:
build-php:
parameters:
executor:
type: executor
executor: << parameters.executor >>
steps:
- run: php -v
- checkout
- restore_cache:
keys:
- composer-v1-{{ checksum "composer.lock" }}
- composer-v1-
- run: composer install -n --prefer-dist --no-scripts --no-suggest
- run: composer lint
- save_cache:
key: composer-v1-{{ checksum "composer.lock" }}
paths:
- vendor
build-node:
executor: node-10
steps:
- run: yarn versions
- checkout
- restore_cache:
keys:
- node-v1-{{ checksum "yarn.lock" }}
- node-v1-
- run: yarn install --frozen-lockfile
- run: yarn run test
- run: yarn run build:production
- save_cache:
key: node-v1-{{ checksum "yarn.lock" }}
paths:
- node_modules

workflows:
build:
jobs:
- sage/build-node
- sage/build-php:
name: build-php-73
executor: sage/php-73
- sage/build-php:
name: build-php-72
executor: sage/php-72
17 changes: 12 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
# editorconfig.org

root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false

[*.php]
indent_size = 4

[*.blade.php]
indent_size = 2

[resources/views/**.php]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can have regular .php files within resources/views. Those should be 2 spaces.

And blade files outside of resources/views should ... probably not be outside of resources/views, or they should be vendored.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll push a change to handle resources/views/**.php – as far as Blade files outside of resources/views – there are multiple Sage-specific Gutenberg libraries popping up that are handling the views outside of resources/views such as:

  • app/Blocks/Example/Example.php
  • app/Blocks/Example/views/example.blade.php
  • app/Blocks/Example/views/example.(css,js)

which despite recommending separating things like this into an mu-plugin, is a somewhat clean approach to handling individual blocks without separating everything into 3 different directories when/if they are done inside of the theme.

indent_size = 2

[index.php]
indent_size = 2
66 changes: 30 additions & 36 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,48 +1,42 @@
module.exports = {
'root': true,
'extends': 'eslint:recommended',
'globals': {
'wp': true,
root: true,
extends: 'eslint:recommended',
parser: 'babel-eslint',
globals: {
wp: true
},
'env': {
'node': true,
'es6': true,
'amd': true,
'browser': true,
'jquery': true,
env: {
node: true,
es6: true,
amd: true,
browser: true,
jquery: true
},
'parserOptions': {
'ecmaFeatures': {
'globalReturn': true,
'generators': false,
'objectLiteralDuplicateProperties': false,
'experimentalObjectRestSpread': true,
parserOptions: {
ecmaFeatures: {
globalReturn: true,
generators: false,
objectLiteralDuplicateProperties: false
},
'ecmaVersion': 2017,
'sourceType': 'module',
ecmaVersion: 2017,
sourceType: 'module'
},
'plugins': [
'import',
],
'settings': {
plugins: ['import'],
settings: {
'import/core-modules': [],
'import/ignore': [
'node_modules',
'\\.(coffee|scss|css|less|hbs|svg|json)$',
],
'import/ignore': ['node_modules', '\\.(coffee|scss|css|less|hbs|svg|json)$']
},
'rules': {
rules: {
'no-console': 0,
'quotes': ['error', 'single'],
'comma-dangle': [
'error',
{
'arrays': 'always-multiline',
'objects': 'always-multiline',
'imports': 'always-multiline',
'exports': 'always-multiline',
'functions': 'ignore',
},
],
},
arrays: 'always-multiline',
objects: 'always-multiline',
imports: 'always-multiline',
exports: 'always-multiline',
functions: 'ignore'
}
]
}
};
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
/.github export-ignore
/.circleci export-ignore
/.gitattributes export-ignore
/.travis.yml export-ignore
10 changes: 3 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
# Include your project-specific ignores in this file
# Read about how to use .gitignore: https://help.github.com/articles/ignoring-files
.cache-loader
dist
node_modules
/node_modules
/vendor
/dist
npm-debug.log
yarn-error.log
/vendor
resources/assets/config-local.json
37 changes: 37 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"extends": "stylelint-config-standard",
"rules": {
"declaration-colon-newline-after": null,
"value-list-comma-newline-after": null,
"no-empty-source": null,
"no-descending-specificity": null,
"at-rule-empty-line-before": null,
"at-rule-no-unknown": [
true,
{
"ignoreAtRules": [
"extend",
"at-root",
"debug",
"warn",
"error",
"if",
"else",
"for",
"each",
"while",
"mixin",
"include",
"content",
"return",
"tailwind",
"apply",
"responsive",
"variants",
"screen",
"function"
]
}
]
}
}
34 changes: 0 additions & 34 deletions .stylelintrc.js

This file was deleted.

41 changes: 0 additions & 41 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
### 10.0.0-alpha.1: TBA
* Change PHP requirement to 7.2.
* Change WordPress requirement to 5.2.
* Move from `sage-lib` to [`Acorn`](https://github.com/roots/acorn) ([#2122](https://github.com/roots/sage/pull/2122))
* Change to [Laravel Mix](https://github.com/JeffreyWay/laravel-mix) for handling webpack and compiling/concatnating assets ([#2172](https://github.com/roots/sage/pull/2172))
* Sage now ships with Blade Composers which are native, robust, more powerful solution to "Controllers" from Sage 9
* Clean up starter Blade views
* Move mandatory filters such as the template include, body class, comments template, search form, etc. to Acorn
* Move core theme files back to the theme root (`index.php`, `functions.php`, etc.) to allow better child theme compatability
* Create a default `storage/` directory for cache, logs, etc.
* Update config files to reflect Acorn
* To be continued...

### 9.0.9: February 13th, 2019
* Update to Bootstrap 4.3.1 ([#2153](https://github.com/roots/sage/pull/2153))

Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) Ben Word and Scott Walkinshaw
Copyright © Roots

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
Loading