Skip to content

Commit c717682

Browse files
authored
Merge branch 'master' into meker12-patch-1
2 parents 2785a50 + 0bdf1dc commit c717682

File tree

323 files changed

+33347
-748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

323 files changed

+33347
-748
lines changed

.github/workflows/linter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ on:
2020
###############
2121
# Set the Job #
2222
###############
23+
permissions:
24+
contents: read
25+
2326
jobs:
2427
mdl:
2528
name: mdl

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ defaults:
127127
path: guides/v2.4/mrg
128128
values:
129129
group: module-reference-guide-2_4
130-
github_link: false
130+
layout: migrated
131131

132132
-
133133
scope:

_plugins/generators/migrated_log.rb

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,19 @@ class MigratedLog < Generator
1414
def generate(site)
1515
# Make the site object available in any scope in this class.
1616
@site = site
17-
migrated_pages = @site.pages.filter { |page| page.data['layout'] == 'migrated' }
18-
17+
pages = @site.pages
18+
migrated_pages = pages.filter { |page| page.data['layout'] == 'migrated' }
19+
number_of_staying_pages = pages.count { |page| page.data['guide_version'] == '2.3' || page.data['group'].nil? }
1920
url_prefix = site.config['url'] + site.config['baseurl']
20-
2121
migrated_pages_data = []
2222
migrated_pages.each do |page|
2323
migrated_page = {
2424
path: page.path,
25-
title: page.data['title'],
26-
guide: @site.data['toc'][page.data['group']]['label'],
25+
title: page.data['title'] || abort("Error in '#{page.path}'.\n Check 'title' in the file's frontmatter.".red),
26+
guide: @site.data.dig('toc', page.data['group'],
27+
'label') || abort("Error in '#{page.path}'.\n Check 'group' in the file's frontmatter or 'label' in the corresponding TOC.".red),
2728
migrated_from: url_prefix + page.url,
28-
migrated_to: page.data['migrated_to'],
29+
migrated_to: page.data['migrated_to'] || abort("Error in '#{page.path}'.\n Check 'migrated_to' in the file's frontmatter.".red),
2930
migrated_to_source: if page.data['migrated_to'].start_with?('https://experienceleague.adobe.com')
3031
'Adobe Experience League'
3132
elsif page.data['migrated_to'].start_with?('https://developer.adobe.com')
@@ -36,10 +37,8 @@ def generate(site)
3637
}
3738
migrated_pages_data << migrated_page
3839
end
39-
40-
migrated_pages_by_group = migrated_pages_data.group_by { |page| page[:guide] }
41-
42-
content = "The folowing is the list of topics that have been migrated and will be redirected soon.\n\n"
40+
migrated_pages_by_group = migrated_pages_data.group_by { |page| page[:guide] }.sort.to_h
41+
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"
4342
migrated_pages_by_group.each do |guide, topics|
4443
content += "\n## #{guide}\n\n\n"
4544
topics.sort_by { |topic| topic[:title] }
@@ -67,7 +66,7 @@ def generate(site)
6766

6867
# Add the newly constructed page object to the rest of pages
6968
# on the site.
70-
@site.pages << topic
69+
pages << topic
7170
end
7271
end
7372
end

_plugins/generators/mrg_v2_4.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ def generate(site)
4848
)
4949
mrg_topic.content = metadata['content']
5050
mrg_topic.data['title'] = metadata['title']
51+
mrg_topic.data['migrated_to'] = 'https://developer.adobe.com/commerce/php/module-reference/' + mrg_topic.url.split('/').pop.sub('.html', '/')
5152
mrg_topic.process("#{mod}.md")
5253

