Skip to content

Commit

Permalink
Merge branch 'morpho' into feat/drupal10
Browse files Browse the repository at this point in the history
* morpho:
  Update simple_sitemap module (#612)
  • Loading branch information
Christian Fritsch committed Nov 21, 2022
2 parents 6dd545d + 1c490ef commit f30c9df
Show file tree
Hide file tree
Showing 24 changed files with 185 additions and 252 deletions.
11 changes: 4 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@
"drupal/field_group": {
"Undefined property: stdClass::$region in field_group_form_process()": "https://www.drupal.org/files/issues/2020-06-15/3059614-37.patch"
},
"drupal/simple_sitemap": {
"Sitemap variant index functionality": "https://www.drupal.org/files/issues/2021-03-03/simple_sitemap-sitemap_variant_index-3109090-16.patch"
},
"drupal/schema_metatag": {
"Metatags have encoded HTML entities instead of plain text content": "https://www.drupal.org/files/issues/2022-02-01/3192117-21.patch"
},
Expand Down Expand Up @@ -75,15 +72,15 @@
"drupal/diff": "1.1",
"drupal/dropzonejs": "^2.6",
"drupal/empty_fields": "^1.0-alpha1",
"drupal/entity_reference_actions": "^1.0-beta9",
"drupal/entity_reference_actions": "^1.0-beta10",
"drupal/entity_reference_revisions": "^1.3",
"drupal/field_group": "3.2",
"drupal/focal_point": "^1.3",
"drupal/facets": "^2.0",
"drupal/gin": "3.x-dev",
"drupal/gin_toolbar": "1.x-dev",
"drupal/graphql": "^4.3",
"drupal/inline_entity_form": "^1.0-rc7",
"drupal/inline_entity_form": "^1.0-rc14",
"drupal/ivw_integration": "^2.0",
"drupal/length_indicator": "^1.2",
"drupal/linkit": "^6.0.0-beta1",
Expand All @@ -92,7 +89,7 @@
"drupal/media_entity_slideshow": "^2.0-alpha1",
"drupal/media_entity_twitter": "^2.5",
"drupal/media_expire": "^2.4",
"drupal/media_library_media_modify": "^1.0.0-beta6",
"drupal/media_library_media_modify": "^1.0.0-beta8",
"drupal/metatag": "^1.19",
"drupal/metatag_async_widget": "^1.0-alpha2",
"drupal/paragraphs": "^1.12",
Expand All @@ -107,7 +104,7 @@
"drupal/schema_metatag": "2.3",
"drupal/select2": "^1.7",
"drupal/search_api_mark_outdated": "^1.0",
"drupal/simple_sitemap": "3.11",
"drupal/simple_sitemap": "^4.1.3",
"drupal/slick": "^2.6",
"drupal/token": "^1.7",
"drupal/update_helper": "^2.0||^3.0.3",
Expand Down
174 changes: 0 additions & 174 deletions config/install/core.entity_form_display.node.page.default.yml

This file was deleted.

5 changes: 5 additions & 0 deletions config/install/simple_sitemap.custom_links.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
links:
-
path: /
priority: '1.0'
changefreq: daily
5 changes: 3 additions & 2 deletions config/install/simple_sitemap.settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@ max_links: 2000
cron_generate: true
cron_generate_interval: 0
generate_duration: 10000
entities_per_queue_item: 50
remove_duplicates: true
skip_untranslated: false
disable_language_hreflang: false
xsl: false
base_url: ''
default_variant: index
custom_links_include_images: false
disable_language_hreflang: false
hide_branding: false
excluded_languages: { }
enabled_entity_types:
- node
- taxonomy_term
entities_per_queue_item: 50
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.article.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.default_hreflang
id: article
label: Article
description: ''
type: default_hreflang
weight: -10
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.basic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.default_hreflang
id: basic
label: Basic
description: ''
type: default_hreflang
weight: -9
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.channel.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.default_hreflang
id: channel
label: Channel
description: ''
type: default_hreflang
weight: -8
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.default.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.default_hreflang
id: default
label: Default
description: 'The default hreflang sitemap - lists URLs to be indexed by modern search engines.'
type: default_hreflang
weight: -6
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.index
id: index
label: 'Sitemap Index'
description: 'The sitemap index listing all other sitemaps - useful if there are at least two other sitemaps. In most cases this sitemap should be last in the generation queue and set as the default sitemap.'
type: index
weight: -5
10 changes: 10 additions & 0 deletions config/install/simple_sitemap.sitemap.tags.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
langcode: en
status: true
dependencies:
config:
- simple_sitemap.type.default_hreflang
id: tags
label: Tags
description: null
type: default_hreflang
weight: -7
12 changes: 12 additions & 0 deletions config/install/simple_sitemap.type.default_hreflang.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
langcode: en
status: true
dependencies: { }
id: default_hreflang
label: 'Default hreflang'
description: 'The default hreflang sitemap type.'
sitemap_generator: default
url_generators:
- custom
- entity
- entity_menu_link_content
- arbitrary
9 changes: 9 additions & 0 deletions config/install/simple_sitemap.type.index.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
langcode: en
status: true
dependencies: { }
id: index
label: 'Sitemap Index'
description: 'The sitemap index sitemap type. A sitemap of this type lists sitemaps of all other types.'
sitemap_generator: index
url_generators:
- index
13 changes: 0 additions & 13 deletions config/install/simple_sitemap.variants.default_hreflang.yml

This file was deleted.

4 changes: 0 additions & 4 deletions config/install/simple_sitemap.variants.variant_index.yml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ content:
taxonomy_term_edit_action: '0'
taxonomy_term_publish_action: '0'
taxonomy_term_unpublish_action: '0'
simple_sitemap:
weight: 10
region: content
settings: { }
third_party_settings: { }
uid:
type: select2_entity_reference
weight: 2
Expand Down
Loading

0 comments on commit f30c9df

Please sign in to comment.