Skip to content

Commit 4082c86

Browse files
BrianGilbertBrianGilbert
committed
Merge branch 'feature/54-update' into develop
2 parents 158228d + 780c3ba commit 4082c86

File tree

88 files changed

+6138
-2737
lines changed

Some content is hidden

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

88 files changed

+6138
-2737
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@
3131

3232
# Ignore auto-generated environmet files
3333
/.ddev/docker-compose.host-docker-internal.yaml
34+
/.gitattributes

‎composer.json

Lines changed: 68 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -11,138 +11,102 @@
1111
"repositories": {
1212
"drupal": {
1313
"type": "composer",
14-
"url": "https://packages.drupal.org/8",
15-
"exclude": [
16-
"drupal/anonymous_redirect",
17-
"drupal/entity_display_mode",
18-
"drupal/field_tools",
19-
"drupal/m4032404",
20-
"drupal/maxlength",
21-
"drupal/node_edit_protection",
22-
"drupal/paragraphs_asymmetric_translation_widgets",
23-
"drupal/paragraphs_ee"
24-
]
25-
},
26-
"drupal/anonymous_redirect": {
27-
"type": "git",
28-
"url": "https://git.drupalcode.org/issue/anonymous_redirect-3286076.git"
29-
},
30-
"drupal/entity_display_mode": {
31-
"type": "git",
32-
"url": "https://git.drupalcode.org/issue/entity_display_mode-3287230.git"
33-
},
34-
"drupal/field_tools": {
35-
"type": "git",
36-
"url": "https://git.drupalcode.org/issue/field_tools-3297214.git"
37-
},
38-
"drupal/m4032404": {
39-
"type": "git",
40-
"url": "https://git.drupalcode.org/issue/m4032404-3288400.git"
41-
},
42-
"drupal/maxlength": {
43-
"type": "git",
44-
"url": "https://git.drupalcode.org/issue/maxlength-3295052.git"
45-
},
46-
"drupal/node_edit_protection": {
47-
"type": "git",
48-
"url": "https://git.drupalcode.org/issue/node_edit_protection-3288778.git"
49-
},
50-
"drupal/paragraphs_asymmetric_translation_widgets": {
51-
"type": "git",
52-
"url": "https://git.drupalcode.org/issue/paragraphs_asymmetric_translation_widgets-3297814.git"
53-
},
54-
"drupal/paragraphs_ee": {
55-
"type": "git",
56-
"url": "https://git.drupalcode.org/issue/paragraphs_ee-3288984.git"
14+
"url": "https://packages.drupal.org/8"
5715
}
5816
},
5917
"require": {
6018
"php": ">=8.1",
6119
"composer/installers": "^2.2",
6220
"cweagans/composer-patches": "^1.7.3",
6321
"drupal-tome/tome_drush": "dev-master",
64-
"drupal/admin_audit_trail": "^1.0.1",
65-
"drupal/admin_toolbar": "^3.3",
22+
"drupal/admin_audit_trail": "^1.0",
23+
"drupal/admin_toolbar": "^3.4",
6624
"drupal/advanced_text_formatter": "^3.0@RC",
67-
"drupal/allowed_formats": "^2.0",
68-
"drupal/anonymous_redirect": "dev-feature/3286076-automated-drupal-10",
69-
"drupal/coffee": "^1.3.0",
70-
"drupal/config_filter": "^2.4",
71-
"drupal/config_ignore": "3.x-dev@dev",
25+
"drupal/allowed_formats": "^3.0",
26+
"drupal/anonymous_redirect": "^2.3",
27+
"drupal/coffee": "^1.4",
28+
"drupal/config_filter": "^2.6",
29+
"drupal/config_ignore": "^3.2",
7230
"drupal/config_pages": "2.x-dev@dev",
7331
"drupal/config_rewrite": "^1.5",
74-
"drupal/config_split": "^2.0@RC",
32+
"drupal/config_split": "^2.0",
33+
"drupal/consumers": "^1.17",
7534
"drupal/content_lock": "^2.3.0",
76-
"drupal/core-composer-scaffold": "10.0.3",
77-
"drupal/core-project-message": "10.0.3",
78-
"drupal/core-recommended": "10.0.3",
35+
"drupal/core-composer-scaffold": "10.2.5",
36+
"drupal/core-project-message": "10.2.5",
37+
"drupal/core-recommended": "10.2.5",
38+
"drupal/ctools": "^4.0",
7939
"drupal/decoupled_router": "^2.0",
8040
"drupal/diff": "^1.1.0",
8141
"drupal/druxt": "^1.2",
8242
"drupal/dynamic_entity_reference": "^4.0@alpha",
83-
"drupal/eca": "1.1.x-dev@dev",
43+
"drupal/eca": "1.1",
8444
"drupal/entity_browser": "^2.9.0",
8545
"drupal/entity_browser_enhanced": "^1.1.0@dev",
86-
"drupal/entity_clone": "^2.0@alpha",
87-
"drupal/entity_display_mode": "dev-feature/3287230-automated-drupal-10",
88-
"drupal/entity_route_context": "^4.0@RC",
89-
"drupal/entity_usage": "^2.0",
90-
"drupal/environment_indicator": "^4.0.14",
46+
"drupal/entity_clone": "^2.0@beta",
47+
"drupal/entity_display_mode": "^2.0@alpha",
48+
"drupal/entity_route_context": "^4.0",
49+
"drupal/entity_usage": "^2.0@beta",
50+
"drupal/environment_indicator": "^4.0",
9151
"drupal/exclude_node_title": "^1.4",
9252
"drupal/field_group": "^3.4.0",
93-
"drupal/field_tools": "dev-3297214-automated-drupal-10",
53+
"drupal/field_tools": "^1.0@alpha",
9454
"drupal/focal_point": "2.x-dev@dev",
95-
"drupal/gin": "3.x-dev@dev",
55+
"drupal/gin": "^3.0@RC",
9656
"drupal/gin_login": "^2.0",
9757
"drupal/gin_toolbar": "^1.0@RC",
98-
"drupal/image_style_warmer": "^1.2@RC",
58+
"drupal/image_style_warmer": "^1.2",
9959
"drupal/jquery_ui": "^1.6",
10060
"drupal/jquery_ui_draggable": "^2.0",
10161
"drupal/jsonapi_hypermedia": "^1.9",
62+
"drupal/jsonapi_image_styles": "^3.0",
10263
"drupal/jsonapi_menu_items": "^1.2",
103-
"drupal/jsonapi_node_preview": "^1.0.0-beta2@beta",
104-
"drupal/jsonapi_node_preview_tab": "^1.0.0@beta",
105-
"drupal/layout_paragraphs": "^2.0.2",
64+
"drupal/jsonapi_node_preview_tab": "^1.0",
65+
"drupal/jsonapi_user_resources": "^1.0@beta",
66+
"drupal/layout_paragraphs": "^2.0",
10667
"drupal/length_indicator": "^1.2",
107-
"drupal/linkit": "6.0.x-dev@dev",
108-
"drupal/linky": "^1.0",
109-
"drupal/linky_revision_ui": "2.x-dev@dev",
68+
"drupal/linkit": "^6.1",
69+
"drupal/linky": "^2.0@beta",
11070
"drupal/linkychecker": "^2.0",
111-
"drupal/linkyreplacer": "^2.2.2",
112-
"drupal/m4032404": "dev-feature/3288400-automated-drupal-10",
113-
"drupal/masquerade": "^2.0",
114-
"drupal/maxlength": "dev-3295052-drupal-10-compatibility",
71+
"drupal/linkyreplacer": "^2.2",
72+
"drupal/m4032404": "^1.0@alpha",
73+
"drupal/masquerade": "^2.0@RC",
74+
"drupal/maxlength": "^3.0@beta",
11575
"drupal/media_file_delete": "^1.3",
11676
"drupal/media_revisions_ui": "^2.1",
11777
"drupal/memcache": "^2.5",
118-
"drupal/node_edit_protection": "dev-3288778-automated-drupal-10",
78+
"drupal/metatag": "^2.0",
79+
"drupal/node_edit_protection": "^1.1",
11980
"drupal/oembed_providers": "^2.1",
120-
"drupal/paragraphs_asymmetric_translation_widgets": "dev-3297814-automated-drupal-10",
121-
"drupal/paragraphs_ee": "dev-feature/3288984-d10",
81+
"drupal/paragraphs": "^1.17",
82+
"drupal/paragraphs_asymmetric_translation_widgets": "^1.3",
83+
"drupal/paragraphs_ee": "2.2.x-dev@dev",
84+
"drupal/paragraphs_features": "^2.0@beta",
12285
"drupal/paragraphs_viewmode": "^1.1",
123-
"drupal/pathauto": "^1.11",
124-
"drupal/permissions_filter": "^1.3",
125-
"drupal/prevent_homepage_deletion": "^2.0.1",
126-
"drupal/redirect": "^1.8",
86+
"drupal/pate": "^1.2",
87+
"drupal/pathauto": "^1.12",
88+
"drupal/prevent_homepage_deletion": "^2.0",
89+
"drupal/redirect": "^1.9",
12790
"drupal/revision_log_default": "^1.3",
12891
"drupal/robotstxt": "^1.5.0",
12992
"drupal/role_delegation": "^1.2",
93+
"drupal/role_watchdog": "^2.1",
13094
"drupal/scheduled_transitions": "2.3.x-dev@dev",
131-
"drupal/schema_metatag": "^2.4.0",
13295
"drupal/security_review": "^2.0",
133-
"drupal/simple_oauth": "^5.2.3",
134-
"drupal/simple_sitemap": "^4.1.4",
135-
"drupal/smart_date": "^3.7",
136-
"drupal/tome": "^1.10.0",
137-
"drupal/transliterate_filenames": "^2.0.1",
138-
"drupal/upgrade_status": "^4.0@alpha",
96+
"drupal/simple_oauth": "^5.2",
97+
"drupal/simple_sitemap": "^4.1",
98+
"drupal/smart_date": "^4.1@RC",
99+
"drupal/token": "^1.13",
100+
"drupal/tome": "^1.11",
101+
"drupal/transliterate_filenames": "^2.0",
102+
"drupal/upgrade_status": "^4.1",
139103
"drupal/username_enumeration_prevention": "^1.3",
140104
"drupal/viewfield": "^3.0",
141-
"drupal/wpf": "^1.0"
105+
"drupal/wpf": "^1.1"
142106
},
143107
"require-dev": {
144-
"drupal/core-dev": "10.0.3",
145-
"drush/drush": "^11.4.0",
108+
"drupal/core-dev": "10.2.5",
109+
"drush/drush": "^12",
146110
"phpspec/prophecy-phpunit": "^2",
147111
"sllh/composer-lint": "^2.0"
148112
},
@@ -161,7 +125,8 @@
161125
"drupal/core-project-message": true,
162126
"dealerdirect/phpcodesniffer-composer-installer": true,
163127
"sllh/composer-lint": true,
164-
"phpstan/extension-installer": true
128+
"phpstan/extension-installer": true,
129+
"php-http/discovery": true
165130
}
166131
},
167132
"scripts": {
@@ -229,10 +194,6 @@
229194
},
230195
"enable-patching": true,
231196
"patches": {
232-
"drupal/core": {
233-
"https://www.drupal.org/project/drupal/issues/3247553#comment-14282335": "https://www.drupal.org/files/issues/2021-11-05/3247553-6.patch",
234-
"https://www.drupal.org/project/drupal/issues/2350939#comment-14901205": "https://www.drupal.org/files/issues/2023-02-02/2350939-314-9.5.x.patch"
235-
},
236197
"drupal/druxt": {
237198
"#3315030 - Add a wildcard route translator": "https://git.drupalcode.org/project/druxt/-/merge_requests/11.diff",
238199
"#3315035 - Cannot load the 'view' entity with NULL ID": "https://git.drupalcode.org/project/druxt/-/merge_requests/10.diff"
@@ -250,40 +211,32 @@
250211
},
251212
"drupal/gin": {
252213
"https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "https://git.drupalcode.org/project/gin/-/merge_requests/92.diff",
253-
"https://www.drupal.org/project/gin/issues/3335557": "https://git.drupalcode.org/project/gin/-/merge_requests/214.diff",
254-
"https://www.drupal.org/project/gin/issues/3340478#comment-14914134": "https://www.drupal.org/files/issues/2023-02-09/3340478-space-issue-between-inline-entity-form-fields.patch",
255-
"https://www.drupal.org/project/gin/issues/3281343#comment-14811812": "https://www.drupal.org/files/issues/2022-12-04/edit-form-media-3281343-4.patch",
256-
"https://www.drupal.org/project/gin/issues/3336522#comment-14890713": "https://www.drupal.org/files/issues/2023-01-27/native-icons-dark-3336522-1.patch",
257-
"https://www.drupal.org/project/gin/issues/3339301": "https://git.drupalcode.org/project/gin/-/merge_requests/223.diff",
258-
"https://www.drupal.org/project/gin/issues/3340160": "https://git.drupalcode.org/project/gin/-/merge_requests/221.diff",
259-
"https://www.drupal.org/project/gin/issues/3331304": "https://git.drupalcode.org/project/gin/-/merge_requests/210.diff",
260-
"https://www.drupal.org/project/gin/issues/3331830": "https://git.drupalcode.org/project/gin/-/merge_requests/211.diff",
261-
"https://www.drupal.org/project/gin/issues/3276752#comment-14816160": "https://www.drupal.org/files/issues/2022-12-07/gin-stick-after-ajax-reload-3276752-23.patch",
262-
"https://www.drupal.org/project/gin/issues/3339063": "https://git.drupalcode.org/project/gin/-/merge_requests/217.diff"
214+
"https://www.drupal.org/project/gin/issues/3281343#comment-14811812": "https://www.drupal.org/files/issues/2023-04-21/edit-form-media-3281343-11.patch",
215+
"https://www.drupal.org/project/gin/issues/3342513": "https://www.drupal.org/files/issues/2024-01-31/gin-ajax-behaviour-edit-form-3342513-11.patch"
263216
},
264217
"drupal/gin_toolbar": {
265218
"https://www.drupal.org/project/gin_toolbar/issues/3217393": "https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/9.diff"
266219
},
267220
"drupal/layout_paragraphs": {
268221
"https://www.drupal.org/project/layout_paragraphs/issues/3259729": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/60.diff",
269-
"https://www.drupal.org/project/layout_paragraphs/issues/3265794": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/84.diff"
222+
"https://www.drupal.org/project/layout_paragraphs/issues/3265794": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/84.diff",
223+
"https://www.drupal.org/project/layout_paragraphs/issues/3313147#comment-14716547": "https://www.drupal.org/files/issues/2022-10-03/layout_paragraphs-cancel-no-validate-3313147-2.patch",
224+
"https://www.drupal.org/project/layout_paragraphs/issues/3356968#comment-15027689": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/127.diff",
225+
"https://www.drupal.org/project/layout_paragraphs/issues/3366968#comment-15123733": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/132.diff"
270226
},
271-
"drupal/linkit": {
272-
"https://www.drupal.org/project/linkit/issues/3022261#comment-14257900": "https://www.drupal.org/files/issues/2021-10-15/3022261_linkit_add-better-support-for-linking-to-anchors_22.patch",
273-
"https://www.drupal.org/project/linkit/issues/3232190#comment-14777689": "https://www.drupal.org/files/issues/2022-11-09/3232190-101-rebased-on-6.0.x.patch"
227+
"drupal/m4032404": {
228+
"https://www.drupal.org/project/m4032404/issues/3358555#comment-15043416": "https://git.drupalcode.org/project/m4032404/-/merge_requests/3.diff"
274229
},
275-
"drupal/metatag": {
276-
"https://www.drupal.org/project/metatag/issues/2945817#comment-14740067": "https://www.drupal.org/files/issues/2022-10-13/metatag-data-type-support-2945817-154.patch"
230+
"drupal/linkit": {
231+
"https://www.drupal.org/project/linkit/issues/3022261#comment-15495980": "https://www.drupal.org/files/issues/2024-03-17/3022261-41.patch"
277232
},
278233
"drupal/node_edit_protection": {
279-
"Triggers if button used instead of input https://www.drupal.org/project/node_edit_protection/issues/3208719": "./patch/3208719.diff"
234+
"https://www.drupal.org/project/node_edit_protection/issues/3196605#comment-14363624": "https://www.drupal.org/files/issues/2021-04-12/node_edit_protection-3196605-5.patch",
235+
"https://www.drupal.org/project/node_edit_protection/issues/3193652#comment-13970107": "https://www.drupal.org/files/issues/2021-01-20/3193652-2.patch"
280236
},
281237
"drupal/paragraphs": {
282238
"https://www.drupal.org/project/paragraphs/issues/2904705#comment-13918715": "https://www.drupal.org/files/issues/2020-11-27/paragraphs_support_asym_translations-2904705-122.patch",
283239
"https://www.drupal.org/project/paragraphs/issues/3031598#comment-13972961": "https://www.drupal.org/files/issues/2021-01-22/paragraph-entity-type-did-not-specify-translation-halder-3031598-45.patch"
284-
},
285-
"drupal/wpf": {
286-
"https://www.drupal.org/project/wpf/issues/3338291": "https://git.drupalcode.org/project/wpf/-/merge_requests/2.diff"
287240
}
288241
}
289242
}

0 commit comments

Comments
 (0)