Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop from master #468

Closed
wants to merge 4 commits into from
Closed

Update develop from master #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3cbcf0
Merge pull request #449 from yalesites-org/develop
nJim Oct 3, 2023
b83e4b3
fix: pin drupal/linkit to 6.0.0 to fix regression in https://www.drup…
vinmassaro Oct 4, 2023
afa0f6f
Merge pull request #450 from yalesites-org/hotfix-pin-linkit
vinmassaro Oct 4, 2023
b61f440
feat(YALB-1186): Upgrade to Drupal 10 and pin revisions in composer
codechefmarc Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
"type": "path",
"url": "web/profiles/custom/yalesites_profile"
},
"drupal/search_api_html_element_filter": {
"type": "git",
"url": "https://git.drupalcode.org/issue/search_api_html_element_filter-3390283.git"
},
"drupal": {
"type": "composer",
"url": "https://packages.drupal.org/8"
Expand All @@ -19,20 +15,20 @@
"require": {
"composer/installers": "^1.9",
"cweagans/composer-patches": "^1.7",
"drupal/core-composer-scaffold": "^9.2",
"drupal/core-recommended": "^9.2",
"drupal/core-composer-scaffold": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10",
"drush/drush": "^11 || ^12",
"oomphinc/composer-installers-extender": "^2.0",
"pantheon-systems/drupal-integrations": "^9",
"pantheon-systems/drupal-integrations": "^10",
"yalesites-org/yalesites_profile": "*"
},
"require-dev": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.2",
"drupal/coder": "^8.3",
"drupal/console": "~1.0",
"drupal/core-dev": "^9.2",
"drupal/core-dev": "^10",
"drupal/drupal-driver": "^2.1",
"drupal/drupal-extension": "^4.1",
"drupal/drupal-extension": "^5.0",
"mikey179/vfsstream": "^1.6",
"phpspec/prophecy-phpunit": "^2",
"phpunit/phpunit": "^9.5",
Expand Down Expand Up @@ -108,15 +104,17 @@
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "7.4"
"php": "8.2"
},
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"composer/installers": true,
"cweagans/composer-patches": true,
"drupal/core-composer-scaffold": true,
"drupal/console-extend-plugin": true,
"oomphinc/composer-installers-extender": true
"oomphinc/composer-installers-extender": true,
"drupal/core-project-message": true,
"phpstan/extension-installer": true,
"drupal/console-extend-plugin": true
}
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion pantheon.upstream.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
api_version: 1
php_version: 8.1
php_version: 8.2
database:
version: 10.4
drush_version: 10
Expand Down
14 changes: 0 additions & 14 deletions patches/add-php-c-format.patch
View file
Open in desktop

This file was deleted.

