Skip to content

Commit

Permalink
Merge pull request #257 from material-components/develop
Browse files Browse the repository at this point in the history
Release 0.5.1 - Bug fixes
  • Loading branch information
rodydavis committed Jan 7, 2022
2 parents 5a2f667 + 82fa1f6 commit f011b04
Show file tree
Hide file tree
Showing 98 changed files with 33,486 additions and 94,863 deletions.
3 changes: 3 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,8 @@
},
"globals": {
"page": true
},
"parserOptions": {
"requireConfigFile": false
}
}
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
engine-strict = true
save-exact = true
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/*
14
4 changes: 2 additions & 2 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "stylelint-config-wordpress",
"rules": {
"extends": "@wordpress/stylelint-config",
"rules": {
"font-weight-notation": null,
"function-url-quotes": null,
"max-line-length": null,
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

/* eslint-env node */

module.exports = function( grunt ) {
module.exports = function ( grunt ) {
'use strict';

// prettier-ignore
Expand Down
2 changes: 1 addition & 1 deletion bin/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ source ./bin/includes.sh
printf "Starting up containers ..."

# Start the containers.
docker-compose up -d 2>/dev/null
docker-compose up -d "$@"

if ! command_exists "curl"; then
printf " $(action_format "unknown")"
Expand Down
9 changes: 8 additions & 1 deletion contributing/engineering.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,9 +150,16 @@ To get a production build, run:
npm run build:js
```

To update the WordPress version you can use wp-cli:
```bash
npm run wp -- wp core update --version=5.8
# or
npm run wp -- wp core update --version=nightly
```

## Continuous Integration

We use [Travis CI](https://travis-ci.com) to lint all code, run tests and report test coverage to [Coveralls](https://coveralls.io) as defined in [`.travis.yml`](.travis.yml). Travis CI will run the unit tests and perform sniffs against the WordPress Coding Standards whenever you push changes to your PR. Tests are required to pass successfully for a merge to be considered.
We use GitHub actions to lint all code, run tests and report test coverage to [Coveralls](https://coveralls.io). GitHub action will run the unit tests and perform sniffs against the WordPress Coding Standards whenever you push changes to your PR. Tests are required to pass successfully for a merge to be considered.

### Branches

Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ services:
volumes:
- ./bin/local-dev/wordpress/html:/var/www/html
- ./plugin:/var/www/html/wp-content/plugins/material-design
- ./uploads:/var/www/html/wp-content/uploads
- ./theme:/var/www/html/wp-content/themes/material-design-google
# Mount composer files and the vendor folder to both the plugin and theme folders.
- ./vendor:/var/www/html/wp-content/plugins/material-design/vendor
Expand All @@ -64,6 +65,7 @@ services:
- ./bin/local-dev/wordpress/html:/var/www/html
- ./plugin:/var/www/html/wp-content/plugins/material-design
- ./theme:/var/www/html/wp-content/themes/material-design-google
- ./uploads:/var/www/html/wp-content/uploads
depends_on:
- mysql
- wordpress
Expand Down

0 comments on commit f011b04

Please sign in to comment.