Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Welcher committed Jul 16, 2019
2 parents 2c96740 + 62439f0 commit 9b1d4b7
Show file tree
Hide file tree
Showing 105 changed files with 5,095 additions and 1,027 deletions.
56 changes: 28 additions & 28 deletions .github/CODEOWNERS
View file
Validating CODEOWNERS rules …
Expand Up @@ -5,7 +5,7 @@

# Data
/packages/api-fetch @youknowriad @aduth @nerrad @mmtr
/packages/core-data @youknowriad @gziolo @aduth @nerrad
/packages/core-data @youknowriad @aduth @nerrad
/packages/data @youknowriad @aduth @nerrad @coderkevin
/packages/redux-routine @youknowriad @aduth @nerrad

Expand All @@ -15,9 +15,9 @@
# Editor
/packages/annotations @youknowriad @aduth @atimmer @ellatrix
/packages/autop @youknowriad @aduth
/packages/block-editor @youknowriad @gziolo @talldan @ellatrix
/packages/block-serialization-spec-parser @youknowriad @gziolo @aduth @dmsnell
/packages/block-serialization-default-parser @youknowriad @gziolo @aduth @dmsnell
/packages/block-editor @youknowriad @talldan @ellatrix
/packages/block-serialization-spec-parser @youknowriad @aduth @dmsnell
/packages/block-serialization-default-parser @youknowriad @aduth @dmsnell
/packages/blocks @youknowriad @gziolo @aduth @ellatrix
/packages/edit-post @youknowriad @talldan
/packages/editor @youknowriad @talldan
Expand All @@ -28,14 +28,14 @@
/packages/edit-widgets @youknowriad

# Tooling
/bin @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/docs/tool @youknowriad @gziolo @chrisvanpatten @ajitbohra @nosolosw
/bin @youknowriad @aduth @ntwb @nerrad @ajitbohra @nosolosw
/docs/tool @youknowriad @chrisvanpatten @ajitbohra @nosolosw
/packages/babel-plugin-import-jsx-pragma @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/babel-plugin-makepot @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
/packages/babel-plugin-makepot @youknowriad @aduth @ntwb @nerrad @ajitbohra
/packages/babel-preset-default @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/browserslist-config @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/custom-templated-path-webpack-plugin @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/docgen @nosolosw @gziolo
/packages/custom-templated-path-webpack-plugin @youknowriad @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/docgen @nosolosw
/packages/e2e-test-utils @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
/packages/e2e-tests @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @talldan
/packages/eslint-plugin @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
Expand All @@ -44,33 +44,33 @@
/packages/jest-puppeteer-axe @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra
/packages/library-export-default-webpack-plugin @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/npm-package-json-lint-config @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/postcss-themes @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/postcss-themes @youknowriad @aduth @ntwb @nerrad @ajitbohra @nosolosw
/packages/scripts @youknowriad @gziolo @aduth @ntwb @nerrad @ajitbohra @nosolosw

# UI Components
/packages/components @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @chrisvanpatten
/packages/compose @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan
/packages/element @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan
/packages/notices @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan
/packages/nux @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
/packages/viewport @youknowriad @gziolo @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan
/packages/notices @youknowriad @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan
/packages/nux @youknowriad @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan @noisysocks
/packages/viewport @youknowriad @aduth @ajitbohra @jaymanpandya @jorgefilipecosta @talldan

# Utilities
/packages/a11y @youknowriad @gziolo @aduth
/packages/blob @youknowriad @gziolo @aduth
/packages/date @youknowriad @gziolo @aduth
/packages/deprecated @youknowriad @gziolo @aduth
/packages/dom @youknowriad @gziolo @aduth @nosolosw @ellatrix
/packages/dom-ready @youknowriad @gziolo @aduth
/packages/escape-html @youknowriad @gziolo @aduth
/packages/html-entities @youknowriad @gziolo @aduth
/packages/a11y @youknowriad @aduth
/packages/blob @youknowriad @aduth
/packages/date @youknowriad @aduth
/packages/deprecated @youknowriad @aduth
/packages/dom @youknowriad @aduth @nosolosw @ellatrix
/packages/dom-ready @youknowriad @aduth
/packages/escape-html @youknowriad @aduth
/packages/html-entities @youknowriad @aduth
/packages/i18n @youknowriad @aduth @swissspidy
/packages/is-shallow-equal @youknowriad @gziolo @aduth
/packages/keycodes @youknowriad @gziolo @aduth @talldan @ellatrix
/packages/priority-queue @youknowriad @gziolo @aduth
/packages/token-list @youknowriad @gziolo @aduth
/packages/url @youknowriad @gziolo @aduth @talldan
/packages/wordcount @youknowriad @gziolo @aduth
/packages/is-shallow-equal @youknowriad @aduth
/packages/keycodes @youknowriad @aduth @talldan @ellatrix
/packages/priority-queue @youknowriad @aduth
/packages/token-list @youknowriad @aduth
/packages/url @youknowriad @aduth @talldan
/packages/wordcount @youknowriad @aduth

