Merge branch 'master' into meker12-patch-1

Author: meker12

.github/workflows/linter.yml

@@ -20,6 +20,9 @@ on:
 ###############
 # Set the Job #
 ###############
+permissions:
+ contents: read
+
 jobs:
  mdl:
  name: mdl

_config.yml

@@ -127,7 +127,7 @@ defaults:
  path: guides/v2.4/mrg
  values:
  group: module-reference-guide-2_4
- github_link: false
+ layout: migrated
 
  -
  scope:

_plugins/generators/migrated_log.rb

@@ -14,18 +14,19 @@ class MigratedLog < Generator
  def generate(site)
  # Make the site object available in any scope in this class.
  @site = site
- migrated_pages = @site.pages.filter { |page| page.data['layout'] == 'migrated' }
-
+ pages = @site.pages
+ migrated_pages = pages.filter { |page| page.data['layout'] == 'migrated' }
+ number_of_staying_pages = pages.count { |page| page.data['guide_version'] == '2.3' || page.data['group'].nil? }
  url_prefix = site.config['url'] + site.config['baseurl']
-
  migrated_pages_data = []
  migrated_pages.each do |page|
  migrated_page = {
  path: page.path,
- title: page.data['title'],
- guide: @site.data['toc'][page.data['group']]['label'],
+ title: page.data['title'] || abort("Error in '#{page.path}'.\n Check 'title' in the file's frontmatter.".red),
+ guide: @site.data.dig('toc', page.data['group'],
+ 'label') || abort("Error in '#{page.path}'.\n Check 'group' in the file's frontmatter or 'label' in the corresponding TOC.".red),
  migrated_from: url_prefix + page.url,
- migrated_to: page.data['migrated_to'],
+ migrated_to: page.data['migrated_to'] || abort("Error in '#{page.path}'.\n Check 'migrated_to' in the file's frontmatter.".red),
  migrated_to_source: if page.data['migrated_to'].start_with?('https://experienceleague.adobe.com')
  'Adobe Experience League'
  elsif page.data['migrated_to'].start_with?('https://developer.adobe.com')
@@ -36,10 +37,8 @@ def generate(site)
  }
  migrated_pages_data << migrated_page
  end
-
- migrated_pages_by_group = migrated_pages_data.group_by { |page| page[:guide] }
-
- content = "The folowing is the list of topics that have been migrated and will be redirected soon.\n\n"
+ migrated_pages_by_group = migrated_pages_data.group_by { |page| page[:guide] }.sort.to_h
+ content = "The folowing #{migrated_pages.size} topics out of #{pages.size - number_of_staying_pages} have been migrated and will be redirected soon.\n\n"
  migrated_pages_by_group.each do |guide, topics|
  content += "\n## #{guide}\n\n\n"
  topics.sort_by { |topic| topic[:title] }
@@ -67,7 +66,7 @@ def generate(site)
 
  # Add the newly constructed page object to the rest of pages
  # on the site.
- @site.pages << topic
+ pages << topic
  end
  end
 end

_plugins/generators/mrg_v2_4.rb

@@ -48,6 +48,7 @@ def generate(site)
  )
  mrg_topic.content = metadata['content']
  mrg_topic.data['title'] = metadata['title']
+ mrg_topic.data['migrated_to'] = 'https://developer.adobe.com/commerce/php/module-reference/' + mrg_topic.url.split('/').pop.sub('.html', '/')
  mrg_topic.process("#{mod}.md")
 
  # Add the newly constructed page object to the rest of pages

src/_data/codebase/v2_3/system-requirements.yml

@@ -10,7 +10,7 @@
  Redis: '6.0'
  Varnish: '6.5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.7:
  Composer: '1'
  Elasticsearch: '7.9'
@@ -21,7 +21,7 @@
  Redis: '6.0'
  Varnish: '6.5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.6:
  Composer: '1'
  Elasticsearch: '7.7'
@@ -32,7 +32,7 @@
  Redis: '5.0'
  Varnish: '6.4'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.5:
  Composer: '1'
  Elasticsearch: '7.6'
@@ -43,7 +43,7 @@
  Redis: '5.0'
  Varnish: '6.3'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.4:
  Composer: '1'
  Elasticsearch: '5, 6'
@@ -54,7 +54,7 @@
  Redis: '5.0'
  Varnish: '4, 5, 6.2'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.3:
  Composer: '1'
  Elasticsearch: '5, 6'
@@ -65,7 +65,7 @@
  Redis: '5.0'
  Varnish: '6.2'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.2:
  Composer: '1'
  Elasticsearch: '5, 6'
@@ -76,7 +76,7 @@
  Redis: '5.0'
  Varnish: '4, 5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.1:
  Composer: '1'
  Elasticsearch: '5, 6'
@@ -87,7 +87,7 @@
  Redis: '5.0'
  Varnish: '4, 5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.3.0:
  Composer: '1'
  Elasticsearch: '2, 5'
@@ -98,4 +98,4 @@
  Redis: '5'
  Varnish: '4, 5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'

src/_data/codebase/v2_4/system-requirements.yml

@@ -10,7 +10,13 @@
  Redis: '6.2'
  Varnish: '7.0'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
+ AWS Aurora (MySQL): '8.0'
+ AWS S3: ✔️
+ AWS MQ: '3.9.13'
+ AWS ElastiCache: Redis 6
+ AWS Elasticsearch: '7.9'
+ AWS OpenSearch: '1.2'
 2.4.4:
  Composer: '2.1'
  Elasticsearch: '7.16'
@@ -22,7 +28,12 @@
  Redis: '6.2'
  Varnish: '7.0'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
