Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DROOP-1125: Upgrade status fixes for d11 & updated modules #917

Merged
merged 5 commits into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
}
},
"require": {
"php": ">=7.2",
"php": ">=8.1",
"bower-asset/colorbox": "^1.6",
"bower-asset/lazysizes": "^5.2",
"bower-asset/masonry": "^4.2",
"cweagans/composer-patches": "^1.6",
"drupal/admin_toolbar": "^3.0",
"drupal/advagg": "^6.0@alpha",
"drupal/better_exposed_filters": "^6.0",
"drupal/better_exposed_filters": "^7.0",
"drupal/checklistapi": "^2.0",
"drupal/colorbox": "^2.0",
"drupal/config_update": "2.0.x-dev@dev",
Expand All @@ -40,15 +40,15 @@
"drupal/field_group": "^3.0",
"drupal/geysir": "^2.1@RC",
"drupal/google_analytics": "^4.0",
"drupal/google_tag": "^1.4",
"drupal/link_attributes": "^1.1",
"drupal/linkit": "^6.0@RC",
"drupal/google_tag": "^2.0",
"drupal/link_attributes": "^2.1",
"drupal/linkit": "^7.0@alpha",
"drupal/menu_link_attributes": "^1.0",
"drupal/metatag": "^1.3",
"drupal/metatag": "^2.0",
"drupal/paragraphs": "^1.1",
"drupal/pathauto": "^1.0",
"drupal/redirect": "^1.0-beta1",
"drupal/schema_metatag": "^2.0",
"drupal/schema_metatag": "^3.0",
"drupal/search_api": "^1.8",
"drupal/simple_sitemap": "^4.1",
"drupal/smtp": "^1.0@beta",
Expand Down
2 changes: 1 addition & 1 deletion droopler.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Profile'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Ready to use site builder with paragraphs.'
type: profile
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_block/d_block.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Block Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides "Block" paragraph and related configuration. It allows you to insert blocks into paragraphs.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_block_field/d_block_field.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Block Field'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a field that allows a content entity to create and configure custom block instances.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down Expand Up @@ -309,7 +308,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_blog/d_blog.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Blog'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Adds a blog to Droopler.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Blog Demo Content'
description: 'Create Lorem Ipsum posts for blog.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
version: DROOPLER_VERSION
dependencies:
- droopler:d_demo
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_color/d_color.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Color Field'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides color field type.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_commerce/d_commerce.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Commerce (experimental)'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides the Droopler integration with Commerce module.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ display:
title: ''
default_argument_type: product
default_argument_options: { }
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Commerce Product (experimental)'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides the Droopler Commerce product type.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,6 @@ display:
default_argument_type: fixed
default_argument_options:
argument: ''
default_argument_skip_url: true
summary_options:
base_path: ''
count: true
Expand Down Expand Up @@ -333,7 +332,6 @@ display:
node: false
limit: false
vids: { }
default_argument_skip_url: true
summary_options: { }
summary:
sort_order: asc
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Commerce Product List (experimental)'
description: 'Provides the Droopler Commerce products list.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
dependencies:
- better_exposed_filters:better_exposed_filters
- droopler:d_commerce
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_content/d_content.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Content Page'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides "Content Page" node type.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Initial Content Installer'
description: 'Installs initial content in Droopler.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
version: DROOPLER_VERSION
dependencies:
- paragraphs:paragraphs
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_demo/d_demo.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Demo Content'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Module with demo content for Droopler.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_documentation/d_documentation.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Documentation Nodes'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Module with documentation content for Droopler.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_geysir/d_geysir.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Geysir Integration'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides extensions and overrides to Geysir module.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_lang_dropdown/d_lang_dropdown.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Language Dropdown'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Replace core language switcher with a dropdown.'
type: module
version: DROOPLER_VERSION
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_mautic/d_mautic.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Mautic Integration'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Allows embedding of Mautic form via URL.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_media/d_media.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Media Integration'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides Media configuration for Drupal.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p/d_p.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Paragraphs'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides base paragraph features.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p/src/Generators/paragraph-info.twig
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ name: {{ name }}
type: module
description: The {{ machine_name }} paragraph.
package: Paragraphs
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
dependencies:
- paragraphs:paragraphs
2 changes: 1 addition & 1 deletion modules/custom/d_p_banner/d_p_banner.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Banner
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides Banner paragraphs type and related configuration. A banner with background, icon, text and CTA.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_carousel/d_p_carousel.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Carousel
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides Carousel paragraphs type and related configuration. Items scrolled by Slick library.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_counters/d_p_counters.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Counters Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with important numbers.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_form/d_p_form.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Form Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with a form.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_gallery/d_p_gallery.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Gallery Paragraph'
description: 'Provides a paragraph with a simple gallery.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
package: 'Droopler Paragraphs'
dependencies:
- 'colorbox:colorbox'
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_help/d_p_help.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Droopler Help
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides Droopler help button.'
type: module
package: Droopler Common
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_media/d_p_media.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Media Paragraph'
description: 'Provides Media paragraph for Drupal.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
dependencies:
- 'colorbox:colorbox'
- 'droopler:d_media'
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_node/d_p_node.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Node Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with node reference.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 'Droopler Reference Content Paragraph'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
dependencies:
- 'droopler:d_media'
- 'droopler:d_p'
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_side_by_side/d_p_side_by_side.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Side By Side Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with paragraphs side by side layout.'
type: module
package: 'Droopler Paragraphs'
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_side_embed/d_p_side_embed.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Side Embed Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with side embed.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_side_image/d_p_side_image.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Side Image Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with a side image.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_side_tiles/d_p_side_tiles.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Side Tiles Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with side Masonry tiles.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Subscribe File Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with subscribe file.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_text_blocks/d_p_text_blocks.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler List Of Text Blocks Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with multiple text blocks.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_text_paged/d_p_text_paged.info.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Text Paged Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraphs with just text.'
type: module
dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'Droopler Text With Background Paragraph'
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
description: 'Provides a paragraph with text + background.'
type: module
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_p_tiles/d_p_tiles.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Tiles Gallery Paragraph'
description: 'Provides a paragraph with Masonry tile gallery.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
package: 'Droopler Paragraphs'
dependencies:
- 'colorbox:colorbox'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ display:
title: ''
default_argument_type: node
default_argument_options: { }
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
1 change: 0 additions & 1 deletion modules/custom/d_product/config/update/d_product.8119.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ views.view.product_images:
title: ''
default_argument_type: node
default_argument_options: { }
default_argument_skip_url: false
summary_options:
base_path: ''
count: true
Expand Down
2 changes: 1 addition & 1 deletion modules/custom/d_product/d_product.info.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Droopler Products'
description: 'Provides Product content type and related configuration.'
type: module
core_version_requirement: ^10
core_version_requirement: ^10 || ^11
dependencies:
- 'better_exposed_filters:better_exposed_filters'
- 'colorbox:colorbox'
Expand Down
Loading
Loading