Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/7.3.x' into feature/improve-thun…
Browse files Browse the repository at this point in the history
…der-menu-gqls
  • Loading branch information
dbosen committed Sep 5, 2024
2 parents 31af1f2 + f6c24ad commit 9ac317e
Show file tree
Hide file tree
Showing 60 changed files with 1,342 additions and 374 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/test.yml → .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
env:
DRUPAL_TESTING_COMPOSER_PROJECT: thunder/thunder-project
DRUPAL_TESTING_COMPOSER_PROJECT_VERSION: "^4.0@stable"
DRUPAL_TESTING_CLEANUP: false
DRUPAL_TESTING_DATABASE_USER: root
DRUPAL_TESTING_DATABASE_PASSWORD: root
DRUPAL_TESTING_TEST_DUMP_FILE: site-dump.tar.gz
Expand All @@ -28,6 +29,7 @@ env:
DRUPAL_TESTING_PARALLEL_TESTING: false
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
BROWSERTEST_OUTPUT_DIRECTORY: /tmp
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
Expand All @@ -38,7 +40,7 @@ jobs:

build:

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
mysql:
Expand All @@ -50,7 +52,7 @@ jobs:

strategy:
matrix:
PHP_VERSION: [ '8.1' ]
PHP_VERSION: [ '8.1', '8.3' ]

env:
DRUPAL_TESTING_TEST_DEPRECATION: true
Expand Down Expand Up @@ -106,7 +108,7 @@ jobs:
test-max:
needs: build

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
mysql:
Expand All @@ -124,7 +126,7 @@ jobs:
strategy:
fail-fast: false
matrix:
PHP_VERSION: [ '8.1' ]
PHP_VERSION: [ '8.3' ]
CHUNK: [ 1, 2, 3 ]

steps:
Expand Down Expand Up @@ -168,9 +170,16 @@ jobs:
THUNDER_TEST_CHUNK: ${{ matrix.CHUNK }}
DRUPAL_TESTING_TEST_PATH: /tmp/test/thunder/install/docroot/profiles/contrib/thunder/tests/src/TestSuites/ThunderTestSuite.php

- name: Upload test output
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: text-max-output-${{ matrix.CHUNK }}-${{ matrix.PHP_VERSION }}
path: /tmp/test/thunder/install/docroot/sites/simpletest/browser_output/

test-upgrade:

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
mysql:
Expand Down Expand Up @@ -281,7 +290,7 @@ jobs:

test-min:

runs-on: ubuntu-20.04
runs-on: ubuntu-24.04

services:
mysql:
Expand Down Expand Up @@ -336,7 +345,9 @@ jobs:
run: test-drupal-project prepare_build

- name: Install suggested dependencies
run: composer require "league/container:^4.2" "consolidation/config:^2.1.2" --no-update --no-progress --working-dir=/tmp/test/thunder/install
run: |
composer require "league/container:^4.2" "drupal/core-dev:^10.3" --no-update --no-progress --working-dir=/tmp/test/thunder/install
composer config allow-plugins.php-http/discovery true --no-plugins --working-dir=/tmp/test/thunder/install
- name: Build the docroot
run: test-drupal-project build
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,34 @@
# Changelog

## [7.3.3](https://github.com/thunder/thunder-distribution/tree/7.3.3) 2024-08-22

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.2...7.3.3)

Add search api GraphQl schema and data producer.

## [7.3.2](https://github.com/thunder/thunder-distribution/tree/7.3.2) 2024-08-14

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.1...7.3.2)

* [Issue #3462165: Add focal_point patch](https://www.drupal.org/node/3462165)

## [7.3.1](https://github.com/thunder/thunder-distribution/tree/7.3.1) 2024-06-024

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.0...7.3.1)

Add patches for upstream issues.