# Extensibility
/packages/hooks @youknowriad @gziolo @aduth @adamsilverstein
Expand All @@ -82,7 +82,7 @@
/packages/block-editor/src/components/rich-text @youknowriad @aduth @ellatrix @jorgefilipecosta @daniloercoli @sergioestevao @etoledom

# PHP
/lib @youknowriad @gziolo @aduth @timothybjacobs
/lib @youknowriad @aduth @timothybjacobs

# Native (Unowned)
*.native.js @ghost
Expand Down
32 changes: 23 additions & 9 deletions .github/actions/milestone-it/entrypoint.sh
View file
@@ -1,7 +1,16 @@
#!/bin/bash
set -e

# 1. Determine if milestone already exists (don't replace one which has already
# 1. Proceed only when merge occurs to `master` base branch.

base=$(jq -r '.pull_request.base.ref' $GITHUB_EVENT_PATH)

if [ "$base" != 'master' ]; then
echo 'Milestones apply only to master merge. Aborting.'
exit 78;
fi

# 2. Determine if milestone already exists (don't replace one which has already
# been assigned).

pr=$(jq -r '.number' $GITHUB_EVENT_PATH)
Expand All @@ -16,18 +25,23 @@ current_milestone=$(

if [ "$current_milestone" != 'null' ]; then
echo 'Milestone already applied. Aborting.'
exit 1;
exit 78;
fi

# 2. Read current version.
# 3. Read current version.

version=$(jq -r '.version' package.json)
version=$(
curl \
--silent \
"https://raw.githubusercontent.com/$GITHUB_REPOSITORY/master/package.json" \
| jq -r '.version'
)

IFS='.' read -ra parts <<< "$version"
major=${parts[0]}
minor=${parts[1]}

# 3. Determine next milestone.
# 4. Determine next milestone.

if [[ $minor == 9* ]]; then
major=$((major+1))
Expand All @@ -38,7 +52,7 @@ fi

milestone="Gutenberg $major.$minor"

# 4. Calculate next milestone due date, using a static reference of an earlier
# 5. Calculate next milestone due date, using a static reference of an earlier
# release (v5.0) as a reference point for the biweekly release schedule.

reference_major=5
Expand All @@ -48,7 +62,7 @@ num_versions_elapsed=$(((major-reference_major)*10+(minor-reference_minor)))
weeks=$((num_versions_elapsed*2))
due=$(date -u --iso-8601=seconds -d "$(date -d @$(echo $reference_date)) + $(echo $weeks) weeks")

# 5. Create milestone. This may fail for duplicates, which is expected and
# 6. Create milestone. This may fail for duplicates, which is expected and
# ignored.

curl \
Expand All @@ -59,7 +73,7 @@ curl \
-d "{\"title\":\"$milestone\",\"due_on\":\"$due\",\"description\":\"Tasks to be included in the $milestone plugin release.\"}" \
"https://api.github.com/repos/$GITHUB_REPOSITORY/milestones" > /dev/null

# 6. Find milestone number. This could be improved to allow for non-open status
# 7. Find milestone number. This could be improved to allow for non-open status
# or paginated results.

number=$(
Expand All @@ -70,7 +84,7 @@ number=$(
| jq ".[] | select(.title == \"$milestone\") | .number"
)

# 7. Assign pull request to milestone.
# 8. Assign pull request to milestone.

curl \
--silent \
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Expand Up @@ -15,3 +15,6 @@ docker-compose.override.yml

playground/dist
.cache

# Report generated from jest-junit
test/native/junit.xml
11 changes: 11 additions & 0 deletions .travis.yml
View file
Expand Up @@ -61,6 +61,16 @@ jobs:
- npx lerna run build
- npm run test-unit -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"

- name: JavaScript native mobile tests
install:
- npm ci
script:
# It's not necessary to run the full build, since Jest can interpret
# source files with `babel-jest`. Some packages have their own custom
# build tasks, however. These must be run.
- npx lerna run build
- npm run test-unit:native -- --ci --maxWorkers=2 --cacheDirectory="$HOME/.jest-cache"

- name: PHP unit tests (Docker)
env: WP_VERSION=latest DOCKER=true
script:
Expand Down Expand Up @@ -150,6 +160,7 @@ jobs:
- $( npm bin )/wp-scripts test-e2e --config=./packages/e2e-tests/jest.config.js --cacheDirectory="$HOME/.jest-cache" --runTestsByPath $( awk 'NR % 4 == 3' < ~/.jest-e2e-tests )

allow_failures:
- name: JavaScript native mobile tests
- name: PHP unit tests (PHP 5.3)
env: WP_VERSION=latest SWITCH_TO_PHP=5.3
script:
Expand Down
6 changes: 6 additions & 0 deletions CONTRIBUTING.md
View file
Expand Up @@ -18,6 +18,12 @@ Please see the [Developer Contributions section](/docs/contributors/develop.md)

If you'd like to contribute to the design or front-end, feel free to contribute to tickets labelled [Needs Design](https://github.com/WordPress/gutenberg/issues?q=is%3Aissue+is%3Aopen+label%3A%22Needs+Design%22) or [Needs Design Feedback](https://github.com/WordPress/gutenberg/issues?q=is%3Aissue+is%3Aopen+label%3A"Needs+Design+Feedback%22). We could use your thoughtful replies, mockups, animatics, sketches, doodles. Proposed changes are best done as minimal and specific iterations on the work that precedes it so we can compare. The [WordPress Design team](http://make.wordpress.org/design/) uses [Figma](https://www.figma.com/) to collaborate and share work. If you'd like to contribute, join the [#design channel](http://wordpress.slack.com/messages/design/) in [Slack](https://make.wordpress.org/chat/) and ask the team to set you up with a free Figma account. This will give you access to a helpful [library of components](https://www.figma.com/file/ZtN5xslEVYgzU7Dd5CxgGZwq/WordPress-Components?node-id=0%3A1) used in WordPress.

## Triage Contributions

*Triage* is the practice of reviewing existing issues to make sure they’re relevant, actionable, and have all the information needed to reproduce and/or solve the issue. Triaging is a very important contribution because it allows the community to focus on and prioritise issues, feature proposals, discussions, and so on.

If you want to learn more about triage, and why it it important, please see the [repository management section](docs/contributors/repository-management.md#triaging-issues) of the Contributor Handbook.

## Contribute to the Documentation

Please see the [Documentation section](/docs/contributors/document.md) of the Contributor Handbook.
Expand Down
22 changes: 20 additions & 2 deletions assets/stylesheets/_mixins.scss
View file
Expand Up @@ -238,15 +238,33 @@
color: $dark-gray-900;
}

@mixin block-style__focus-active() {
@mixin block-style__focus() {
color: $dark-gray-900;
box-shadow: 0 0 0 2px $blue-medium-500;
box-shadow: 0 0 0 1px $white, 0 0 0 3px $blue-medium-500;

// Windows High Contrast mode will show this outline, but not the box-shadow.
outline: 2px solid transparent;
outline-offset: -2px;
}

@mixin block-style__is-active() {
color: $dark-gray-900;
box-shadow: inset 0 0 0 2px $dark-gray-500;

// Windows High Contrast mode will show this outline, but not the box-shadow.
outline: 2px solid transparent;
outline-offset: -2px;
}

@mixin block-style__is-active-focus() {
color: $dark-gray-900;
box-shadow: 0 0 0 1px $white, 0 0 0 3px $blue-medium-500, inset 0 0 0 2px $dark-gray-500;

// Windows High Contrast mode will show this outline, but not the box-shadow.
outline: 4px solid transparent;
outline-offset: -4px;
}

/**
* Applies editor left position to the selector passed as argument
*/
Expand Down
7 changes: 0 additions & 7 deletions docker-compose.yml
View file
Expand Up @@ -4,7 +4,6 @@ services:

wordpress:
image: wordpress
restart: always
ports:
- 8888:80
environment:
Expand All @@ -24,7 +23,6 @@ services:

cli:
image: wordpress:cli
restart: always
user: xfs
volumes:
- wordpress_data:/var/www/html
Expand All @@ -35,14 +33,12 @@ services:

mysql:
image: mysql:5.7
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
MYSQL_DATABASE: wordpress_test

wordpress_phpunit:
image: chriszarate/wordpress-phpunit
restart: always
environment:
PHPUNIT_DB_HOST: mysql
volumes:
Expand All @@ -53,13 +49,11 @@ services:

composer:
image: composer
restart: always
volumes:
- .:/app

wordpress_e2e_tests:
image: wordpress
restart: always
ports:
- 8889:80
environment:
Expand All @@ -80,7 +74,6 @@ services:

cli_e2e_tests:
image: wordpress:cli
restart: always
user: xfs
volumes:
- wordpress_e2e_tests_data:/var/www/html
Expand Down
16 changes: 12 additions & 4 deletions docs/contributors/repository-management.md
View file
Expand Up @@ -60,12 +60,16 @@ To keep the issue list healthy, it needs to be triaged regularly. *Triage* is th

Anyone can help triage, although you’ll need contributor permission on the Gutenberg repository to modify an issue’s labels or edit its title.

Here are a couple places you can start:
To start simply choose from one of these filtered lists of issues:

- [All Gutenberg issues without an assigned label](https://github.com/wordpress/gutenberg/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc+no%3Alabel).
- [The least recently updated Gutenberg issues](https://github.com/WordPress/gutenberg/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc).
- [All Gutenberg issues without an assigned label](https://github.com/wordpress/gutenberg/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc+no%3Alabel). Triaging by simply adding labels helps people focused on certain aspects of Gutenberg find relevant issues easier and start working on them.
- [The least recently updated Gutenberg issues](https://github.com/WordPress/gutenberg/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-asc). Triaging issues that are getting old and possibly out of date keeps important work from being overlooked.
- [All Gutenberg issues with no comments](https://github.com/WordPress/gutenberg/issues?q=is%3Aopen+is%3Aissue+sort%3Acomments-asc) Triaging this list helps make sure all issues are acknowledged, and can help identify issues that may need more information or discussion before they are actionable.
- [The least commented on issues](https://github.com/WordPress/gutenberg/issues?q=is%3Aopen+is%3Aissue+sort%3Acomments-asc) Triaging this list helps the community figure out things like traction for certain proposals.

When reviewing issues, here are some steps you can perform:
You can also create your own custom set of filters on GitHub. If you have a filter you think might be useful for the community, feel free to submit a PR to add it to this list.

When triaging, either one of the lists above or issues in general, here are some steps you can perform:

- First search for duplicates. If the issue is duplicate, close it by commenting with “Duplicate of #<original-id>” and add any relevant new details to the existing issue.
- If the issue is missing labels, add some to better categorize it (requires proper permissions).
Expand All @@ -78,6 +82,10 @@ When reviewing issues, here are some steps you can perform:
- Check that the bug report is valid by debugging it to see if you can track down the technical specifics.
- Check if the issue is missing some detail and see if you can fill in those details. For instance, if a bug report is missing visual detail, it’s helpful to reproduce the issue locally and upload a screenshot or GIF.

For triaging there are some labels which are very useful:
- `Needs Technical Feedback` - you can apply them when you see new features or API changes proposed
- `Needs More Info` - when it’s not clear what the issue is or it would help to provide additional details
- `Needs Testing` - it’s useful for old bugs where it seems like they are no longer relevant

## Pull Requests

Expand Down
2 changes: 1 addition & 1 deletion docs/designers-developers/developers/filters/block-filters.md
View file
Expand Up @@ -59,7 +59,7 @@ Extending blocks can involve more than just providing alternative styles, in thi

#### `blocks.registerBlockType`

Used to filter the block settings. It receives the block settings and the name of the block the registered block as arguments. Since v6.1.0 this filter is also applied to each of a block's deprecated settings.
Used to filter the block settings. It receives the block settings and the name of the registered block as arguments. Since v6.1.0 this filter is also applied to each of a block's deprecated settings.

_Example:_

Expand Down

0 comments on commit 9b1d4b7

Please sign in to comment.