diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01b0b2959..6a9a27e95 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,5 +39,5 @@ jobs: - name: Back to Dev if: ${{ steps.tag.outputs.tag }} run: | - composer global require su-sws/stanford-caravan:dev-8.x-3.x + composer global require su-sws/stanford-caravan:10.x-dev ~/.composer/vendor/bin/sws-caravan back-to-dev ${{ steps.tag.outputs.tag }} ${{ github.workspace }} main diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7f67fd225..a4ed0d5e6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -28,7 +28,7 @@ jobs: env: CC_TEST_REPORTER_ID: ${{secrets.CC_TEST_REPORTER_ID}} run: | - composer global require su-sws/stanford-caravan:dev-8.x-3.x + composer global require su-sws/stanford-caravan:10.x-dev ~/.composer/vendor/bin/sws-caravan phpunit /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --with-coverage - name: Save Test Results uses: actions/upload-artifact@v3 @@ -66,7 +66,7 @@ jobs: env: STANFORD_ENCRYPT: ${{ secrets.STANFORD_ENCRYPT }} run: | - composer global require su-sws/stanford-caravan:dev-8.x-3.x + composer global require su-sws/stanford-caravan:10.x-dev ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=acceptance - name: Save Test Results uses: actions/upload-artifact@v3 @@ -107,7 +107,7 @@ jobs: env: STANFORD_ENCRYPT: ${{ secrets.STANFORD_ENCRYPT }}= run: | - composer global require su-sws/stanford-caravan:dev-8.x-3.x + composer global require su-sws/stanford-caravan:10.x-dev ~/.composer/vendor/bin/sws-caravan codeception /var/www/html --extension-dir=$GITHUB_WORKSPACE/project --suites=functional - name: Save Test Results uses: actions/upload-artifact@v3 diff --git a/composer.json b/composer.json index 26281045c..83dc686ca 100644 --- a/composer.json +++ b/composer.json @@ -8,7 +8,8 @@ "repositories": [ { "type": "composer", - "url": "https://packages.drupal.org/8" + "url": "https://packages.drupal.org/8", + "exclude": ["drupal/display_field_copy"] }, { "type": "package", @@ -33,6 +34,10 @@ "reference": "master" } } + }, + { + "type": "vcs", + "url": "https://git.drupalcode.org/issue/display_field_copy-3287010.git" } ], "require": { @@ -44,7 +49,7 @@ "composer/installers": ">=1.2", "drupal/address": "^1.2", "drupal/admin_toolbar": "^3.1", - "drupal/allowed_formats": "^2.0", + "drupal/allowed_formats": "^3.0", "drupal/auto_entitylabel": "^3.0@beta", "drupal/block_content_permissions": "^1.8", "drupal/change_labels": "^1.0", @@ -60,11 +65,11 @@ "drupal/config_split": "^2.0", "drupal/confirm_leave": "^1.0@beta", "drupal/content_lock": "^2.2", - "drupal/core": "~9.5.0", + "drupal/core": "~10.1.0", "drupal/cshs": "^4.0", "drupal/default_content": "^2.0@alpha", "drupal/diff": "^1.0@RC", - "drupal/display_field_copy": "^2.0", + "drupal/display_field_copy": "dev-3287010-automated-drupal-10 as 2.0.0", "drupal/domain_301_redirect": "^2.0", "drupal/ds": "^3.3", "drupal/editoria11y": "^2.0", @@ -155,11 +160,11 @@ "sainsburys/guzzle-oauth2-plugin": "^3.0", "seboettg/citeproc-php": "2.4.1", "su-sws/ckeditor5_plugins": "^1.0", - "su-sws/drupal-patches": "^8.1", + "su-sws/drupal-patches": "^10.1", "su-sws/react_paragraphs": "^8.2", "su-sws/stanford_actions": "^8.2", "su-sws/stanford_fields": "^8.2", - "su-sws/stanford_media": "^9.0", + "su-sws/stanford_media": "^10.0", "su-sws/stanford_migrate": "^8.3", "su-sws/stanford_profile_helper": "^9.2", "su-sws/stanford_samlauth": "^1.0" @@ -184,6 +189,9 @@ } }, "patches": { + "drupal/google_analytics": { + "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" + }, "drupal/hook_event_dispatcher": { "https://www.drupal.org/project/hook_event_dispatcher/issues/3354751": "https://www.drupal.org/files/issues/2023-04-17/hook_event_dispatcher-4.x-3354751.patch" }, diff --git a/config/sync/core.entity_form_display.config_pages.stanford_local_footer.default.yml b/config/sync/core.entity_form_display.config_pages.stanford_local_footer.default.yml index 3520af6a9..26385c233 100644 --- a/config/sync/core.entity_form_display.config_pages.stanford_local_footer.default.yml +++ b/config/sync/core.entity_form_display.config_pages.stanford_local_footer.default.yml @@ -130,7 +130,7 @@ third_party_settings: classes: '' id: '' open: false - description: 'The local footer''s lockup settings' + description: "The local footer's lockup settings" required_fields: true group_content_blocks: children: diff --git a/config/sync/core.entity_view_display.media.image.default.yml b/config/sync/core.entity_view_display.media.image.default.yml index 0a08b064d..0411207bd 100644 --- a/config/sync/core.entity_view_display.media.image.default.yml +++ b/config/sync/core.entity_view_display.media.image.default.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - field.field.media.image.field_media_image + - field.field.media.image.su_media_category - media.type.image - responsive_image.styles.full_responsive module: @@ -21,6 +22,8 @@ content: settings: responsive_image_style: full_responsive image_link: '' + image_loading: + attribute: eager third_party_settings: { } weight: 0 region: content diff --git a/config/sync/core.entity_view_display.media.video.full.yml b/config/sync/core.entity_view_display.media.video.full.yml index 4a915471d..3cf3b7811 100644 --- a/config/sync/core.entity_view_display.media.video.full.yml +++ b/config/sync/core.entity_view_display.media.video.full.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.media.full - field.field.media.video.field_media_oembed_video + - field.field.media.video.su_media_category - media.type.video module: - media @@ -21,6 +22,8 @@ content: settings: max_width: 0 max_height: 0 + loading: + attribute: eager third_party_settings: { } weight: 0 region: content diff --git a/config/sync/core.entity_view_display.node.stanford_course.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_course.stanford_card.yml index 55e05327f..eb62a7da8 100644 --- a/config/sync/core.entity_view_display.node.stanford_course.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_course.stanford_card.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.stanford_course.su_course_section_units - field.field.node.stanford_course.su_course_subject - field.field.node.stanford_course.su_course_tags + - field.field.node.stanford_course.su_metatags - field.field.node.stanford_course.su_shared_tags - node.type.stanford_course module: diff --git a/config/sync/core.entity_view_display.node.stanford_course.teaser.yml b/config/sync/core.entity_view_display.node.stanford_course.teaser.yml index 00360b77b..38f181f4a 100644 --- a/config/sync/core.entity_view_display.node.stanford_course.teaser.yml +++ b/config/sync/core.entity_view_display.node.stanford_course.teaser.yml @@ -14,6 +14,7 @@ dependencies: - field.field.node.stanford_course.su_course_section_units - field.field.node.stanford_course.su_course_subject - field.field.node.stanford_course.su_course_tags + - field.field.node.stanford_course.su_metatags - field.field.node.stanford_course.su_shared_tags - node.type.stanford_course module: diff --git a/config/sync/core.entity_view_display.node.stanford_event.default.yml b/config/sync/core.entity_view_display.node.stanford_event.default.yml index 689e7060d..45bad1e5b 100644 --- a/config/sync/core.entity_view_display.node.stanford_event.default.yml +++ b/config/sync/core.entity_view_display.node.stanford_event.default.yml @@ -207,6 +207,16 @@ third_party_settings: allday_label: '' date_first: '1' ampm_reduce: 0 + site_time_toggle: '1' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 third_party_settings: field_formatter_class: class: su-event-date @@ -237,6 +247,16 @@ third_party_settings: allday_label: '' date_first: '0' ampm_reduce: 0 + site_time_toggle: '1' + tooltip: + date_format: '' + custom_date_format: '' + time_diff: + enabled: false + future_format: '@interval hence' + past_format: '@interval ago' + granularity: 2 + refresh: 60 third_party_settings: field_formatter_class: class: su-event-time diff --git a/config/sync/core.entity_view_display.node.stanford_event_series.default.yml b/config/sync/core.entity_view_display.node.stanford_event_series.default.yml index 6360db803..a618adae2 100644 --- a/config/sync/core.entity_view_display.node.stanford_event_series.default.yml +++ b/config/sync/core.entity_view_display.node.stanford_event_series.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.stanford_event_series.field_menulink - field.field.node.stanford_event_series.layout_builder__layout - field.field.node.stanford_event_series.stanford_intranet__access - field.field.node.stanford_event_series.su_event_series_components diff --git a/config/sync/core.entity_view_display.node.stanford_event_series.search_indexing.yml b/config/sync/core.entity_view_display.node.stanford_event_series.search_indexing.yml index 949340107..6ce154749 100644 --- a/config/sync/core.entity_view_display.node.stanford_event_series.search_indexing.yml +++ b/config/sync/core.entity_view_display.node.stanford_event_series.search_indexing.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.search_indexing + - field.field.node.stanford_event_series.field_menulink - field.field.node.stanford_event_series.layout_builder__layout - field.field.node.stanford_event_series.stanford_intranet__access - field.field.node.stanford_event_series.su_event_series_components diff --git a/config/sync/core.entity_view_display.node.stanford_event_series.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_event_series.stanford_card.yml index 09ba0ed35..fc33f5eaf 100644 --- a/config/sync/core.entity_view_display.node.stanford_event_series.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_event_series.stanford_card.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.stanford_card + - field.field.node.stanford_event_series.field_menulink - field.field.node.stanford_event_series.layout_builder__layout - field.field.node.stanford_event_series.stanford_intranet__access - field.field.node.stanford_event_series.su_event_series_components @@ -12,6 +13,7 @@ dependencies: - field.field.node.stanford_event_series.su_event_series_subheadline - field.field.node.stanford_event_series.su_event_series_type - field.field.node.stanford_event_series.su_event_series_weight + - field.field.node.stanford_event_series.su_metatags - field.field.node.stanford_event_series.su_shared_tags - node.type.stanford_event_series module: diff --git a/config/sync/core.entity_view_display.node.stanford_event_series.teaser.yml b/config/sync/core.entity_view_display.node.stanford_event_series.teaser.yml index a2799cdae..7877a11b4 100644 --- a/config/sync/core.entity_view_display.node.stanford_event_series.teaser.yml +++ b/config/sync/core.entity_view_display.node.stanford_event_series.teaser.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser + - field.field.node.stanford_event_series.field_menulink - field.field.node.stanford_event_series.layout_builder__layout - field.field.node.stanford_event_series.stanford_intranet__access - field.field.node.stanford_event_series.su_event_series_components @@ -12,6 +13,7 @@ dependencies: - field.field.node.stanford_event_series.su_event_series_subheadline - field.field.node.stanford_event_series.su_event_series_type - field.field.node.stanford_event_series.su_event_series_weight + - field.field.node.stanford_event_series.su_metatags - field.field.node.stanford_event_series.su_shared_tags - node.type.stanford_event_series module: diff --git a/config/sync/core.entity_view_display.node.stanford_news.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_news.stanford_card.yml index 98c5e930f..4e808314f 100644 --- a/config/sync/core.entity_view_display.node.stanford_news.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_news.stanford_card.yml @@ -6,12 +6,14 @@ dependencies: - core.entity_view_mode.node.stanford_card - field.field.node.stanford_news.layout_builder__layout - field.field.node.stanford_news.stanford_intranet__access + - field.field.node.stanford_news.su_metatags - field.field.node.stanford_news.su_news_banner - field.field.node.stanford_news.su_news_banner_media_caption - field.field.node.stanford_news.su_news_byline - field.field.node.stanford_news.su_news_components - field.field.node.stanford_news.su_news_dek - field.field.node.stanford_news.su_news_featured_media + - field.field.node.stanford_news.su_news_hide_social - field.field.node.stanford_news.su_news_publishing_date - field.field.node.stanford_news.su_news_source - field.field.node.stanford_news.su_news_topics diff --git a/config/sync/core.entity_view_display.node.stanford_page.default.yml b/config/sync/core.entity_view_display.node.stanford_page.default.yml index 0a384a08e..6d2e3f357 100644 --- a/config/sync/core.entity_view_display.node.stanford_page.default.yml +++ b/config/sync/core.entity_view_display.node.stanford_page.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.node.stanford_page.field_menulink - field.field.node.stanford_page.layout_builder__layout - field.field.node.stanford_page.layout_selection - field.field.node.stanford_page.stanford_intranet__access diff --git a/config/sync/core.entity_view_display.node.stanford_page.search_indexing.yml b/config/sync/core.entity_view_display.node.stanford_page.search_indexing.yml index 792d64a83..f9191acb8 100644 --- a/config/sync/core.entity_view_display.node.stanford_page.search_indexing.yml +++ b/config/sync/core.entity_view_display.node.stanford_page.search_indexing.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.search_indexing + - field.field.node.stanford_page.field_menulink - field.field.node.stanford_page.layout_builder__layout - field.field.node.stanford_page.layout_selection - field.field.node.stanford_page.stanford_intranet__access diff --git a/config/sync/core.entity_view_display.node.stanford_page.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_page.stanford_card.yml index 21fc5a8c9..44339c6e7 100644 --- a/config/sync/core.entity_view_display.node.stanford_page.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_page.stanford_card.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.node.stanford_card + - field.field.node.stanford_page.field_menulink - field.field.node.stanford_page.layout_builder__layout - field.field.node.stanford_page.layout_selection - field.field.node.stanford_page.stanford_intranet__access diff --git a/config/sync/core.entity_view_display.node.stanford_person.default.yml b/config/sync/core.entity_view_display.node.stanford_person.default.yml index b6033c05f..180fbfa32 100644 --- a/config/sync/core.entity_view_display.node.stanford_person.default.yml +++ b/config/sync/core.entity_view_display.node.stanford_person.default.yml @@ -5,6 +5,7 @@ dependencies: config: - core.base_field_override.node.stanford_person.title - field.field.node.stanford_person.body + - field.field.node.stanford_person.field_menulink - field.field.node.stanford_person.layout_builder__layout - field.field.node.stanford_person.stanford_intranet__access - field.field.node.stanford_person.su_metatags diff --git a/config/sync/core.entity_view_display.node.stanford_person.search_indexing.yml b/config/sync/core.entity_view_display.node.stanford_person.search_indexing.yml index 1d08b623d..085853a4b 100644 --- a/config/sync/core.entity_view_display.node.stanford_person.search_indexing.yml +++ b/config/sync/core.entity_view_display.node.stanford_person.search_indexing.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.node.search_indexing - field.field.node.stanford_person.body + - field.field.node.stanford_person.field_menulink - field.field.node.stanford_person.layout_builder__layout - field.field.node.stanford_person.stanford_intranet__access - field.field.node.stanford_person.su_metatags diff --git a/config/sync/core.entity_view_display.node.stanford_person.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_person.stanford_card.yml index ae3c348b8..af16236f4 100644 --- a/config/sync/core.entity_view_display.node.stanford_person.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_person.stanford_card.yml @@ -5,8 +5,10 @@ dependencies: config: - core.entity_view_mode.node.stanford_card - field.field.node.stanford_person.body + - field.field.node.stanford_person.field_menulink - field.field.node.stanford_person.layout_builder__layout - field.field.node.stanford_person.stanford_intranet__access + - field.field.node.stanford_person.su_metatags - field.field.node.stanford_person.su_person_academic_appt - field.field.node.stanford_person.su_person_admin_appts - field.field.node.stanford_person.su_person_affiliations @@ -25,6 +27,7 @@ dependencies: - field.field.node.stanford_person.su_person_mobile_phone - field.field.node.stanford_person.su_person_photo - field.field.node.stanford_person.su_person_profile_link + - field.field.node.stanford_person.su_person_pronouns - field.field.node.stanford_person.su_person_research - field.field.node.stanford_person.su_person_research_interests - field.field.node.stanford_person.su_person_scholarly_interests diff --git a/config/sync/core.entity_view_display.node.stanford_person.teaser.yml b/config/sync/core.entity_view_display.node.stanford_person.teaser.yml index 0aadf291e..fc3cb4d2a 100644 --- a/config/sync/core.entity_view_display.node.stanford_person.teaser.yml +++ b/config/sync/core.entity_view_display.node.stanford_person.teaser.yml @@ -5,8 +5,10 @@ dependencies: config: - core.entity_view_mode.node.teaser - field.field.node.stanford_person.body + - field.field.node.stanford_person.field_menulink - field.field.node.stanford_person.layout_builder__layout - field.field.node.stanford_person.stanford_intranet__access + - field.field.node.stanford_person.su_metatags - field.field.node.stanford_person.su_person_academic_appt - field.field.node.stanford_person.su_person_admin_appts - field.field.node.stanford_person.su_person_affiliations @@ -25,6 +27,7 @@ dependencies: - field.field.node.stanford_person.su_person_mobile_phone - field.field.node.stanford_person.su_person_photo - field.field.node.stanford_person.su_person_profile_link + - field.field.node.stanford_person.su_person_pronouns - field.field.node.stanford_person.su_person_research - field.field.node.stanford_person.su_person_research_interests - field.field.node.stanford_person.su_person_scholarly_interests diff --git a/config/sync/core.entity_view_display.node.stanford_policy.printable.yml b/config/sync/core.entity_view_display.node.stanford_policy.printable.yml index 4f2a84882..542a79204 100644 --- a/config/sync/core.entity_view_display.node.stanford_policy.printable.yml +++ b/config/sync/core.entity_view_display.node.stanford_policy.printable.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.node.printable - field.field.node.stanford_policy.body + - field.field.node.stanford_policy.field_menulink - field.field.node.stanford_policy.layout_builder__layout - field.field.node.stanford_policy.su_policy_authority - field.field.node.stanford_policy.su_policy_auto_prefix diff --git a/config/sync/core.entity_view_display.node.stanford_policy.search_indexing.yml b/config/sync/core.entity_view_display.node.stanford_policy.search_indexing.yml index e08876edf..8d7891feb 100644 --- a/config/sync/core.entity_view_display.node.stanford_policy.search_indexing.yml +++ b/config/sync/core.entity_view_display.node.stanford_policy.search_indexing.yml @@ -5,6 +5,7 @@ dependencies: config: - core.entity_view_mode.node.search_indexing - field.field.node.stanford_policy.body + - field.field.node.stanford_policy.field_menulink - field.field.node.stanford_policy.layout_builder__layout - field.field.node.stanford_policy.su_policy_authority - field.field.node.stanford_policy.su_policy_auto_prefix diff --git a/config/sync/core.entity_view_display.node.stanford_publication.stanford_card.yml b/config/sync/core.entity_view_display.node.stanford_publication.stanford_card.yml index 6b09d0f86..6fa7b0f52 100644 --- a/config/sync/core.entity_view_display.node.stanford_publication.stanford_card.yml +++ b/config/sync/core.entity_view_display.node.stanford_publication.stanford_card.yml @@ -6,6 +6,8 @@ dependencies: - core.entity_view_mode.node.stanford_card - field.field.node.stanford_publication.layout_builder__layout - field.field.node.stanford_publication.stanford_intranet__access + - field.field.node.stanford_publication.su_metatags + - field.field.node.stanford_publication.su_publication_author_ref - field.field.node.stanford_publication.su_publication_citation - field.field.node.stanford_publication.su_publication_components - field.field.node.stanford_publication.su_publication_cta diff --git a/config/sync/core.entity_view_display.node.stanford_publication.teaser.yml b/config/sync/core.entity_view_display.node.stanford_publication.teaser.yml index 33cb1f0b3..9d4acd375 100644 --- a/config/sync/core.entity_view_display.node.stanford_publication.teaser.yml +++ b/config/sync/core.entity_view_display.node.stanford_publication.teaser.yml @@ -6,6 +6,8 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.stanford_publication.layout_builder__layout - field.field.node.stanford_publication.stanford_intranet__access + - field.field.node.stanford_publication.su_metatags + - field.field.node.stanford_publication.su_publication_author_ref - field.field.node.stanford_publication.su_publication_citation - field.field.node.stanford_publication.su_publication_components - field.field.node.stanford_publication.su_publication_cta diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 3d11c9980..10b355feb 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -142,6 +142,7 @@ module: path_redirect_import: 0 pdb: 0 pdb_react: 0 + phpass: 0 preprocess_event_dispatcher: 0 printable: 0 r4032login: 0 diff --git a/config/sync/editor.editor.stanford_html.yml b/config/sync/editor.editor.stanford_html.yml index 3cc47f009..91ad965a6 100644 --- a/config/sync/editor.editor.stanford_html.yml +++ b/config/sync/editor.editor.stanford_html.yml @@ -40,12 +40,96 @@ settings: - undo - redo plugins: + ckeditor5_alignment: + enabled_alignments: + - center + - justify + - left + - right + ckeditor5_codeBlock: + languages: + - + label: 'Plain text' + language: plaintext + - + label: C + language: c + - + label: 'C#' + language: cs + - + label: C++ + language: cpp + - + label: CSS + language: css + - + label: Diff + language: diff + - + label: HTML + language: html + - + label: Java + language: java + - + label: JavaScript + language: javascript + - + label: PHP + language: php + - + label: Python + language: python + - + label: Ruby + language: ruby + - + label: TypeScript + language: typescript + - + label: XML + language: xml ckeditor5_heading: enabled_headings: - heading2 - heading3 - heading4 - heading5 + ckeditor5_list: + reversed: false + startIndex: true + ckeditor5_sourceEditing: + allowed_tags: + - '' + - '' + - '
' + - '
'
+        - ''
+        - '
' + - '
' + - '
' + - '' + - '