Drupal 10 support (#161)

* Drupal 10 support * Remove permissions for services content types that should be assigned using hook_localgov_roles_default * Use ckeditor5 * Test Drupal 9 and 10 in GitHub Actions
localgovdrupal · Jun 22, 2023 · 59805fc · 59805fc
1 parent 49735ba
commit 59805fc
Show file tree

Hide file tree

Showing 17 changed files with 249 additions and 224 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,6 +1,3 @@
-##
-# Managed by https://github.com/localgovdrupal/github_workflow_manager
----
 name: Test localgovdrupal/localgov_core drupal-module
 
 on:
@@ -24,13 +21,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -82,6 +79,7 @@ jobs:
 
       - name: Create LocalGov Drupal project
         run: |
+          composer config --global github-oauth.github.com ${{ github.token }}
           composer create-project --stability dev --no-install localgovdrupal/localgov-project ./html "${{ matrix.localgov-version }}"
           composer --working-dir=./html require --no-install localgovdrupal/localgov:${{ matrix.localgov-version }}-dev
           composer --working-dir=./html require --no-install drupal/core-recommended:${{ matrix.drupal-version }} drupal/core-composer-scaffold:${{ matrix.drupal-version }} drupal/core-project-message:${{ matrix.drupal-version }} drupal/core-dev:${{ matrix.drupal-version }}
@@ -91,7 +89,6 @@ jobs:
         if: env.HEAD_USER == 'localgovdrupal'
         run: |
           composer --working-dir=html config repositories.1 vcs git@github.com:${LOCALGOV_DRUPAL_PROJECT}.git
-          composer global config github-oauth.github.com ${{ github.token }}
           composer --working-dir=./html require --with-all-dependencies ${LOCALGOV_DRUPAL_PROJECT}:"${COMPOSER_REF} as ${LATEST_RELEASE}"
 
       - name: Obtain the test target using Git
@@ -108,13 +105,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -144,13 +141,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 
@@ -179,13 +176,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        localgov-version:
-          - '2.x'
-        drupal-version:
-          - '~9.3'
-        php-version:
-          - '7.4'
-          - '8.1'
+        include:
+          - localgov-version: '2.x'
+            drupal-version: '~9.4'
+            php-version: '8.1'
+          - localgov-version: '3.x'
+            drupal-version: '~10.0'
+            php-version: '8.1'
 
     steps:
 

diff --git a/localgov_core.info.yml b/localgov_core.info.yml
@@ -2,7 +2,7 @@ name: LocalGov Core
 description: LocalGov Drupal helper functions and core dependencies.
 package: LocalGov Drupal
 type: module
-core_version_requirement: ^9
+core_version_requirement: ^9 || ^10
 
 dependencies:
   - drupal:block

diff --git a/modules/localgov_admin_theme_improvements/localgov_admin_theme_improvements.info.yml b/modules/localgov_admin_theme_improvements/localgov_admin_theme_improvements.info.yml
@@ -2,4 +2,4 @@ name: LocalGov Admin Theme Improvements
 type: module
 description: 'Small items to fix issues with the admin theme.'
 package: LocalGov Drupal
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9 || ^10
diff --git a/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml b/modules/localgov_media/config/optional/core.entity_view_display.media.image.freestyle.yml
@@ -7,7 +7,6 @@ dependencies:
     - media.type.image
     - responsive_image.styles.freestyle_responsive
   module:
-    - field_formatter_class
     - responsive_image
 id: media.image.freestyle
 targetEntityType: media
@@ -20,9 +19,7 @@ content:
     settings:
       responsive_image_style: freestyle_responsive
       image_link: ''
-    third_party_settings:
-      field_formatter_class:
-        class: ''
+    third_party_settings: {  }
     weight: 1
     region: content
 hidden:

diff --git a/modules/localgov_media/config/optional/editor.editor.wysiwyg.yml b/modules/localgov_media/config/optional/editor.editor.wysiwyg.yml
@@ -4,67 +4,120 @@ dependencies:
   config:
     - filter.format.wysiwyg
   module:
-    - ckeditor
+    - ckeditor5
 format: wysiwyg
-editor: ckeditor
+editor: ckeditor5
 settings:
   toolbar:
-    rows:
-      -
+    items:
+      - heading
+      - style
+      - removeFormat
+      - underline
+      - bold
+      - italic
+      - '|'
+      - undo
+      - redo
+      - '|'
+      - link
+      - '|'
+      - bulletedList
+      - numberedList
+      - '|'
+      - blockQuote
+      - drupalInsertImage
+      - drupalMedia
+      - '|'
+      - sourceEditing
+      - '|'
+      - insertTable
+      - '|'
+      - code
+      - codeBlock
+  plugins:
+    ckeditor5_heading:
+      enabled_headings:
+        - heading1
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_style:
+      styles:
         -
-          name: Formatting
-          items:
-            - Format
-            - Styles
-            - RemoveFormat
-            - Underline
-            - Bold
-            - Italic
+          label: 'External link'
+          element: '<a class="external-link">'
         -
-          name: Edit
-          items:
-            - Copy
-            - Cut
-            - Paste
-            - Undo
-            - Redo
+          label: 'PDF link'
+          element: '<a class="pdf-link">'
         -
-          name: Links
-          items:
-            - DrupalLink
-            - DrupalUnlink
+          label: 'Start button'
+          element: '<a class="btn btn-start col-sm-6 mt-3">'
         -
-          name: Lists
-          items:
-            - BulletedList
-            - NumberedList
+          label: 'Alert info'
+          element: '<p class="alert alert-info">'
         -
-          name: Media
-          items:
-            - Blockquote
-            - DrupalImage
-            - DrupalMediaLibrary
+          label: 'Alert warning'
+          element: '<p class="alert alert-danger">'
         -
-          name: Tools
-          items:
-            - Source
+          label: 'Alert failure'
+          element: '<p class="alert alert-primary">'
         -
-          name: Tables
-          items:
-            - Table
-  plugins:
-    language:
-      language_list: un
-    stylescombo:
-      styles: "mark|Highlight\r\na.external-link|External link\r\na.pdf-link|PDF link\r\na.btn.btn-start.col-sm-6.mt-3|Start button\r\np.alert.alert-info|Alert info\r\np.alert.alert-danger|Alert warning\r\np.alert.alert-primary|Alert failure\r\np.alert.alert-success|Alert success\r\np.callout.callout-primary|Callout primary\r\np.callout.callout-success|Callout success\r\np.callout.callout-danger|Callout danger\r\np.callout.callout-teal|Callout teal\r\np.callout.callout-carbon|Callout carbon\r\np.callout.callout-yellow|Callout yellow\r\nul.list-checked|Green ticks"
-    drupallink:
-      linkit_enabled: true
-      linkit_profile: default
+          label: 'Alert success'
+          element: '<p class="alert alert-success">'
+        -
+          label: 'Callout primary'
+          element: '<p class="callout callout-primary">'
+        -
+          label: 'Callout success'
+          element: '<p class="callout callout-success">'
+        -
+          label: 'Callout danger'
+          element: '<p class="callout callout-danger">'
+        -
+          label: 'Callout teal'
+          element: '<p class="callout callout-teal">'
+        -
+          label: 'Callout carbon'
+          element: '<p class="callout callout-carbon">'
+        -
+          label: 'Callout yellow'
+          element: '<p class="callout callout-yellow">'
+        -
+          label: 'Green ticks'
+          element: '<ul class="list-checked">'
+    ckeditor5_sourceEditing:
+      allowed_tags:
+        - '<cite>'
+        - '<dl>'
+        - '<dt>'
+        - '<dd>'
+        - '<mark>'
+        - '<blockquote cite>'
+        - '<ol type>'
+        - '<h2 id>'
+        - '<h3 id>'
+        - '<h4 id>'
+        - '<h5 id>'
+        - '<h6 id>'
+        - '<a hreflang data-entity-substitution data-entity-type data-entity-uuid title>'
+        - '<ul type>'
+        - '<img data-entity-type data-entity-uuid data-caption>'
+        - '<drupal-media data-caption title>'
+    ckeditor5_list:
+      reversed: false
+      startIndex: true
+    ckeditor5_imageResize:
+      allow_resize: true
+    media_media:
+      allow_view_mode_override: true
 image_upload:
   status: false
   scheme: public
   directory: inline-images
   max_size: ''
   max_dimensions:
-    width: null
-    height: null
+    width: 0
+    height: 0
diff --git a/modules/localgov_media/localgov_media.info.yml b/modules/localgov_media/localgov_media.info.yml
@@ -2,9 +2,10 @@ name: LocalGov Media
 description: LocalGov Media configuration.
 package: LocalGov Drupal
 type: module
-core_version_requirement: ^8.8 || ^9
+core_version_requirement: ^9 || ^10
 
 dependencies:
+  - drupal:ckeditor5
   - drupal:editor
   - drupal:media_library
   - drupal:media_library_edit