Skip to content

Commit

Permalink
Merge branch 'feature/54-update' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@BrianGilbert
BrianGilbert committed Apr 29, 2024
2 parents 158228d + 780c3ba commit 4082c86
Show file tree
Hide file tree
Showing 88 changed files with 6,138 additions and 2,737 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@

# Ignore auto-generated environmet files
/.ddev/docker-compose.host-docker-internal.yaml
/.gitattributes
183 changes: 68 additions & 115 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,138 +11,102 @@
"repositories": {
"drupal": {
"type": "composer",
"url": "https://packages.drupal.org/8",
"exclude": [
"drupal/anonymous_redirect",
"drupal/entity_display_mode",
"drupal/field_tools",
"drupal/m4032404",
"drupal/maxlength",
"drupal/node_edit_protection",
"drupal/paragraphs_asymmetric_translation_widgets",
"drupal/paragraphs_ee"
]
},
"drupal/anonymous_redirect": {
"type": "git",
"url": "https://git.drupalcode.org/issue/anonymous_redirect-3286076.git"
},
"drupal/entity_display_mode": {
"type": "git",
"url": "https://git.drupalcode.org/issue/entity_display_mode-3287230.git"
},
"drupal/field_tools": {
"type": "git",
"url": "https://git.drupalcode.org/issue/field_tools-3297214.git"
},
"drupal/m4032404": {
"type": "git",
"url": "https://git.drupalcode.org/issue/m4032404-3288400.git"
},
"drupal/maxlength": {
"type": "git",
"url": "https://git.drupalcode.org/issue/maxlength-3295052.git"
},
"drupal/node_edit_protection": {
"type": "git",
"url": "https://git.drupalcode.org/issue/node_edit_protection-3288778.git"
},
"drupal/paragraphs_asymmetric_translation_widgets": {
"type": "git",
"url": "https://git.drupalcode.org/issue/paragraphs_asymmetric_translation_widgets-3297814.git"
},
"drupal/paragraphs_ee": {
"type": "git",
"url": "https://git.drupalcode.org/issue/paragraphs_ee-3288984.git"
"url": "https://packages.drupal.org/8"
}
},
"require": {
"php": ">=8.1",
"composer/installers": "^2.2",
"cweagans/composer-patches": "^1.7.3",
"drupal-tome/tome_drush": "dev-master",
"drupal/admin_audit_trail": "^1.0.1",
"drupal/admin_toolbar": "^3.3",
"drupal/admin_audit_trail": "^1.0",
"drupal/admin_toolbar": "^3.4",
"drupal/advanced_text_formatter": "^3.0@RC",
"drupal/allowed_formats": "^2.0",
"drupal/anonymous_redirect": "dev-feature/3286076-automated-drupal-10",
"drupal/coffee": "^1.3.0",
"drupal/config_filter": "^2.4",
"drupal/config_ignore": "3.x-dev@dev",
"drupal/allowed_formats": "^3.0",
"drupal/anonymous_redirect": "^2.3",
"drupal/coffee": "^1.4",
"drupal/config_filter": "^2.6",
"drupal/config_ignore": "^3.2",
"drupal/config_pages": "2.x-dev@dev",
"drupal/config_rewrite": "^1.5",
"drupal/config_split": "^2.0@RC",
"drupal/config_split": "^2.0",
"drupal/consumers": "^1.17",
"drupal/content_lock": "^2.3.0",
"drupal/core-composer-scaffold": "10.0.3",
"drupal/core-project-message": "10.0.3",
"drupal/core-recommended": "10.0.3",
"drupal/core-composer-scaffold": "10.2.5",
"drupal/core-project-message": "10.2.5",
"drupal/core-recommended": "10.2.5",
"drupal/ctools": "^4.0",
"drupal/decoupled_router": "^2.0",
"drupal/diff": "^1.1.0",
"drupal/druxt": "^1.2",
"drupal/dynamic_entity_reference": "^4.0@alpha",
"drupal/eca": "1.1.x-dev@dev",
"drupal/eca": "1.1",
"drupal/entity_browser": "^2.9.0",
"drupal/entity_browser_enhanced": "^1.1.0@dev",
"drupal/entity_clone": "^2.0@alpha",
"drupal/entity_display_mode": "dev-feature/3287230-automated-drupal-10",
"drupal/entity_route_context": "^4.0@RC",
"drupal/entity_usage": "^2.0",
"drupal/environment_indicator": "^4.0.14",
"drupal/entity_clone": "^2.0@beta",
"drupal/entity_display_mode": "^2.0@alpha",
"drupal/entity_route_context": "^4.0",
"drupal/entity_usage": "^2.0@beta",
"drupal/environment_indicator": "^4.0",
"drupal/exclude_node_title": "^1.4",
"drupal/field_group": "^3.4.0",
"drupal/field_tools": "dev-3297214-automated-drupal-10",
"drupal/field_tools": "^1.0@alpha",
"drupal/focal_point": "2.x-dev@dev",
"drupal/gin": "3.x-dev@dev",
"drupal/gin": "^3.0@RC",
"drupal/gin_login": "^2.0",
"drupal/gin_toolbar": "^1.0@RC",
"drupal/image_style_warmer": "^1.2@RC",
"drupal/image_style_warmer": "^1.2",
"drupal/jquery_ui": "^1.6",
"drupal/jquery_ui_draggable": "^2.0",
"drupal/jsonapi_hypermedia": "^1.9",
"drupal/jsonapi_image_styles": "^3.0",
"drupal/jsonapi_menu_items": "^1.2",
"drupal/jsonapi_node_preview": "^1.0.0-beta2@beta",
"drupal/jsonapi_node_preview_tab": "^1.0.0@beta",
"drupal/layout_paragraphs": "^2.0.2",
"drupal/jsonapi_node_preview_tab": "^1.0",
"drupal/jsonapi_user_resources": "^1.0@beta",
"drupal/layout_paragraphs": "^2.0",
"drupal/length_indicator": "^1.2",
"drupal/linkit": "6.0.x-dev@dev",
"drupal/linky": "^1.0",
"drupal/linky_revision_ui": "2.x-dev@dev",
"drupal/linkit": "^6.1",
"drupal/linky": "^2.0@beta",
"drupal/linkychecker": "^2.0",
"drupal/linkyreplacer": "^2.2.2",
"drupal/m4032404": "dev-feature/3288400-automated-drupal-10",
"drupal/masquerade": "^2.0",
"drupal/maxlength": "dev-3295052-drupal-10-compatibility",
"drupal/linkyreplacer": "^2.2",
"drupal/m4032404": "^1.0@alpha",
"drupal/masquerade": "^2.0@RC",
"drupal/maxlength": "^3.0@beta",
"drupal/media_file_delete": "^1.3",
"drupal/media_revisions_ui": "^2.1",
"drupal/memcache": "^2.5",
"drupal/node_edit_protection": "dev-3288778-automated-drupal-10",
"drupal/metatag": "^2.0",
"drupal/node_edit_protection": "^1.1",
"drupal/oembed_providers": "^2.1",
"drupal/paragraphs_asymmetric_translation_widgets": "dev-3297814-automated-drupal-10",
"drupal/paragraphs_ee": "dev-feature/3288984-d10",
"drupal/paragraphs": "^1.17",
"drupal/paragraphs_asymmetric_translation_widgets": "^1.3",
"drupal/paragraphs_ee": "2.2.x-dev@dev",
"drupal/paragraphs_features": "^2.0@beta",
"drupal/paragraphs_viewmode": "^1.1",
"drupal/pathauto": "^1.11",
"drupal/permissions_filter": "^1.3",
"drupal/prevent_homepage_deletion": "^2.0.1",
"drupal/redirect": "^1.8",
"drupal/pate": "^1.2",
"drupal/pathauto": "^1.12",
"drupal/prevent_homepage_deletion": "^2.0",
"drupal/redirect": "^1.9",
"drupal/revision_log_default": "^1.3",
"drupal/robotstxt": "^1.5.0",
"drupal/role_delegation": "^1.2",
"drupal/role_watchdog": "^2.1",
"drupal/scheduled_transitions": "2.3.x-dev@dev",
"drupal/schema_metatag": "^2.4.0",
"drupal/security_review": "^2.0",
"drupal/simple_oauth": "^5.2.3",
"drupal/simple_sitemap": "^4.1.4",
"drupal/smart_date": "^3.7",
"drupal/tome": "^1.10.0",
"drupal/transliterate_filenames": "^2.0.1",
"drupal/upgrade_status": "^4.0@alpha",
"drupal/simple_oauth": "^5.2",
"drupal/simple_sitemap": "^4.1",
"drupal/smart_date": "^4.1@RC",
"drupal/token": "^1.13",
"drupal/tome": "^1.11",
"drupal/transliterate_filenames": "^2.0",
"drupal/upgrade_status": "^4.1",
"drupal/username_enumeration_prevention": "^1.3",
"drupal/viewfield": "^3.0",
"drupal/wpf": "^1.0"
"drupal/wpf": "^1.1"
},
"require-dev": {
"drupal/core-dev": "10.0.3",
"drush/drush": "^11.4.0",
"drupal/core-dev": "10.2.5",
"drush/drush": "^12",
"phpspec/prophecy-phpunit": "^2",
"sllh/composer-lint": "^2.0"
},
Expand All @@ -161,7 +125,8 @@
"drupal/core-project-message": true,
"dealerdirect/phpcodesniffer-composer-installer": true,
"sllh/composer-lint": true,
"phpstan/extension-installer": true
"phpstan/extension-installer": true,
"php-http/discovery": true
}
},
"scripts": {
Expand Down Expand Up @@ -229,10 +194,6 @@
},
"enable-patching": true,
"patches": {
"drupal/core": {
"https://www.drupal.org/project/drupal/issues/3247553#comment-14282335": "https://www.drupal.org/files/issues/2021-11-05/3247553-6.patch",
"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"
},
"drupal/druxt": {
"#3315030 - Add a wildcard route translator": "https://git.drupalcode.org/project/druxt/-/merge_requests/11.diff",
"#3315035 - Cannot load the 'view' entity with NULL ID": "https://git.drupalcode.org/project/druxt/-/merge_requests/10.diff"
Expand All @@ -250,40 +211,32 @@
},
"drupal/gin": {
"https://www.drupal.org/project/gin/issues/3217391#comment-14212917": "https://git.drupalcode.org/project/gin/-/merge_requests/92.diff",
"https://www.drupal.org/project/gin/issues/3335557": "https://git.drupalcode.org/project/gin/-/merge_requests/214.diff",
"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",
"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",
"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",
"https://www.drupal.org/project/gin/issues/3339301": "https://git.drupalcode.org/project/gin/-/merge_requests/223.diff",
"https://www.drupal.org/project/gin/issues/3340160": "https://git.drupalcode.org/project/gin/-/merge_requests/221.diff",
"https://www.drupal.org/project/gin/issues/3331304": "https://git.drupalcode.org/project/gin/-/merge_requests/210.diff",
"https://www.drupal.org/project/gin/issues/3331830": "https://git.drupalcode.org/project/gin/-/merge_requests/211.diff",
"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",
"https://www.drupal.org/project/gin/issues/3339063": "https://git.drupalcode.org/project/gin/-/merge_requests/217.diff"
"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",
"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"
},
"drupal/gin_toolbar": {
"https://www.drupal.org/project/gin_toolbar/issues/3217393": "https://git.drupalcode.org/project/gin_toolbar/-/merge_requests/9.diff"
},
"drupal/layout_paragraphs": {
"https://www.drupal.org/project/layout_paragraphs/issues/3259729": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/60.diff",
"https://www.drupal.org/project/layout_paragraphs/issues/3265794": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/84.diff"
"https://www.drupal.org/project/layout_paragraphs/issues/3265794": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/84.diff",
"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",
"https://www.drupal.org/project/layout_paragraphs/issues/3356968#comment-15027689": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/127.diff",
"https://www.drupal.org/project/layout_paragraphs/issues/3366968#comment-15123733": "https://git.drupalcode.org/project/layout_paragraphs/-/merge_requests/132.diff"
},
"drupal/linkit": {
"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",
"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"
"drupal/m4032404": {
"https://www.drupal.org/project/m4032404/issues/3358555#comment-15043416": "https://git.drupalcode.org/project/m4032404/-/merge_requests/3.diff"
},
"drupal/metatag": {
"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"
"drupal/linkit": {
"https://www.drupal.org/project/linkit/issues/3022261#comment-15495980": "https://www.drupal.org/files/issues/2024-03-17/3022261-41.patch"
},
"drupal/node_edit_protection": {
"Triggers if button used instead of input https://www.drupal.org/project/node_edit_protection/issues/3208719": "./patch/3208719.diff"
"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",
"https://www.drupal.org/project/node_edit_protection/issues/3193652#comment-13970107": "https://www.drupal.org/files/issues/2021-01-20/3193652-2.patch"
},
"drupal/paragraphs": {
"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",
"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"
},
"drupal/wpf": {
"https://www.drupal.org/project/wpf/issues/3338291": "https://git.drupalcode.org/project/wpf/-/merge_requests/2.diff"
}
}
}
Expand Down
Loading

0 comments on commit 4082c86

Please sign in to comment.