Merge branch 'master' into hg-cloud-issues

Author: hguthrie

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/magento-devdocs/devdocs-theme.git
-  revision: c437253c75119e8c890b7e8e968ddf812205085c
+  revision: b1e43366e1fa7c7cd33a2213c6a9304f57536e8f
   specs:
     devdocs (16)
       jekyll (>= 4.0)
@@ -16,7 +16,7 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    chef-utils (17.2.29)
+    chef-utils (17.5.22)
       concurrent-ruby
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
@@ -27,14 +27,15 @@ GEM
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     exifr (1.3.9)
-    faraday (1.5.1)
+    faraday (1.8.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
       faraday-httpclient (~> 1.0.1)
       faraday-net_http (~> 1.0)
       faraday-net_http_persistent (~> 1.1)
       faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
       multipart-post (>= 1.2, < 3)
       ruby2_keywords (>= 0.0.4)
     faraday-em_http (1.0.0)
@@ -44,7 +45,8 @@ GEM
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
-    ffi (1.15.3)
+    faraday-rack (1.0.0)
+    ffi (1.15.4)
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     fspath (3.1.2)
@@ -72,9 +74,9 @@ GEM
     image_optim_pack (0.7.0.20210511-x86_64-darwin)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_size (2.1.1)
+    image_size (2.1.2)
     in_threads (1.5.4)
-    jekyll (4.2.0)
+    jekyll (4.2.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -120,7 +122,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     liquid (4.0.3)
-    listen (3.5.1)
+    listen (3.7.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mdl (0.11.0)
@@ -130,25 +132,25 @@ GEM
       mixlib-config (>= 2.2.1, < 4)
       mixlib-shellout
     mercenary (0.4.0)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.6.1)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
     mixlib-shellout (3.2.5)
       chef-utils
     multipart-post (2.1.1)
     netrc (0.11.0)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
       racc (~> 1.4)
-    nokogiri (1.11.7-x86_64-darwin)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     nokogumbo (2.0.5)
       nokogiri (~> 1.8, >= 1.8.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.20.1)
+    parallel (1.21.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
     progress (3.6.0)
@@ -161,8 +163,8 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.0)
-    ruby2_keywords (0.0.4)
+    rouge (3.26.1)
+    ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
@@ -175,7 +177,7 @@ GEM
     tomlrb (2.0.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
-    unicode-display_width (1.7.0)
+    unicode-display_width (1.8.0)
     verbal_expressions (0.1.5)
     wdm (0.1.1)
     whatsup_github (0.4.2)

_config.yml

@@ -115,15 +115,13 @@ defaults:
     values:
       group: module-reference-guide-2_3
       github_link: false
-      feedback_link: false
 
   -
     scope:
       path: guides/v2.4/mrg
     values:
       group: module-reference-guide-2_4
       github_link: false
-      feedback_link: false
 
   -
     scope:

src/_data/codebase/cloud/magento-cloud.json

@@ -16,6 +16,14 @@ features:
           2.2: false
           2.3: false
           2.4: true
+      -
+        name: Live Search powered by Adobe Sensei
+        support:
+          2.0: false
+          2.1: false
+          2.2: false
+          2.3: false
+          2.4: true
       -
         name: Product Recommendations powered by Adobe Sensei
         support:

src/_data/features.yml

@@ -54,6 +54,9 @@ pages:
         - label: Run the Upgrade Compatibility Tool
           url: /ext-best-practices/phpstorm/uct-run-configuration.html
 
+        - label: The built-in Upgrade Compatibility Tool (MVP)
+          url: /ext-best-practices/phpstorm/built-in-upgrade-compatibility-tool.html
+
     - label: Storefront
       url: /ext-best-practices/storefront/storefront-best-practices.html
 

src/_data/toc/extension-best-practices.yml

@@ -32,6 +32,10 @@ pages:
   url: /recommendations/customize.html
   versionless: true
 
+- label: Integrate Product Recommendations into your Headless Storefront
+  url: /recommendations/headless.html
+  versionless: true
+
 - label: Recommendations SDK
   url: /recommendations/recs-api.html
   versionless: true