release: v2.1.0

.github/workflows/sync-develop-with-main.yml

@@ -0,0 +1,26 @@
+name: Keep develop in sync with main
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  merge-main-back-to-develop:
+    timeout-minutes: 2
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.SYNC_TOKEN }}
+      - name: Set Git config
+        run: |
+          git config --local user.email "actions@github.com"
+          git config --local user.name "Github Actions"
+      - name: Merge main back to develop
+        run: |
+          git fetch --unshallow
+          git checkout develop
+          git pull
+          git merge --no-ff origin/main -m "Auto-merge main back to develop"
+          git push

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 2.1.0
+
+## Upgrade Notice
+
+While fixing some [performance issues](https://github.com/wp-graphql/wpgraphql-acf/pull/152) we had to adjust the fallback logic for mapping ACF Field Groups to the Schema if they do not have "graphql_types" defined.
+
+ACF Field Groups that did not have "graphql_types" defined AND were assigned to Location Rules based on "post_status", "post_format", "post_category" or "post_taxonomy" _might_ not show in the Schema until their "graphql_types" are explicitly defined.
+
+## New Features
+
+- [#156](https://github.com/wp-graphql/wpgraphql-acf/pull/156): feat: Use published ACF values in resolvers for fields associated with posts that use the block editor, since the Block Editor has a bug preventing meta from being saved for previews. Adds a debug message if ACF fields are queried for with "asPreview" on post(s) that use the block editor.
+
+### Chores / Bugfixes
+
+- [#156](https://github.com/wp-graphql/wpgraphql-acf/pull/156): fix: ACF Fields not resolving when querying "asPreview"
+- [#155](https://github.com/wp-graphql/wpgraphql-acf/pull/155): fix: "show_in_graphql" setting not being respected when turned "off"
+- [#152](https://github.com/wp-graphql/wpgraphql-acf/pull/152): fix: performance issues with mapping ACF Field Groups to the Schema
+- [#148](https://github.com/wp-graphql/wpgraphql-acf/pull/148): fix: bug when querying taxonomy field on blocks
+- [#146](https://github.com/wp-graphql/wpgraphql-acf/pull/146): chore: update phpcs to match core WPGraphQL
+
 ## 2.0.0
 
 - [#142](https://github.com/wp-graphql/wpgraphql-acf/pull/142): Update README, versions, plugin assets for deploy to WordPress.org.

README.md

@@ -1,9 +1,15 @@
 # WPGraphQL for Advanced Custom Fields
 
+![WPGraphQL for ACF plugin banner](/.wordpress-org/banner-1544x500.png)
+
 WPGraphQL for Advanced Custom Fields is a free, open-source WordPress plugin that adds ACF Fields and Field Groups to the WPGraphQL Schema.
 
+The plugin is [now available on WordPress.org!](https://wordpress.org/plugins/wpgraphql-acf/)
+
 Development of this plugin has been made possible by [WP Engine Atlas](https://wpengine.com/atlas)
 
+Learn more at [https://acf.wpgraphql.com](https://acf.wpgraphql.com)
+
 ## Table of Contents
 
 - [Upgrade Notice](#upgrade-notice)

access-functions.php

@@ -1,16 +1,14 @@
 <?php
 
 /**
- * @param string $acf_field_type
- * @param array|callable  $config
- *
- * @return void
+ * @param string                $acf_field_type
+ * @param array<mixed>|callable $config
  */
 function register_graphql_acf_field_type( string $acf_field_type, $config = [] ): void {
 	add_action(
 		'wpgraphql/acf/register_field_types',
 		static function ( \WPGraphQL\Acf\FieldTypeRegistry $registry ) use ( $acf_field_type, $config ) {
 			$registry->register_field_type( $acf_field_type, $config );
-		} 
+		}
 	);
 }

composer.json

@@ -14,7 +14,7 @@
     "appsero/client": "1.2.1"
   },
   "require-dev": {
-    "automattic/vipwpcs": "^2.3",
+    "automattic/vipwpcs": "^3.0",
     "lucatume/wp-browser": "3.1.0",
     "codeception/module-asserts": "^1.3",
     "codeception/module-phpbrowser": "^1.0",