Merge branch '7.2.x' into feature/improve-thunder-menu-gqls

thunder · Aug 21, 2024 · 31af1f2 · 31af1f2
2 parents 7a214b8 + 612957a
commit 31af1f2
Show file tree

Hide file tree

Showing 35 changed files with 584 additions and 14,476 deletions.
diff --git a/.github/workflows/tests.yml → .github/workflows/test.yml b/.github/workflows/tests.yml → .github/workflows/test.yml
@@ -20,7 +20,7 @@ env:
   DRUPAL_TESTING_TEST_PROFILE: thunder
   DRUPAL_TESTING_HTTP_PORT: 8888
   DRUPAL_TESTING_VERBOSE: false
-  DRUPAL_TESTING_VERSION: "^1.0.41"
+  DRUPAL_TESTING_VERSION: "^1.0.42"
   DRUPAL_TESTING_TEST_FILTER: ""
   DRUPAL_TESTING_SELENIUM_HOST: 127.0.0.1
   DRUPAL_TESTING_SELENIUM_PORT: 9515
@@ -29,6 +29,10 @@ env:
   MINK_DRIVER_ARGS_WEBDRIVER: '["chrome", {"browserName":"chrome","chromeOptions":{"args":["--disable-gpu","--headless", "--no-sandbox", "--disable-dev-shm-usage"]}}, "http://127.0.0.1:9515"]'
   SIMPLETEST_BASE_URL: http://thunder-testing:8888
   SKIP_TEST_CLEANUP: true
+  # The following variable set the version that the upgrade test starts with.
+  DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION: 3.0.12
+  DRUPAL_TESTING_UPGRADE_DRUSH_VERSION: 10.3.6
+  DRUPAL_TESTING_UPGRADE_VERSION: 6.5.4
 
 jobs:
 
@@ -71,6 +75,12 @@ jobs:
         run: |
           composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true --no-plugins
           composer global require thunder/drupal-testing:${DRUPAL_TESTING_VERSION}
+          composer global require php-parallel-lint/php-parallel-lint
+
+      - name: Lint
+        run: |
+          parallel-lint --version
+          parallel-lint --no-progress -e php,module,install,inc,profile,theme .
 
       - name: Prepare the build
         run: test-drupal-project prepare_build
@@ -193,7 +203,6 @@ jobs:
           coverage: none
           php-version: ${{ matrix.PHP_VERSION }}
           extensions: Imagick, gd, pdo_mysql
-          tools: composer:2.4.4
 
       - name: Cache composer dependencies
         uses: actions/cache@v3
@@ -213,22 +222,30 @@ jobs:
           composer global config allow-plugins.dealerdirect/phpcodesniffer-composer-installer true --no-plugins
           composer global require thunder/drupal-testing:${DRUPAL_TESTING_VERSION}
 
-      - name: Prepare the build
-        run: test-drupal-project prepare_build
+      - name: Prepare the old install
+        run: test-drupal-project prepare_old_install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
-      - name: Use Thunder 6 lockfile
+      - name: Fix the old install
         run: |
-          touch /tmp/test/thunder/finished-stages/build
-          cp ${GITHUB_WORKSPACE}/tests/fixtures/thunder6.composer.lock composer.lock
-          composer install
+          composer upgrade caxy/php-htmldiff
         working-directory: /tmp/test/thunder/install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - name: Install drupal
         run: test-drupal-project install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
+
+      - name: Prepare the upgrade
+        run: test-drupal-project prepare_upgrade
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - name: Update the docroot
         run: |
-          composer config repositories.0 path "${GITHUB_WORKSPACE}"
           composer remove thunder/thunder-distribution --no-update
           composer config name "drupal-testing-thunder/thunder-distribution" --working-dir="${GITHUB_WORKSPACE}"
           composer require "drupal-testing-thunder/thunder-distribution:*" --no-update