5354
# Add the newly constructed page object to the rest of pages

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
Redis: '6.0'
1111
Varnish: '6.5'
1212
Apache: '2.4'
13-
nginx: '1.8'
13+
nginx: '1.18'
1414
2.3.7:
1515
Composer: '1'
1616
Elasticsearch: '7.9'
@@ -21,7 +21,7 @@
2121
Redis: '6.0'
2222
Varnish: '6.5'
2323
Apache: '2.4'
24-
nginx: '1.8'
24+
nginx: '1.18'
2525
2.3.6:
2626
Composer: '1'
2727
Elasticsearch: '7.7'
@@ -32,7 +32,7 @@
3232
Redis: '5.0'
3333
Varnish: '6.4'
3434
Apache: '2.4'
35-
nginx: '1.8'
35+
nginx: '1.18'
3636
2.3.5:
3737
Composer: '1'
3838
Elasticsearch: '7.6'
@@ -43,7 +43,7 @@
4343
Redis: '5.0'
4444
Varnish: '6.3'
4545
Apache: '2.4'
46-
nginx: '1.8'
46+
nginx: '1.18'
4747
2.3.4:
4848
Composer: '1'
4949
Elasticsearch: '5, 6'
@@ -54,7 +54,7 @@
5454
Redis: '5.0'
5555
Varnish: '4, 5, 6.2'
5656
Apache: '2.4'
57-
nginx: '1.8'
57+
nginx: '1.18'
5858
2.3.3:
5959
Composer: '1'
6060
Elasticsearch: '5, 6'
@@ -65,7 +65,7 @@
6565
Redis: '5.0'
6666
Varnish: '6.2'
6767
Apache: '2.4'
68-
nginx: '1.8'
68+
nginx: '1.18'
6969
2.3.2:
7070
Composer: '1'
7171
Elasticsearch: '5, 6'
@@ -76,7 +76,7 @@
7676
Redis: '5.0'
7777
Varnish: '4, 5'
7878
Apache: '2.4'
79-
nginx: '1.8'
79+
nginx: '1.18'
8080
2.3.1:
8181
Composer: '1'
8282
Elasticsearch: '5, 6'
@@ -87,7 +87,7 @@
8787
Redis: '5.0'
8888
Varnish: '4, 5'
8989
Apache: '2.4'
90-
nginx: '1.8'
90+
nginx: '1.18'
9191
2.3.0:
9292
Composer: '1'
9393
Elasticsearch: '2, 5'
@@ -98,4 +98,4 @@
9898
Redis: '5'
9999
Varnish: '4, 5'
100100
Apache: '2.4'
101-
nginx: '1.8'
101+
nginx: '1.18'

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

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010
Redis: '6.2'
1111
Varnish: '7.0'
1212
Apache: '2.4'
13-
nginx: '1.8'
13+
nginx: '1.18'
14+
AWS Aurora (MySQL): '8.0'
15+
AWS S3: ✔️
16+
AWS MQ: '3.9.13'
17+
AWS ElastiCache: Redis 6
18+
AWS Elasticsearch: '7.9'
19+
AWS OpenSearch: '1.2'
1420
2.4.4:
1521
Composer: '2.1'
1622
Elasticsearch: '7.16'
@@ -22,7 +28,12 @@
2228
Redis: '6.2'
2329
Varnish: '7.0'
2430
Apache: '2.4'
25-
nginx: '1.8'
31+
nginx: '1.18'
32+
AWS Aurora (MySQL): '5.7'
33+
AWS S3: ✔️
34+
AWS MQ: '3.8.11'
35+
AWS ElastiCache: Redis 6
36+
AWS Elasticsearch: '7.9'
2637
2.4.3-p2:
2738
Composer: '1'
2839
Elasticsearch: '7.16'
@@ -34,7 +45,12 @@
3445
Redis: '6.0'
3546
Varnish: '6.5'
3647
Apache: '2.4'
37-
nginx: '1.8'
48+
nginx: '1.18'
49+
AWS Aurora (MySQL): '5.7'
50+
AWS S3: ✔️
51+
AWS MQ: '3.8.11'
52+
AWS ElastiCache: Redis 6
53+
AWS Elasticsearch: '7.9'
3854
2.4.3:
3955
Composer: '1'
4056
Elasticsearch: '7.10'
@@ -45,12 +61,12 @@
4561
Redis: '6.0'
4662
Varnish: '6.5'
4763
Apache: '2.4'
48-
nginx: '1.8'
64+
nginx: '1.18'
4965
AWS Aurora (MySQL): '5.7'
5066
AWS S3: ✔️
5167
AWS MQ: '3.8.11'
5268
AWS ElastiCache: Redis 6
53-
AWS ElasticSearch: '7.9'
69+
AWS Elasticsearch: '7.9'
5470
2.4.2:
5571
Composer: '1'
5672
Elasticsearch: '7.9'
@@ -61,7 +77,7 @@
6177
Redis: '6.0'
6278
Varnish: '6.4'
6379
Apache: '2.4'
64-
nginx: '1.8'
80+
nginx: '1.18'
6581
AWS S3: ✔️
6682
2.4.1:
6783
Composer: '1'
@@ -73,7 +89,7 @@
7389
Redis: '5.0'
7490
Varnish: '6.2'
7591
Apache: '2.4'
76-
nginx: '1.8'
92+
nginx: '1.18'
7793
2.4.0:
7894
Composer: '1'
7995
Elasticsearch: '7.6'
@@ -84,4 +100,4 @@
84100
Redis: '5.0'
85101
Varnish: '6'
86102
Apache: '2.4'
87-
nginx: '1.8'
103+
nginx: '1.18'

