diff --git a/composer.json b/composer.json index 5fa1275..9f8d32b 100644 --- a/composer.json +++ b/composer.json @@ -135,7 +135,6 @@ "drupal/seckit": "^2.0", "drupal/select_or_other": "^4.0", "drupal/shield": "^1.4", - "drupal/simple_sitemap": "^4.1", "drupal/smart_date": "^4.0", "drupal/sms": "^2.0", "drupal/social_post_facebook": "3.0.x-dev@dev", diff --git a/composer.lock b/composer.lock index 5169007..5ff1c3c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "31cd4a2ced5dbfa0dc89c5d4c0f61ec8", + "content-hash": "39257e18564ae7ab4fdbd33409a18757", "packages": [ { "name": "abraham/twitteroauth", @@ -15669,63 +15669,6 @@ "source": "https://git.drupalcode.org/project/similarterms" } }, - { - "name": "drupal/simple_sitemap", - "version": "4.1.9", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.9" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", - "reference": "4.1.9", - "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" - }, - "require": { - "drupal/core": "^9.3 || ^10", - "ext-xmlwriter": "*" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "4.1.9", - "datestamp": "1712441608", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - }, - "drush": { - "services": { - "drush.services.yml": ">=9" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "Pawel Ginalski (gbyte)", - "homepage": "https://www.drupal.org/u/gbyte", - "email": "contact@gbyte.dev", - "role": "Maintainer" - }, - { - "name": "WalkingDexter", - "homepage": "https://www.drupal.org/user/3251330" - } - ], - "description": "Creates a standard conform hreflang XML sitemap of the site content and provides a framework for developing other sitemap types.", - "homepage": "https://drupal.org/project/simple_sitemap", - "support": { - "source": "https://cgit.drupalcode.org/simple_sitemap", - "issues": "https://drupal.org/project/issues/simple_sitemap" - } - }, { "name": "drupal/skins", "version": "2.0.0-alpha1", diff --git a/config/config_snapshot.snapshot.config_sync.module.simple_sitemap.yml b/config/config_snapshot.snapshot.config_sync.module.simple_sitemap.yml deleted file mode 100644 index 5ea07c8..0000000 --- a/config/config_snapshot.snapshot.config_sync.module.simple_sitemap.yml +++ /dev/null @@ -1,103 +0,0 @@ -uuid: 12aadf90-d910-46d1-9af3-e72c9bb57a5e -langcode: en -status: true -dependencies: - module: - - simple_sitemap -id: config_sync.module.simple_sitemap -snapshotSet: config_sync -extensionType: module -extensionName: simple_sitemap -items: - - - collection: '' - name: simple_sitemap.custom_links.default - data: - links: - - - path: / - priority: '1.0' - changefreq: daily - _core: - default_config_hash: 25hWeYa4sasuJtHqKKcEN_nYiuEC1lMPYHsn5dawJEw - - - collection: '' - name: simple_sitemap.settings - data: - max_links: 2000 - cron_generate: true - cron_generate_interval: 0 - generate_duration: 10000 - entities_per_queue_item: 50 - remove_duplicates: true - skip_untranslated: true - xsl: true - base_url: '' - default_variant: default - custom_links_include_images: false - disable_language_hreflang: false - hide_branding: false - excluded_languages: { } - enabled_entity_types: - - node - - taxonomy_term - - menu_link_content - _core: - default_config_hash: MUpaAk1hn-0Ph4OFw3DD_6gUF9KbGwxja9Y0qmampzo - - - collection: '' - name: simple_sitemap.sitemap.default - data: - id: default - label: Default - description: 'The default hreflang sitemap - lists URLs to be indexed by modern search engines.' - type: default_hreflang - weight: 0 - status: true - dependencies: - config: - - simple_sitemap.type.default_hreflang - _core: - default_config_hash: zHW-ZT11Lkf2zSRgisGKjgU7TzrNcT8_MwFeuVtl8O8 - - - collection: '' - name: simple_sitemap.sitemap.index - data: - 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: 1000 - status: false - dependencies: - config: - - simple_sitemap.type.index - _core: - default_config_hash: aJs7eKxEbjBloVrp0IuxQbeq25CNH0r9AhSS29kHFMw - - - collection: '' - name: simple_sitemap.type.default_hreflang - data: - id: default_hreflang - label: 'Default hreflang' - description: 'The default hreflang sitemap type. A sitemap of this type is understood by most modern search engines.' - sitemap_generator: default - url_generators: - - custom - - entity - - entity_menu_link_content - - arbitrary - _core: - default_config_hash: pYORFuFzL0b2FKevz6fSag1wOUNTthFPPLxZ18JB1t0 - - - collection: '' - name: simple_sitemap.type.index - data: - 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 - _core: - default_config_hash: pbgJrin6L7zsVEKS8oEDCYJPCzgu765iTGQh2GPX1no diff --git a/config/config_snapshot.snapshot.config_sync.module.simple_sitemap_engines.yml b/config/config_snapshot.snapshot.config_sync.module.simple_sitemap_engines.yml deleted file mode 100644 index 812d332..0000000 --- a/config/config_snapshot.snapshot.config_sync.module.simple_sitemap_engines.yml +++ /dev/null @@ -1,88 +0,0 @@ -uuid: 83681fa6-8f66-43d7-a964-ccb70b5bff8b -langcode: en -status: true -dependencies: - module: - - simple_sitemap_engines -id: config_sync.module.simple_sitemap_engines -snapshotSet: config_sync -extensionType: module -extensionName: simple_sitemap_engines -items: - - - collection: '' - name: simple_sitemap_engines.settings - data: - enabled: true - submission_interval: 24 - index_now_enabled: true - index_now_preferred_engine: '' - index_now_on_entity_save: false - _core: - default_config_hash: 33gg8hVdxE7nTswwBBOY_d2rH3XjAbBa4rw0XyMRh6Y - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.bing - data: - id: bing - label: Bing - url: null - index_now_url: 'https://www.bing.com/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: uOksGlB4ho0egmcvzWqkR0Gon2HxOILPRhHQYuvcQ_E - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.index_now - data: - id: index_now - label: IndexNow - url: null - index_now_url: 'https://api.indexnow.org/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: CEvRzshIbGfbSDdfC3_RrIcyIACFbQzIqPK0W2l0LpY - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.naver - data: - id: naver - label: Naver - url: null - index_now_url: 'https://searchadvisor.naver.com/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: oCsWl2tvWgytYORap-rUJCMkzKsFtICQt21uOtHGG_I - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.seznam - data: - id: seznam - label: Seznam - url: null - index_now_url: 'https://search.seznam.cz/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: VVUUpnJomJ_zAlrcmzQCTAVLNHiZWbw4-e4rdaLHic4 - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.yandex - data: - id: yandex - label: Yandex - url: null - index_now_url: 'https://yandex.com/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: H5rVsTF_mIRdWj_oH26Hcc-U8aT3HU8A_mjbkZ_D27s - - - collection: '' - name: simple_sitemap_engines.simple_sitemap_engine.yep - data: - id: yep - label: Yep - url: null - index_now_url: 'https://indexnow.yep.com/indexnow?url=[url]&key=[key]' - sitemap_variants: { } - _core: - default_config_hash: GtuDCiCWdrpa9bravGtmwQGVNTGToZx3RDZ5_IzS2Kk diff --git a/config/core.extension.yml b/config/core.extension.yml index 1a313ef..fcd219e 100644 --- a/config/core.extension.yml +++ b/config/core.extension.yml @@ -106,9 +106,6 @@ module: search_api_db: 0 shortcut: 0 similarterms: 0 - simple_sitemap: 0 - simple_sitemap_engines: 0 - simple_sitemap_views: 0 skins: 0 system: 0 taxonomy: 0 diff --git a/config/simple_sitemap.bundle_settings.default.node.article.yml b/config/simple_sitemap.bundle_settings.default.node.article.yml deleted file mode 100644 index 9d8f80e..0000000 --- a/config/simple_sitemap.bundle_settings.default.node.article.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.6' -changefreq: monthly -include_images: false diff --git a/config/simple_sitemap.bundle_settings.default.node.event.yml b/config/simple_sitemap.bundle_settings.default.node.event.yml deleted file mode 100644 index 9d8f80e..0000000 --- a/config/simple_sitemap.bundle_settings.default.node.event.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.6' -changefreq: monthly -include_images: false diff --git a/config/simple_sitemap.bundle_settings.default.node.page.yml b/config/simple_sitemap.bundle_settings.default.node.page.yml deleted file mode 100644 index 9d8f80e..0000000 --- a/config/simple_sitemap.bundle_settings.default.node.page.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.6' -changefreq: monthly -include_images: false diff --git a/config/simple_sitemap.bundle_settings.default.node.resource.yml b/config/simple_sitemap.bundle_settings.default.node.resource.yml deleted file mode 100644 index 9d8f80e..0000000 --- a/config/simple_sitemap.bundle_settings.default.node.resource.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.6' -changefreq: monthly -include_images: false diff --git a/config/simple_sitemap.custom_links.default.yml b/config/simple_sitemap.custom_links.default.yml deleted file mode 100644 index 18a8d45..0000000 --- a/config/simple_sitemap.custom_links.default.yml +++ /dev/null @@ -1,7 +0,0 @@ -_core: - default_config_hash: 25hWeYa4sasuJtHqKKcEN_nYiuEC1lMPYHsn5dawJEw -links: - - - path: / - priority: '1.0' - changefreq: daily diff --git a/config/simple_sitemap.settings.yml b/config/simple_sitemap.settings.yml deleted file mode 100644 index 5760eb1..0000000 --- a/config/simple_sitemap.settings.yml +++ /dev/null @@ -1,20 +0,0 @@ -_core: - default_config_hash: MUpaAk1hn-0Ph4OFw3DD_6gUF9KbGwxja9Y0qmampzo -max_links: 2000 -cron_generate: true -cron_generate_interval: 0 -generate_duration: 10000 -entities_per_queue_item: 50 -remove_duplicates: true -skip_untranslated: true -xsl: true -base_url: '' -default_variant: default -custom_links_include_images: false -disable_language_hreflang: false -hide_branding: false -excluded_languages: { } -enabled_entity_types: - - node - - taxonomy_term - - menu_link_content diff --git a/config/simple_sitemap.sitemap.default.yml b/config/simple_sitemap.sitemap.default.yml deleted file mode 100644 index bf7d5e0..0000000 --- a/config/simple_sitemap.sitemap.default.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: 01b01338-5021-4bc4-a12d-a355e063cc21 -langcode: en -status: true -dependencies: - config: - - simple_sitemap.type.default_hreflang -_core: - default_config_hash: zHW-ZT11Lkf2zSRgisGKjgU7TzrNcT8_MwFeuVtl8O8 -id: default -label: Default -description: 'The default hreflang sitemap - lists URLs to be indexed by modern search engines.' -type: default_hreflang -weight: 0 diff --git a/config/simple_sitemap.sitemap.index.yml b/config/simple_sitemap.sitemap.index.yml deleted file mode 100644 index b9d3fe6..0000000 --- a/config/simple_sitemap.sitemap.index.yml +++ /dev/null @@ -1,13 +0,0 @@ -uuid: d2600416-5c35-4eab-8c78-6d73a223b032 -langcode: en -status: false -dependencies: - config: - - simple_sitemap.type.index -_core: - default_config_hash: aJs7eKxEbjBloVrp0IuxQbeq25CNH0r9AhSS29kHFMw -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: 1000 diff --git a/config/simple_sitemap.type.default_hreflang.yml b/config/simple_sitemap.type.default_hreflang.yml deleted file mode 100644 index 0b28f4d..0000000 --- a/config/simple_sitemap.type.default_hreflang.yml +++ /dev/null @@ -1,16 +0,0 @@ -uuid: 2156662b-3a4c-4a7c-9cdc-3cfe96d5fa23 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: pYORFuFzL0b2FKevz6fSag1wOUNTthFPPLxZ18JB1t0 -id: default_hreflang -label: 'Default hreflang' -description: 'The default hreflang sitemap type. A sitemap of this type is understood by most modern search engines.' -sitemap_generator: default -url_generators: - arbitrary: arbitrary - custom: custom - entity_menu_link_content: entity_menu_link_content - entity: entity - views: views diff --git a/config/simple_sitemap.type.index.yml b/config/simple_sitemap.type.index.yml deleted file mode 100644 index 31ccb7f..0000000 --- a/config/simple_sitemap.type.index.yml +++ /dev/null @@ -1,12 +0,0 @@ -uuid: 96d60c48-ce77-4868-b578-2733c1184395 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: pbgJrin6L7zsVEKS8oEDCYJPCzgu765iTGQh2GPX1no -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 diff --git a/config/simple_sitemap_engines.bundle_settings.node.article.yml b/config/simple_sitemap_engines.bundle_settings.node.article.yml deleted file mode 100644 index e07e898..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.article.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: true diff --git a/config/simple_sitemap_engines.bundle_settings.node.blog.yml b/config/simple_sitemap_engines.bundle_settings.node.blog.yml deleted file mode 100644 index 405c243..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.blog.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: false diff --git a/config/simple_sitemap_engines.bundle_settings.node.event.yml b/config/simple_sitemap_engines.bundle_settings.node.event.yml deleted file mode 100644 index e07e898..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.event.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: true diff --git a/config/simple_sitemap_engines.bundle_settings.node.landing_page.yml b/config/simple_sitemap_engines.bundle_settings.node.landing_page.yml deleted file mode 100644 index 405c243..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.landing_page.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: false diff --git a/config/simple_sitemap_engines.bundle_settings.node.page.yml b/config/simple_sitemap_engines.bundle_settings.node.page.yml deleted file mode 100644 index e07e898..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.page.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: true diff --git a/config/simple_sitemap_engines.bundle_settings.node.people.yml b/config/simple_sitemap_engines.bundle_settings.node.people.yml deleted file mode 100644 index 405c243..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.people.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: false diff --git a/config/simple_sitemap_engines.bundle_settings.node.resource.yml b/config/simple_sitemap_engines.bundle_settings.node.resource.yml deleted file mode 100644 index e07e898..0000000 --- a/config/simple_sitemap_engines.bundle_settings.node.resource.yml +++ /dev/null @@ -1 +0,0 @@ -index_now: true diff --git a/config/simple_sitemap_engines.settings.yml b/config/simple_sitemap_engines.settings.yml deleted file mode 100644 index 85aebfe..0000000 --- a/config/simple_sitemap_engines.settings.yml +++ /dev/null @@ -1,7 +0,0 @@ -_core: - default_config_hash: 33gg8hVdxE7nTswwBBOY_d2rH3XjAbBa4rw0XyMRh6Y -enabled: true -submission_interval: 24 -index_now_enabled: true -index_now_preferred_engine: '' -index_now_on_entity_save: false diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.bing.yml b/config/simple_sitemap_engines.simple_sitemap_engine.bing.yml deleted file mode 100644 index cd939af..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.bing.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 200f5dd4-9567-40c7-8e0a-1455db392c82 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: uOksGlB4ho0egmcvzWqkR0Gon2HxOILPRhHQYuvcQ_E -id: bing -label: Bing -url: null -index_now_url: 'https://www.bing.com/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.index_now.yml b/config/simple_sitemap_engines.simple_sitemap_engine.index_now.yml deleted file mode 100644 index c129299..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.index_now.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 665c83eb-b31e-4d30-8064-e5dc0ac8ee81 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: CEvRzshIbGfbSDdfC3_RrIcyIACFbQzIqPK0W2l0LpY -id: index_now -label: IndexNow -url: null -index_now_url: 'https://api.indexnow.org/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.naver.yml b/config/simple_sitemap_engines.simple_sitemap_engine.naver.yml deleted file mode 100644 index 15c50b5..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.naver.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 45d880b5-cfe2-4cd8-8945-d01ea4e0aa0e -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: oCsWl2tvWgytYORap-rUJCMkzKsFtICQt21uOtHGG_I -id: naver -label: Naver -url: null -index_now_url: 'https://searchadvisor.naver.com/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.seznam.yml b/config/simple_sitemap_engines.simple_sitemap_engine.seznam.yml deleted file mode 100644 index 67fc1cb..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.seznam.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: c7c23c54-5000-402d-a7f0-140563deffc4 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: VVUUpnJomJ_zAlrcmzQCTAVLNHiZWbw4-e4rdaLHic4 -id: seznam -label: Seznam -url: null -index_now_url: 'https://search.seznam.cz/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.yandex.yml b/config/simple_sitemap_engines.simple_sitemap_engine.yandex.yml deleted file mode 100644 index 36cee59..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.yandex.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 40b99532-d0dc-4d28-8913-d8c83a4bd276 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: H5rVsTF_mIRdWj_oH26Hcc-U8aT3HU8A_mjbkZ_D27s -id: yandex -label: Yandex -url: null -index_now_url: 'https://yandex.com/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/simple_sitemap_engines.simple_sitemap_engine.yep.yml b/config/simple_sitemap_engines.simple_sitemap_engine.yep.yml deleted file mode 100644 index 22d3490..0000000 --- a/config/simple_sitemap_engines.simple_sitemap_engine.yep.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: b44890de-d7e9-44b3-90e5-37cf79fe0e67 -langcode: en -status: true -dependencies: { } -_core: - default_config_hash: GtuDCiCWdrpa9bravGtmwQGVNTGToZx3RDZ5_IzS2Kk -id: yep -label: Yep -url: null -index_now_url: 'https://indexnow.yep.com/indexnow?url=[url]&key=[key]' -sitemap_variants: { } diff --git a/config/views.settings.yml b/config/views.settings.yml index c2cf285..479e7cb 100644 --- a/config/views.settings.yml +++ b/config/views.settings.yml @@ -1,7 +1,6 @@ _core: default_config_hash: uZHsLrDp1ThO0RvupHKcPzLOyVvWexm58JTTHNDo7yc -display_extenders: - simple_sitemap_display_extender: simple_sitemap_display_extender +display_extenders: { } sql_signature: false ui: show: diff --git a/config/views.view.article.yml b/config/views.view.article.yml index 6887d41..6c51b8e 100644 --- a/config/views.view.article.yml +++ b/config/views.view.article.yml @@ -215,15 +215,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - simple_sitemap_display_extender: - variants: - default: - index: true - priority: '0.6' - changefreq: weekly - arguments: { } - max_links: 100 + display_extenders: { } path: articles menu: type: normal diff --git a/config/views.view.event.yml b/config/views.view.event.yml index fcc6cf9..6aad5d2 100644 --- a/config/views.view.event.yml +++ b/config/views.view.event.yml @@ -337,15 +337,7 @@ display: display_plugin: page position: 1 display_options: - display_extenders: - simple_sitemap_display_extender: - variants: - default: - index: true - priority: '0.6' - changefreq: monthly - arguments: { } - max_links: 100 + display_extenders: { } path: events menu: type: normal diff --git a/config/views.view.resource.yml b/config/views.view.resource.yml index b396193..25d7e21 100644 --- a/config/views.view.resource.yml +++ b/config/views.view.resource.yml @@ -258,15 +258,7 @@ display: type: none defaults: cache: false - display_extenders: - simple_sitemap_display_extender: - variants: - default: - index: true - priority: '0.6' - changefreq: monthly - arguments: { } - max_links: 100 + display_extenders: { } path: resources menu: type: normal