Skip to content

Commit 4e1b514

Browse files
authored
chore(#17): incorporate upstream changes and updates (#20)
Co-authored-by: Brian Gilbert <[email protected]>
1 parent 00f00e9 commit 4e1b514

30 files changed

+1623
-2110
lines changed

drupal/composer.json

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,13 @@
2727
"drupal/coffee": "^1.2",
2828
"drupal/config_filter": "^2.2",
2929
"drupal/config_ignore": "^3.0",
30+
"drupal/config_pages": "^2.9",
3031
"drupal/content_lock": "^2.2",
3132
"drupal/core-composer-scaffold": "^9.3",
3233
"drupal/core-project-message": "^9.3",
3334
"drupal/core-recommended": "^9.3",
3435
"drupal/diff": "^1.0",
36+
"drupal/documentation_generator": "^2.0",
3537
"drupal/druxt": "^1.1.1",
3638
"drupal/dynamic_entity_reference": "^2.0",
3739
"drupal/entity_browser": "^2.6",
@@ -45,8 +47,8 @@
4547
"drupal/field_tools": "^1.0",
4648
"drupal/focal_point": "^1.5",
4749
"drupal/gin": "^3.x-dev",
48-
"drupal/gin_login": "1.x-dev",
49-
"drupal/gin_toolbar": "1.x-dev",
50+
"drupal/gin_login": "^1.2",
51+
"drupal/gin_toolbar": "1.x-dev@dev",
5052
"drupal/jsonapi_hypermedia": "^1.6",
5153
"drupal/jsonapi_node_preview": "^1.0@beta",
5254
"drupal/jsonapi_node_preview_tab": "1.0.x-dev",
@@ -65,6 +67,7 @@
6567
"drupal/oembed_providers": "^2.0",
6668
"drupal/paragraphs_ee": "^2.0",
6769
"drupal/pathauto": "^1.8",
70+
"drupal/permissions_filter": "^1.2",
6871
"drupal/prevent_homepage_deletion": "^1.4",
6972
"drupal/redirect": "^1.7",
7073
"drupal/revision_log_default": "^1.2",
@@ -75,14 +78,14 @@
7578
"drupal/simple_oauth": "^5.2",
7679
"drupal/simple_sitemap": "^4.x-dev",
7780
"drupal/title_field_for_manage_display": "^2.0",
78-
"drupal/tome": "^1.4",
81+
"drupal/tome": "^1.6",
7982
"drupal/transliterate_filenames": "^2.0",
8083
"drupal/username_enumeration_prevention": "^1.2",
8184
"drupal/viewfield": "^3.0"
8285
},
8386
"require-dev": {
8487
"drupal/core-dev": "^9.3",
85-
"drush/drush": "^10.5"
88+
"drush/drush": "^11.0"
8689
},
8790
"conflict": {
8891
"drupal/drupal": "*"
@@ -167,7 +170,7 @@
167170
"https://www.drupal.org/project/drupal/issues/2350939#comment-14289157": "https://www.drupal.org/files/issues/2021-11-12/2350939-202.patch"
168171
},
169172
"drupal/entity_clone": {
170-
"Batch field creation https://www.drupal.org/project/entity_clone/issues/2845094#comment-14163283": "./patch/2845094.diff"
173+
"Batch field creation https://www.drupal.org/project/entity_clone/issues/2845094#comment-14163283": "https://git.drupalcode.org/project/entity_clone/-/merge_requests/8.diff"
171174
},
172175
"drupal/entity_display_mode": {
173176
"Automated Drupal Rector fixes https://www.drupal.org/project/entity_display_mode/issues/3140377#comment-13635386": "https://www.drupal.org/files/issues/2020-05-23/entity_display_mode.1.x-dev.rector.patch"
@@ -179,22 +182,20 @@
179182
"Preview link accidentally closes the media library https://www.drupal.org/project/focal_point/issues/3162210#comment-13855854": "https://www.drupal.org/files/issues/2020-10-11/preview_link_accidentally_closes_the_media_library-3162210-19.patch"
180183
},
181184
"drupal/gin": {
182-
"https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "./patch/3217391.diff",
183-
"https://www.drupal.org/project/gin/issues/3194226#comment-14415576": "./patch/3194226.diff"
185+
"https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "./patch/3217391.diff"
184186
},
185187
"drupal/gin_toolbar": {
186-
"https://www.drupal.org/project/gin_toolbar/issues/3217393": "./patch/3217393.diff"
188+
"https://www.drupal.org/project/gin_toolbar/issues/3217393": "https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/9.diff"
187189
},
188190
"drupal/layout_paragraphs": {
189191
"https://www.drupal.org/project/layout_paragraphs/issues/3259729": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/60.diff",
190-
"https://www.drupal.org/project/layout_paragraphs/issues/3265807": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/68.diff",
191192
"https://www.drupal.org/project/layout_paragraphs/issues/3214406#comment-14425196": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/70.diff"
192193
},
194+
"drupal/metatag": {
195+
"https://www.drupal.org/project/metatag/issues/2945817#comment-14420231": "https://www.drupal.org/files/issues/2022-02-21/metatag-n2945817-143.patch"
196+
},
193197
"drupal/node_edit_protection": {
194198
"Triggers if button used instead of input https://www.drupal.org/project/node_edit_protection/issues/3208719": "./patch/3208719.diff"
195-
},
196-
"drupal/tome": {
197-
"https://www.drupal.org/project/tome/issues/3257363#comment-14395629": "https://www.drupal.org/files/issues/2022-02-02/3257363-3.patch"
198199
}
199200
}
200201
}

0 commit comments

Comments
 (0)