Merge commit '873d1bebc5cc4a82d71df9b4877828ae80e38471' into feat/con…

…tent-blocks-support

# Conflicts:
#	composer.lock
#	src/assets/admin/js/main.js

.distignore

@@ -1,28 +1,49 @@
 # A set of files you probably don't want in your WordPress.org distribution
+*.sql
+*.tar.gz
+*.yml
+*.zip
+.DS_Store
+.babelrc
+.deployignore
 .distignore
 .editorconfig
+.env
+.env.dist
+.env.testing.dist
+.eslintignore
+.eslintrc
 .git
+.gitattributes
+.github
 .gitignore
 .gitlab-ci.yml
+.idea
+.log
 .travis.yml
-.DS_Store
+.vscode
+.wordpress-org
+/docker
+/docs
+/phpstan
+/plugin-build
+Gruntfile.js
+README.md
 Thumbs.db
 behat.yml
 bin
+c3.php
 circle.yml
 composer.json
 composer.lock
-Gruntfile.js
+multisite.xml
+multisite.xml.dist
+node_modules
 package.json
+packages
+phpcs.xml.dist
+phpstan.neon.dist
 phpunit.xml
 phpunit.xml.dist
-multisite.xml
-multisite.xml.dist
-phpcs.ruleset.xml
-README.md
-wp-cli.local.yml
 tests
-node_modules
-*.sql
-*.tar.gz
-*.zip
+wp-cli.local.yml

.github/workflows/deploy-to-github.yml

@@ -21,16 +21,15 @@ jobs:
 
       - name: Create Artifact
         run: |
-          mkdir plugin-build
-          composer archive -vvv --format=zip --file="plugin-build/wp-graphql-acf"
+          composer run-script zip
 
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: wp-graphql-acf
-          path: plugin-build/wp-graphql-acf.zip
+          name: wpgraphql-acf
+          path: plugin-build/wpgraphql-acf.zip
 
       - name: Upload release asset to github
         uses: softprops/action-gh-release@v1
         with:
-          files: plugin-build/wp-graphql-acf.zip
+          files: plugin-build/wpgraphql-acf.zip

composer.json

@@ -72,7 +72,7 @@
     ],
     "build-app": "@docker-build -a",
     "build-test": "@docker-build -t",
-    "build-plugin": "composer install --no-dev && composer archive -vvv --format=zip --file=\"plugin-build/wp-graphql-acf\" && composer install",
+    "build-plugin": "composer install --no-dev && composer run-script zip && composer install",
     "run-app": "@docker-run -a",
     "run-test": "@docker-run -t",
     "lint": "vendor/bin/phpcs",
@@ -87,26 +87,12 @@
     ],
     "phpstan": [
       "phpstan analyze --ansi --memory-limit=1G"
-    ]
-  },
-  "archive": {
-    "exclude": [
-      "*.yml",
-      "!vendor/",
-      "node_modules/",
-      "!.wordpress-org/",
-      "composer.json",
-      "composer.lock",
-      "c3.php",
-      "docs/",
-      "docker",
-      "phpcs.xml.dist",
-      "phpstan.neon.dist",
-      "phpstan/",
-      "plugin-build",
-      "wp-graphql.zip",
-      "!build",
-      "packages"
+    ],
+    "zip": [
+      "mkdir -p plugin-build/wpgraphql-acf",
+      "rsync -rc --exclude-from=.distignore --exclude=plugin-build . plugin-build/wpgraphql-acf/ --delete --delete-excluded -v",
+      "cd plugin-build ; zip -r wpgraphql-acf.zip wpgraphql-acf",
+      "rm -rf plugin-build/wpgraphql-acf/"
     ]
   }
 }

src/assets/admin/js/main.js

@@ -33,8 +33,8 @@ $j(document).ready(function () {
 				return;
 			}
 
-			var $graphqlFieldName = field.$setting('graphql_field_name');
-			var graphqlFieldName = acf?.getInstance($graphqlFieldName)?.getValue() ?? null;
+			var $graphqlFieldName = field?.$setting('graphql_field_name');
+			var graphqlFieldName = acf?.getInstance($graphqlFieldName)?.getValue() ?? '';
 
 			if ( graphqlFieldName === '' ) {
 				var sanitizedGraphqlFieldName = acf.strCamelCase( acf.strSanitize(name) );