src/_data/features.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ features:
4848
2.2: false
4949
2.3: true
5050
2.4: true
51+
-
52+
name: Payment Services flexible payment options
53+
support:
54+
2.0: false
55+
2.1: false
56+
2.2: false
57+
2.3: false
58+
2.4: true
5159
-
5260
name: PayPal Smart Buttons
5361
support:
@@ -179,6 +187,14 @@ features:
179187
2.2: true
180188
2.3: true
181189
2.4: true
190+
-
191+
name: Payment Services reporting and reconciliation dashboard
192+
support:
193+
2.0: false
194+
2.1: false
195+
2.2: false
196+
2.3: false
197+
2.4: true
182198
-
183199
name: Platform, performance, and security enhancements
184200
versions:

src/_data/main-nav.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@
105105

106106
- label: Module Reference Guide
107107
url: /mrg/intro.html
108+
include_versions: ["2.3"]
109+
110+
- label: Module Reference Guide
111+
url: https://developer.adobe.com/commerce/php/module-reference/
112+
include_versions: ["2.4"]
108113

109114
- label: Coding Standards
110115
url: /coding-standards/bk-coding-standards.html

src/_data/mde.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ extensions:
915915
name: Product Recommendations
916916
versions:
917917
-
918-
name: 3.3.7
918+
name: 4.0.0
919919
support:
920920
2.4.4: supported
921921
2.4.3: supported
@@ -930,6 +930,22 @@ extensions:
930930
2.3.2: supported
931931
2.3.1: supported
932932
2.3.0: supported
933+
-
934+
name: 3.3.7
935+
support:
936+
2.4.4: compatible
937+
2.4.3: compatible
938+
2.4.2: compatible
939+
2.4.1: compatible
940+
2.4.0: compatible
941+
2.3.7: compatible
942+
2.3.6: compatible
943+
2.3.5-p1: compatible
944+
2.3.4: compatible
945+
2.3.3: compatible
946+
2.3.2: compatible
947+
2.3.1: compatible
948+
2.3.0: compatible
933949
-
934950
name: 3.3.6
935951
support:

src/_data/roadmap.yml

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,62 +3,29 @@ roadmap:
33
features:
44
- name: Accessibility improvements for storefront/admin
55
status: inProgress
6-
- name: Channel manager with Walmart Marketplace (extension)
6+
- name: Composer 2.2 support
77
status: inProgress
8-
type: Extension
9-
- name: Express Checkout for Adobe Commerce (extension)
8+
- name: Elasticsearch 7.17 support
109
status: inProgress
11-
type: Extension
12-
- name: Framework updates (for example, KnockoutJS and RequireJS)
10+
- name: Mobile layout optimization
1311
status: inProgress
14-
- name: GraphQL - Admin configuration
12+
- name: Column grid layouts (viewports)
1513
status: inProgress
16-
- name: GraphQL - Caching updates
17-
status: inProgress
18-
- name: jQuery 3.6.x support
19-
status: inProgress
20-
- name: OpenSearch 1.x support
21-
status: inProgress
22-
- name: Payment services (extension)
23-
status: inProgress
24-
type: Extension
25-
- name: PayPal and Braintree updates
26-
status: inProgress
27-
type: Extension
28-
- name: PHP 8.1 support
29-
status: inProgress
30-
- name: PWA - Global theming/styling
31-
status: inProgress
32-
- name: PWA - Custom product attributes
14+
- name: Security and quality improvements
3315
status: inProgress
34-
- name: PWA - Performance optimizations
16+
- name: Replace Froogaloop library with player.js
3517
status: inProgress
36-
- name: PWA - Shopping and cart improvements
18+
- name: TinyMCE 5.10 support
3719
status: inProgress
38-
- name: Security and quality improvements
20+
- name: Latest Vimeo API support
3921
status: inProgress
40-
- name: Vendor Bundled Extensions (VBEs) – Remove (except Braintree)
41-
status: inProgress
42-
type: Extension
4322
- name: Planned
4423
features:
45-
- name: Framework updates (for example, KnockoutJS and RequireJS)
46-
status: Planned
47-
- name: GraphQL - Personalization updates
48-
status: Planned
49-
- name: GraphQL - Page Builder improvements
50-
status: Planned
51-
- name: GraphQL - Inventory improvements
24+
- name: OpenSearch as independent search engine
5225
status: Planned
53-
- name: Page Builder - Mobile layout optimization
26+
- name: Remove jquery-migrate
5427
status: Planned
55-
- name: Page Builder - Column grid layouts (viewports)
28+
- name: Remove PHP 7.4 compatibility
5629
status: Planned
57-
- name: PWA - Server-side rendering (SSR)
58-
status: Planned
59-
- name: PWA - Extensibility improvements (payment/ship)
60-
status: Planned
61-
- name: PWA - Bundle product type
62-
status: Planned
63-
- name: Security and quality improvements
30+
- name: Symfony dependency updates
6431
status: Planned

0 commit comments

Comments
 (0)