+ AWS Aurora (MySQL): '5.7'
+ AWS S3: ✔️
+ AWS MQ: '3.8.11'
+ AWS ElastiCache: Redis 6
+ AWS Elasticsearch: '7.9'
 2.4.3-p2:
  Composer: '1'
  Elasticsearch: '7.16'
@@ -34,7 +45,12 @@
  Redis: '6.0'
  Varnish: '6.5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
+ AWS Aurora (MySQL): '5.7'
+ AWS S3: ✔️
+ AWS MQ: '3.8.11'
+ AWS ElastiCache: Redis 6
+ AWS Elasticsearch: '7.9'
 2.4.3:
  Composer: '1'
  Elasticsearch: '7.10'
@@ -45,12 +61,12 @@
  Redis: '6.0'
  Varnish: '6.5'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
  AWS Aurora (MySQL): '5.7'
  AWS S3: ✔️
  AWS MQ: '3.8.11'
  AWS ElastiCache: Redis 6
- AWS ElasticSearch: '7.9'
+ AWS Elasticsearch: '7.9'
 2.4.2:
  Composer: '1'
  Elasticsearch: '7.9'
@@ -61,7 +77,7 @@
  Redis: '6.0'
  Varnish: '6.4'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
  AWS S3: ✔️
 2.4.1:
  Composer: '1'
@@ -73,7 +89,7 @@
  Redis: '5.0'
  Varnish: '6.2'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'
 2.4.0:
  Composer: '1'
  Elasticsearch: '7.6'
@@ -84,4 +100,4 @@
  Redis: '5.0'
  Varnish: '6'
  Apache: '2.4'
- nginx: '1.8'
+ nginx: '1.18'

src/_data/features.yml

@@ -48,6 +48,14 @@ features:
  2.2: false
  2.3: true
  2.4: true
+ -
+ name: Payment Services flexible payment options
+ support:
+ 2.0: false
+ 2.1: false
+ 2.2: false
+ 2.3: false
+ 2.4: true 
  -
  name: PayPal Smart Buttons
  support:
@@ -179,6 +187,14 @@ features:
  2.2: true
  2.3: true
  2.4: true
+ -
+ name: Payment Services reporting and reconciliation dashboard
+ support:
+ 2.0: false
+ 2.1: false
+ 2.2: false
+ 2.3: false
+ 2.4: true 
  -
  name: Platform, performance, and security enhancements
  versions:

src/_data/main-nav.yml

@@ -105,6 +105,11 @@
 
  - label: Module Reference Guide
  url: /mrg/intro.html
+ include_versions: ["2.3"]
+
+ - label: Module Reference Guide
+ url: https://developer.adobe.com/commerce/php/module-reference/
+ include_versions: ["2.4"]
 
  - label: Coding Standards
  url: /coding-standards/bk-coding-standards.html

src/_data/mde.yml

@@ -915,7 +915,7 @@ extensions:
  name: Product Recommendations
  versions:
  -
- name: 3.3.7
+ name: 4.0.0
  support:
  2.4.4: supported
  2.4.3: supported
@@ -930,6 +930,22 @@ extensions:
  2.3.2: supported
  2.3.1: supported
  2.3.0: supported
+ -
+ name: 3.3.7
+ support:
+ 2.4.4: compatible
+ 2.4.3: compatible
+ 2.4.2: compatible
+ 2.4.1: compatible
+ 2.4.0: compatible
+ 2.3.7: compatible
+ 2.3.6: compatible
+ 2.3.5-p1: compatible
+ 2.3.4: compatible
+ 2.3.3: compatible
+ 2.3.2: compatible
+ 2.3.1: compatible
+ 2.3.0: compatible
  -
  name: 3.3.6
  support:

src/_data/roadmap.yml

@@ -3,62 +3,29 @@ roadmap:
  features:
  - name: Accessibility improvements for storefront/admin
  status: inProgress
- - name: Channel manager with Walmart Marketplace (extension)
+ - name: Composer 2.2 support
  status: inProgress
- type: Extension
- - name: Express Checkout for Adobe Commerce (extension)
+ - name: Elasticsearch 7.17 support
  status: inProgress
- type: Extension
- - name: Framework updates (for example, KnockoutJS and RequireJS)
+ - name: Mobile layout optimization
  status: inProgress
- - name: GraphQL - Admin configuration
+ - name: Column grid layouts (viewports)
  status: inProgress
- - name: GraphQL - Caching updates
- status: inProgress
- - name: jQuery 3.6.x support
- status: inProgress
- - name: OpenSearch 1.x support
- status: inProgress
- - name: Payment services (extension)
- status: inProgress
- type: Extension
- - 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
+ - name: Security and quality improvements
  status: inProgress
- - name: PWA - Performance optimizations
+ - name: Replace Froogaloop library with player.js
  status: inProgress
- - name: PWA - Shopping and cart improvements
+ - name: TinyMCE 5.10 support
  status: inProgress
- - name: Security and quality improvements
+ - name: Latest Vimeo API support
  status: inProgress
- - name: Vendor Bundled Extensions (VBEs) – Remove (except Braintree)
- status: inProgress
- type: Extension
  - name: Planned
  features:
- - name: Framework updates (for example, KnockoutJS and RequireJS)
- status: Planned
- - name: GraphQL - Personalization updates
- status: Planned
- - name: GraphQL - Page Builder improvements
- status: Planned
- - name: GraphQL - Inventory improvements
+ - name: OpenSearch as independent search engine
  status: Planned
- - name: Page Builder - Mobile layout optimization
+ - name: Remove jquery-migrate
  status: Planned
- - name: Page Builder - Column grid layouts (viewports)
+ - name: Remove PHP 7.4 compatibility
  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
+ - name: Symfony dependency updates
  status: Planned