* [Issue #3465364: Fatal error when changing password when password_policy_history is enabled](https://www.drupal.org/project/password_policy/issues/3465364)
* [Issue #3455558: There is no visible change to a toggle when pressed (but it does trigger conditional fields, value is saved, etc)](https://www.drupal.org/project/gin/issues/3455558)

## [7.3.0](https://github.com/thunder/thunder-distribution/tree/7.1.0) 2024-06-024

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.2.2...7.3.0)

* Drupal 10.3 compatibility.
* Updated Gin theme.
* PHP8.3 compatibility.

## [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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ For general help using Thunder, please refer to [the official Thunder documentat

### Community support

For additional help, you can use one of this channel to ask question:
For additional help, you can use one of these channels to ask question:

* [Slack](https://thunder.org/contact-us) (highly recommended for faster support)
* [Twitter](https://twitter.com/ThunderCoreTeam)
Expand Down
31 changes: 17 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@
"patches": {
"drupal/core": {
"Fix Claro styles for exposed views filters wrapped in fieldsets": "https://www.drupal.org/files/issues/2021-05-31/3133639.19.patch",
"Let users configure the text of the \"Add media\" button": "https://www.drupal.org/files/issues/2021-10-01/3169956-34.patch",
"Issue #3388913: Checkbox for Media library modal missing after search": "https://www.drupal.org/files/issues/2024-01-30/3388913-48-d10.1.patch"
"Let users configure the text of the \"Add media\" button": "https://www.drupal.org/files/issues/2021-10-01/3169956-34.patch"
},
"drupal/diff": {
"Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
},
"drupal/focal_point": {
"Preview link accidentally closes the media library": "https://www.drupal.org/files/issues/2020-10-11/preview_link_accidentally_closes_the_media_library-3162210-19.patch"
"Issue #3462165: Preview results in Error: Call to a member function getDefinitions() on null": "https://www.drupal.org/files/issues/2024-07-18/Preview-results-in-Error-3462165.patch"
},
"drupal/gin": {
"Issue #3455558: There is no visible change to a toggle when pressed (but it does trigger conditional fields, value is saved, etc)": "https://www.drupal.org/files/issues/2024-08-06/3455558-Refactor-toggle-styles-mr438.patch"
}
}
},
Expand All @@ -53,25 +55,25 @@
"drupal/access_unpublished": "^1.5",
"drupal/admin_toolbar": "^3.4",
"drupal/autofill": "^1.1",
"drupal/autosave_form": "^1.2",
"drupal/autosave_form": "^1.6",
"drupal/blazy": "^2.14",
"drupal/checklistapi": "^2.1",
"drupal/core-recommended": "~10.2.4@stable",
"drupal/core-recommended": "~10.3.0@stable",
"drupal/config_selector": "^2.1",
"drupal/config_update": "^1.7 || ^2.0",
"drupal/content_lock": "^2.1",
"drupal/crop": "^2.2",
"drupal/default_content": "^1.0-alpha7||^2.0@ALPHA",
"drupal/diff": "1.3",
"drupal/diff": "1.7",
"drupal/dropzonejs": "^2.8",
"drupal/empty_fields": "^1.0-alpha1",
"drupal/entity_reference_actions": "^1.0",
"drupal/entity_reference_actions": "^1.1.1",
"drupal/entity_reference_revisions": "^1.3",
"drupal/field_group": "^3.4",
"drupal/focal_point": "2.0.2",
"drupal/focal_point": "2.1.1",
"drupal/facets": "^2.0.6",
"drupal/gin": "3.0-rc9",
"drupal/gin_toolbar": "^1.0-rc5",
"drupal/gin": "3.0-rc11",
"drupal/gin_toolbar": "^1.0-rc6",
"drupal/graphql": "^4.7",
"drupal/inline_entity_form": "^1.0-rc14",
"drupal/ivw_integration": "^2.0",
Expand All @@ -82,18 +84,18 @@
"drupal/media_entity_slideshow": "^2.0-alpha1",
"drupal/media_entity_twitter": "^2.5",
"drupal/media_expire": "^2.6",
"drupal/media_library_media_modify": "^1.0.0-beta14",
"drupal/media_library_media_modify": "^1.0.0",
"drupal/media_file_delete": "^1.2",
"drupal/metatag": "^1.26",
"drupal/metatag_async_widget": "^1.0-alpha2",
"drupal/paragraphs": "^1.12",
"drupal/paragraphs_features": "^2.0.0-beta3",
"drupal/paragraphs_paste": "^2.0-beta3",
"drupal/password_policy": "^4.0",
"drupal/password_policy": "^4.0.3",
"drupal/pathauto": "^1.11",
"drupal/responsive_preview": "^2.1",
"drupal/redirect": "^1.7",
"drupal/scheduler": "^2.0",
"drupal/scheduler": "^2.0.2",
"drupal/scheduler_content_moderation_integration": "^2.0",
"drupal/schema_metatag": "^2.4",
"drupal/select2": "^1.7",
Expand All @@ -114,7 +116,8 @@
"npm-asset/select2": "^4.0.7",
"caxy/php-htmldiff": "^0.1.14",
"webonyx/graphql-php": "^14.11.8",
"drupal/jquery_ui": "^1.6"
"drupal/jquery_ui": "^1.6",
"drupal/jquery_ui_draggable": "^2.1"
},
"suggest": {
"drupal/search_api_solr": "Provides a Apache Solr backend for the Search API module"
Expand Down
6 changes: 3 additions & 3 deletions config/install/editor.editor.basic_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,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
6 changes: 3 additions & 3 deletions config/install/editor.editor.full_html.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,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/install/gin.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ focus_color: ''
layout_density: small
show_description_toggle: true
show_user_theme_settings: true
sticky_action_buttons: true
6 changes: 6 additions & 0 deletions config/install/image.style.linkit_result_thumbnail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,9 @@ effects:
width: 50
height: 50
anchor: center-center
451bc36f-b256-43cc-adb5-4f3151fd892d:
uuid: 451bc36f-b256-43cc-adb5-4f3151fd892d
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/install/image.style.thumbnail.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 100
height: 100
crop_type: focal_point
c4eb9942-2c9e-4a81-949f-6161a44b6559:
uuid: c4eb9942-2c9e-4a81-949f-6161a44b6559
id: image_convert
weight: 2
data:
extension: webp
1 change: 1 addition & 0 deletions config/install/views.view.media_library.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
4 changes: 3 additions & 1 deletion config/install/views.view.scheduler_scheduled_content.yml
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,7 @@ display:
previous: '‹ previous'
first: '« first'
last: 'last »'
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down Expand Up @@ -1080,7 +1081,7 @@ display:
admin_label: ''
entity_type: node
entity_field: uid
plugin_id: numeric
plugin_id: entity_target_id
default_action: empty
exception:
value: all
Expand Down Expand Up @@ -1112,6 +1113,7 @@ display:
roles: { }
break_phrase: false
not: false
target_entity_type_id: user
defaults:
empty: false
access: false
Expand Down
4 changes: 3 additions & 1 deletion config/install/views.view.scheduler_scheduled_media.yml
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down Expand Up @@ -1077,7 +1078,8 @@ display:
field: uid
entity_type: media
entity_field: uid
plugin_id: numeric
plugin_id: entity_target_id
target_entity_type_id: user
defaults:
empty: false
access: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,7 @@ display:
items_per_page_options_all_label: '- All -'
offset: false
offset_label: Offset
pagination_heading_level: h4
exposed_form:
type: basic
options:
Expand Down
6 changes: 6 additions & 0 deletions config/optional/image.style.facebook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 1200
height: 630
crop_type: focal_point
ddffc1b0-0ba5-4137-bc44-90354696de13:
uuid: ddffc1b0-0ba5-4137-bc44-90354696de13
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/optional/image.style.gallery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 853
height: 480
crop_type: focal_point
9d5cfaec-9903-444e-964b-4ea2ccdb6608:
uuid: 9d5cfaec-9903-444e-964b-4ea2ccdb6608
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/optional/image.style.media_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 938
height: 527
crop_type: focal_point
8963e07c-e414-417d-a0dd-59b2c29399d6:
uuid: 8963e07c-e414-417d-a0dd-59b2c29399d6
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/optional/image.style.media_image_mobile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 560
height: 315
crop_type: focal_point
ee591d84-f108-4b47-a0a4-bd3802b38284:
uuid: ee591d84-f108-4b47-a0a4-bd3802b38284
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/optional/image.style.media_image_tablet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 850
height: 478
crop_type: focal_point
3898254c-5ffd-47d9-ac3c-6f2d0be0d9ec:
uuid: 3898254c-5ffd-47d9-ac3c-6f2d0be0d9ec
id: image_convert
weight: 2
data:
extension: webp
6 changes: 6 additions & 0 deletions config/optional/image.style.twitter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@ effects:
width: 1024
height: 512
crop_type: focal_point
2c85b491-12ad-48cd-9a33-2d32905c2cf5:
uuid: 2c85b491-12ad-48cd-9a33-2d32905c2cf5
id: image_convert
weight: 2
data:
extension: webp
2 changes: 1 addition & 1 deletion config/optional/node.type.article.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ third_party_settings:
name: Article
type: article
description: 'Use <em>articles</em> for evergreen content.'
help: ''
help: null
new_revision: true
preview_mode: 1
display_submitted: true
Loading

0 comments on commit 9ac317e

Please sign in to comment.