Skip to content

Commit

Permalink
Merge pull request #12 from WordPress/trunk
Browse files Browse the repository at this point in the history
Sync with trunk
  • Loading branch information
carolinan authored Mar 31, 2021
2 parents 60548d0 + 69f2462 commit 3c90e05
Show file tree
Hide file tree
Showing 565 changed files with 11,047 additions and 7,530 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ module.exports = {
'error',
{
forbid: [
[ 'button', 'Button' ],
[ 'circle', 'Circle' ],
[ 'g', 'G' ],
[ 'path', 'Path' ],
Expand Down
5 changes: 3 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
/packages/create-block @gziolo @mkaz
/packages/create-block-tutorial-template @gziolo
/packages/custom-templated-path-webpack-plugin @ntwb @nerrad @ajitbohra
/packages/dependency-extraction-webpack-plugin @gziolo
/packages/docgen @nosolosw
/packages/e2e-test-utils @ntwb @nerrad @ajitbohra
/packages/e2e-tests @ntwb @nerrad @ajitbohra
Expand All @@ -63,9 +64,9 @@
/packages/library-export-default-webpack-plugin @ntwb @nerrad @ajitbohra
/packages/npm-package-json-lint-config @gziolo @ntwb @nerrad @ajitbohra
/packages/postcss-themes @ntwb @nerrad @ajitbohra
/packages/scripts @gziolo @ntwb @nerrad @ajitbohra
/packages/dependency-extraction-webpack-plugin @gziolo
/packages/prettier-config @ntwb @gziolo
/packages/scripts @gziolo @ntwb @nerrad @ajitbohra
/packages/stylelint-config @ntwb

# UI Components
/packages/components @ajitbohra @jaymanpandya @chrisvanpatten
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
- [ ] I've tested my changes with keyboard and screen readers. <!-- Instructions: https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/accessibility-testing.md -->
- [ ] My code has proper inline documentation. <!-- Guidelines: https://developer.wordpress.org/coding-standards/inline-documentation-standards/javascript/ -->
- [ ] I've included developer documentation if appropriate. <!-- Handbook: https://developer.wordpress.org/block-editor/ -->
- [ ] I've updated all React Native files affected by any refactorings/renamings in this PR. <!-- React Native mobile Gutenberg guidelines: https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/code/native-mobile.md -->
- [ ] I've updated all React Native files affected by any refactorings/renamings in this PR (please manually search all `*.native.js` files for terms that need renaming or removal). <!-- React Native mobile Gutenberg guidelines: https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/code/native-mobile.md -->
6 changes: 2 additions & 4 deletions .github/workflows/build-plugin-zip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ name: Build Gutenberg Plugin Zip

on:
pull_request:
paths-ignore:
- '**.md'
push:
branches: [trunk]
paths-ignore:
- '**.md'
workflow_dispatch:
inputs:
version:
Expand All @@ -31,6 +27,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
with:
token: ${{ secrets.GUTENBERG_TOKEN }}

- name: Compute old and new version
id: get_version
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/create-block.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,8 @@ name: Create Block

on:
pull_request:
paths:
- 'packages/**'
- '!packages/**/test/**'
- '!packages/**/*.md'
push:
branches: [trunk, wp/trunk]
paths:
- 'packages/**'
- '!packages/**/test/**'
- '!packages/**/*.md'

jobs:
checks:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/end2end-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,10 @@ name: End-to-End Tests

on:
pull_request:
paths-ignore:
- '**.md'
push:
branches:
- trunk
- 'wp/**'
paths-ignore:
- '**.md'

jobs:
admin:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Performances Tests

on:
pull_request:
paths-ignore:
- '**.md'
release:
types: [created]

Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rnmobile-android-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ name: React Native E2E Tests (Android)

on:
pull_request:
paths-ignore:
- '**.md'
push:
branches: [trunk]
paths-ignore:
- '**.md'

jobs:
test:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/rnmobile-ios-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,8 @@ name: React Native E2E Tests (iOS)

on:
pull_request:
paths-ignore:
- '**.md'
push:
branches: [trunk]
paths-ignore:
- '**.md'

jobs:
test:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/upload-release-to-plugin-repo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
with:
ref: ${{ matrix.branch }}
token: ${{ secrets.GUTENBERG_TOKEN }}

- name: Update the Changelog to include the release notes
run: |
Expand Down
1 change: 0 additions & 1 deletion bin/build-plugin-zip.sh
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ build_files=$(
build/block-library/blocks/*.php \
build/block-library/blocks/*/block.json \
build/block-library/blocks/*/*.css \
build/edit-widgets/blocks/*.php \
build/edit-widgets/blocks/*/block.json \
)

Expand Down
3 changes: 1 addition & 2 deletions bin/packages/build-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,7 @@ async function buildCSS( file ) {
// Editor styles should be excluded from the default CSS vars output.
.concat(
file.includes( 'common.scss' ) ||
( ! file.includes( 'block-library' ) &&
! file.includes( 'editor-styles.scss' ) )
! file.includes( 'block-library' )
? [ 'default-custom-properties' ]
: []
)
Expand Down
Loading

0 comments on commit 3c90e05

Please sign in to comment.