@@ -247,6 +264,8 @@ jobs:
           php core/scripts/db-tools.php dump-database-d8-mysql --database-url "${SIMPLETEST_DB}" >"sites/default/database-dump.php"
           tar -czf "${DRUPAL_TESTING_TEST_DUMP_FILE}" --exclude='config_*' --exclude='php' --exclude='styles' --directory='sites/default' files database-dump.php
         working-directory: /tmp/test/thunder/install
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
       - name: Setup Apache
         uses: thunder/apache-shiva-php-action@v1
@@ -257,6 +276,8 @@ jobs:
 
       - name: Run tests suite
         run: test-drupal-project run_tests
+        env:
+          COMPOSER_ROOT_VERSION: ${{ env.DRUPAL_TESTING_UPGRADE_COMPOSER_PROJECT_VERSION }}
 
   test-min:
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [7.2.2](https://github.com/thunder/thunder-distribution/tree/7.2.2) 2024-04-30
+
+[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.1...7.2.2)
+
+* Fix menu links active trail data producer
+* Update simple_sitemap and diff modules
+* Bring back paragraphs split!
+* [Possible break of Thunder GraphQL schema with drupal/graphql:4.6.0](https://www.drupal.org/node/3401211)
+
 ## [7.2.1](https://github.com/thunder/thunder-distribution/tree/7.2.1) 2024-04-10
 
 [Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.0...7.2.1)

diff --git a/composer.json b/composer.json
@@ -62,7 +62,7 @@
         "drupal/content_lock": "^2.1",
         "drupal/crop": "^2.2",
         "drupal/default_content": "^1.0-alpha7||^2.0@ALPHA",
-        "drupal/diff": "1.1",
+        "drupal/diff": "1.3",
         "drupal/dropzonejs": "^2.8",
         "drupal/empty_fields": "^1.0-alpha1",
         "drupal/entity_reference_actions": "^1.0",

diff --git a/config/install/editor.editor.basic_html.yml b/config/install/editor.editor.basic_html.yml
@@ -22,6 +22,8 @@ settings:
       - '|'
       - heading
       - '|'
+      - splitParagraph
+      - '|'
       - sourceEditing
   plugins:
     ckeditor5_heading:

diff --git a/config/install/editor.editor.full_html.yml b/config/install/editor.editor.full_html.yml
@@ -29,25 +29,10 @@ settings:
       - heading
       - codeBlock
       - '|'
+      - splitParagraph
+      - '|'
       - sourceEditing
   plugins:
-    ckeditor5_heading:
-      enabled_headings:
-        - heading2
-        - heading3
-        - heading4
-        - heading5
-        - heading6
-    ckeditor5_list:
-      properties:
-        reversed: true
-        startIndex: true
-      multiBlock: true
-    ckeditor5_sourceEditing:
-      allowed_tags: {  }
-    linkit_extension:
-      linkit_enabled: true
-      linkit_profile: default
     ckeditor5_codeBlock:
       languages:
         -
@@ -92,6 +77,23 @@ settings:
         -
           label: XML
           language: xml
+    ckeditor5_heading:
+      enabled_headings:
+        - heading2
+        - heading3
+        - heading4
+        - heading5
+        - heading6
+    ckeditor5_list:
+      properties:
+        reversed: true
+        startIndex: true
+      multiBlock: true
+    ckeditor5_sourceEditing:
+      allowed_tags: {  }
+    linkit_extension:
+      linkit_enabled: true
+      linkit_profile: default
 image_upload:
   status: true
   scheme: public

diff --git a/config/install/filter.format.basic_html.yml b/config/install/filter.format.basic_html.yml
@@ -2,13 +2,29 @@ langcode: en
 status: true
 dependencies:
   module:
+    - blazy
     - editor
     - linkit
     - slick
 name: 'Basic HTML'
 format: basic_html
 weight: 0
 filters:
+  blazy_filter:
+    id: blazy_filter
+    provider: blazy
+    status: false
+    weight: 3
+    settings:
+      media_switch: ''
+      hybrid_style: ''
+      box_style: ''
+      box_media_style: ''
+      box_caption: ''
+      filter_tags:
+        img: img
+        iframe: iframe
+      use_data_uri: '0'
   editor_file_reference:
     id: editor_file_reference
     provider: editor
@@ -33,7 +49,7 @@ filters:
     status: true
     weight: -10
     settings:
-      allowed_html: '<em> <strong> <cite> <blockquote cite> <code> <ul type> <ol start type> <li> <dl> <dt> <dd> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <p> <br> <span> <img src alt height width data-entity-type data-entity-uuid data-align data-caption> <a href hreflang !href accesskey id rel target title data-entity-substitution data-entity-type data-entity-uuid>'
+      allowed_html: '<br> <p> <h2 id> <h3 id> <h4 id> <h5 id> <h6 id> <cite> <dl> <dt> <dd> <a hreflang href data-entity-type data-entity-uuid data-entity-substitution> <blockquote cite> <ul type> <ol type start> <strong> <em> <li> <div>'
       filter_html_help: false
       filter_html_nofollow: false
   filter_html_image_secure:
@@ -61,5 +77,41 @@ filters:
     status: false
     weight: 4
     settings:
+      caption:
+        alt: '0'
+        title: '0'
       optionset: default
+      layout: ''
+      background: false
+      box_caption: ''
+      box_caption_custom: ''
+      box_media_style: ''
+      loading: ''
+      responsive_image_style: ''
+      box_style: ''
+      image_style: ''
       media_switch: ''
+      ratio: ''
+      thumbnail_style: ''
+      grid: ''
+      grid_medium: ''
+      grid_small: ''
+      style: ''
+      skin: ''
+      overridables:
+        arrows: '0'
+        autoplay: '0'
+        dots: '0'
+        draggable: '0'
+        infinite: '0'
+        mouseWheel: '0'
+        randomize: '0'
+        variableWidth: '0'
+      optionset_thumbnail: ''
+      skin_thumbnail: ''
+      thumbnail_caption: ''
+      thumbnail_effect: ''
+      thumbnail_position: ''
+      override: false
+      preserve_keys: false
+      visible_items: null
diff --git a/config/install/filter.format.full_html.yml b/config/install/filter.format.full_html.yml
@@ -2,13 +2,29 @@ langcode: en
 status: true
 dependencies:
   module:
+    - blazy
     - editor
     - linkit
     - slick
 name: 'Full HTML'
 format: full_html
 weight: 2
 filters:
+  blazy_filter:
+    id: blazy_filter
+    provider: blazy
+    status: false
+    weight: 3
+    settings:
+      media_switch: ''
+      hybrid_style: ''
+      box_style: ''
+      box_media_style: ''
+      box_caption: ''
+      filter_tags:
+        img: img
+        iframe: iframe
+      use_data_uri: '0'
   editor_file_reference:
     id: editor_file_reference
     provider: editor
@@ -27,6 +43,15 @@ filters:
     status: true
     weight: 9
     settings: {  }
+  filter_html:
+    id: filter_html
+    provider: filter
+    status: false
+    weight: -10
+    settings:
+      allowed_html: ''
+      filter_html_help: true
+      filter_html_nofollow: false
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
@@ -52,5 +77,41 @@ filters:
     status: false
     weight: 4
     settings:
+      caption:
+        alt: '0'
+        title: '0'
       optionset: default
+      layout: ''
+      background: false
+      box_caption: ''
+      box_caption_custom: ''
+      box_media_style: ''
+      loading: ''
+      responsive_image_style: ''
+      box_style: ''
+      image_style: ''
       media_switch: ''
+      ratio: ''
+      thumbnail_style: ''
+      grid: ''
+      grid_medium: ''
+      grid_small: ''
+      style: ''
+      skin: ''
+      overridables:
+        arrows: '0'
+        autoplay: '0'
+        dots: '0'
+        draggable: '0'
+        infinite: '0'
+        mouseWheel: '0'
+        randomize: '0'
+        variableWidth: '0'
+      optionset_thumbnail: ''
+      skin_thumbnail: ''
+      thumbnail_caption: ''
+      thumbnail_effect: ''
+      thumbnail_position: ''
+      override: false
+      preserve_keys: false
+      visible_items: null