Merge branch 'rnmobile/refactor/gallery-as-nested-image-blocks' into …

…rnmobile/refactor/gallery-as-nested-image-blocks-cleanup

.eslintrc.js

@@ -28,6 +28,7 @@ const developmentFiles = [
 	'**/benchmark/**/*.js',
 	'**/@(__mocks__|__tests__|test)/**/*.js',
 	'**/@(storybook|stories)/**/*.js',
+	'packages/babel-preset-default/bin/**/*.js',
 ];
 
 // All files from packages that have types provided with TypeScript.
@@ -163,7 +164,11 @@ module.exports = {
 	},
 	overrides: [
 		{
-			files: [ '**/*.@(android|ios|native).js', ...developmentFiles ],
+			files: [
+				'**/*.@(android|ios|native).js',
+				'packages/react-native-*/**/*.js',
+				...developmentFiles,
+			],
 			rules: {
 				'import/no-extraneous-dependencies': 'off',
 				'import/no-unresolved': 'off',

.github/CODEOWNERS

@@ -123,8 +123,8 @@
 /lib                                            @timothybjacobs @spacedmonkey
 /lib/global-styles.php                          @timothybjabocs @spacedmonkey @nosolosw
 /lib/experimental-default-theme.json            @timothybjabocs @spacedmonkey @nosolosw
-/lib/class-wp-theme-json.php                    @timothybjabocs @spacedmonkey @nosolosw
-/lib/class-wp-theme-json-resolver.php           @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json-gutenberg.php          @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json-resolver-gutenberg.php @timothybjabocs @spacedmonkey @nosolosw
 /phpunit/class-wp-theme-json-test.php           @nosolosw
 
 # Native (Unowned)

.github/workflows/build-plugin-zip.yml

@@ -10,11 +10,19 @@ on:
                 description: 'rc or stable?'
                 required: true
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     bump-version:
         name: Bump version
         runs-on: ubuntu-latest
         if: |
+            github.repository == 'WordPress/gutenberg' &&
             github.event_name == 'workflow_dispatch' &&
             github.ref == 'refs/heads/trunk' && (
               github.event.inputs.version == 'rc' ||
@@ -162,6 +170,8 @@ jobs:
         name: Create Release Draft and Attach Asset
         needs: [bump-version, build]
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
+
         steps:
             - name: Set Release Version
               id: get_release_version

.github/workflows/bundle-size.yml

@@ -1,6 +1,35 @@
 name: Compressed Size
 
-on: [pull_request]
+on:
+    pull_request:
+        paths:
+            # Any change to a CSS, Sass, or JavaScript file should run checks.
+            - '**.js'
+            - '**.css'
+            - '**.scss'
+            # Changes to any NPM related files could affect the outcome.
+            - '**package*.json'
+            # These files configures ESLint. Changes could affect the outcome.
+            - '**.eslint*'
+            # These files configures JSHint. Changes could affect the outcome.
+            - '**.jshint*'
+            # These files configures Prettier. Changes could affect the outcome.
+            - '**.prettier*'
+            # These files configures stylelint. Changes could affect the outcome.
+            - '**.stylelint*'
+            # These files configures TypeScript. Changes could affect the outcome.
+            - '**.tsconfig*'
+            # This file configures Webpack. Changes could affect the outcome.
+            - 'webpack.config.js'
+            # Changes to this workflow file should always verify the changes are successful.
+            - '.github/workflows/bundle-size.yml'
+
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
 
 jobs:
     build:

.github/workflows/create-block.yml

@@ -5,10 +5,18 @@ on:
     push:
         branches: [trunk, wp/trunk]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     checks:
         name: Checks
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             fail-fast: false
             matrix:

.github/workflows/end2end-test.yml

@@ -8,12 +8,18 @@ on:
             - 'release/**'
             - 'wp/**'
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     admin:
         name: Admin - ${{ matrix.part }}
-
         runs-on: ubuntu-latest
-
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             fail-fast: false
             matrix:

.github/workflows/performance.yml

@@ -5,11 +5,18 @@ on:
     release:
         types: [published]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     performance:
         name: Run performance tests
-
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
 
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@@ -40,13 +47,13 @@ jobs:
               if: github.event_name == 'release'
               env:
                   PLUGIN_VERSION: ${{ github.event.release.name }}
+              shell: bash
               run: |
-                  IFS='.' read -r -a PLUGIN_VERSION_ARRAY <<< "$PLUGIN_VERSION"
+                  IFS=. read -ra PLUGIN_VERSION_ARRAY <<< "$PLUGIN_VERSION"
                   CURRENT_RELEASE_BRANCH="release/${PLUGIN_VERSION_ARRAY[0]}.${PLUGIN_VERSION_ARRAY[1]}"
-                  PREVIOUS_VERSION_BASE_10=$(expr ${PLUGIN_VERSION_ARRAY[0]} \* 10 + ${PLUGIN_VERSION_ARRAY[1]} - 1)
-                  PREVIOUS_RELEASE_BRANCH="release/$(expr $PREVIOUS_VERSION_BASE_10 / 10).$(expr $PREVIOUS_VERSION_BASE_10 % 10)"
-                  TESTED_UP_TO_REGEX="Tested up to: \K([0-9]+)\.([0-9]+)\.?([0-9]?)"
-                  WP_VERSION=$(grep -oP "$TESTED_UP_TO_REGEX" ./readme.txt)
-                  IFS='.' read -r -a WP_VERSION_ARRAY <<< "$WP_VERSION"
-                  WP_BRANCH="wp/${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
-                  ./bin/plugin/cli.js perf --ci $WP_BRANCH $PREVIOUS_RELEASE_BRANCH $CURRENT_RELEASE_BRANCH
+                  PREVIOUS_VERSION_BASE_10=$((PLUGIN_VERSION_ARRAY[0] * 10 + PLUGIN_VERSION_ARRAY[1] - 1))
+                  PREVIOUS_RELEASE_BRANCH="release/$((PREVIOUS_VERSION_BASE_10 / 10)).$((PREVIOUS_VERSION_BASE_10 % 10))"
+                  WP_VERSION=$(awk -F ': ' '/^Tested up to/{print $2}' readme.txt)
+                  IFS=. read -ra WP_VERSION_ARRAY <<< "$WP_VERSION"
+                  WP_MAJOR="${WP_VERSION_ARRAY[0]}.${WP_VERSION_ARRAY[1]}"
+                  ./bin/plugin/cli.js perf --ci "wp/$WP_MAJOR" "$PREVIOUS_RELEASE_BRANCH" "$CURRENT_RELEASE_BRANCH" --wp-version "$WP_MAJOR"

.github/workflows/pull-request-automation.yml

@@ -7,6 +7,7 @@ name: Pull request automation
 jobs:
     pull-request-automation:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
         steps:
             # Checkout defaults to using the branch which triggered the event, which
             # isn't necessarily `trunk` (e.g. in the case of a merge).

.github/workflows/rnmobile-android-runner.yml

@@ -5,9 +5,17 @@ on:
     push:
         branches: [trunk]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     test:
         runs-on: macos-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             matrix:
                 native-test-name: [gutenberg-editor-initial-html]

.github/workflows/rnmobile-ios-runner.yml

@@ -5,9 +5,17 @@ on:
     push:
         branches: [trunk]
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     test:
         runs-on: macos-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
         strategy:
             matrix:
                 xcode: [12.2]

.github/workflows/stale-issue-add-needs-testing.yml

@@ -6,6 +6,7 @@ on:
 jobs:
     stale:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
         steps:
             - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
               with:

.github/workflows/stale-issue-mark-stale.yml

@@ -6,6 +6,7 @@ on:
 jobs:
     stale:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
         steps:
             - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
               with:

.github/workflows/stale-issue-needs-info.yml

@@ -6,6 +6,7 @@ on:
 jobs:
     stale:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
         steps:
             - uses: actions/stale@996798eb71ef485dc4c7b4d3285842d714040c4a # v3.0.17
               with:

.github/workflows/static-checks.yml

@@ -8,11 +8,18 @@ on:
             - 'release/**'
             - 'wp/**'
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     check:
         name: All
-
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
 
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4

.github/workflows/storybook-pages.yml

@@ -8,6 +8,7 @@ on:
 jobs:
     deploy:
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' }}
         steps:
             - name: Checkout
               uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4

.github/workflows/unit-test.yml

@@ -10,10 +10,19 @@ on:
             - 'release/**'
             - 'wp/**'
 
+# Cancels all previous workflow runs for pull requests that have not completed.
+concurrency:
+    # The concurrency group contains the workflow name and the branch name for pull requests
+    # or the commit hash for any other events.
+    group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.head_ref || github.sha }}
+    cancel-in-progress: true
+
 jobs:
     unit-js:
         name: JavaScript
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
+
         strategy:
             fail-fast: false
             matrix:
@@ -52,8 +61,8 @@ jobs:
 
     unit-php:
         name: PHP
-
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
 
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
@@ -94,8 +103,8 @@ jobs:
 
     mobile-unit-js:
         name: Mobile
-
         runs-on: ubuntu-latest
+        if: ${{ github.repository == 'WordPress/gutenberg' || github.event_name == 'pull_request' }}
 
         steps:
             - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4

bin/build-plugin-zip.sh

@@ -114,6 +114,7 @@ build_files=$(
 	build/block-library/blocks/*.php \
 	build/block-library/blocks/*/block.json \
 	build/block-library/blocks/*/*.css \
+	build/block-library/blocks/*/*.js \
 	build/edit-widgets/blocks/*/block.json \
 )
 

bin/plugin/cli.js

@@ -62,6 +62,10 @@ program
 		'--tests-branch <branch>',
 		"Use this branch's performance test files"
 	)
+	.option(
+		'--wp-version <version>',
+		'Specify a WordPress version on which to test all branches'
+	)
 	.description(
 		'Runs performance tests on two separate branches and outputs the result'
 	)