Merge branch 'master' into imported-ravi-chandra3197-devdocs-9293

Author: dobooth

.github/CONTRIBUTING.md

@@ -8,12 +8,9 @@ DevDocs staff members and [Community Maintainers](https://devdocs.magento.com/co
 
 ## Rewards for contributions
 
-DevDocs works with Magento Community Engineering teams and projects.
-As you contribute PRs, you gain [Contribution Points](https://devdocs.magento.com/contributor-guide/contributing.html#points).
-
 If you write and contribute a full topic, we will add your name (or your company's name) at the top of the DevDocs page and link it to your blog or website!
 
-If you contribute a major update to a topic, your GitHub username will be added to a description of the update in our [What's New topic](https://devdocs.magento.com/whats-new.html).
+If you contribute a new topic or a major update to a topic, your GitHub username will be added to a description of the update in our [What's New topic](https://devdocs.magento.com/whats-new.html).
 
 ## Get started
 

.github/workflows/linter.yml

@@ -55,7 +55,7 @@ jobs:
       # Run Linter against code base #
       ################################
       - name: Lint Code Base
-        uses: github/super-linter@v3
+        uses: github/super-linter@v4
         env:
           VALIDATE_ALL_CODEBASE: false
           DEFAULT_BRANCH: master

Gemfile.lock

@@ -16,14 +16,14 @@ GEM
     algoliasearch (1.27.5)
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
-    chef-utils (17.5.22)
+    chef-utils (17.8.25)
       concurrent-ruby
     colorator (1.1.0)
     concurrent-ruby (1.1.9)
-    em-websocket (0.5.2)
+    em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
-      http_parser.rb (~> 0.6.0)
-    ethon (0.14.0)
+      http_parser.rb (~> 0)
+    ethon (0.15.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     exifr (1.3.9)
@@ -50,31 +50,31 @@ GEM
     filesize (0.2.0)
     forwardable-extended (2.6.0)
     fspath (3.1.2)
-    html-proofer (3.19.2)
+    html-proofer (3.19.3)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogumbo (~> 2.0)
+      nokogiri (~> 1.12)
       parallel (~> 1.3)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
-    http_parser.rb (0.6.0)
+    http_parser.rb (0.8.0)
     httpclient (2.8.3)
-    i18n (1.8.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    image_optim (0.30.0)
+    image_optim (0.31.1)
       exifr (~> 1.2, >= 1.2.2)
       fspath (~> 3.0)
-      image_size (>= 1.5, < 3)
+      image_size (>= 1.5, < 4)
       in_threads (~> 1.3)
       progress (~> 3.0, >= 3.0.1)
-    image_optim_pack (0.7.0.20210511)
+    image_optim_pack (0.8.0.20211116)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_optim_pack (0.7.0.20210511-x86_64-darwin)
+    image_optim_pack (0.8.0.20211116-x86_64-darwin)
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
-    image_size (2.1.2)
+    image_size (3.0.1)
     in_threads (1.5.4)
     jekyll (4.2.1)
       addressable (~> 2.4)
@@ -114,7 +114,7 @@ GEM
       jekyll (>= 3.3, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.5.1)
+    json (2.6.1)
     kramdown (2.3.1)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -145,8 +145,6 @@ GEM
       racc (~> 1.4)
     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)
@@ -156,14 +154,14 @@ GEM
     progress (3.6.0)
     progressbar (1.11.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (13.0.6)
     rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (3.27.0)
     ruby2_keywords (0.0.5)
     safe_yaml (1.0.5)
     sassc (2.4.0)

_config.yml

@@ -109,6 +109,12 @@ defaults:
       github_files: https://github.com/magento/magento2-page-builder-docs/tree/master/
       github_repo: https://github.com/magento/magento2-page-builder-docs/
 
+  - 
+    scope:
+      path: magento-payments
+    values:
+      group: magento-payments
+
   -
     scope:
       path: guides/v2.3/mrg

src/_data/core-releases.json

@@ -1,6 +1,14 @@
 {
-    "2.4": {
+    "2.4.4-2.4.6": {
+        "releases": [],
+        "end-of-support": "2024-11-??"
+    },
+    "2.4.0-2.4.3": {
         "releases": [
+            {
+                "publishedAt": "2021-10-12T14:41:27Z",
+                "tagName": "2.4.3-p1"
+            },
             {
                 "publishedAt": "2021-08-10T16:44:14Z",
                 "tagName": "2.4.3"
@@ -34,10 +42,14 @@
                 "tagName":"2.4.0"
             }
         ],
-        "end-of-support": "????-??-??"
+        "end-of-support": "2022-11-??"
     },
     "2.3": {
         "releases": [
+            {
+                "publishedAt": "2021-10-12T14:41:22Z",
+                "tagName": "2.3.7-p2"
+            },
             {
                 "publishedAt": "2021-08-10T16:44:05Z",
                 "tagName": "2.3.7-p1"

src/_data/main-nav.yml

@@ -131,7 +131,7 @@
           url: /design-styleguide/bk-styleguide.html
 
         - label: PWA Documentation Site
-          url: https://magento.github.io/pwa-studio/
+          url: https://developer.adobe.com/commerce/pwa-studio/
 
         - label: Page Builder Developer Guide
           url: /page-builder/docs/index.html
@@ -206,6 +206,10 @@
       url: /marketplace/sellers/getting-started.html
       versionless: true
 
+    - label: Payment Services
+      url: /payment-services/index.html
+      versionless: true
+
     - label: Order Management
       url: http://omsdocs.magento.com/en/
 

src/_data/mde.yml

@@ -505,7 +505,7 @@ extensions:
     name: Product Recommendations
     versions:
       -
-        name: 3.3.3
+        name: 3.3.5
         support:
           2.3.0: supported
           2.3.1: supported
@@ -519,6 +519,21 @@ extensions:
           2.4.1: supported
           2.4.2: supported
           2.4.3: supported
+      -
+        name: 3.3.3
+        support:
+          2.3.0: compatible
+          2.3.1: compatible
+          2.3.2: compatible
+          2.3.3: compatible
+          2.3.4: compatible
+          2.3.5-p1: compatible
+          2.3.6: compatible
+          2.3.7: compatible
+          2.4.0: compatible
+          2.4.1: compatible
+          2.4.2: compatible
+          2.4.3: compatible
       -
         name: 3.3.2
         support:

src/_data/roadmap.yml

@@ -0,0 +1,63 @@
+roadmap:
+  - name: In Progress
+    features:
+      - name: Framework updates (e.g. KnockoutJS, RequireJS, etc.)
+        status: inProgress
+      - name: GraphQL - Admin configuration
+        status: inProgress
+      - name: GraphQL - Caching updates
+        status: inProgress
+      - name: jQuery 3.6.x support
+        status: inProgress
+      - name: OpenSearch 1.x support
+        status: inProgress
+      - name: PayPal and Braintree updates
+        status: inProgress
+        type: Extension
+      - name: PHP 8.1 support
+        status: inProgress
+      - name: PWA - Global theming/styling
+        status: inProgress
+      - name: PWA - Custom product attributes
+        status: inProgress
+      - name: PWA - Performance optimizations
+        status: inProgress
+      - name: PWA - Shopping and cart improvements
+        status: inProgress
+      - name: Security and quality improvements
+        status: inProgress
+      - name: Vendor Bundled Extensions (VBEs) – Updates
+        status: inProgress
+        type: Extension
+  - name: Planned
+    features:
+      - name: Accelerated checkout powered by Bolt (extension)
+        status: Planned
+        type: Extension
+      - name: Accessibility improvements for storefront/admin
+        status: Planned
+      - name: Framework updates (e.g. KnockoutJS, RequireJS, etc.)
+        status: Planned
+      - name: GraphQL - Personalization updates
+        status: Planned
+      - name: GraphQL - Page Builder improvements
+        status: Planned
+      - name: GraphQL - Inventory improvements
+        status: Planned
+      - name: Page Builder - Mobile layout optimization
+        status: Planned
+      - name: Page Builder - Column grid layouts (viewports)
+        status: Planned
+      - name: Payment services (extension)
+        status: Planned
+      - name: PWA - Server-side rendering (SSR)
+        status: Planned
+      - name: PWA - Extensibility improvements (payment/ship)
+        status: Planned
+      - name: PWA - Bundle product type
+        status: Planned
+      - name: Security and quality improvements
+        status: Planned
+      - name: Walmart Marketplace (extension)
+        status: Planned
+        type: Extension

src/_data/toc/cloud-guide.yml

@@ -570,46 +570,14 @@ pages:
       versionless: true
       children:
 
-        - label: Troubleshoot deployment
-          url: /cloud/trouble/troubleshoot-deployment.html
-          versionless: true
-
-        - label: Incorrect credentials
-          url: /cloud/trouble/trouble_ce-creds.html
-          versionless: true
-
-        - label: Resolve issues with a new project
-          url: /cloud/trouble/trouble_proj-startover.html
-          versionless: true
-
         - label: Component deployment failure
           url: /cloud/trouble/trouble_comp-deploy-fail.html
           versionless: true
 
-        - label: Resolve issues with encryption key
-          url: /cloud/trouble/trouble-crypt-key-variable.html
-          versionless: true
-
-        - label: Resolve issues with HTML minification
-          url: /cloud/trouble/trouble-error-html-minification.html
-          versionless: true
-
-        - label: Resolve issues with Google Analytics during deployment
-          url: /cloud/trouble/trouble-google-analytics-deploy.html
-          versionless: true
-
-        - label: Site availability
-          url: /cloud/trouble/site-availability.html
-          versionless: true
-
         - label: Add site map and search engine robots
           url: /cloud/trouble/robots-sitemap.html
           versionless: true
 
-        - label: Theme troubleshooting
-          url: /cloud/trouble/theme-troubleshooting.html
-          versionless: true
-
     - label: Upgrades and patches
       url: /cloud/project/project-upgrade-parent.html
       versionless: true

src/_data/toc/coding-standards.yml

@@ -28,6 +28,10 @@ pages:
         - label: HTML style guide
           url: /coding-standards/code-standard-html.html
 
+        - label: Contributing
+          url: /coding-standards/contributing.html
+          exclude_versions: ["2.3"]
+
     - label: Technical guidelines
       url: /coding-standards/technical-guidelines.html