Skip to content

Commit

Permalink
Updated packages and Drupal config and cypress tests to work with Dru…
Browse files Browse the repository at this point in the history
…pal 10.3 (#98)

* Updated some packages.

* Removed pre-commit and updated cypress github workflow.

* Captured D10.3 config changes, updated PHP version, updated tests after updates to 10.3.

* Another npm update.

* Removed tour module from config.
  • Loading branch information
dmundra authored Jun 28, 2024
1 parent 5d0f8a2 commit 0476a66
Show file tree
Hide file tree
Showing 52 changed files with 1,163 additions and 951 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ jobs:

steps:
- name: Checkout source.
uses: actions/checkout@v2
uses: actions/checkout@v4

- uses: php-actions/composer@v6
with:
php_version: '8.1'
php_version: '8.3'
php_extensions: gd

- name: Install ddev.
Expand All @@ -39,7 +39,7 @@ jobs:
check_name: 'Cypress Test Results'

- name: Archive test results.
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: always()
with:
name: cypress-results
Expand Down
25 changes: 0 additions & 25 deletions .github/workflows/pre-commit.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion config/sync/block_content.type.basic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ _core:
default_config_hash: zglzjmYxi0G0ag9MZ02y0LSJOdpWRwJxyP_OvFojFyo
id: basic
label: 'Basic block'
revision: 0
revision: false
description: 'A basic block contains a title and a body.'
1 change: 1 addition & 0 deletions config/sync/core.entity_form_mode.media.media_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ _core:
default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0
id: media.media_library
label: 'Media library'
description: ''
targetEntityType: media
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_form_mode.user.register.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI
id: user.register
label: Register
description: ''
targetEntityType: user
cache: true
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ content:
settings:
max_width: 0
max_height: 0
loading:
attribute: eager
third_party_settings: { }
weight: 0
region: content
Expand Down
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.block_content.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: 4tedlMuvQjDOdvHdw86_e-2Rt78aR7TGFMfOK8Ejppg
id: block_content.full
label: Full
description: ''
targetEntityType: block_content
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.comment.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: K7eNlfU7NEUajz01wItywZklr2oaPgL6s1_97fmDXLA
id: comment.full
label: 'Full comment'
description: ''
targetEntityType: comment
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.media.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: 6NBUEuGmlkClK8Fb76tSMMpO2eZ4LWCBdbUk4z7CuP0
id: media.full
label: 'Full content'
description: ''
targetEntityType: media
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.media.media_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ _core:
default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0
id: media.media_library
label: 'Media library'
description: ''
targetEntityType: media
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.node.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk
id: node.full
label: 'Full content'
description: ''
targetEntityType: node
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.node.rss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU
id: node.rss
label: RSS
description: ''
targetEntityType: node
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.node.search_index.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY
id: node.search_index
label: 'Search index'
description: ''
targetEntityType: node
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.node.search_result.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM
id: node.search_result
label: 'Search result highlighting input'
description: ''
targetEntityType: node
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.node.teaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
id: node.teaser
label: Teaser
description: ''
targetEntityType: node
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.taxonomy_term.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE'
id: taxonomy_term.full
label: 'Taxonomy term page'
description: ''
targetEntityType: taxonomy_term
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.user.compact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g
id: user.compact
label: Compact
description: ''
targetEntityType: user
cache: true
1 change: 1 addition & 0 deletions config/sync/core.entity_view_mode.user.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ _core:
default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM
id: user.full
label: 'User account'
description: ''
targetEntityType: user
cache: true
1 change: 0 additions & 1 deletion config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ module:
taxonomy: 0
text: 0
toolbar: 0
tour: 0
update: 0
user: 0
views_ui: 0
Expand Down
14 changes: 8 additions & 6 deletions config/sync/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ settings:
ckeditor5_imageResize:
allow_resize: true
ckeditor5_list:
reversed: false
startIndex: true
properties:
reversed: false
startIndex: true
multiBlock: true
ckeditor5_sourceEditing:
allowed_tags:
- '<cite>'
Expand All @@ -50,7 +52,7 @@ settings:
- '<a hreflang>'
- '<blockquote cite>'
- '<ul type>'
- '<ol start type>'
- '<ol type>'
- '<h2 id>'
- '<h3 id>'
- '<h4 id>'
Expand All @@ -60,7 +62,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
56 changes: 51 additions & 5 deletions config/sync/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,50 @@ settings:
- sourceEditing
- drupalMedia
plugins:
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
Expand All @@ -46,8 +90,10 @@ settings:
ckeditor5_imageResize:
allow_resize: true
ckeditor5_list:
reversed: true
startIndex: true
properties:
reversed: true
startIndex: true
multiBlock: true
ckeditor5_sourceEditing:
allowed_tags: { }
media_media:
Expand All @@ -56,7 +102,7 @@ image_upload:
status: true
scheme: public
directory: inline-images
max_size: ''
max_size: null
max_dimensions:
width: 0
height: 0
width: null
height: null
1 change: 1 addition & 0 deletions config/sync/field.field.block_content.basic.body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ default_value_callback: ''
settings:
display_summary: false
required_summary: false
allowed_formats: { }
field_type: text_with_summary
3 changes: 2 additions & 1 deletion config/sync/field.field.comment.comment.comment_body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ required: true
translatable: true
default_value: { }
default_value_callback: ''
settings: { }
settings:
allowed_formats: { }
field_type: text_long
1 change: 1 addition & 0 deletions config/sync/field.field.node.article.body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ default_value_callback: ''
settings:
display_summary: true
required_summary: false
allowed_formats: { }
field_type: text_with_summary
1 change: 1 addition & 0 deletions config/sync/field.field.node.page.body.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ default_value_callback: ''
settings:
display_summary: true
required_summary: false
allowed_formats: { }
field_type: text_with_summary
28 changes: 14 additions & 14 deletions config/sync/filter.format.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,12 @@ name: 'Basic HTML'
format: basic_html
weight: 0
filters:
filter_html:
id: filter_html
provider: filter
editor_file_reference:
id: editor_file_reference
provider: editor
status: true
weight: -10
settings:
allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href> <blockquote cite> <ul type> <ol start type> <strong> <em> <code> <li> <img src alt data-entity-uuid data-entity-type height width data-caption data-align>'
filter_html_help: false
filter_html_nofollow: false
weight: 11
settings: { }
filter_align:
id: filter_align
provider: filter
Expand All @@ -31,15 +28,18 @@ filters:
status: true
weight: 8
settings: { }
filter_html:
id: filter_html
provider: filter
status: true
weight: -10
settings:
allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href> <blockquote cite> <ul type> <ol start type> <strong> <em> <code> <li> <img src alt data-entity-uuid data-entity-type height width data-caption data-align>'
filter_html_help: false
filter_html_nofollow: false
filter_html_image_secure:
id: filter_html_image_secure
provider: filter
status: true
weight: 9
settings: { }
editor_file_reference:
id: editor_file_reference
provider: editor
status: true
weight: 11
settings: { }
24 changes: 12 additions & 12 deletions config/sync/filter.format.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ name: 'Full HTML'
format: full_html
weight: 2
filters:
editor_file_reference:
id: editor_file_reference
provider: editor
status: true
weight: 11
settings: { }
filter_align:
id: filter_align
provider: filter
Expand All @@ -23,18 +29,6 @@ filters:
status: true
weight: 9
settings: { }
filter_htmlcorrector:
id: filter_htmlcorrector
provider: filter
status: true
weight: 10
settings: { }
editor_file_reference:
id: editor_file_reference
provider: editor
status: true
weight: 11
settings: { }
filter_html:
id: filter_html
provider: filter
Expand All @@ -44,6 +38,12 @@ filters:
allowed_html: ''
filter_html_help: true
filter_html_nofollow: false
filter_htmlcorrector:
id: filter_htmlcorrector
provider: filter
status: true
weight: 10
settings: { }
media_embed:
id: media_embed
provider: media
Expand Down
Loading

0 comments on commit 0476a66

Please sign in to comment.