Merge branch 'master' into rnmobile/audio-block-I-b

.eslintrc.js

@@ -63,6 +63,11 @@ module.exports = {
 						importNames: [ 'memoize' ],
 						message: 'Please use `memize` instead.',
 					},
+					{
+						name: 'react',
+						message:
+							'Please use React API through `@wordpress/element` instead.',
+					},
 					{
 						name: 'reakit',
 						message:
@@ -105,6 +110,12 @@ module.exports = {
 			{
 				selector:
 					'CallExpression[callee.object.name="page"][callee.property.name="waitFor"]',
+				message:
+					'This method is deprecated. You should use the more explicit API methods available.',
+			},
+			{
+				selector:
+					'CallExpression[callee.object.name="page"][callee.property.name="waitForTimeout"]',
 				message: 'Prefer page.waitForSelector instead.',
 			},
 			{

.github/CODEOWNERS

@@ -18,12 +18,12 @@
 /packages/block-library/src/image               @ajlende
 
 # Editor
-/packages/annotations                           @atimmer @ellatrix
+/packages/annotations                           @atimmer
 /packages/autop
 /packages/block-editor                          @ellatrix
 /packages/block-serialization-spec-parser       @dmsnell
 /packages/block-serialization-default-parser    @dmsnell
-/packages/blocks                                @ellatrix
+/packages/blocks
 /packages/edit-post
 /packages/editor
 /packages/list-reusable-blocks
@@ -88,7 +88,7 @@
 /packages/html-entities
 /packages/i18n                                  @swissspidy
 /packages/is-shallow-equal
-/packages/keycodes                              @ellatrix
+/packages/keycodes
 /packages/priority-queue
 /packages/token-list
 /packages/url

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!-- Learn the overall process and best practices for pull requests at https://github.com/WordPress/gutenberg/blob/master/docs/contributors/repository-management.md#pull-requests. -->
+<!-- Learn the overall process and best practices for pull requests at https://github.com/WordPress/gutenberg/blob/HEAD/docs/contributors/repository-management.md#pull-requests. -->
 
 ## Description
 <!-- Please describe what you have changed or added -->
@@ -22,4 +22,4 @@
 - [ ] My code follows the accessibility standards. <!-- Guidelines: https://developer.wordpress.org/coding-standards/wordpress-coding-standards/accessibility/ -->
 - [ ] 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/master/docs/contributors/native-mobile.md -->
+- [ ] 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/native-mobile.md -->

.github/SUPPORT.md

@@ -3,9 +3,9 @@
 
 Welcome to Gutenberg, a WordPress project. We hope you join us in creating the future platform for publishing; all are welcome here.
 
-* Please see the [Contributing Guidelines](https://github.com/WordPress/gutenberg/blob/master/CONTRIBUTING.md) for additional information on how to contribute.
+* Please see the [Contributing Guidelines](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) for additional information on how to contribute.
 
-* As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/master/CODE_OF_CONDUCT.md).
+* As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/HEAD/CODE_OF_CONDUCT.md).
 
 * Join us on Slack for real-time communication, it is where maintainers coordinate around the project. To get started using Slack, see: https://make.wordpress.org/chat/
 

.github/workflows/create-block.yml

@@ -7,16 +7,20 @@ on:
     - '!packages/**/test/**'
     - '!packages/**/*.md'
   push:
-    branches: [master]
+    branches: [master, wp/trunk]
     paths:
     - 'packages/**'
     - '!packages/**/test/**'
     - '!packages/**/*.md'
 
 jobs:
-  build:
-
+  checks:
+    name: Checks
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [12, 14]
 
     steps:
     - uses: actions/checkout@v2
@@ -34,14 +38,12 @@ jobs:
           ${{ runner.os }}-build-
           ${{ runner.os }}-
 
-    - name: Use Node.js 14.x
+    - name: Use Node.js ${{ matrix.node }}.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: ${{ matrix.node }}
 
     - name: npm install, build, format and lint
       run: |
         npm ci
         npm run test:create-block
-      env:
-        CI: true

.github/workflows/unit-test.yml

@@ -5,15 +5,18 @@ on:
     paths-ignore:
     - '**.md'
   push:
-    branches: [master]
+    branches: [master, wp-trunk]
     paths-ignore:
     - '**.md'
 
 jobs:
   unit-js:
     name: JavaScript
-
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [12, 14]
 
     steps:
     - uses: actions/checkout@v2
@@ -31,10 +34,10 @@ jobs:
           ${{ runner.os }}-build-
           ${{ runner.os }}-
 
-    - name: Use Node.js 14.x
+    - name: Use Node.js ${{ matrix.node }}.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
+        node-version: ${{ matrix.node }}
 
     - name: Npm install and build
       # It's not necessary to run the full build, since Jest can interpret
@@ -92,7 +95,7 @@ jobs:
     - name: Running single site unit tests
       run: npm run test-unit-php
       if: ${{ success() || failure() }}
-    
+
     - name: Running multisite unit tests
       run: npm run test-unit-php-multisite
       if: ${{ success() || failure() }}

README.md

@@ -13,7 +13,7 @@
 
 Welcome to the development hub for the WordPress Gutenberg project!
 
-"Gutenberg" is a codename for a whole new paradigm in WordPress site building and publishing, that aims to revolutionize the entire publishing experience as much as Gutenberg did the printed word. Right now, the project is in the first phase of a four-phase process that will touch every piece of WordPress -- Editing, Customization, Collaboration, and Multilingual -- and is focused on a new editing experience, the block editor.
+"Gutenberg" is a codename for a whole new paradigm in WordPress site building and publishing, that aims to revolutionize the entire publishing experience as much as Gutenberg did the printed word. Right now, the project is in the second phase of a four-phase process that will touch every piece of WordPress -- Editing, **Customization** (which includes Full Site Editing, Block Patterns, Block Directory and Block based themes), Collaboration, and Multilingual -- and is focused on a new editing experience, the block editor.
 
 The block editor introduces a modular approach to pages and posts: each piece of content in the editor, from a paragraph to an image gallery to a headline, is its own block. And just like physical blocks, WordPress blocks can added, arranged, and rearranged, allowing WordPress users to create media-rich pages in a visually intuitive way -- and without work-arounds like shortcodes or custom HTML.
 
@@ -41,9 +41,9 @@ Review the [Create a Block tutorial](/docs/designers-developers/developers/tutor
 
 Gutenberg is an open-source project and welcomes all contributors from code to design, from documentation to triage. The project is built by many contributors and volunteers and we'd love your help building it.
 
-See the [Contributors Handbook](https://developer.wordpress.org/block-editor/contributors/) for all the details on how you can contribute. See [CONTRIBUTING.md](https://github.com/WordPress/gutenberg/blob/master/CONTRIBUTING.md) for the contributing guidelines.
+See the [Contributors Handbook](https://developer.wordpress.org/block-editor/contributors/) for all the details on how you can contribute. See [CONTRIBUTING.md](https://github.com/WordPress/gutenberg/blob/HEAD/CONTRIBUTING.md) for the contributing guidelines.
 
-As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/master/CODE_OF_CONDUCT.md).
+As with all WordPress projects, we want to ensure a welcoming environment for everyone. With that in mind, all contributors are expected to follow our [Code of Conduct](https://github.com/WordPress/gutenberg/blob/HEAD/CODE_OF_CONDUCT.md).
 
 ## Get Involved
 

bin/check-latest-npm.js

@@ -23,7 +23,7 @@ async function getLatestNPMVersion() {
 					// will return an abbreviated form of the package data which
 					// includes enough detail to determine the latest version.
 					//
-					// See: https://github.com/npm/registry/blob/master/docs/responses/package-metadata.md
+					// See: https://github.com/npm/registry/blob/HEAD/docs/responses/package-metadata.md
 					Accept: 'application/vnd.npm.install-v1+json',
 				},
 			},

bin/plugin/cli.js

@@ -21,8 +21,8 @@ const catchException = ( command ) => {
  */
 const { releaseRC, releaseStable } = require( './commands/release' );
 const {
-	prepareLatestDistTag,
-	prepareNextDistTag,
+	publishNpmLatestDistTag,
+	publishNpmNextDistTag,
 } = require( './commands/packages' );
 const { getReleaseChangelog } = require( './commands/changelog' );
 const { runPerformanceTests } = require( './commands/performance' );
@@ -40,20 +40,20 @@ program
 	.action( catchException( releaseStable ) );
 
 program
-	.command( 'prepare-packages-stable' )
-	.alias( 'npm-stable' )
+	.command( 'publish-npm-packages-latest' )
+	.alias( 'npm-latest' )
 	.description(
-		'Prepares the packages to be published to npm as stable (latest dist-tag, production version)'
+		'Publishes packages to npm (latest dist-tag, production version)'
 	)
-	.action( catchException( prepareLatestDistTag ) );
+	.action( catchException( publishNpmLatestDistTag ) );
 
 program
-	.command( 'prepare-packages-rc' )
-	.alias( 'npm-rc' )
+	.command( 'publish-npm-packages-next' )
+	.alias( 'npm-next' )
 	.description(
-		'Prepares the packages to be published to npm as RC (next dist-tag, RC version)'
+		'Publishes packages to npm (next dist-tag, prerelease version)'
 	)
-	.action( catchException( prepareNextDistTag ) );
+	.action( catchException( publishNpmNextDistTag ) );
 
 program
 	.command( 'release-plugin-changelog' )