182 changes: 88 additions & 94 deletions web/profiles/custom/yalesites_profile/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,97 +1,97 @@
{
"name": "yalesites-org/yalesites_profile",
"type": "drupal-custom-profile",
"repositories": [
{
"repositories": {
"drupal": {
"type": "composer",
"url": "https://packages.drupal.org/8"
}
],
},
"require": {
"drupal/address": "^1.10",
"drupal/admin_toolbar": "3.3.0",
"drupal/allowed_formats": "^2.0",
"drupal/auto_entitylabel": "^3.0",
"drupal/autosave_form": "^1.3",
"drupal/better_exposed_filters": "^6.0",
"drupal/block_content_permissions": "^1.11",
"drupal/address": "1.12",
"drupal/admin_toolbar": "3.4.1",
"drupal/allowed_formats": "3.0",
"drupal/auto_entitylabel": "3.0",
"drupal/autosave_form": "1.4",
"drupal/better_exposed_filters": "6.0.3",
"drupal/bugherd": "1.0",
"drupal/calendar_link": "^3.0",
"drupal/captcha": "1.10.0",
"drupal/cas": "^2.0",
"drupal/chosen": "^4.0",
"drupal/components": "^3.0",
"drupal/config_filter": "^2.4",
"drupal/config_ignore": "^3.0",
"drupal/config_split": "^2.0@RC",
"drupal/ctools": "^3.7",
"drupal/devel": "^5.1",
"drupal/devel_kint_extras": "^1.0",
"drupal/easy_breadcrumb": "^2.0",
"drupal/editoria11y": "^2.0",
"drupal/emulsify_twig": "^4.0",
"drupal/entity_redirect": "^2.2",
"drupal/fast_404": "^2.0@alpha",
"drupal/field_group": "^3.2",
"drupal/formdazzle": "^3.0",
"drupal/gin": "^3.0@beta",
"drupal/gin_lb": "^1.0@RC",
"drupal/google_analytics": "^4.0",
"drupal/hide_revision_field": "^2.2",
"drupal/honeypot": "^2.1",
"drupal/image_widget_crop": "^2.3",
"drupal/imagemagick": "^3.4",
"drupal/improve_line_breaks_filter": "^1.3",
"drupal/inline_entity_form": "^1.0@RC",
"drupal/layout_builder_browser": "^1.4",
"drupal/layout_builder_iframe_modal": "^1.3",
"drupal/layout_builder_lock": "^1.2",
"drupal/layout_builder_restrictions": "^2.17",
"drupal/layout_builder_restrictions_by_role": "^1.0@alpha",
"drupal/libraries": "^4.0",
"drupal/linkit": "^6.0@RC",
"drupal/mailchimp_transactional": "^1.0",
"drupal/mailsystem": "^4.3",
"drupal/markup": "^1.0@beta",
"drupal/maxlength": "^2.0@RC",
"drupal/media_library_edit": "^3.0",
"drupal/media_library_form_element": "^2.0",
"drupal/menu_admin_per_menu": "^1.4",
"drupal/menu_breadcrumb": "^1.16",
"drupal/menu_item_extras": "^3.0",
"drupal/metatag": "^1.19",
"drupal/migrate_plus": "^6.0",
"drupal/migrate_tools": "^6.0",
"drupal/multivalue_form_element": "^1.0@beta",
"drupal/node_revision_delete": "^1.0@RC",
"drupal/override_node_options": "^2.6",
"drupal/pantheon_advanced_page_cache": "^2.1",
"drupal/calendar_link": "3.0.2",
"drupal/captcha": "1.14",
"drupal/cas": "2.2.0",
"drupal/chosen": "4.0.0",
"drupal/components": "3.0.0-beta3",
"drupal/config_filter": "2.4",
"drupal/config_ignore": "3.0-beta2",
"drupal/config_split": "2.0.0-rc4",
"drupal/ctools": "4.0.4",
"drupal/devel": "5.1.2",
"drupal/devel_kint_extras": "1.1.0",
"drupal/easy_breadcrumb": "2.0.5",
"drupal/editoria11y": "2.0.14",
"drupal/emulsify_twig": "4.0.0",
"drupal/entity_redirect": "2.2",
"drupal/fast_404": "3.2",
"drupal/field_group": "3.4",
"drupal/formdazzle": "3.0.0",
"drupal/gin": "3.0-rc6",
"drupal/gin_lb": "1.0.x-dev@dev",
"drupal/google_analytics": "4.0.2",
"drupal/hide_revision_field": "2.3",
"drupal/honeypot": "2.1.3",
"drupal/image_widget_crop": "2.4",
"drupal/imagemagick": "3.4",
"drupal/improve_line_breaks_filter": "1.5",
"drupal/inline_entity_form": "2.0.0-rc9",
"drupal/layout_builder_browser": "1.x-dev@dev",
"drupal/layout_builder_iframe_modal": "1.3",
"drupal/layout_builder_lock": "1.2",
"drupal/layout_builder_restrictions": "2.19",
"drupal/layout_builder_restrictions_by_role": "1.0-alpha5",
"drupal/libraries": "4.0.4",
"drupal/linkit": "6.1.0",
"drupal/mailchimp_transactional": "1.1.0",
"drupal/mailsystem": "4.4",
"drupal/markup": "2.0.0-beta6",
"drupal/maxlength": "2.1.2",
"drupal/media_library_edit": "3.0.2",
"drupal/media_library_form_element": "2.0.6",
"drupal/menu_admin_per_menu": "1.5",
"drupal/menu_breadcrumb": "2.0.0-alpha0",
"drupal/menu_item_extras": "3.0.2",
"drupal/metatag": "2.0.0",
"drupal/migrate_plus": "6.0.1",
"drupal/migrate_tools": "6.0.2",
"drupal/multivalue_form_element": "1.0-beta6",
"drupal/node_revision_delete": "2.0.0-alpha2",
"drupal/override_node_options": "2.7",
"drupal/pantheon_advanced_page_cache": "2.1.2",
"drupal/pantheon_secrets": "1.0.1",
"drupal/paragraphs": "^1.12",
"drupal/paragraphs_features": "^2.0@beta",
"drupal/pathauto": "^1.8",
"drupal/publishcontent": "^1.5",
"drupal/quick_node_clone": "^1.15",
"drupal/recaptcha": "^3.1",
"drupal/recaptcha_v3": "^1.7",
"drupal/redirect": "^1.7",
"drupal/role_delegation": "^1.2",
"drupal/search_api": "^1.25",
"drupal/search_api_exclude": "^2.0",
"drupal/search_api_html_element_filter": "dev-3390283-drupal-10-symfony",
"drupal/section_library": "^1.1",
"drupal/selective_better_exposed_filters": "^3.0@beta",
"drupal/simple_sitemap": "^4.1",
"drupal/single_content_sync": "^1.4",
"drupal/smart_date": "^3.5",
"drupal/twig_tweak": "^3.1",
"drupal/typogrify": "^1.2",
"drupal/upgrade_status": "^3.18",
"drupal/webform": "^6.2@beta",
"drupal/wingsuit_companion": "^2.0@RC",
"jjj/chosen": "^2.2",
"drupal/paragraphs": "1.16",
"drupal/paragraphs_features": "2.0-beta3",
"drupal/pathauto": "1.11",
"drupal/publishcontent": "1.6",
"drupal/quick_node_clone": "1.16",
"drupal/recaptcha": "3.2",
"drupal/recaptcha_v3": "1.9",
"drupal/redirect": "1.9",
"drupal/role_delegation": "1.2",
"drupal/search_api": "1.29",
"drupal/search_api_exclude": "2.0.2",
"drupal/search_api_html_element_filter": "1.0.4",
"drupal/section_library": "1.1.1",
"drupal/selective_better_exposed_filters": "3.0.0-beta1",
"drupal/simple_sitemap": "4.1.6",
"drupal/single_content_sync": "1.4.1",
"drupal/smart_date": "4.0.3",
"drupal/twig_tweak": "3.2.1",
"drupal/typogrify": "1.2",
"drupal/upgrade_status": "4.0.0",
"drupal/webform": "6.2.0-beta6",
"drupal/wingsuit_companion": "2.1",
"jjj/chosen": "2.2.1",
"laminas/laminas-escaper": "2.12",
"yalesites-org/atomic": "1.21.1",
"yalesites-org/yale_cas": "^1.0"
"yalesites-org/yale_cas": "1.0.4"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand All @@ -112,26 +112,17 @@
"hide remove button": "https://www.drupal.org/files/issues/2020-05-13/hide_field_required_paragraphs_remove_button_1.patch"
},
"drupal/core": {
"plural results summary https://www.drupal.org/project/drupal/issues/2888320": "https://www.drupal.org/files/issues/2021-12-15/2888320-78.patch",
"Prevent media library item overflow https://www.drupal.org/project/drupal/issues/3059955": "https://www.drupal.org/files/issues/2023-03-18/3059955-167.patch",
"Remove for Drupal 10 - CKEditor 5 should not grow to infinite height https://www.drupal.org/project/drupal/issues/3273755": "https://www.drupal.org/files/issues/2023-07-26/ckeditor-height-fix.patch",
"Fix ZipArchive deprecation: https://www.drupal.org/project/single_content_sync/issues/3364535": "https://www.drupal.org/files/issues/2022-08-22/2850794-51.patch"
"plural results summary https://www.drupal.org/project/drupal/issues/2888320": "https://www.drupal.org/files/issues/2021-12-15/2888320-78.patch"
},
"drupal/entity_redirect": {
"fix layout route https://www.drupal.org/project/entity_redirect/issues/3352265": "https://git.drupalcode.org/project/entity_redirect/-/merge_requests/6.patch"
},
"drupal/layout_builder_restrictions_by_role": {
"Fix user 1 https://www.drupal.org/project/layout_builder_restrictions_by_role/issues/3298638": "https://www.drupal.org/files/issues/2022-07-28/3298638--layout_builder_restrictions_by_role--user-1-exception-8.patch"
},
"drupal/layout_builder_browser": {
"close modal on submit https://www.drupal.org/project/layout_builder_browser/issues/3352754": "https://www.drupal.org/files/issues/2023-04-19/layout_builder_browser-modal_does_not_close_on_submit-3352754-2.patch"
},
"drupal/bugherd": {
"anonymous user unable to fill in email field https://www.drupal.org/project/bugherd/issues/3364305": "https://git.drupalcode.org/project/bugherd/-/merge_requests/4.diff"
},
"drupal/smart_date": {
"add PHP c date format": "patches/add-php-c-format.patch"
},
"drupal/gin": {
"fix description toggle for CKEditor fields https://www.drupal.org/project/gin/issues/3316265": "https://git.drupalcode.org/project/gin/-/merge_requests/227.patch",
"update dark mode localstorage https://www.drupal.org/project/gin/issues/3387653": "https://git.drupalcode.org/project/gin/-/merge_requests/304.diff"
Expand All @@ -141,6 +132,9 @@
},
"drupal/redirect": {
"fix validation issue on adding url redirect": "https://www.drupal.org/files/issues/2023-08-09/3057250-65.patch"
},
"drupal/google_analytics": {
"Cannot install from existing config https://www.drupal.org/project/google_analytics/issues/3373921": "https://www.drupal.org/files/issues/2023-08-07/google-analytics-issues-3373921-cannot-install-from-existing-config-11.patch"
}
}
}
Expand Down
7 changes: 4 additions & 3 deletions web/profiles/custom/yalesites_profile/config/sync/captcha.settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
_core:
default_config_hash: hSAUW7BoAd9YUpKcVKyZpW4wY67g4XZAYlt3Vnz6SVA
enabled_default: 0
enable_globally: 0
enable_globally_on_admin_routes: false
default_challenge: recaptcha_v3/form_submission
description: 'This question is for testing whether or not you are a human visitor and to prevent automated spam submissions.'
administration_mode: false
allow_on_admin_pages: false
administration_mode_on_admin_routes: false
whitelist_ips: ''
add_captcha_description: true
wrong_captcha_response_message: 'The answer you entered for the CAPTCHA was not correct.'
default_validation: 1
persistence: 1
enable_stats: false
log_wrong_responses: false
title: CAPTCHA
2 changes: 2 additions & 0 deletions ...custom/yalesites_profile/config/sync/core.entity_view_display.media.image.banner_16_5.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: banner_16_5_
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...stom/yalesites_profile/config/sync/core.entity_view_display.media.image.card_list_3_2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: card_list_3_2
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...yalesites_profile/config/sync/core.entity_view_display.media.image.card_secondary_3_2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: card_secondary_3_2
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...les/custom/yalesites_profile/config/sync/core.entity_view_display.media.image.default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ content:
settings:
responsive_image_style: image_max_width
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...alesites_profile/config/sync/core.entity_view_display.media.image.image_content_width.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: image_content_width
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...custom/yalesites_profile/config/sync/core.entity_view_display.media.image.image_float.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: image_float
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ..._profile/config/sync/core.entity_view_display.media.image.profile_directory_card_1_1_.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ content:
settings:
responsive_image_style: profile_1_1_
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
2 changes: 2 additions & 0 deletions ...rofile/config/sync/core.entity_view_display.media.image.text_with_image_feature_equal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
responsive_image_style: text_with_image_feature_equal
image_link: ''
image_loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
Loading
Loading