Merge remote-tracking branch 'origin/master'

# Conflicts:
#	composer.lock
#	mihdan-yandex-turbo-feed.php
#	readme.txt

.distignore

@@ -1,12 +1,9 @@
 # A set of files you probably don't want in your WordPress.org distribution
 .distignore
 .editorconfig
-.git
 .gitignore
 .gitlab-ci.yml
 .travis.yml
-.DS_Store
-.idea
 Thumbs.db
 behat.yml
 circle.yml
@@ -27,11 +24,16 @@ CHANGELOG.md
 CONTRIBUTING.md
 wp-cli.local.yml
 yarn.lock
-bin
-tests
-node_modules
 *.sql
 *.tar.gz
 *.zip
+
 /assets
+/node_modules
 /src
+/tests
+/.git
+/.github
+/.idea
+/.wordpress-org
+/.DS_Store

README.md

@@ -1,9 +1,7 @@
-[![RIPS CodeRisk](https://coderisk.com/wp/plugin/mihdan-yandex-turbo-feed/badge "RIPS CodeRisk")](https://coderisk.com/wp/plugin/mihdan-yandex-turbo-feed)
-
 # Mihdan: Yandex Turbo Feed
 WordPress-плагин, генерирующий фид для [Турбо-страниц](https://yandex.ru/adv/turbo) от компании Яндекс
 
-![Mihdan: Yandex Turbo Feed](./screenshot-1.png)
+![Mihdan: Yandex Turbo Feed](.wordpress-org/screenshot-1.png)
 
 ## Автора ##
 "Писатель" - [Кобзарёв Михаил](https://www.kobzarev.com/)
@@ -92,6 +90,4 @@ add_filter( 'mihdan_yandex_turbo_feed_taxonomy', function( $taxonomy ) {
 
 ## Помочь проекту
 
-[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=BENCPARA8S224)
-
-[](http://coderisk.com/wp/plugin/mihdan-yandex-turbo-feed/RIPS-xig8tE5A4u)
+[Donate](https://www.kobzarev.com/donate/)

admin/css/app.css

@@ -96,6 +96,10 @@ a[data-key$="exclude_tab"]:before {
 	content: '\f14f';
 }
 
+a[data-key$="woocommerce_tab"]:before {
+	content: '\f174';
+}
+
 .mihdan_yandex_turbo_feed_exclude_shortcode {
 	overflow: auto;
 	max-height: 500px;

composer.json

@@ -33,10 +33,14 @@
     "require": {
         "php": ">=7.4",
         "composer/installers": "*",
-        "wptrt/admin-notices": "*",
-        "wpackagist-plugin/advanced-custom-fields": "^5.8",
+        "wptrt/admin-notices": "1.0.3",
+        "wpackagist-plugin/advanced-custom-fields": "6.1.7",
         "stoutlogic/acf-builder": "^1.9",
-      "ext-json": "*"
+        "ext-json": "*",
+        "wpackagist-plugin/acf-multiple-taxonomy": "^1.0"
+    },
+    "require-dev": {
+        "roave/security-advisories": "dev-latest"
     },
     "extra": {
         "installer-paths": {