Merge branch '2.4.2-develop' into MC-39995-composer2

Author: jeff-matthews

.github/workflows/linter.yml

@@ -11,14 +11,11 @@ name: Lint Code Base
 # https://help.github.com/en/articles/workflow-syntax-for-github-actions
 #
 
-#############################
-# Start the job on all push #
-#############################
+###################################
+# Start the job on a pull request #
+###################################
 on:
-  pull_request:
-    branches:
-      - master
-      - 2.*-develop
+  pull_request
 
 ###############
 # Set the Job #
@@ -50,4 +47,5 @@ jobs:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master
           VALIDATE_HTML: false
+          VALIDATE_OPENAPI: false
           MARKDOWN_CONFIG_FILE: .markdownlint.json

.github/workflows/main.yml

@@ -15,7 +15,7 @@ This site is built by [Jekyll](https://jekyllrb.com/), which is an open-source t
 You can build the site locally in the following ways:
 
 -  [Installing the project dependencies locally](#build-locally) (Mac, Linux)
--  [Using Docker (docker-compose)](#docker-docker-compose) (Mac, Linux, Windows)
+-  [Using Docker (docker-compose)](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker) (Mac, Linux, Windows)
 -  [Using a Vagrant virtual machine](https://github.com/magento-devdocs/vagrant-for-magento-devdocs) (Mac, Linux, Windows)
 -  [Build DevDocs in Windows](https://github.com/magento/devdocs/wiki/Build-DevDocs-in-Windows) (Windows 7 & 10)
 -  [Building older versions of the documentation](https://github.com/magento/devdocs/wiki/Build-DevDocs-with-Docker)

README.md

@@ -78,13 +78,14 @@ task :whatsnew do
   print 'Generating data for the What\'s New digest: $ '.magenta
 
   # Generate tmp/whats-new.yml
-  if since.nil? || since.empty?
-    sh 'bin/whatsup_github', 'since', last_update
-  elsif since.is_a? String
-    sh 'bin/whatsup_github', 'since', since
-  else
-    abort 'The "since" argument must be a string. Example: "jul 4"'
-  end
+  report =
+    if since.nil? || since.empty?
+      `bin/whatsup_github since '#{last_update}'`
+    elsif since.is_a? String
+      `bin/whatsup_github since #{since}`
+    else
+      abort 'The "since" argument must be a string. Example: "jul 4"'
+    end
 
   # Merge generated tmp/whats-new.yml with existing src/_data/whats-new.yml
   generated_data = YAML.load_file generated_file
@@ -94,6 +95,9 @@ task :whatsnew do
 
   puts "Writing updates to #{current_file}"
   File.write current_file, current_data.to_yaml
+
+  abort report if report.include? 'MISSING whatsnew'
+  puts report
 end
 
 desc 'Generate index for Algolia'

Rakefile

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+# To enable this plugin, add to your '_config.local.yml' the following:
+#
+# debug: site_post_render
+#
+# This plugin runs an IRB session (https://github.com/ruby/irb) of a Jekyll application in a serving mode when it's at a state after rendering the whole site, but before writing any files.
+# See the ":site, :post_render" hook: https://jekyllrb.com/docs/plugins/hooks/
+# Available objects to explore are 'site' and 'payload'.
+#
+# Several helpful methods (to use a method, chain to an object such as 'site.methods', 'payload.keys'):
+# - '.methods.sort'
+# - '.instance_variables.sort'
+# - '.keys.sort'
+#
+# Examples:
+#
+# To view available configuration data of the site
+# > payload.site.keys
+#
+# To view the number of pages:
+# > payload.site.pages.count
+#
+# To find a page by path and view its data:
+# > page = payload.site.pages.select { |page| page.path == 'cloud/env/variables-build.md' }[0]
+# > page.data
+#
+# To exit from the IRB session:
+# > exit!
+#
+Jekyll::Hooks.register :site, :post_render do |site, payload|
+  next unless site.config['serving']
+
+  # rubocop:disable Lint/Debugger
+  binding.irb if site.config['debug'] == 'site_post_render'
+  # rubocop:enable Lint/Debugger
+end

_plugins/debug/site_post_render.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+# To enable this plugin, add to your '_config.local.yml' the following:
+#
+# debug: site_pre_render
+#
+# This plugin runs an IRB session (https://github.com/ruby/irb) of a Jekyll application in a serving mode when it's at a state just before rendering the whole site.
+# See the ":site, :pre_render" hook: https://jekyllrb.com/docs/plugins/hooks/
+# Available objects to explore are 'site' and 'payload'.
+#
+# Several helpful methods (to use a method, chain to an object such as 'site.methods', 'payload.keys'):
+# - '.methods.sort'
+# - '.instance_variables.sort'
+# - '.keys.sort'
+#
+# Examples:
+#
+# To view available configuration data of the site
+# > payload.site.keys
+#
+# To view the number of pages:
+# > payload.site.pages.count
+#
+# To find a page by path and view its data:
+# > page = payload.site.pages.select { |page| page.path == 'cloud/env/variables-build.md' }[0]
+# > page.data
+#
+# To exit from the IRB session:
+# > exit!
+#
+Jekyll::Hooks.register :site, :pre_render do |site, payload|
+  next unless site.config['serving']
+
+  # rubocop:disable Lint/Debugger
+  binding.irb if site.config['debug'] == 'site_pre_render'
+  # rubocop:enable Lint/Debugger
+end

_plugins/debug/site_pre_render.rb

@@ -2,7 +2,7 @@ version: '3.6'
 
 services:
   jekyll:
-    image: jekyll/jekyll:latest
+    image: jekyll/jekyll:3.8.6
     command: jekyll serve --watch --incremental --open-url --livereload
     ports:
       - 4000:4000

docker-compose.yaml

@@ -367,6 +367,9 @@ pages:
         - label: Set up optional database replication
           url: /config-guide/multi-master/multi-master_slavedb.html
 
+    - label: Revert from a split database to a single database
+      url: /config-guide/revert-split-database.html
+
     - label: Custom Logging
       url: /config-guide/log/log-intro.html
       children:

src/_data/toc/configuration-guide.yml

@@ -181,10 +181,30 @@ pages:
         - label: addDownloadableProductsToCart mutation
           url: /graphql/mutations/add-downloadable-products.html
 
+        - label: addProductsToRequisitionList mutation
+          url: /graphql/mutations/add-products-to-requisition-list.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
         - label: addProductsToWishlist mutation
           url: /graphql/mutations/add-products-to-wishlist.html
           exclude_versions: ["2.3"]
 
+        - label: addRequisitionListItemsToCart mutation
+          url: /graphql/mutations/add-requisition-list-items-to-cart.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
+        - label: addReturnComment mutation
+          url: /graphql/mutations/add-return-comment.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
+
+        - label: addReturnTracking mutation
+          url: /graphql/mutations/add-return-tracking.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
+
         - label: addSimpleProductsToCart mutation
           url: /graphql/mutations/add-simple-products.html
 
@@ -210,8 +230,18 @@ pages:
         - label: changeCustomerPassword mutation
           url: /graphql/mutations/change-customer-password.html
 
-        - label: copyProductsToWishlist mutation
-          url: /graphql/mutations/copy-products-to-wishlist.html
+        - label: clearCustomerCart mutation
+          url: /graphql/mutations/clear-customer-cart.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
+        - label: copyItemsBetweenRequisitionLists mutation
+          url: /graphql/mutations/copy-items-between-requisition-lists.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
+        - label: copyProductsBetweenWishlists mutation
+          url: /graphql/mutations/copy-products-between-wishlists.html
           edition: ee-only
           exclude_versions: ["2.3"]
 
@@ -293,19 +323,24 @@ pages:
         - label: deleteCustomerAddress mutation
           url: /graphql/mutations/delete-customer-address.html
 
-        - label: deleteWishlist mutation
-          url: /graphql/mutations/delete-wishlist.html
-          edition: ee-only
-          exclude_versions: ["2.3"]
-
-        - label: deletePaymentToken mutation
-          url: /graphql/mutations/delete-payment-token.html
-
         - label: deleteRequisitionList mutation
           url: /graphql/mutations/delete-requisition-list.html
           edition: b2b-only
           exclude_versions: [ "2.3" ]
 
+        - label: deleteRequisitionListItems mutation
+          url: /graphql/mutations/delete-requisition-list-items.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
+        - label: deletePaymentToken mutation
+          url: /graphql/mutations/delete-payment-token.html
+
+        - label: deleteWishlist mutation
+          url: /graphql/mutations/delete-wishlist.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
+
         - label: generateCustomerToken mutation
           url: /graphql/mutations/generate-customer-token.html
 
@@ -319,11 +354,16 @@ pages:
         - label: mergeCarts mutation
           url: /graphql/mutations/merge-carts.html
 
-        - label: moveProductsToWishlist mutation
-          url: /graphql/mutations/move-products-to-wishlist.html
+        - label: moveProductsBetweenWishlists mutation
+          url: /graphql/mutations/move-products-between-wishlists.html
           edition: ee-only
           exclude_versions: ["2.3"]
 
+        - label: moveItemsBetweenRequisitionLists mutation
+          url: /graphql/mutations/move-items-between-requisition-lists.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
         - label: placeOrder mutation
           url: /graphql/mutations/place-order.html
 
@@ -345,6 +385,11 @@ pages:
           url: /graphql/mutations/remove-products-from-wishlist.html
           exclude_versions: ["2.3"]
 
+        - label: removeReturnTracking mutation
+          url: /graphql/mutations/remove-return-tracking.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
+
         - label: removeRewardPointsFromCart mutation
           url: /graphql/mutations/remove-reward-points.html
           edition: ee-only
@@ -354,11 +399,6 @@ pages:
           url: /graphql/mutations/remove-store-credit.html
           edition: ee-only
 
-        - label: renameRequisitionList mutation
-          url: /graphql/mutations/rename-requisition-list.html
-          edition: b2b-only
-          exclude_versions: [ "2.3" ]
-
         - label: reorderItems mutation
           url: /graphql/mutations/reorder-items.html
           exclude_versions: ["2.3"]
@@ -367,13 +407,18 @@ pages:
           url: /graphql/mutations/request-password-reset-email.html
           exclude_versions: ["2.3"]
 
-        - label: revokeCustomerToken mutation
-          url: /graphql/mutations/revoke-customer-token.html
+        - label: requestReturn mutation
+          url: /graphql/mutations/request-return.html
+          edition: ee-only
+          exclude_versions: ["2.3"]
 
         - label: resetPassword mutation
           url: /graphql/mutations/reset-password.html
           exclude_versions: ["2.3"]
 
+        - label: revokeCustomerToken mutation
+          url: /graphql/mutations/revoke-customer-token.html
+
         - label: sendEmailToFriend mutation
           url: /graphql/mutations/send-email-to-friend.html
 
@@ -449,6 +494,16 @@ pages:
           url: /graphql/mutations/update-products-in-wishlist.html
           exclude_versions: ["2.3"]
 
+        - label: updateRequisitionList mutation
+          url: /graphql/mutations/update-requisition-list.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
+        - label: updateRequisitionListItems mutation
+          url: /graphql/mutations/update-requisition-list-items.html
+          edition: b2b-only
+          exclude_versions: [ "2.3" ]
+
         - label: updateWishlist mutation
           url: /graphql/mutations/update-wishlist.html
           edition: ee-only
@@ -465,7 +520,7 @@ pages:
         - label: CategoryInterface attributes
           url: /graphql/interfaces/category-interface.html
 
-        - label: CustomizableOptionInterface
+        - label: CustomizableOptionInterface attributes
           url: /graphql/interfaces/customizable-option-interface.html
 
         - label: Bundle product data types
@@ -489,6 +544,10 @@ pages:
         - label: Virtual product data types
           url: /graphql/interfaces/virtual-product.html
 
+        - label: CartItemInterface attributes and implementations
+          url: /graphql/interfaces/cart-item-interface.html
+          exclude_versions: ["2.3"]
+
         - label: CreditMemoItemInterface attributes and implementations
           url: /graphql/interfaces/credit-memo-item-interface.html
           exclude_versions: ["2.3"]
@@ -501,10 +560,19 @@ pages:
           url: /graphql/interfaces/order-item-interface.html
           exclude_versions: ["2.3"]
 
+        - label: RequisitionListItemInterface attributes and implementations
+          url: /graphql/interfaces/requisition-list-item-interface.html
+          edition: b2b-only
+          exclude_versions: ["2.3"]
+
         - label: ShipmentItemInterface attributes and implementations
           url: /graphql/interfaces/shipment-item-interface.html
           exclude_versions: ["2.3"]
 
+        - label: WishlistItemInterface attributes and implementations
+          url: /graphql/interfaces/wishlist-item-interface.html
+          exclude_versions: ["2.3"]
+
     - label: Payment methods
       children: